[maven2] 47/87: * New upstream version * Added myself to Uploaders. * Change section to java, bump Standards-Version to 3.8.1 * Add a Build-Depends-Indep dependency on maven-repo-helper * Move ant to Build-Depends (needed for clean target) * Add dependency on java runtimes for the maven2 binary. * Change the dependency on java-gcj to default-jdk (Closes: #526295) * Update watch and added orig-tar.sh to download the sources, get-orig-source in rules now uses uscan * Use quilt to manage the patches, add a patch to use the upstream build.xml as the build file, disabling all dependency downloading from it * Split the package in 2 parts: maven2-core contains all libraries, this package contains only the uber jar and the scripts * Updated the build to use Maven and its plugins to bootstrap itself, based on a patched version of the build.xml boostrap script provided with Maven. In particular, it now generates properly the shaded uber-jar, this will avoid potential class versionning conflicts for the shared libraries used in the plugins. * Added Build-Depends-Indep on libmaven-clean-plugin-java, libmaven-compiler-plugin-java, libmaven-install-plugin-java, libmaven-jar-plugin-java, libmaven-resources-plugin-java, libmaven-shade-plugin-java and add a Recommends on those libraries. * Remove debian/META-INF as this information is now generated by the build.

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Fri Feb 27 13:59:09 UTC 2015


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository maven2.

commit a8d6e5d4a9663ce8a97ccca803a351dd9539c43c
Author: Ludovic Claude <ludovic.claude at laposte.net>
Date:   Fri Jul 10 00:27:11 2009 +0000

    * New upstream version
    * Added myself to Uploaders.
    * Change section to java, bump Standards-Version to 3.8.1
    * Add a Build-Depends-Indep dependency on maven-repo-helper
    * Move ant to Build-Depends (needed for clean target)
    * Add dependency on java runtimes for the maven2 binary.
    * Change the dependency on java-gcj to default-jdk (Closes: #526295)
    * Update watch and added orig-tar.sh to download the sources,
      get-orig-source in rules now uses uscan
    * Use quilt to manage the patches, add a patch to use the upstream
      build.xml as the build file, disabling all dependency downloading from it
    * Split the package in 2 parts: maven2-core contains all libraries,
      this package contains only the uber jar and the scripts
    * Updated the build to use Maven and its plugins to bootstrap itself,
      based on a patched version of the build.xml boostrap script provided
      with Maven. In particular, it now generates properly the shaded uber-jar,
      this will avoid potential class versionning conflicts for the shared
      libraries used in the plugins.
    * Added Build-Depends-Indep on libmaven-clean-plugin-java,
      libmaven-compiler-plugin-java, libmaven-install-plugin-java,
      libmaven-jar-plugin-java, libmaven-resources-plugin-java,
      libmaven-shade-plugin-java and add a Recommends on those libraries.
    * Remove debian/META-INF as this information is now generated by the build.
---
 debian/META-INF/MANIFEST.MF                        |   13 -
 debian/META-INF/info.xml                           |   90 --
 .../doxia-sink-api/pom.properties                  |    5 -
 .../org.apache.maven.doxia/doxia-sink-api/pom.xml  |   32 -
 .../maven-reporting-api/pom.properties             |    5 -
 .../maven-reporting-api/pom.xml                    |   49 -
 .../wagon-file/pom.properties                      |    5 -
 .../org.apache.maven.wagon/wagon-file/pom.xml      |   17 -
 .../wagon-http-lightweight/pom.properties          |    5 -
 .../wagon-http-lightweight/pom.xml                 |   44 -
 .../wagon-http-shared/pom.properties               |    5 -
 .../wagon-http-shared/pom.xml                      |   26 -
 .../wagon-provider-api/pom.properties              |    5 -
 .../wagon-provider-api/pom.xml                     |   17 -
 .../wagon-ssh-common/pom.properties                |    5 -
 .../wagon-ssh-common/pom.xml                       |   26 -
 .../wagon-ssh-external/pom.properties              |    5 -
 .../wagon-ssh-external/pom.xml                     |   47 -
 .../wagon-ssh/pom.properties                       |    5 -
 .../maven/org.apache.maven.wagon/wagon-ssh/pom.xml |   57 --
 .../wagon-webdav/pom.properties                    |    5 -
 .../org.apache.maven.wagon/wagon-webdav/pom.xml    |   50 -
 .../org.apache.maven/apache-maven/pom.properties   |    5 -
 .../maven/org.apache.maven/apache-maven/pom.xml    |  172 ----
 .../maven-artifact-manager/pom.properties          |    5 -
 .../maven-artifact-manager/pom.xml                 |   78 --
 .../org.apache.maven/maven-artifact/pom.properties |    5 -
 .../maven/org.apache.maven/maven-artifact/pom.xml  |   42 -
 .../org.apache.maven/maven-core/pom.properties     |    5 -
 .../maven/org.apache.maven/maven-core/pom.xml      |  234 -----
 .../maven-error-diagnostics/pom.properties         |    5 -
 .../maven-error-diagnostics/pom.xml                |   40 -
 .../org.apache.maven/maven-model/pom.properties    |    5 -
 .../maven/org.apache.maven/maven-model/pom.xml     |   93 --
 .../org.apache.maven/maven-monitor/pom.properties  |    5 -
 .../maven/org.apache.maven/maven-monitor/pom.xml   |   31 -
 .../maven-plugin-api/pom.properties                |    5 -
 .../org.apache.maven/maven-plugin-api/pom.xml      |   39 -
 .../maven-plugin-descriptor/pom.properties         |    5 -
 .../maven-plugin-descriptor/pom.xml                |   57 --
 .../pom.properties                                 |    5 -
 .../maven-plugin-parameter-documenter/pom.xml      |   53 -
 .../maven-plugin-registry/pom.properties           |    5 -
 .../org.apache.maven/maven-plugin-registry/pom.xml |   52 -
 .../org.apache.maven/maven-profile/pom.properties  |    5 -
 .../maven/org.apache.maven/maven-profile/pom.xml   |   57 --
 .../org.apache.maven/maven-project/pom.properties  |    5 -
 .../maven/org.apache.maven/maven-project/pom.xml   |   73 --
 .../maven-repository-metadata/pom.properties       |    5 -
 .../maven-repository-metadata/pom.xml              |   51 -
 .../org.apache.maven/maven-settings/pom.properties |    5 -
 .../maven/org.apache.maven/maven-settings/pom.xml  |   57 --
 .../maven-toolchain/pom.properties                 |    5 -
 .../maven/org.apache.maven/maven-toolchain/pom.xml |  100 --
 .../plexus-container-default/pom.properties        |    5 -
 .../plexus-container-default/pom.xml               |   65 --
 .../plexus-interactivity-api/pom.properties        |    5 -
 .../plexus-interactivity-api/pom.xml               |  284 ------
 .../plexus-utils/pom.properties                    |    5 -
 .../maven/org.codehaus.plexus/plexus-utils/pom.xml |   62 --
 .../maven/plugin-expressions/project.paramdoc.xml  |  172 ----
 .../maven/plugin-expressions/rootless.paramdoc.xml |   48 -
 .../maven/plugin-expressions/settings.paramdoc.xml |   53 -
 debian/META-INF/plexus/components.xml              | 1036 --------------------
 debian/META-INF/plexus/plexus.xml                  |   37 -
 debian/build.properties                            |   20 +-
 debian/build.xml                                   |  136 ---
 debian/changelog                                   |   28 +
 debian/compat                                      |    2 +-
 debian/components.xml                              |  414 ++++++++
 debian/control                                     |   29 +-
 debian/m2.1                                        |   92 --
 debian/maven.rules                                 |    7 +
 debian/maven2.install                              |    2 +-
 debian/maven2.links                                |   19 +-
 debian/maven2.manpages                             |    2 +-
 debian/maven2.poms                                 |    2 +
 debian/mvn.1                                       |  141 ++-
 debian/mvnDebug.1                                  |  137 +++
 debian/orig-tar.sh                                 |   21 +
 debian/patches/build.patch                         |  195 ++++
 debian/patches/mvn-cmd.patch                       |    9 +-
 debian/patches/pom.patch                           |  111 +++
 debian/patches/series                              |    3 +
 debian/rules                                       |   52 +-
 debian/watch                                       |    5 +-
 86 files changed, 1080 insertions(+), 3946 deletions(-)

diff --git a/debian/META-INF/MANIFEST.MF b/debian/META-INF/MANIFEST.MF
deleted file mode 100644
index c346d8e..0000000
--- a/debian/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Archiver-Version: Plexus Archiver
-Created-By: Apache Maven
-Built-By: paul
-Build-Jdk: 1.6.0_05
-Specification-Title: Maven Bundle
-Specification-Version: 2.0.9
-Specification-Vendor: The Apache Software Foundation
-Implementation-Title: Maven Bundle
-Implementation-Version: 2.0.9
-Implementation-Vendor-Id: org.apache.maven
-Implementation-Vendor: The Apache Software Foundation
-
diff --git a/debian/META-INF/info.xml b/debian/META-INF/info.xml
deleted file mode 100644
index d94d084..0000000
--- a/debian/META-INF/info.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0"?>
-<info>
-    <title>JDOM</title>
-    <version>1.0, built September 9 2004</version>
-    <description>
-        JDOM is a Java-oriented object model which models XML documents.
-        It provides a Java-centric means of generating and manipulating
-        XML documents. While JDOM interoperates well with existing
-        standards such as the Simple API for XML (SAX) and the Document
-        Object Model (DOM), it is not an abstraction layer or
-        enhancement to those APIs. Rather, it seeks to provide a robust,
-        light-weight means of reading and writing XML data without the
-        complex and memory-consumptive options that current API
-        offerings provide.
-    </description>
-    <copyright>2000-2004, Jason Hunter</copyright>
-    <license>BSD/Apache style, see LICENSE.txt</license>
-    <support>See the jdom-interest mailing list at jdom.org</support>
-    <web-site>http://www.jdom.org/</web-site>
-    <!--
-    The following list of authors was initially extracted from @author
-    comments in the code. Apologies if anyone has been left out.
-    -->
-    <author>
-        <name>Jason Hunter (primary)</name>
-    </author>
-    <author>
-        <name>Brett McLaughlin (primary)</name>
-    </author>
-    <author>
-        <name>Steven Gould</name>
-    </author>
-    <author>
-        <name>Alex Chaffee</name>
-    </author>
-    <author>
-        <name>Jon Baer</name>
-    </author>
-    <author>
-        <name>Elliotte Rusty Harold</name>
-    </author>
-    <author>
-        <name>Dan Schaffer</name>
-    </author>
-    <author>
-        <name>Fred Trimble</name>
-    </author>
-    <author>
-        <name>Jason Reid</name>
-    </author>
-    <author>
-        <name>Kevin Regan</name>
-    </author>
-    <author>
-        <name>Lucas Gonze</name>
-    </author>
-    <author>
-        <name>Matthew Merlo</name>
-    </author>
-    <author>
-        <name>Philip Nelson</name>
-    </author>
-    <author>
-        <name>Wesley Biggs</name>
-    </author>
-    <author>
-        <name>Wolfgang Werner</name>
-    </author>
-    <author>
-        <name>Yusuf Goolamabbas</name>
-    </author>
-    <author>
-        <name>Brad Huffman</name>
-    </author>
-</info>
-
-<!-- 
-
-The following would go in MANIFEST.MF, if only the file supported comments.
-
-For more information on package versioning, see http://java.sun.com/
-  products/jdk/1.2/docs/guide/versioning/spec/VersioningSpecification.html
-Also http://java.sun.com/products/jdk/1.2/docs/guide/jar/manifest.html
-and http://java.sun.com/j2se/1.3/docs/guide/extensions/versioning.html
-
-FYI- Spec version 0.6 means beta6, 0.7 means beta7, and so on.  Perhaps
-surprisingly, 0.10 means beta10.  It's ugly, but is in line with the 
-Dewey Decimal system used by package versioning.
-
--->
diff --git a/debian/META-INF/maven/org.apache.maven.doxia/doxia-sink-api/pom.properties b/debian/META-INF/maven/org.apache.maven.doxia/doxia-sink-api/pom.properties
deleted file mode 100644
index 3609d64..0000000
--- a/debian/META-INF/maven/org.apache.maven.doxia/doxia-sink-api/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Mon Oct 29 23:45:13 CET 2007
-version=1.0-alpha-10
-groupId=org.apache.maven.doxia
-artifactId=doxia-sink-api
diff --git a/debian/META-INF/maven/org.apache.maven.doxia/doxia-sink-api/pom.xml b/debian/META-INF/maven/org.apache.maven.doxia/doxia-sink-api/pom.xml
deleted file mode 100644
index 941d484..0000000
--- a/debian/META-INF/maven/org.apache.maven.doxia/doxia-sink-api/pom.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>doxia</artifactId>
-    <groupId>org.apache.maven.doxia</groupId>
-    <version>1.0-alpha-10</version>
-  </parent>
-  <artifactId>doxia-sink-api</artifactId>
-  <name>Doxia :: Sink API</name>
-  <description>Doxia Sink API.</description>
-</project>
diff --git a/debian/META-INF/maven/org.apache.maven.reporting/maven-reporting-api/pom.properties b/debian/META-INF/maven/org.apache.maven.reporting/maven-reporting-api/pom.properties
deleted file mode 100644
index f4979a8..0000000
--- a/debian/META-INF/maven/org.apache.maven.reporting/maven-reporting-api/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Mon Apr 14 22:55:36 UTC 2008
-version=2.0.9
-groupId=org.apache.maven.reporting
-artifactId=maven-reporting-api
diff --git a/debian/META-INF/maven/org.apache.maven.reporting/maven-reporting-api/pom.xml b/debian/META-INF/maven/org.apache.maven.reporting/maven-reporting-api/pom.xml
deleted file mode 100644
index 8571a0d..0000000
--- a/debian/META-INF/maven/org.apache.maven.reporting/maven-reporting-api/pom.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>maven-reporting</artifactId>
-    <groupId>org.apache.maven.reporting</groupId>
-    <version>2.0.9</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>maven-reporting-api</artifactId>
-  <name>Maven Reporting API</name>
-  <developers>
-    <developer>
-      <id>vsiveton</id>
-      <name>Vincent Siveton</name>
-      <email>vincent.siveton at gmail.com</email>
-      <roles>
-        <role>Java Developer</role>
-      </roles>
-      <timezone>-5</timezone>
-    </developer>
-  </developers>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven.doxia</groupId>
-      <artifactId>doxia-sink-api</artifactId>
-      <version>1.0-alpha-10</version>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/debian/META-INF/maven/org.apache.maven.wagon/wagon-file/pom.properties b/debian/META-INF/maven/org.apache.maven.wagon/wagon-file/pom.properties
deleted file mode 100644
index 6d6267a..0000000
--- a/debian/META-INF/maven/org.apache.maven.wagon/wagon-file/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Tue Dec 12 17:08:31 EST 2006
-version=1.0-beta-2
-groupId=org.apache.maven.wagon
-artifactId=wagon-file
diff --git a/debian/META-INF/maven/org.apache.maven.wagon/wagon-file/pom.xml b/debian/META-INF/maven/org.apache.maven.wagon/wagon-file/pom.xml
deleted file mode 100644
index ee4c629..0000000
--- a/debian/META-INF/maven/org.apache.maven.wagon/wagon-file/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>wagon-providers</artifactId>
-    <groupId>org.apache.maven.wagon</groupId>
-    <version>1.0-beta-2</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>wagon-file</artifactId>
-  <name>Maven Wagon File Provider</name>
-  <description>
-    Wagon that gets and puts artifacts using file system protocol
-  </description>
-  <issueManagement>
-    <system>jira</system>
-    <url>http://jira.codehaus.org/browse/WAGONFILE</url>
-  </issueManagement>
-</project>
diff --git a/debian/META-INF/maven/org.apache.maven.wagon/wagon-http-lightweight/pom.properties b/debian/META-INF/maven/org.apache.maven.wagon/wagon-http-lightweight/pom.properties
deleted file mode 100644
index df87480..0000000
--- a/debian/META-INF/maven/org.apache.maven.wagon/wagon-http-lightweight/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Tue Dec 12 17:23:11 EST 2006
-version=1.0-beta-2
-groupId=org.apache.maven.wagon
-artifactId=wagon-http-lightweight
diff --git a/debian/META-INF/maven/org.apache.maven.wagon/wagon-http-lightweight/pom.xml b/debian/META-INF/maven/org.apache.maven.wagon/wagon-http-lightweight/pom.xml
deleted file mode 100644
index af4c8ec..0000000
--- a/debian/META-INF/maven/org.apache.maven.wagon/wagon-http-lightweight/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>wagon-providers</artifactId>
-    <groupId>org.apache.maven.wagon</groupId>
-    <version>1.0-beta-2</version>
-  </parent>
-
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>wagon-http-lightweight</artifactId>
-  <name>Maven Wagon Lightweight HTTP Provider</name>
-  <description>
-    Wagon that gets and puts artifacts through http using standard Java library
-  </description>
-
-  <issueManagement>
-    <system>jira</system>
-    <url>http://jira.codehaus.org/browse/WAGONHTTP</url>
-  </issueManagement>
-
-  <dependencies>
-    <dependency>
-      <groupId>${pom.groupId}</groupId>
-      <artifactId>wagon-http-shared</artifactId>
-      <version>${pom.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>xml-apis</groupId>
-      <artifactId>xml-apis</artifactId>
-      <version>1.0.b2</version>
-    </dependency>
-    <dependency>
-      <groupId>plexus</groupId>
-      <artifactId>plexus-jetty-httpd</artifactId>
-      <version>1.0-beta-1</version>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <artifactId>plexus-container-default</artifactId>
-          <groupId>plexus</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-  </dependencies>
-</project>
\ No newline at end of file
diff --git a/debian/META-INF/maven/org.apache.maven.wagon/wagon-http-shared/pom.properties b/debian/META-INF/maven/org.apache.maven.wagon/wagon-http-shared/pom.properties
deleted file mode 100644
index 3a0352d..0000000
--- a/debian/META-INF/maven/org.apache.maven.wagon/wagon-http-shared/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Tue Dec 12 17:03:55 EST 2006
-version=1.0-beta-2
-groupId=org.apache.maven.wagon
-artifactId=wagon-http-shared
diff --git a/debian/META-INF/maven/org.apache.maven.wagon/wagon-http-shared/pom.xml b/debian/META-INF/maven/org.apache.maven.wagon/wagon-http-shared/pom.xml
deleted file mode 100644
index e655521..0000000
--- a/debian/META-INF/maven/org.apache.maven.wagon/wagon-http-shared/pom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>wagon-providers</artifactId>
-    <groupId>org.apache.maven.wagon</groupId>
-    <version>1.0-beta-2</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>wagon-http-shared</artifactId>
-  <name>Maven Wagon HTTP Shared Library</name>
-  <description>
-    Shared Library for the wagon-http, and wagon-http-lightweight wagon providers.
-  </description>
-
-  <issueManagement>
-    <system>jira</system>
-    <url>http://jira.codehaus.org/browse/WAGONHTTP</url>
-  </issueManagement>
-
-  <dependencies>
-    <dependency>
-      <groupId>jtidy</groupId>
-      <artifactId>jtidy</artifactId>
-      <version>4aug2000r7-dev</version>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/debian/META-INF/maven/org.apache.maven.wagon/wagon-provider-api/pom.properties b/debian/META-INF/maven/org.apache.maven.wagon/wagon-provider-api/pom.properties
deleted file mode 100644
index 77c922d..0000000
--- a/debian/META-INF/maven/org.apache.maven.wagon/wagon-provider-api/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Tue Dec 12 17:05:59 EST 2006
-version=1.0-beta-2
-groupId=org.apache.maven.wagon
-artifactId=wagon-provider-api
diff --git a/debian/META-INF/maven/org.apache.maven.wagon/wagon-provider-api/pom.xml b/debian/META-INF/maven/org.apache.maven.wagon/wagon-provider-api/pom.xml
deleted file mode 100644
index b98499b..0000000
--- a/debian/META-INF/maven/org.apache.maven.wagon/wagon-provider-api/pom.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>wagon</artifactId>
-    <groupId>org.apache.maven.wagon</groupId>
-    <version>1.0-beta-2</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>wagon-provider-api</artifactId>
-  <name>Maven Wagon API</name>
-  <description>Maven Wagon API that defines the contract between different Wagon implementations</description>
-  <dependencies>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-    </dependency>
-  </dependencies>
-</project>
\ No newline at end of file
diff --git a/debian/META-INF/maven/org.apache.maven.wagon/wagon-ssh-common/pom.properties b/debian/META-INF/maven/org.apache.maven.wagon/wagon-ssh-common/pom.properties
deleted file mode 100644
index f00566c..0000000
--- a/debian/META-INF/maven/org.apache.maven.wagon/wagon-ssh-common/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Tue Dec 12 17:25:05 EST 2006
-version=1.0-beta-2
-groupId=org.apache.maven.wagon
-artifactId=wagon-ssh-common
diff --git a/debian/META-INF/maven/org.apache.maven.wagon/wagon-ssh-common/pom.xml b/debian/META-INF/maven/org.apache.maven.wagon/wagon-ssh-common/pom.xml
deleted file mode 100644
index 9e6d70a..0000000
--- a/debian/META-INF/maven/org.apache.maven.wagon/wagon-ssh-common/pom.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>wagon-providers</artifactId>
-    <groupId>org.apache.maven.wagon</groupId>
-    <version>1.0-beta-2</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>wagon-ssh-common</artifactId>
-  <name>Maven Wagon SSH Common Library</name>
-
-  <issueManagement>
-    <system>jira</system>
-    <url>http://jira.codehaus.org/browse/WAGONSSH</url>
-  </issueManagement>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-interactivity-api</artifactId>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/debian/META-INF/maven/org.apache.maven.wagon/wagon-ssh-external/pom.properties b/debian/META-INF/maven/org.apache.maven.wagon/wagon-ssh-external/pom.properties
deleted file mode 100644
index a202a57..0000000
--- a/debian/META-INF/maven/org.apache.maven.wagon/wagon-ssh-external/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Tue Dec 12 17:26:58 EST 2006
-version=1.0-beta-2
-groupId=org.apache.maven.wagon
-artifactId=wagon-ssh-external
diff --git a/debian/META-INF/maven/org.apache.maven.wagon/wagon-ssh-external/pom.xml b/debian/META-INF/maven/org.apache.maven.wagon/wagon-ssh-external/pom.xml
deleted file mode 100644
index c2d36dc..0000000
--- a/debian/META-INF/maven/org.apache.maven.wagon/wagon-ssh-external/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>wagon-providers</artifactId>
-    <groupId>org.apache.maven.wagon</groupId>
-    <version>1.0-beta-2</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>wagon-ssh-external</artifactId>
-  <name>Maven Wagon SSH External Provider</name>
-  <description>
-    Wagon that gets and puts artifacts using SSH protocol with a preinstalled SSH client
-  </description>
-
-  <issueManagement>
-    <system>jira</system>
-    <url>http://jira.codehaus.org/browse/WAGONSSH</url>
-  </issueManagement>
-
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <excludes>
-            <exclude>**/Scp*Test.*</exclude>
-            <exclude>**/SshCommandExecutorTest.*</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-ssh-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-ssh-common-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/debian/META-INF/maven/org.apache.maven.wagon/wagon-ssh/pom.properties b/debian/META-INF/maven/org.apache.maven.wagon/wagon-ssh/pom.properties
deleted file mode 100644
index cfe05ed..0000000
--- a/debian/META-INF/maven/org.apache.maven.wagon/wagon-ssh/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Tue Dec 12 17:27:50 EST 2006
-version=1.0-beta-2
-groupId=org.apache.maven.wagon
-artifactId=wagon-ssh
diff --git a/debian/META-INF/maven/org.apache.maven.wagon/wagon-ssh/pom.xml b/debian/META-INF/maven/org.apache.maven.wagon/wagon-ssh/pom.xml
deleted file mode 100644
index bfaf9eb..0000000
--- a/debian/META-INF/maven/org.apache.maven.wagon/wagon-ssh/pom.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>wagon-providers</artifactId>
-    <groupId>org.apache.maven.wagon</groupId>
-    <version>1.0-beta-2</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>wagon-ssh</artifactId>
-  <name>Maven Wagon SSH Provider</name>
-
-  <issueManagement>
-    <system>jira</system>
-    <url>http://jira.codehaus.org/browse/WAGONSSH</url>
-  </issueManagement>
-
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <!-- Tests that require an ssh server on localhost -->
-          <excludes>
-            <exclude>**/ScpWagon*Test.*</exclude>
-            <exclude>**/SftpWagonTest.*</exclude>
-            <exclude>**/SshCommandExecutorTest.*</exclude>
-            <exclude>**/KnownHostsProviderTest.*</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>com.jcraft</groupId>
-      <artifactId>jsch</artifactId>
-      <version>0.1.27</version>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-interactivity-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-ssh-common</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-ssh-common-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/debian/META-INF/maven/org.apache.maven.wagon/wagon-webdav/pom.properties b/debian/META-INF/maven/org.apache.maven.wagon/wagon-webdav/pom.properties
deleted file mode 100644
index a042219..0000000
--- a/debian/META-INF/maven/org.apache.maven.wagon/wagon-webdav/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Tue Dec 12 17:29:47 EST 2006
-version=1.0-beta-2
-groupId=org.apache.maven.wagon
-artifactId=wagon-webdav
diff --git a/debian/META-INF/maven/org.apache.maven.wagon/wagon-webdav/pom.xml b/debian/META-INF/maven/org.apache.maven.wagon/wagon-webdav/pom.xml
deleted file mode 100644
index 247b74b..0000000
--- a/debian/META-INF/maven/org.apache.maven.wagon/wagon-webdav/pom.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>wagon-providers</artifactId>
-    <groupId>org.apache.maven.wagon</groupId>
-    <version>1.0-beta-2</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>wagon-webdav</artifactId>
-  <name>Maven Wagon WebDav Provider</name>
-  <description>
-    Wagon that gets and puts artifacts through webdav protocol
-  </description>
-
-  <contributors>
-    <contributor>
-      <name>Henry Isidro</name>
-      <email>hisidro at exist.com</email>
-    </contributor>
-    <contributor>
-      <name>Joakim Erdfelt</name>
-      <email>joakim at erdfelt.com</email>
-    </contributor>
-  </contributors>
-
-  <dependencies>
-    <dependency>
-      <groupId>slide</groupId>
-      <artifactId>slide-webdavlib</artifactId>
-      <version>2.1</version>
-    </dependency>
-    <dependency>
-      <groupId>commons-logging</groupId>
-      <artifactId>commons-logging</artifactId>
-      <version>1.0.4</version>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>it.could</groupId>
-      <artifactId>webdav</artifactId>
-      <version>0.4</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.mortbay.jetty</groupId>
-      <artifactId>jetty</artifactId>
-      <version>4.2.12</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/debian/META-INF/maven/org.apache.maven/apache-maven/pom.properties b/debian/META-INF/maven/org.apache.maven/apache-maven/pom.properties
deleted file mode 100644
index 12b1e22..0000000
--- a/debian/META-INF/maven/org.apache.maven/apache-maven/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Mon Apr 14 22:56:28 UTC 2008
-version=2.0.9
-groupId=org.apache.maven
-artifactId=apache-maven
diff --git a/debian/META-INF/maven/org.apache.maven/apache-maven/pom.xml b/debian/META-INF/maven/org.apache.maven/apache-maven/pom.xml
deleted file mode 100644
index f45fb5c..0000000
--- a/debian/META-INF/maven/org.apache.maven/apache-maven/pom.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>maven</artifactId>
-    <groupId>org.apache.maven</groupId>
-    <version>2.0.9</version>
-  </parent>
-
-  <artifactId>apache-maven</artifactId>
-  <name>Maven Bundle</name>
-
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-shade-plugin</artifactId>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <finalName>maven-${project.version}-uber</finalName>
-              <createDependencyReducedPom>
-                false
-              </createDependencyReducedPom>
-              <keepDependenciesWithProvidedScope>
-                true
-              </keepDependenciesWithProvidedScope>
-              <transformers>
-                <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer" />
-              </transformers>
-              <artifactSet>
-                <excludes>
-                  <exclude>
-                    org.codehaus.plexus:plexus-component-api
-                  </exclude>
-                  <exclude>classworlds:classworlds</exclude>
-                  <exclude>junit:junit</exclude>
-                  <exclude>jmock:jmock</exclude>
-                  <exclude>xml-apis:xml-apis</exclude>
-                </excludes>
-              </artifactSet>
-              <relocations>
-                <relocation>
-                  <pattern>org.jdom</pattern>
-                </relocation>
-                <relocation>
-                  <pattern>de.zeigermann.xml</pattern>
-                </relocation>
-                <relocation>
-                  <pattern>org.apache.webdav</pattern>
-                </relocation>
-                <relocation>
-                  <pattern>org.apache.commons.httpclient</pattern>
-                </relocation>
-                <relocation>
-                  <pattern>org.apache.commons.logging</pattern>
-                </relocation>
-                <relocation>
-                  <pattern>org.codehaus.plexus.util</pattern>
-                  <excludes>
-                    <exclude>
-                      org.codehaus.plexus.util.xml.Xpp3Dom
-                    </exclude>
-                    <exclude>
-                      org.codehaus.plexus.util.xml.pull.*
-                    </exclude>
-                  </excludes>
-                </relocation>
-              </relocations>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <version>2.1</version>
-        <configuration>
-          <descriptor>src/assemble/bin.xml</descriptor>
-          <finalName>apache-maven-${project.version}</finalName>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>package</phase>
-            <goals>
-              <goal>single</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-toolchain</artifactId>
-    </dependency>
- </dependencies>
-
-  <profiles>
-    <profile>
-      <id>include-site</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-scm-plugin</artifactId>
-            <configuration>
-              <connectionUrl>scm:svn:http://svn.apache.org/repos/asf/maven/site/trunk</connectionUrl>
-              <checkoutDirectory>${project.build.directory}/maven-site</checkoutDirectory>
-            </configuration>
-            <executions>
-              <execution>
-                <phase>initialize</phase>
-                <goals>
-                  <goal>checkout</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-invoker-plugin</artifactId>
-            <configuration>
-              <projectsDirectory>${project.build.directory}/maven-site</projectsDirectory>
-              <pom>${project.build.directory}/maven-site/pom.xml</pom>
-              <goals>
-                <goal>clean</goal>
-                <goal>site</goal>
-              </goals>
-            </configuration>
-            <executions>
-              <execution>
-                <id>initialize</id>
-                <phase>initialize</phase>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-</project>
diff --git a/debian/META-INF/maven/org.apache.maven/maven-artifact-manager/pom.properties b/debian/META-INF/maven/org.apache.maven/maven-artifact-manager/pom.properties
deleted file mode 100644
index 83c25fd..0000000
--- a/debian/META-INF/maven/org.apache.maven/maven-artifact-manager/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Mon Apr 14 22:55:26 UTC 2008
-version=2.0.9
-groupId=org.apache.maven
-artifactId=maven-artifact-manager
diff --git a/debian/META-INF/maven/org.apache.maven/maven-artifact-manager/pom.xml b/debian/META-INF/maven/org.apache.maven/maven-artifact-manager/pom.xml
deleted file mode 100644
index e68421d..0000000
--- a/debian/META-INF/maven/org.apache.maven/maven-artifact-manager/pom.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>maven</artifactId>
-    <groupId>org.apache.maven</groupId>
-    <version>2.0.9</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>maven-artifact-manager</artifactId>
-  <name>Maven Artifact Manager</name>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-repository-metadata</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-file</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-artifact</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-provider-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>easymock</groupId>
-      <artifactId>easymock</artifactId>
-      <version>1.2_Java1.3</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-  <build>
-    <pluginManagement>
-      <plugins>
-        <plugin>
-          <artifactId>maven-surefire-plugin</artifactId>
-          <configuration>
-            <excludes>
-              <exclude>**/testutils/**</exclude>
-            </excludes>
-          </configuration>
-        </plugin>
-      </plugins>
-    </pluginManagement>
-  </build>
-</project>
diff --git a/debian/META-INF/maven/org.apache.maven/maven-artifact/pom.properties b/debian/META-INF/maven/org.apache.maven/maven-artifact/pom.properties
deleted file mode 100644
index c566a78..0000000
--- a/debian/META-INF/maven/org.apache.maven/maven-artifact/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Mon Apr 14 22:55:21 UTC 2008
-version=2.0.9
-groupId=org.apache.maven
-artifactId=maven-artifact
diff --git a/debian/META-INF/maven/org.apache.maven/maven-artifact/pom.xml b/debian/META-INF/maven/org.apache.maven/maven-artifact/pom.xml
deleted file mode 100644
index a149314..0000000
--- a/debian/META-INF/maven/org.apache.maven/maven-artifact/pom.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>maven</artifactId>
-    <groupId>org.apache.maven</groupId>
-    <version>2.0.9</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>maven-artifact</artifactId>
-  <name>Maven Artifact</name>
-  <dependencies>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/debian/META-INF/maven/org.apache.maven/maven-core/pom.properties b/debian/META-INF/maven/org.apache.maven/maven-core/pom.properties
deleted file mode 100644
index d98cfe1..0000000
--- a/debian/META-INF/maven/org.apache.maven/maven-core/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Mon Apr 14 22:56:12 UTC 2008
-version=2.0.9
-groupId=org.apache.maven
-artifactId=maven-core
diff --git a/debian/META-INF/maven/org.apache.maven/maven-core/pom.xml b/debian/META-INF/maven/org.apache.maven/maven-core/pom.xml
deleted file mode 100644
index ee7a760..0000000
--- a/debian/META-INF/maven/org.apache.maven/maven-core/pom.xml
+++ /dev/null
@@ -1,234 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!--
-  Licensed to the Apache Software Foundation (ASF) under one
-  or more contributor license agreements.  See the NOTICE file
-  distributed with this work for additional information
-  regarding copyright ownership.  The ASF licenses this file
-  to you under the Apache License, Version 2.0 (the
-  "License"); you may not use this file except in compliance
-  with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing,
-  software distributed under the License is distributed on an
-  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  KIND, either express or implied.  See the License for the
-  specific language governing permissions and limitations
-  under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <artifactId>maven</artifactId>
-    <groupId>org.apache.maven</groupId>
-    <version>2.0.9</version>
-  </parent>
-
-  <artifactId>maven-core</artifactId>
-  <name>Maven Core</name>
-
-  <pluginRepositories>
-    <pluginRepository>
-      <id>apache.snapshots</id>
-      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-    </pluginRepository>
-  </pluginRepositories>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-settings</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-file</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-parameter-documenter</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-webdav</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-http-lightweight</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.reporting</groupId>
-      <artifactId>maven-reporting-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-profile</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-model</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-artifact</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-provider-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-repository-metadata</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-error-diagnostics</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-project</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>commons-cli</groupId>
-      <artifactId>commons-cli</artifactId>
-      <version>1.0</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>commons-lang</artifactId>
-          <groupId>commons-lang</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>commons-logging</artifactId>
-          <groupId>commons-logging</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-ssh-external</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-descriptor</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-interactivity-api</artifactId>
-      <version>1.0-alpha-4</version>
-      <exclusions>
-        <exclusion>
-          <artifactId>plexus-utils</artifactId>
-          <groupId>plexus</groupId>
-        </exclusion>
-        <exclusion>
-          <artifactId>plexus-container-default</artifactId>
-          <groupId>org.codehaus.plexus</groupId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-artifact-manager</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-monitor</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven.wagon</groupId>
-      <artifactId>wagon-ssh</artifactId>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>classworlds</groupId>
-      <artifactId>classworlds</artifactId>
-    </dependency>
-  </dependencies>
-
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>l10n-maven-plugin</artifactId>
-        <version>1.0-alpha-1</version>
-        <configuration>
-          <locales>
-            <locale>el</locale>
-            <locale>de</locale>
-            <locale>es</locale>
-            <locale>fr</locale>
-            <locale>ja</locale>
-            <locale>nl</locale>
-            <locale>no</locale>
-            <locale>pl</locale>
-            <locale>zh_CN</locale>
-          </locales>
-        </configuration>
-      </plugin>
-    </plugins>
-  </reporting>
-
-  <profiles>
-    <profile>
-      <id>include-site</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-scm-plugin</artifactId>
-            <configuration>
-              <connectionUrl>scm:svn:http://svn.apache.org/repos/asf/maven/site/trunk</connectionUrl>
-              <checkoutDirectory>${project.build.directory}/maven-site</checkoutDirectory>
-            </configuration>
-            <executions>
-              <execution>
-                <phase>initialize</phase>
-                <goals>
-                  <goal>checkout</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-invoker-plugin</artifactId>
-            <configuration>
-              <projectsDirectory>${project.build.directory}/maven-site</projectsDirectory>
-              <pom>${project.build.directory}/maven-site/pom.xml</pom>
-              <goals>
-                <goal>clean</goal>
-                <goal>site</goal>
-              </goals>
-            </configuration>
-            <executions>
-              <execution>
-                <id>initialize</id>
-                <phase>initialize</phase>
-                <goals>
-                  <goal>run</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-</project>
diff --git a/debian/META-INF/maven/org.apache.maven/maven-error-diagnostics/pom.properties b/debian/META-INF/maven/org.apache.maven/maven-error-diagnostics/pom.properties
deleted file mode 100644
index 7541f93..0000000
--- a/debian/META-INF/maven/org.apache.maven/maven-error-diagnostics/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Mon Apr 14 22:55:39 UTC 2008
-version=2.0.9
-groupId=org.apache.maven
-artifactId=maven-error-diagnostics
diff --git a/debian/META-INF/maven/org.apache.maven/maven-error-diagnostics/pom.xml b/debian/META-INF/maven/org.apache.maven/maven-error-diagnostics/pom.xml
deleted file mode 100644
index a82488e..0000000
--- a/debian/META-INF/maven/org.apache.maven/maven-error-diagnostics/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>maven</artifactId>
-    <groupId>org.apache.maven</groupId>
-    <version>2.0.9</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>maven-error-diagnostics</artifactId>
-  <name>Maven Error Diagnostics</name>
-  <description>Provides a manager component which will process a given Throwable instance through a set of diagnostic
-    sub-components, and return a String message with user-friendly information about the error and possibly
-    how to fix it.</description>
-  <dependencies>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/debian/META-INF/maven/org.apache.maven/maven-model/pom.properties b/debian/META-INF/maven/org.apache.maven/maven-model/pom.properties
deleted file mode 100644
index a58931f..0000000
--- a/debian/META-INF/maven/org.apache.maven/maven-model/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Mon Apr 14 22:55:29 UTC 2008
-version=2.0.9
-groupId=org.apache.maven
-artifactId=maven-model
diff --git a/debian/META-INF/maven/org.apache.maven/maven-model/pom.xml b/debian/META-INF/maven/org.apache.maven/maven-model/pom.xml
deleted file mode 100644
index 0a7a675..0000000
--- a/debian/META-INF/maven/org.apache.maven/maven-model/pom.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>maven</artifactId>
-    <groupId>org.apache.maven</groupId>
-    <version>2.0.9</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>maven-model</artifactId>
-  <name>Maven Model</name>
-  <description>Maven Model</description>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.modello</groupId>
-        <artifactId>modello-maven-plugin</artifactId>
-        <configuration>
-          <version>4.0.0</version>
-          <model>src/main/mdo/maven.mdo</model>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <profiles>
-    <profile>
-      <id>all-models</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.codehaus.modello</groupId>
-            <artifactId>modello-maven-plugin</artifactId>
-            <version>1.0-alpha-8</version>
-            <executions>
-              <execution>
-                <id>v3</id>
-                <goals>
-                  <goal>xpp3-writer</goal>
-                  <goal>java</goal>
-                  <goal>xpp3-reader</goal>
-                  <goal>xsd</goal>
-                </goals>
-                <configuration>
-                  <version>3.0.0</version>
-                  <packageWithVersion>true</packageWithVersion>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-          <plugin>
-            <artifactId>maven-jar-plugin</artifactId>
-            <executions>
-              <execution>
-                <phase>package</phase>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-                <configuration>
-                  <classifier>all</classifier>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-  </profiles>
-  <dependencies>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/debian/META-INF/maven/org.apache.maven/maven-monitor/pom.properties b/debian/META-INF/maven/org.apache.maven/maven-monitor/pom.properties
deleted file mode 100644
index 64a6470..0000000
--- a/debian/META-INF/maven/org.apache.maven/maven-monitor/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Mon Apr 14 22:56:00 UTC 2008
-version=2.0.9
-groupId=org.apache.maven
-artifactId=maven-monitor
diff --git a/debian/META-INF/maven/org.apache.maven/maven-monitor/pom.xml b/debian/META-INF/maven/org.apache.maven/maven-monitor/pom.xml
deleted file mode 100644
index 1639695..0000000
--- a/debian/META-INF/maven/org.apache.maven/maven-monitor/pom.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>maven</artifactId>
-    <groupId>org.apache.maven</groupId>
-    <version>2.0.9</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>maven-monitor</artifactId>
-  <name>Maven Monitor</name>
-</project>
diff --git a/debian/META-INF/maven/org.apache.maven/maven-plugin-api/pom.properties b/debian/META-INF/maven/org.apache.maven/maven-plugin-api/pom.properties
deleted file mode 100644
index 828e202..0000000
--- a/debian/META-INF/maven/org.apache.maven/maven-plugin-api/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Mon Apr 14 22:55:55 UTC 2008
-version=2.0.9
-groupId=org.apache.maven
-artifactId=maven-plugin-api
diff --git a/debian/META-INF/maven/org.apache.maven/maven-plugin-api/pom.xml b/debian/META-INF/maven/org.apache.maven/maven-plugin-api/pom.xml
deleted file mode 100644
index b76a05e..0000000
--- a/debian/META-INF/maven/org.apache.maven/maven-plugin-api/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>maven</artifactId>
-    <groupId>org.apache.maven</groupId>
-    <version>2.0.9</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>maven-plugin-api</artifactId>
-  <name>Maven Plugin API</name>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/debian/META-INF/maven/org.apache.maven/maven-plugin-descriptor/pom.properties b/debian/META-INF/maven/org.apache.maven/maven-plugin-descriptor/pom.properties
deleted file mode 100644
index a1d6b07..0000000
--- a/debian/META-INF/maven/org.apache.maven/maven-plugin-descriptor/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Mon Apr 14 22:55:57 UTC 2008
-version=2.0.9
-groupId=org.apache.maven
-artifactId=maven-plugin-descriptor
diff --git a/debian/META-INF/maven/org.apache.maven/maven-plugin-descriptor/pom.xml b/debian/META-INF/maven/org.apache.maven/maven-plugin-descriptor/pom.xml
deleted file mode 100644
index bfb8e62..0000000
--- a/debian/META-INF/maven/org.apache.maven/maven-plugin-descriptor/pom.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>maven</artifactId>
-    <groupId>org.apache.maven</groupId>
-    <version>2.0.9</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>maven-plugin-descriptor</artifactId>
-  <name>Maven Plugin Descriptor Model</name>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.modello</groupId>
-        <artifactId>modello-maven-plugin</artifactId>
-        <configuration>
-          <model>src/main/mdo/lifecycle.mdo</model>
-          <version>1.0.0</version>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-artifact</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/debian/META-INF/maven/org.apache.maven/maven-plugin-parameter-documenter/pom.properties b/debian/META-INF/maven/org.apache.maven/maven-plugin-parameter-documenter/pom.properties
deleted file mode 100644
index d72b77b..0000000
--- a/debian/META-INF/maven/org.apache.maven/maven-plugin-parameter-documenter/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Mon Apr 14 22:55:35 UTC 2008
-version=2.0.9
-groupId=org.apache.maven
-artifactId=maven-plugin-parameter-documenter
diff --git a/debian/META-INF/maven/org.apache.maven/maven-plugin-parameter-documenter/pom.xml b/debian/META-INF/maven/org.apache.maven/maven-plugin-parameter-documenter/pom.xml
deleted file mode 100644
index ded371e..0000000
--- a/debian/META-INF/maven/org.apache.maven/maven-plugin-parameter-documenter/pom.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>maven</artifactId>
-    <groupId>org.apache.maven</groupId>
-    <version>2.0.9</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>maven-plugin-parameter-documenter</artifactId>
-  <name>Maven Plugin Parameter Documenter API</name>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.modello</groupId>
-        <artifactId>modello-maven-plugin</artifactId>
-        <configuration>
-          <version>1.0.0</version>
-          <model>src/main/mdo/paramdoc.mdo</model>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/debian/META-INF/maven/org.apache.maven/maven-plugin-registry/pom.properties b/debian/META-INF/maven/org.apache.maven/maven-plugin-registry/pom.properties
deleted file mode 100644
index bc43cb7..0000000
--- a/debian/META-INF/maven/org.apache.maven/maven-plugin-registry/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Mon Apr 14 22:55:41 UTC 2008
-version=2.0.9
-groupId=org.apache.maven
-artifactId=maven-plugin-registry
diff --git a/debian/META-INF/maven/org.apache.maven/maven-plugin-registry/pom.xml b/debian/META-INF/maven/org.apache.maven/maven-plugin-registry/pom.xml
deleted file mode 100644
index 4381224..0000000
--- a/debian/META-INF/maven/org.apache.maven/maven-plugin-registry/pom.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>maven</artifactId>
-    <groupId>org.apache.maven</groupId>
-    <version>2.0.9</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.apache.maven</groupId>
-  <artifactId>maven-plugin-registry</artifactId>
-  <name>Maven Plugin Registry Model</name>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.modello</groupId>
-        <artifactId>modello-maven-plugin</artifactId>
-        <configuration>
-          <version>1.0.0</version>
-          <model>plugin-registry.mdo</model>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/debian/META-INF/maven/org.apache.maven/maven-profile/pom.properties b/debian/META-INF/maven/org.apache.maven/maven-profile/pom.properties
deleted file mode 100644
index 45c8177..0000000
--- a/debian/META-INF/maven/org.apache.maven/maven-profile/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Mon Apr 14 22:55:39 UTC 2008
-version=2.0.9
-groupId=org.apache.maven
-artifactId=maven-profile
diff --git a/debian/META-INF/maven/org.apache.maven/maven-profile/pom.xml b/debian/META-INF/maven/org.apache.maven/maven-profile/pom.xml
deleted file mode 100644
index 3f9e1c4..0000000
--- a/debian/META-INF/maven/org.apache.maven/maven-profile/pom.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>maven</artifactId>
-    <groupId>org.apache.maven</groupId>
-    <version>2.0.9</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>maven-profile</artifactId>
-  <name>Maven Profile Model</name>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.modello</groupId>
-        <artifactId>modello-maven-plugin</artifactId>
-        <configuration>
-          <version>1.0.0</version>
-          <model>src/main/mdo/profiles.mdo</model>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-model</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/debian/META-INF/maven/org.apache.maven/maven-project/pom.properties b/debian/META-INF/maven/org.apache.maven/maven-project/pom.properties
deleted file mode 100644
index 8f5b668..0000000
--- a/debian/META-INF/maven/org.apache.maven/maven-project/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Mon Apr 14 22:55:52 UTC 2008
-version=2.0.9
-groupId=org.apache.maven
-artifactId=maven-project
diff --git a/debian/META-INF/maven/org.apache.maven/maven-project/pom.xml b/debian/META-INF/maven/org.apache.maven/maven-project/pom.xml
deleted file mode 100644
index a7aebef..0000000
--- a/debian/META-INF/maven/org.apache.maven/maven-project/pom.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>maven</artifactId>
-    <groupId>org.apache.maven</groupId>
-    <version>2.0.9</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>maven-project</artifactId>
-  <name>Maven Project Builder</name>
-  <description>This library is used to not only read Maven project object model files, but to assemble inheritence
-    and to retrieve remote models as required.</description>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-settings</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-artifact-test</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-profile</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-model</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-artifact-manager</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-registry</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-artifact</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/debian/META-INF/maven/org.apache.maven/maven-repository-metadata/pom.properties b/debian/META-INF/maven/org.apache.maven/maven-repository-metadata/pom.properties
deleted file mode 100644
index 934ec63..0000000
--- a/debian/META-INF/maven/org.apache.maven/maven-repository-metadata/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Mon Apr 14 22:55:24 UTC 2008
-version=2.0.9
-groupId=org.apache.maven
-artifactId=maven-repository-metadata
diff --git a/debian/META-INF/maven/org.apache.maven/maven-repository-metadata/pom.xml b/debian/META-INF/maven/org.apache.maven/maven-repository-metadata/pom.xml
deleted file mode 100644
index 884fdfa..0000000
--- a/debian/META-INF/maven/org.apache.maven/maven-repository-metadata/pom.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>maven</artifactId>
-    <groupId>org.apache.maven</groupId>
-    <version>2.0.9</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>maven-repository-metadata</artifactId>
-  <name>Maven Repository Metadata Model</name>
-  <description>Maven Plugin Mapping</description>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.modello</groupId>
-        <artifactId>modello-maven-plugin</artifactId>
-        <version>1.0-alpha-8</version>
-        <configuration>
-          <version>1.0.0</version>
-          <model>src/main/mdo/metadata.mdo</model>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/debian/META-INF/maven/org.apache.maven/maven-settings/pom.properties b/debian/META-INF/maven/org.apache.maven/maven-settings/pom.properties
deleted file mode 100644
index 7f15ea1..0000000
--- a/debian/META-INF/maven/org.apache.maven/maven-settings/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Mon Apr 14 22:55:32 UTC 2008
-version=2.0.9
-groupId=org.apache.maven
-artifactId=maven-settings
diff --git a/debian/META-INF/maven/org.apache.maven/maven-settings/pom.xml b/debian/META-INF/maven/org.apache.maven/maven-settings/pom.xml
deleted file mode 100644
index f68a550..0000000
--- a/debian/META-INF/maven/org.apache.maven/maven-settings/pom.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>maven</artifactId>
-    <groupId>org.apache.maven</groupId>
-    <version>2.0.9</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>maven-settings</artifactId>
-  <name>Maven Local Settings Model</name>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.modello</groupId>
-        <artifactId>modello-maven-plugin</artifactId>
-        <configuration>
-          <version>1.0.0</version>
-          <model>src/main/mdo/settings.mdo</model>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-model</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/debian/META-INF/maven/org.apache.maven/maven-toolchain/pom.properties b/debian/META-INF/maven/org.apache.maven/maven-toolchain/pom.properties
deleted file mode 100644
index 870b529..0000000
--- a/debian/META-INF/maven/org.apache.maven/maven-toolchain/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Mon Apr 14 22:56:22 UTC 2008
-version=2.0.9
-groupId=org.apache.maven
-artifactId=maven-toolchain
diff --git a/debian/META-INF/maven/org.apache.maven/maven-toolchain/pom.xml b/debian/META-INF/maven/org.apache.maven/maven-toolchain/pom.xml
deleted file mode 100644
index 6a62cfc..0000000
--- a/debian/META-INF/maven/org.apache.maven/maven-toolchain/pom.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-  http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <groupId>org.apache.maven</groupId>
-    <artifactId>maven</artifactId>
-    <version>2.0.9</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>maven-toolchain</artifactId>
-  <name>Maven Toolchains</name>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-core</artifactId>
-      <version>2.0.9</version>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-artifact</artifactId>
-      <version>2.0.9</version>
-    </dependency>
-  </dependencies>
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.codehaus.modello</groupId>
-        <artifactId>modello-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <goals>
-              <goal>java</goal>
-              <goal>xsd</goal>
-              <goal>xpp3-reader</goal>
-            </goals>
-          </execution>
-        </executions>
-        <configuration>
-          <version>1.0.0</version>
-          <packageWithVersion>false</packageWithVersion>
-          <model>src/main/mdo/toolchains.xml</model>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-shade-plugin</artifactId>
-        <groupId>org.apache.maven.plugins</groupId>
-        <executions>
-          <execution>
-            <id>shading</id>                
-            <phase>package</phase>
-            <goals>
-              <goal>shade</goal>
-            </goals>
-            <configuration>
-              <artifactSet>
-                <includes>
-                  <include>${project.groupId}:${project.artifactId}</include>
-                </includes>
-              </artifactSet>
-              <relocations>
-                <relocation>
-                  <pattern>org.codehaus.plexus.util</pattern>
-                  <excludes>
-                    <exclude>org.codehaus.plexus.util.xml.Xpp3Dom</exclude>
-                    <exclude>org.codehaus.plexus.util.xml.pull.*</exclude>
-                  </excludes>
-                </relocation>
-              </relocations>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
diff --git a/debian/META-INF/maven/org.codehaus.plexus/plexus-container-default/pom.properties b/debian/META-INF/maven/org.codehaus.plexus/plexus-container-default/pom.properties
deleted file mode 100644
index 7610bfd..0000000
--- a/debian/META-INF/maven/org.codehaus.plexus/plexus-container-default/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Sat Mar 10 17:49:07 PST 2007
-version=1.0-alpha-9-stable-1
-groupId=org.codehaus.plexus
-artifactId=plexus-container-default
diff --git a/debian/META-INF/maven/org.codehaus.plexus/plexus-container-default/pom.xml b/debian/META-INF/maven/org.codehaus.plexus/plexus-container-default/pom.xml
deleted file mode 100644
index 5e52b57..0000000
--- a/debian/META-INF/maven/org.codehaus.plexus/plexus-container-default/pom.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<project>
-  <parent>
-    <artifactId>plexus-containers</artifactId>
-    <groupId>org.codehaus.plexus</groupId>
-    <version>1.0.3</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>plexus-container-default</artifactId>
-  <name>Default Plexus Container</name>
-  <version>1.0-alpha-9-stable-1</version>
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration>
-          <excludes>
-            <exclude>**/Test*.java</exclude>
-            <exclude>**/Abstract*.java</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-    </plugins>
-    <extensions>
-      <extension>
-        <groupId>org.apache.maven.wagon</groupId>
-        <artifactId>wagon-webdav</artifactId>
-        <version>1.0-beta-2</version>
-      </extension>
-    </extensions>
-  </build>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-      <version>1.0.4</version>
-    </dependency>
-    <dependency>
-      <groupId>classworlds</groupId>
-      <artifactId>classworlds</artifactId>
-      <version>1.1-alpha-2</version>
-    </dependency>
-  </dependencies>
-  <distributionManagement>                                                                                                                                               
-    <repository>                                                                                                                                                         
-      <id>codehaus.org</id>                                                                                                                                              
-      <name>Plexus Central Repository</name>                                                                                                                             
-      <url>dav:https://dav.codehaus.org/repository/plexus</url>                                                                                                          
-    </repository>                                                                                                                                                        
-    <snapshotRepository>                                                                                                                                                 
-      <id>codehaus.org</id>                                                                                                                                              
-      <name>Plexus Central Development Repository</name>                                                                                                                 
-      <url>dav:https://dav.codehaus.org/snapshots.repository/plexus</url>                                                                                                
-    </snapshotRepository>                                                                                                                                                
-    <site>                                                                                                                                                               
-      <id>codehaus.org</id>                                                                                                                                              
-      <url>dav:https://dav.codehaus.org/plexus</url>                                                                                                                     
-    </site>                                                                                                                                                              
-  </distributionManagement>    
-</project>
diff --git a/debian/META-INF/maven/org.codehaus.plexus/plexus-interactivity-api/pom.properties b/debian/META-INF/maven/org.codehaus.plexus/plexus-interactivity-api/pom.properties
deleted file mode 100644
index bd77bcd..0000000
--- a/debian/META-INF/maven/org.codehaus.plexus/plexus-interactivity-api/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Wed Oct 12 23:06:05 EST 2005
-version=1.0-alpha-4
-groupId=org.codehaus.plexus
-artifactId=plexus-interactivity-api
diff --git a/debian/META-INF/maven/org.codehaus.plexus/plexus-interactivity-api/pom.xml b/debian/META-INF/maven/org.codehaus.plexus/plexus-interactivity-api/pom.xml
deleted file mode 100644
index 4add500..0000000
--- a/debian/META-INF/maven/org.codehaus.plexus/plexus-interactivity-api/pom.xml
+++ /dev/null
@@ -1,284 +0,0 @@
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.codehaus.plexus</groupId>
-  <artifactId>plexus-interactivity-api</artifactId>
-  <name>Plexus Default Interactivity Handler</name>
-  <version>1.0-alpha-4</version>
-  <ciManagement>
-    <notifiers>
-      <notifier>
-        <configuration>
-          <address>dev at plexus.codehaus.org</address>
-        </configuration>
-      </notifier>
-      <notifier>
-        <type>irc</type>
-        <configuration>
-          <port>6667</port>
-          <host>irc.codehaus.org</host>
-          <channel>#plexus</channel>
-        </configuration>
-      </notifier>
-    </notifiers>
-  </ciManagement>
-  <inceptionYear>2001</inceptionYear>
-  <mailingLists>
-    <mailingList>
-      <name>Plexus Developer List</name>
-      <subscribe>http://lists.codehaus.org/mailman/listinfo/plexus-dev</subscribe>
-      <unsubscribe>http://lists.codehaus.org/mailman/listinfo/plexus-dev</unsubscribe>
-      <archive>http://lists.codehaus.org/pipermail/plexus-dev/</archive>
-    </mailingList>
-  </mailingLists>
-  <developers>
-    <developer>
-      <id>jvanzyl</id>
-      <name>Jason van Zyl</name>
-      <email>jason at zenplex.com</email>
-      <organization>Zenplex</organization>
-      <roles>
-        <role>Developer</role>
-        <role>Release Manager</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>kaz</id>
-      <name>Pete Kazmier</name>
-      <email></email>
-      <organization></organization>
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>jtaylor</id>
-      <name>James Taylor</name>
-      <email>james at jamestaylor.org</email>
-      <organization></organization>
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>dandiep</id>
-      <name>Dan Diephouse</name>
-      <email>dan at envoisolutions.com</email>
-      <organization>Envoi solutions</organization>
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>kasper</id>
-      <name>Kasper Nielsen</name>
-      <email>apache at kav.dk</email>
-      <organization></organization>
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>bwalding</id>
-      <name>Ben Walding</name>
-      <email>bwalding at codehaus.org</email>
-      <organization>Walding Consulting Services</organization>
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>mhw</id>
-      <name>Mark Wilkinson</name>
-      <email>mhw at kremvax.net</email>
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>michal</id>
-      <name>Michal Maczka</name>
-      <email>mmaczka at interia.pl</email>
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>evenisse</id>
-      <name>Emmanuel Venisse</name>
-      <email>evenisse at codehaus.org</email>
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>trygvis</id>
-      <name>Trygve Laugst�l</name>
-      <email>trygvis at codehaus.org</email>
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>
-    <developer>
-      <id>kenney</id>
-      <name>Kenney Westerhof</name>
-      <email>kenney at codehaus.org</email>
-      <roles>
-        <role>Developer</role>
-      </roles>
-    </developer>
-  </developers>
-  <scm>
-    <connection>scm:svn:svn://svn.codehaus.org/plexus/scm/trunk/plexus-components/plexus-interactivity/plexus-interactivity-api</connection>
-    <developerConnection>scm:svn:https://svn.codehaus.org/plexus/trunk/plexus-components/plexus-interactivity/plexus-interactivity-api</developerConnection>
-  </scm>
-  <organization>
-    <name>Codehaus</name>
-    <url>http://www.codehaus.org/</url>
-  </organization>
-  <build>
-    <sourceDirectory>c:\home\Brett\cvs\plexus\plexus-components\plexus-interactivity\target\checkout\plexus-interactivity-api\src\main\java</sourceDirectory>
-    <scriptSourceDirectory>src/main/scripts</scriptSourceDirectory>
-    <testSourceDirectory>c:\home\Brett\cvs\plexus\plexus-components\plexus-interactivity\target\checkout\plexus-interactivity-api\src\test\java</testSourceDirectory>
-    <outputDirectory>c:\home\Brett\cvs\plexus\plexus-components\plexus-interactivity\target\checkout\plexus-interactivity-api\target\classes</outputDirectory>
-    <testOutputDirectory>c:\home\Brett\cvs\plexus\plexus-components\plexus-interactivity\target\checkout\plexus-interactivity-api\target\test-classes</testOutputDirectory>
-    <resources>
-      <resource>
-        <directory>c:\home\Brett\cvs\plexus\plexus-components\plexus-interactivity\target\checkout\plexus-interactivity-api\src\main\resources</directory>
-      </resource>
-    </resources>
-    <testResources>
-      <testResource>
-        <directory>c:\home\Brett\cvs\plexus\plexus-components\plexus-interactivity\target\checkout\plexus-interactivity-api\src\test\resources</directory>
-      </testResource>
-    </testResources>
-    <directory>c:\home\Brett\cvs\plexus\plexus-components\plexus-interactivity\target\checkout\plexus-interactivity-api\target</directory>
-    <finalName>plexus-interactivity-api-1.0-alpha-4</finalName>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.0-beta-2-SNAPSHOT</version>
-      </plugin>
-      <plugin>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <version>2.0-beta-2-SNAPSHOT</version>
-        <inherited>true</inherited>
-        <configuration>
-          <updateReleaseInfo>true</updateReleaseInfo>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-install-plugin</artifactId>
-        <version>2.0-beta-2-SNAPSHOT</version>
-      </plugin>
-      <plugin>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>2.0-rc2-SNAPSHOT</version>
-      </plugin>
-      <plugin>
-        <artifactId>maven-release-plugin</artifactId>
-        <version>2.0-beta-3-SNAPSHOT</version>
-        <configuration>
-          <tagBase>https://svn.codehaus.org/plexus/tags</tagBase>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-resources-plugin</artifactId>
-        <version>2.0-beta-3-SNAPSHOT</version>
-      </plugin>
-      <plugin>
-        <artifactId>maven-source-plugin</artifactId>
-        <version>2.0-rc2-SNAPSHOT</version>
-        <executions>
-          <execution>
-            <id>attach-sources</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
-        <inherited>true</inherited>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.0-beta-2-SNAPSHOT</version>
-      </plugin>
-    </plugins>
-  </build>
-  <repositories>
-    <repository>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <id>snapshots</id>
-      <name>Maven Snapshot Development Repository</name>
-      <url>http://snapshots.maven.codehaus.org/maven2</url>
-    </repository>
-    <repository>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <id>central</id>
-      <name>Maven Repository Switchboard</name>
-      <url>http://repo1.maven.org/maven2</url>
-    </repository>
-  </repositories>
-  <pluginRepositories>
-    <pluginRepository>
-      <releases>
-        <enabled>false</enabled>
-      </releases>
-      <id>snapshots-plugins</id>
-      <name>Maven Snapshot Plugins Development Repository</name>
-      <url>http://snapshots.maven.codehaus.org/maven2</url>
-    </pluginRepository>
-    <pluginRepository>
-      <snapshots>
-        <enabled>false</enabled>
-      </snapshots>
-      <id>central</id>
-      <name>Maven Plugin Repository</name>
-      <url>http://repo1.maven.org/maven2</url>
-    </pluginRepository>
-  </pluginRepositories>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-      <version>1.0.2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>classworlds</groupId>
-      <artifactId>classworlds</artifactId>
-      <version>1.1-alpha-2</version>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-container-default</artifactId>
-      <version>1.0-alpha-7</version>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>
-  <reporting>
-    <outputDirectory>target/site</outputDirectory>
-  </reporting>
-  <distributionManagement>
-    <repository>
-      <id>repo1</id>
-      <name>Maven Central Repository</name>
-      <url>scp://repo1.maven.org/home/projects/maven/repository-staging/to-ibiblio/maven2</url>
-    </repository>
-    <snapshotRepository>
-      <id>snapshots</id>
-      <name>Maven Central Development Repository</name>
-      <url>scp://repo1.maven.org/home/projects/maven/repository-staging/snapshots/maven2</url>
-    </snapshotRepository>
-  </distributionManagement>
-</project>
\ No newline at end of file
diff --git a/debian/META-INF/maven/org.codehaus.plexus/plexus-utils/pom.properties b/debian/META-INF/maven/org.codehaus.plexus/plexus-utils/pom.properties
deleted file mode 100644
index eac303c..0000000
--- a/debian/META-INF/maven/org.codehaus.plexus/plexus-utils/pom.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-#Generated by Maven
-#Thu Feb 21 12:14:14 EST 2008
-version=1.5.1
-groupId=org.codehaus.plexus
-artifactId=plexus-utils
diff --git a/debian/META-INF/maven/org.codehaus.plexus/plexus-utils/pom.xml b/debian/META-INF/maven/org.codehaus.plexus/plexus-utils/pom.xml
deleted file mode 100644
index 7444bc6..0000000
--- a/debian/META-INF/maven/org.codehaus.plexus/plexus-utils/pom.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <artifactId>plexus</artifactId>
-    <groupId>org.codehaus.plexus</groupId>
-    <version>1.0.11</version>
-    <relativePath>../pom/pom.xml</relativePath>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>plexus-utils</artifactId>
-  <name>Plexus Common Utilities</name>
-  <version>1.5.1</version>
-  <url>http://plexus.codehaus.org/plexus-utils</url>
-  <build>
-    <plugins>
-      <plugin>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <!-- surefire requires plexus-utils to be jdk 1.3 compatible -->
-          <source>1.3</source>
-          <target>1.3</target>
-        </configuration>
-      </plugin>
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.3</version>
-        <configuration>
-          <!-- required to ensure the test classes are used, not surefire's plexus-utils -->
-          <childDelegation>true</childDelegation>
-          <excludes>
-            <exclude>org/codehaus/plexus/util/FileBasedTestCase.java</exclude>
-            <exclude>**/Test*.java</exclude>
-          </excludes>
-          <systemProperties>
-            <property>
-              <name>JAVA_HOME</name>
-              <value>${JAVA_HOME}</value>
-            </property>
-            <property>
-              <name>M2_HOME</name>
-              <value>${M2_HOME}</value>
-            </property>
-          </systemProperties>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-  <scm>
-    <connection>scm:svn:http://svn.codehaus.org/plexus/plexus-utils/tags/plexus-utils-1.5.1</connection>
-    <developerConnection>scm:svn:https://svn.codehaus.org/plexus/plexus-utils/tags/plexus-utils-1.5.1</developerConnection>
-    <url>http://fisheye.codehaus.org/browse/plexus/plexus-utils/tags/plexus-utils-1.5.1</url>
-  </scm>
-  <reporting>
-    <plugins>
-      <plugin>
-        <artifactId>maven-javadoc-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <artifactId>maven-jxr-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
-</project>
diff --git a/debian/META-INF/maven/plugin-expressions/project.paramdoc.xml b/debian/META-INF/maven/plugin-expressions/project.paramdoc.xml
deleted file mode 100644
index 0db2a6d..0000000
--- a/debian/META-INF/maven/plugin-expressions/project.paramdoc.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<paramdoc xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 ../../../../../../../maven-plugin-parameter-documenter/target/generated-site/xsd/paramdoc-1.0.0.xsd ">
-<expressions>
-  <expression>
-    <syntax>project.distributionManagementArtifactRepository</syntax>
-    <configuration>
-      <![CDATA[
-<distributionManagement>
-  <!-- use the following if you're not using a snapshot version. -->
-  <repository>
-    <id>repo</id>
-    <name>Repository Name</name>
-    <url>scp://host/path/to/repo</url>
-  </repository>
-  <!-- use the following if you ARE using a snapshot version. -->
-  <snapshotRepository>
-    <id>repo</id>
-    <name>Repository Name</name>
-    <url>scp://host/path/to/repo</url>
-  </snapshotRepository>
-</distributionManagement>
-    ]]></configuration>
-    <description> This is the ArtifactRepository used to deploy artifacts built by this
-      Maven.
-    </description>
-  </expression>
-  <expression>
-    <syntax>project.artifact</syntax>
-    <configuration>
-      <![CDATA[
-<groupId>project.group</groupId>
-<artifactId>project-artifact</artifactId>
-<version>0.0.0.0</version>
-<packaging>type</packaging>
-    ]]></configuration>
-    <description> This is the Artifact instance created from the essential project
-      attributes: groupId, artifactId, version, and packaging (with a default packaging of
-      'jar').
-    </description>
-  </expression>
-  <expression>
-    <syntax>project.parent</syntax>
-    <configuration>
-      <![CDATA[
-<parent>
-  <groupId>project.group</groupId>
-  <artifactId>project-artifact</artifactId>
-  <version>0.0.0.0</version>
-</parent>
-    ]]></configuration>
-    <description> This is the MavenProject instance for the parent of the current POM.
-    </description>
-  </expression>
-  <expression>
-    <syntax>project.file</syntax>
-    <description> This is the File instance that refers to the location of the current POM on
-      disk.
-    </description>
-  </expression>
-  <expression>
-    <syntax>project.artifacts</syntax>
-    <configuration>
-      <![CDATA[
-<dependencies>
-  ...
-</dependencies>
-    ]]></configuration>
-    <description>
-      <![CDATA[
-      This is a set of Artifact instances resolved from the set of dependencies for
-      the current project.
-      
-      NOTE: This will likely contain much more than the direct dependencies of the 
-      current POM, since Maven uses transitive, or chained, dependency resolution.
-    ]]></description>
-  </expression>
-  <expression>
-    <syntax>project.parentArtifact</syntax>
-    <configuration>
-      <![CDATA[
-    <parent>
-      <groupId>project.group</groupId>
-      <artifactId>project-artifact</artifactId>
-      <version>0.0.0.0</version>
-    </parent>
-    ]]></configuration>
-    <description> This is the Artifact instance for the parent of the current POM.
-    </description>
-  </expression>
-  <expression>
-    <syntax>project.pluginArtifacts</syntax>
-    <configuration>
-      <![CDATA[
-<build>
-  <plugins>
-    ...
-  </plugins>
-</build>
-    ]]></configuration>
-    <description>
-      <![CDATA[
-      This is the list of Artifact instances for plugins used in the current build
-      for this project.
-      
-      NOTE: This list may contain plugin Artifacts which are implied by the current POM's
-      packaging and the lifecycle phase being built.
-    ]]></description>
-  </expression>
-  <expression>
-    <syntax>project.remoteArtifactRepositories</syntax>
-    <configuration>
-      <![CDATA[
-<repositories>
-  ...
-</repositories>
-    ]]></configuration>
-    <description>
-      <![CDATA[
-      This is a list of ArtifactRepository instances used to resolve the Artifacts associated
-      with the current POM.
-      
-      NOTE: This list will contain entries for repositories specified by ancestor POMs, including
-      the default built-in super-POM, which is the parent of all POMs.
-    ]]></description>
-  </expression>
-  <expression>
-    <syntax>project.pluginArtifactRepositories</syntax>
-    <configuration>
-      <![CDATA[
-<pluginRepositories>
-  ...
-</pluginRepositories>
-    ]]></configuration>
-    <description>
-      <![CDATA[
-      This is a list of ArtifactRepository instances used to resolve the Artifacts associated
-      with plugins used in building the current POM.
-      
-      NOTE: This list will contain entries for repositories specified by ancestor POMs, including
-      the default built-in super-POM, which is the parent of all POMs.
-    ]]></description>
-  </expression>
-  <expression>
-    <syntax>project.attachedArtifacts</syntax>
-    <description>
-      <![CDATA[
-      This is a list of attachments to the main artifact produced by building the current POM.
-      Attachments are derived works, based on the main build process, such as an ejb-client jar,
-      project sources jar, etc.
-    ]]></description>
-  </expression>
-</expressions>
-</paramdoc>
\ No newline at end of file
diff --git a/debian/META-INF/maven/plugin-expressions/rootless.paramdoc.xml b/debian/META-INF/maven/plugin-expressions/rootless.paramdoc.xml
deleted file mode 100644
index 19dc065..0000000
--- a/debian/META-INF/maven/plugin-expressions/rootless.paramdoc.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<paramdoc xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 ../../../../../../../maven-plugin-parameter-documenter/target/generated-site/xsd/paramdoc-1.0.0.xsd ">
-  <expressions>
-    <expression>
-      <syntax>localRepository</syntax>
-      <configuration>
-        <![CDATA[
-      Inside ~/.m2/settings.xml:
-      
-      <localRepository>/path/to/local/repository</localRepository>  
-      ]]></configuration>
-      <description>The ArtifactRepository instance referencing the local artifact
-        repository.</description>
-      <cliOptions>
-        <cliOption>
-          <key>-Dmaven.repo.local=/path/to/local/repo</key>
-          <value>Override the local repository location on a per-build basis.</value>
-        </cliOption>
-      </cliOptions>
-    </expression>
-    <expression>
-      <syntax>reactorProjects</syntax>
-      <description>This is the current list of projects being built by
-        Maven.</description>
-    </expression>
-  </expressions>
-</paramdoc>
diff --git a/debian/META-INF/maven/plugin-expressions/settings.paramdoc.xml b/debian/META-INF/maven/plugin-expressions/settings.paramdoc.xml
deleted file mode 100644
index e058218..0000000
--- a/debian/META-INF/maven/plugin-expressions/settings.paramdoc.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<paramdoc xmlns="http://maven.apache.org/POM/4.0.0"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 ../../../../../../../maven-plugin-parameter-documenter/target/generated-site/xsd/paramdoc-1.0.0.xsd ">
-  <expressions>
-    <expression>
-      <syntax>settings.offline</syntax>
-      <configuration>
-        <![CDATA[
-    <offline>true</offline>
-    ]]></configuration>
-      <description>
-        <![CDATA[
-      Flags the system as offline, to prevent accessing the network to resolve artifacts or execute plugins.
-
-      NOTE: It's also possible to switch to offline mode on a per-build basis, using the '-o' command-line option.
-    ]]></description>
-    </expression>
-    <expression>
-      <syntax>settings.interactiveMode</syntax>
-      <configuration>
-        <![CDATA[
-    <interactiveMode>true</interactiveMode>
-    ]]></configuration>
-      <description>
-        <![CDATA[
-      If false, flags the system to skip prompting the user for any information, or holding up the build
-      waiting for any input.
-
-      NOTE: It's also possible to switch to batch (ie. non-interactive) mode using the '-B' command-line option.
-    ]]></description>
-    </expression>
-  </expressions>
-</paramdoc>
\ No newline at end of file
diff --git a/debian/META-INF/plexus/components.xml b/debian/META-INF/plexus/components.xml
deleted file mode 100644
index 419974b..0000000
--- a/debian/META-INF/plexus/components.xml
+++ /dev/null
@@ -1,1036 +0,0 @@
-<component-set>
-  <components>
-    <component>
-      <role>org.apache.maven.plugin.PluginManager</role>
-      <implementation>org.apache.maven.plugin.DefaultPluginManager</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.project.path.PathTranslator</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.plugin.MavenPluginCollector</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.plugin.version.PluginVersionManager</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.plugin.PluginMappingManager</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.execution.RuntimeInformation</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.project.MavenProjectBuilder</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.apache.maven.extension.ExtensionManager</role>
-      <implementation>org.apache.maven.extension.DefaultExtensionManager</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.manager.WagonManager</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.apache.maven.plugin.PluginMappingManager</role>
-      <implementation>org.apache.maven.plugin.DefaultPluginMappingManager</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.apache.maven.project.path.PathTranslator</role>
-      <implementation>org.apache.maven.project.path.DefaultPathTranslator</implementation>
-    </component>
-    <component>
-      <role>org.apache.maven.Maven</role>
-      <implementation>org.apache.maven.DefaultMaven</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.project.MavenProjectBuilder</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.lifecycle.LifecycleExecutor</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.usability.diagnostics.ErrorDiagnostics</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.execution.RuntimeInformation</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.apache.maven.execution.RuntimeInformation</role>
-      <implementation>org.apache.maven.execution.DefaultRuntimeInformation</implementation>
-    </component>
-    <component>
-      <role>org.apache.maven.usability.diagnostics.ErrorDiagnoser</role>
-      <role-hint>MojoExecutionExceptionDiagnoser</role-hint>
-      <implementation>org.apache.maven.usability.MojoExecutionExceptionDiagnoser</implementation>
-    </component>
-    <component>
-      <role>org.apache.maven.usability.diagnostics.ErrorDiagnoser</role>
-      <role-hint>MojoFailureExceptionDiagnoser</role-hint>
-      <implementation>org.apache.maven.usability.MojoFailureExceptionDiagnoser</implementation>
-    </component>
-    <component>
-      <role>org.apache.maven.usability.diagnostics.ErrorDiagnoser</role>
-      <role-hint>ProjectBuildDiagnoser</role-hint>
-      <implementation>org.apache.maven.usability.ProjectBuildDiagnoser</implementation>
-    </component>
-    <component>
-      <role>org.apache.maven.usability.diagnostics.ErrorDiagnoser</role>
-      <role-hint>ProfileActivationDiagnoser</role-hint>
-      <implementation>org.apache.maven.usability.ProfileActivationDiagnoser</implementation>
-    </component>
-    <component>
-      <role>org.apache.maven.usability.diagnostics.ErrorDiagnoser</role>
-      <role-hint>PluginConfigurationDiagnoser</role-hint>
-      <implementation>org.apache.maven.usability.PluginConfigurationDiagnoser</implementation>
-    </component>
-    <component>
-      <role>org.apache.maven.usability.diagnostics.ErrorDiagnoser</role>
-      <role-hint>ArtifactNotFoundDiagnoser</role-hint>
-      <implementation>org.apache.maven.usability.ArtifactNotFoundDiagnoser</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.artifact.manager.WagonManager</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.apache.maven.usability.diagnostics.ErrorDiagnoser</role>
-      <role-hint>ArtifactResolverDiagnoser</role-hint>
-      <implementation>org.apache.maven.usability.ArtifactResolverDiagnoser</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.artifact.manager.WagonManager</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.apache.maven.usability.diagnostics.ErrorDiagnoser</role>
-      <role-hint>InvalidArtifactDiagnoser</role-hint>
-      <implementation>org.apache.maven.usability.InvalidArtifactDiagnoser</implementation>
-    </component>
-    <component>
-      <role>org.apache.maven.lifecycle.LifecycleExecutor</role>
-      <implementation>org.apache.maven.lifecycle.DefaultLifecycleExecutor</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.plugin.PluginManager</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.extension.ExtensionManager</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.handler.manager.ArtifactHandlerManager</role>
-        </requirement>
-      </requirements>
-      <configuration>
-        <lifecycles>
-          <lifecycle>
-            <id>default</id>
-            <phases>
-              <phase>validate</phase>
-              <phase>initialize</phase>
-              <phase>generate-sources</phase>
-              <phase>process-sources</phase>
-              <phase>generate-resources</phase>
-              <phase>process-resources</phase>
-              <phase>compile</phase>
-              <phase>process-classes</phase>
-              <phase>generate-test-sources</phase>
-              <phase>process-test-sources</phase>
-              <phase>generate-test-resources</phase>
-              <phase>process-test-resources</phase>
-              <phase>test-compile</phase>
-              <phase>process-test-classes</phase>
-              <phase>test</phase>
-              <phase>package</phase>
-              <phase>pre-integration-test</phase>
-              <phase>integration-test</phase>
-              <phase>post-integration-test</phase>
-              <phase>verify</phase>
-              <phase>install</phase>
-              <phase>deploy</phase>
-            </phases>
-          </lifecycle>
-          <lifecycle>
-            <id>clean</id>
-            <phases>
-              <phase>pre-clean</phase>
-              <phase>clean</phase>
-              <phase>post-clean</phase>
-            </phases>
-            <default-phases>
-              <clean>org.apache.maven.plugins:maven-clean-plugin:clean</clean>
-            </default-phases>
-          </lifecycle>
-          <lifecycle>
-            <id>site</id>
-            <phases>
-              <phase>pre-site</phase>
-              <phase>site</phase>
-              <phase>post-site</phase>
-              <phase>site-deploy</phase>
-            </phases>
-            <default-phases>
-              <site>org.apache.maven.plugins:maven-site-plugin:site</site>
-              <site-deploy>org.apache.maven.plugins:maven-site-plugin:deploy</site-deploy>
-            </default-phases>
-          </lifecycle>
-        </lifecycles>
-        <defaultReports>
-          <report>org.apache.maven.plugins:maven-project-info-reports-plugin</report>
-        </defaultReports>
-      </configuration>
-    </component>
-    <component>
-      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
-      <role-hint>pom</role-hint>
-      <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
-      <configuration>
-        <lifecycles>
-          <lifecycle>
-            <id>default</id>
-            <phases>
-              <package>org.apache.maven.plugins:maven-site-plugin:attach-descriptor</package>
-              <install>org.apache.maven.plugins:maven-install-plugin:install</install>
-              <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
-            </phases>
-            <optional-mojos>
-              <optional-mojo>org.apache.maven.plugins:maven-site-plugin:attach-descriptor</optional-mojo>
-            </optional-mojos>
-          </lifecycle>
-        </lifecycles>
-      </configuration>
-    </component>
-    <component>
-      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
-      <role-hint>jar</role-hint>
-      <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
-      <configuration>
-        <lifecycles>
-          <lifecycle>
-            <id>default</id>
-            <phases>
-              <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
-              <compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
-              <process-test-resources>org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
-              <test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
-              <test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
-              <package>org.apache.maven.plugins:maven-jar-plugin:jar</package>
-              <install>org.apache.maven.plugins:maven-install-plugin:install</install>
-              <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
-            </phases>
-          </lifecycle>
-        </lifecycles>
-      </configuration>
-    </component>
-    <component>
-      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
-      <role-hint>maven-plugin</role-hint>
-      <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
-      <configuration>
-        <lifecycles>
-          <lifecycle>
-            <id>default</id>
-            <phases>
-              <generate-resources>org.apache.maven.plugins:maven-plugin-plugin:descriptor</generate-resources>
-              <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
-              <compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
-              <process-test-resources>org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
-              <test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
-              <test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
-              <package>org.apache.maven.plugins:maven-jar-plugin:jar,
-                org.apache.maven.plugins:maven-plugin-plugin:addPluginArtifactMetadata</package>
-              <install>org.apache.maven.plugins:maven-install-plugin:install,
-                org.apache.maven.plugins:maven-plugin-plugin:updateRegistry</install>
-              <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
-            </phases>
-          </lifecycle>
-        </lifecycles>
-      </configuration>
-    </component>
-    <component>
-      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
-      <role-hint>ejb</role-hint>
-      <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
-      <configuration>
-        <lifecycles>
-          <lifecycle>
-            <id>default</id>
-            <phases>
-              <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
-              <compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
-              <process-test-resources>org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
-              <test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
-              <test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
-              <package>org.apache.maven.plugins:maven-ejb-plugin:ejb</package>
-              <install>org.apache.maven.plugins:maven-install-plugin:install</install>
-              <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
-            </phases>
-          </lifecycle>
-        </lifecycles>
-      </configuration>
-    </component>
-    <component>
-      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
-      <role-hint>war</role-hint>
-      <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
-      <configuration>
-        <lifecycles>
-          <lifecycle>
-            <id>default</id>
-            <phases>
-              <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
-              <compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
-              <process-test-resources>org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
-              <test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
-              <test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
-              <package>org.apache.maven.plugins:maven-war-plugin:war</package>
-              <install>org.apache.maven.plugins:maven-install-plugin:install</install>
-              <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
-            </phases>
-          </lifecycle>
-        </lifecycles>
-      </configuration>
-    </component>
-    <component>
-      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
-      <role-hint>ear</role-hint>
-      <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
-      <configuration>
-        <lifecycles>
-          <lifecycle>
-            <id>default</id>
-            <phases>
-              <generate-resources>org.apache.maven.plugins:maven-ear-plugin:generate-application-xml</generate-resources>
-              <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
-              <package>org.apache.maven.plugins:maven-ear-plugin:ear</package>
-              <install>org.apache.maven.plugins:maven-install-plugin:install</install>
-              <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
-            </phases>
-          </lifecycle>
-        </lifecycles>
-      </configuration>
-    </component>
-    <component>
-      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
-      <role-hint>rar</role-hint>
-      <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
-      <configuration>
-        <lifecycles>
-          <lifecycle>
-            <id>default</id>
-            <phases>
-              <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
-              <compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
-              <process-test-resources>org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
-              <test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
-              <test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
-              <package>org.apache.maven.plugins:maven-rar-plugin:rar</package>
-              <install>org.apache.maven.plugins:maven-install-plugin:install</install>
-              <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
-            </phases>
-          </lifecycle>
-        </lifecycles>
-      </configuration>
-    </component>
-    <component>
-      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
-      <role-hint>par</role-hint>
-      <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
-      <configuration>
-        <phases>
-          <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
-          <compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
-          <process-test-resources>org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
-          <test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
-          <test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
-          <package>org.apache.maven.plugins:maven-par-plugin:par</package>
-          <install>org.apache.maven.plugins:maven-install-plugin:install</install>
-          <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
-        </phases>
-      </configuration>
-    </component>
-    <component>
-      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
-      <role-hint>ejb3</role-hint>
-      <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
-      <configuration>
-        <phases>
-          <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
-          <compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
-          <process-test-resources>org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
-          <test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
-          <test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
-          <package>org.apache.maven.plugins:maven-ejb3-plugin:ejb3</package>
-          <install>org.apache.maven.plugins:maven-install-plugin:install</install>
-          <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
-        </phases>
-      </configuration>
-    </component>
-    <component>
-      <role>org.apache.maven.plugin.version.PluginVersionManager</role>
-      <role-hint>default</role-hint>
-      <implementation>org.apache.maven.plugin.version.DefaultPluginVersionManager</implementation>
-      <instantiation-strategy>per-lookup</instantiation-strategy>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.plugin.registry.MavenPluginRegistryBuilder</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
-        </requirement>
-        <requirement>
-          <role>org.codehaus.plexus.components.interactivity.InputHandler</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.project.MavenProjectBuilder</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.execution.RuntimeInformation</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.apache.maven.settings.MavenSettingsBuilder</role>
-      <implementation>org.apache.maven.settings.DefaultMavenSettingsBuilder</implementation>
-      <configuration>
-        <globalSettingsPath>${maven.home}/conf/settings.xml</globalSettingsPath>
-        <userSettingsPath>${user.home}/.m2/settings.xml</userSettingsPath>
-      </configuration>
-    </component>
-    <component>
-      <role>org.apache.maven.wagon.Wagon</role>
-      <role-hint>file</role-hint>
-      <implementation>org.apache.maven.wagon.providers.file.FileWagon</implementation>
-      <instantiation-strategy>per-lookup</instantiation-strategy>
-    </component>
-    <component>
-      <role>org.apache.maven.wagon.Wagon</role>
-      <role-hint>dav</role-hint>
-      <implementation>org.apache.maven.wagon.providers.webdav.WebDavWagon</implementation>
-      <instantiation-strategy>per-lookup</instantiation-strategy>
-    </component>
-    <component>
-      <role>org.apache.maven.wagon.Wagon</role>
-      <role-hint>http</role-hint>
-      <implementation>org.apache.maven.wagon.providers.http.LightweightHttpWagon</implementation>
-      <instantiation-strategy>per-lookup</instantiation-strategy>
-    </component>
-    <component>
-      <role>org.apache.maven.wagon.Wagon</role>
-      <role-hint>https</role-hint>
-      <implementation>org.apache.maven.wagon.providers.http.LightweightHttpWagon</implementation>
-      <instantiation-strategy>per-lookup</instantiation-strategy>
-    </component>
-    <component>
-      <role>org.apache.maven.profiles.MavenProfilesBuilder</role>
-      <implementation>org.apache.maven.profiles.DefaultMavenProfilesBuilder</implementation>
-    </component>
-    <component>
-      <role>org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout</role>
-      <role-hint>default</role-hint>
-      <implementation>org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout</implementation>
-    </component>
-    <component>
-      <role>org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout</role>
-      <role-hint>legacy</role-hint>
-      <implementation>org.apache.maven.artifact.repository.layout.LegacyRepositoryLayout</implementation>
-    </component>
-    <component>
-      <role>org.apache.maven.artifact.handler.manager.ArtifactHandlerManager</role>
-      <implementation>org.apache.maven.artifact.handler.manager.DefaultArtifactHandlerManager</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
-          <field-name>artifactHandlers</field-name>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
-      <role-hint>ejb</role-hint>
-      <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
-      <configuration>
-        <type>ejb</type>
-        <extension>jar</extension>
-        <language>java</language>
-        <addedToClasspath>true</addedToClasspath>
-      </configuration>
-    </component>
-    <component>
-      <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
-      <role-hint>jar</role-hint>
-      <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
-      <configuration>
-        <type>jar</type>
-        <language>java</language>
-        <addedToClasspath>true</addedToClasspath>
-      </configuration>
-    </component>
-    <component>
-      <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
-      <role-hint>test-jar</role-hint>
-      <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
-      <configuration>
-        <classifier>tests</classifier>
-        <extension>jar</extension>
-        <type>test-jar</type>
-        <packaging>jar</packaging>
-        <language>java</language>
-        <addedToClasspath>true</addedToClasspath>
-      </configuration>
-    </component>
-    <component>
-      <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
-      <role-hint>maven-plugin</role-hint>
-      <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
-      <configuration>
-        <type>maven-plugin</type>
-        <extension>jar</extension>
-        <language>java</language>
-        <addedToClasspath>true</addedToClasspath>
-      </configuration>
-    </component>
-    <component>
-      <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
-      <role-hint>pom</role-hint>
-      <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
-      <configuration>
-        <type>pom</type>
-      </configuration>
-    </component>
-    <component>
-      <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
-      <role-hint>java-source</role-hint>
-      <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
-      <configuration>
-        <classifier>sources</classifier>
-        <type>java-source</type>
-        <extension>jar</extension>
-        <language>java</language>
-        <addedToClasspath>false</addedToClasspath>
-      </configuration>
-    </component>
-    <component>
-      <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
-      <role-hint>javadoc</role-hint>
-      <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
-      <configuration>
-        <classifier>javadoc</classifier>
-        <type>javadoc</type>
-        <extension>jar</extension>
-        <language>java</language>
-        <addedToClasspath>true</addedToClasspath>
-      </configuration>
-    </component>
-    <component>
-      <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
-      <role-hint>war</role-hint>
-      <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
-      <configuration>
-        <type>war</type>
-        <includesDependencies>true</includesDependencies>
-        <language>java</language>
-        <addedToClasspath>false</addedToClasspath>
-      </configuration>
-    </component>
-    <component>
-      <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
-      <role-hint>ear</role-hint>
-      <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
-      <configuration>
-        <type>ear</type>
-        <includesDependencies>true</includesDependencies>
-        <language>java</language>
-        <addedToClasspath>false</addedToClasspath>
-      </configuration>
-    </component>
-    <component>
-      <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
-      <role-hint>ejb-client</role-hint>
-      <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
-      <configuration>
-        <type>ejb-client</type>
-        <extension>jar</extension>
-        <packaging>ejb</packaging>
-        <classifier>client</classifier>
-        <language>java</language>
-        <addedToClasspath>true</addedToClasspath>
-      </configuration>
-    </component>
-    <component>
-      <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
-      <role-hint>rar</role-hint>
-      <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
-      <configuration>
-        <type>rar</type>
-        <includesDependencies>true</includesDependencies>
-        <language>java</language>
-        <addedToClasspath>false</addedToClasspath>
-      </configuration>
-    </component>
-    <component>
-      <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
-      <role-hint>par</role-hint>
-      <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
-      <configuration>
-        <type>par</type>
-        <includesDependencies>true</includesDependencies>
-        <language>java</language>
-        <addedToClasspath>false</addedToClasspath>
-      </configuration>
-    </component>
-    <component>
-      <role>org.apache.maven.artifact.handler.ArtifactHandler</role>
-      <role-hint>ejb3</role-hint>
-      <implementation>org.apache.maven.artifact.handler.DefaultArtifactHandler</implementation>
-      <configuration>
-        <type>ejb3</type>
-        <includesDependencies>true</includesDependencies>
-        <language>java</language>
-        <addedToClasspath>false</addedToClasspath>
-      </configuration>
-    </component>
-    <component>
-      <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
-      <implementation>org.apache.maven.artifact.factory.DefaultArtifactFactory</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.artifact.handler.manager.ArtifactHandlerManager</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.apache.maven.artifact.resolver.ArtifactCollector</role>
-      <implementation>org.apache.maven.artifact.resolver.DefaultArtifactCollector</implementation>
-    </component>
-    <component>
-      <role>org.apache.maven.usability.diagnostics.ErrorDiagnostics</role>
-      <implementation>org.apache.maven.usability.diagnostics.ErrorDiagnostics</implementation>
-    </component>
-    <component>
-      <role>org.apache.maven.project.MavenProjectHelper</role>
-      <implementation>org.apache.maven.project.DefaultMavenProjectHelper</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.artifact.handler.manager.ArtifactHandlerManager</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.apache.maven.project.interpolation.ModelInterpolator</role>
-      <implementation>org.apache.maven.project.interpolation.RegexBasedModelInterpolator</implementation>
-    </component>
-    <component>
-      <role>org.apache.maven.project.injection.ModelDefaultsInjector</role>
-      <implementation>org.apache.maven.project.injection.DefaultModelDefaultsInjector</implementation>
-    </component>
-    <component>
-      <role>org.apache.maven.project.injection.ProfileInjector</role>
-      <implementation>org.apache.maven.project.injection.DefaultProfileInjector</implementation>
-    </component>
-    <component>
-      <role>org.apache.maven.project.MavenProjectBuilder</role>
-      <implementation>org.apache.maven.project.DefaultMavenProjectBuilder</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.profiles.MavenProfilesBuilder</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.project.injection.ProfileInjector</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.project.injection.ModelDefaultsInjector</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.project.interpolation.ModelInterpolator</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.project.inheritance.ModelInheritanceAssembler</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.project.validation.ModelValidator</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.project.path.PathTranslator</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.manager.WagonManager</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.apache.maven.profiles.activation.ProfileActivator</role>
-      <role-hint>always-on</role-hint>
-      <implementation>org.apache.maven.profiles.activation.AlwaysOnProfileActivator</implementation>
-    </component>
-    <component>
-      <role>org.apache.maven.profiles.activation.ProfileActivator</role>
-      <role-hint>jdk-prefix</role-hint>
-      <implementation>org.apache.maven.profiles.activation.JdkPrefixProfileActivator</implementation>
-    </component>
-    <component>
-      <role>org.apache.maven.profiles.activation.ProfileActivator</role>
-      <role-hint>system-property</role-hint>
-      <implementation>org.apache.maven.profiles.activation.SystemPropertyProfileActivator</implementation>
-    </component>
-    <component>
-      <role>org.apache.maven.profiles.activation.ProfileActivator</role>
-      <role-hint>os</role-hint>
-      <implementation>org.apache.maven.profiles.activation.OperatingSystemProfileActivator</implementation>
-    </component>
-    <component>
-      <role>org.apache.maven.profiles.activation.ProfileActivator</role>
-      <role-hint>file</role-hint>
-      <implementation>org.apache.maven.profiles.activation.FileProfileActivator</implementation>
-    </component>
-    <component>
-      <role>org.apache.maven.project.inheritance.ModelInheritanceAssembler</role>
-      <implementation>org.apache.maven.project.inheritance.DefaultModelInheritanceAssembler</implementation>
-    </component>
-    <component>
-      <role>org.apache.maven.project.validation.ModelValidator</role>
-      <implementation>org.apache.maven.project.validation.DefaultModelValidator</implementation>
-    </component>
-    <component>
-      <role>org.apache.maven.project.ModelResolver</role>
-      <role-hint>default</role-hint>
-      <implementation>org.apache.maven.project.ModelResolver</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
-      <role-hint>maven</role-hint>
-      <implementation>org.apache.maven.project.artifact.MavenMetadataSource</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.project.MavenProjectBuilder</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.apache.maven.artifact.manager.WagonManager</role>
-      <implementation>org.apache.maven.artifact.manager.DefaultWagonManager</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
-      <implementation>org.apache.maven.artifact.repository.metadata.DefaultRepositoryMetadataManager</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.artifact.manager.WagonManager</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.apache.maven.artifact.transform.ArtifactTransformation</role>
-      <role-hint>snapshot</role-hint>
-      <implementation>org.apache.maven.artifact.transform.SnapshotTransformation</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.artifact.manager.WagonManager</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.apache.maven.artifact.transform.ArtifactTransformation</role>
-      <role-hint>release</role-hint>
-      <implementation>org.apache.maven.artifact.transform.ReleaseArtifactTransformation</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.artifact.manager.WagonManager</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.apache.maven.artifact.transform.ArtifactTransformation</role>
-      <role-hint>latest</role-hint>
-      <implementation>org.apache.maven.artifact.transform.LatestArtifactTransformation</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.artifact.manager.WagonManager</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.apache.maven.artifact.transform.ArtifactTransformationManager</role>
-      <implementation>org.apache.maven.artifact.transform.DefaultArtifactTransformationManager</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.artifact.transform.ArtifactTransformation</role>
-          <field-name>artifactTransformations</field-name>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
-      <implementation>org.apache.maven.artifact.resolver.DefaultArtifactResolver</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.artifact.manager.WagonManager</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.transform.ArtifactTransformationManager</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.resolver.ArtifactCollector</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.apache.maven.artifact.installer.ArtifactInstaller</role>
-      <implementation>org.apache.maven.artifact.installer.DefaultArtifactInstaller</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.artifact.transform.ArtifactTransformationManager</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.apache.maven.artifact.deployer.ArtifactDeployer</role>
-      <implementation>org.apache.maven.artifact.deployer.DefaultArtifactDeployer</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.artifact.manager.WagonManager</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.transform.ArtifactTransformationManager</role>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.apache.maven.artifact.repository.ArtifactRepositoryFactory</role>
-      <implementation>org.apache.maven.artifact.repository.DefaultArtifactRepositoryFactory</implementation>
-    </component>
-    <component>
-      <role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataBuilder</role>
-      <role-hint>default</role-hint>
-      <implementation>org.apache.maven.artifact.repository.metadata.DefaultRepositoryMetadataBuilder</implementation>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.apache.maven.plugin.registry.MavenPluginRegistryBuilder</role>
-      <implementation>org.apache.maven.plugin.registry.DefaultPluginRegistryBuilder</implementation>
-      <configuration>
-        <globalRegistryPath>${maven.home}/conf/plugin-registry.xml</globalRegistryPath>
-        <userRegistryPath>${user.home}/.m2/plugin-registry.xml</userRegistryPath>
-      </configuration>
-    </component>
-    <component>
-      <role>org.apache.maven.wagon.Wagon</role>
-      <role-hint>scpexe</role-hint>
-      <implementation>org.apache.maven.wagon.providers.ssh.external.ScpExternalWagon</implementation>
-      <instantiation-strategy>per-lookup</instantiation-strategy>
-    </component>
-    <component>
-      <role>org.apache.maven.wagon.CommandExecutor</role>
-      <implementation>org.apache.maven.wagon.providers.ssh.jsch.ScpWagon</implementation>
-      <instantiation-strategy>per-lookup</instantiation-strategy>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.wagon.providers.ssh.knownhost.KnownHostsProvider</role>
-          <role-hint>file</role-hint>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.wagon.providers.ssh.interactive.InteractiveUserInfo</role>
-        </requirement>
-        <requirement>
-          <role>com.jcraft.jsch.UIKeyboardInteractive</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.apache.maven.wagon.providers.ssh.knownhost.KnownHostsProvider</role>
-      <role-hint>file</role-hint>
-      <implementation>org.apache.maven.wagon.providers.ssh.knownhost.FileKnownHostsProvider</implementation>
-      <instantiation-strategy>per-lookup</instantiation-strategy>
-      <configuration>
-        <hostKeyChecking>ask</hostKeyChecking>
-      </configuration>
-    </component>
-    <component>
-      <role>org.apache.maven.wagon.providers.ssh.knownhost.KnownHostsProvider</role>
-      <role-hint>null</role-hint>
-      <implementation>org.apache.maven.wagon.providers.ssh.knownhost.NullKnownHostsProvider</implementation>
-      <instantiation-strategy>per-lookup</instantiation-strategy>
-      <configuration>
-        <hostKeyChecking>ask</hostKeyChecking>
-      </configuration>
-    </component>
-    <component>
-      <role>org.apache.maven.wagon.providers.ssh.interactive.InteractiveUserInfo</role>
-      <implementation>org.apache.maven.wagon.providers.ssh.interactive.ConsoleInteractiveUserInfo</implementation>
-      <instantiation-strategy>per-lookup</instantiation-strategy>
-      <requirements>
-        <requirement>
-          <role>org.codehaus.plexus.components.interactivity.Prompter</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.codehaus.plexus.components.interactivity.InputHandler</role>
-      <role-hint>default</role-hint>
-      <implementation>org.codehaus.plexus.components.interactivity.DefaultInputHandler</implementation>
-      <instantiation-strategy>per-lookup</instantiation-strategy>
-    </component>
-    <component>
-      <role>org.codehaus.plexus.components.interactivity.OutputHandler</role>
-      <role-hint>default</role-hint>
-      <implementation>org.codehaus.plexus.components.interactivity.DefaultOutputHandler</implementation>
-      <instantiation-strategy>per-lookup</instantiation-strategy>
-    </component>
-    <component>
-      <role>org.codehaus.plexus.components.interactivity.Prompter</role>
-      <role-hint>default</role-hint>
-      <implementation>org.codehaus.plexus.components.interactivity.DefaultPrompter</implementation>
-      <instantiation-strategy>per-lookup</instantiation-strategy>
-      <requirements>
-        <requirement>
-          <role>org.codehaus.plexus.components.interactivity.InputHandler</role>
-        </requirement>
-        <requirement>
-          <role>org.codehaus.plexus.components.interactivity.OutputHandler</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.apache.maven.wagon.Wagon</role>
-      <role-hint>scp</role-hint>
-      <implementation>org.apache.maven.wagon.providers.ssh.jsch.ScpWagon</implementation>
-      <instantiation-strategy>per-lookup</instantiation-strategy>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.wagon.providers.ssh.knownhost.KnownHostsProvider</role>
-          <role-hint>file</role-hint>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.wagon.providers.ssh.interactive.InteractiveUserInfo</role>
-        </requirement>
-        <requirement>
-          <role>com.jcraft.jsch.UIKeyboardInteractive</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.apache.maven.wagon.Wagon</role>
-      <role-hint>sftp</role-hint>
-      <implementation>org.apache.maven.wagon.providers.ssh.jsch.SftpWagon</implementation>
-      <instantiation-strategy>per-lookup</instantiation-strategy>
-      <requirements>
-        <requirement>
-          <role>org.apache.maven.wagon.providers.ssh.knownhost.KnownHostsProvider</role>
-          <role-hint>file</role-hint>
-        </requirement>
-        <requirement>
-          <role>org.apache.maven.wagon.providers.ssh.interactive.InteractiveUserInfo</role>
-        </requirement>
-        <requirement>
-          <role>com.jcraft.jsch.UIKeyboardInteractive</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>com.jcraft.jsch.UIKeyboardInteractive</role>
-      <implementation>org.apache.maven.wagon.providers.ssh.jsch.interactive.PrompterUIKeyboardInteractive</implementation>
-      <requirements>
-        <requirement>
-          <role>org.codehaus.plexus.components.interactivity.Prompter</role>
-        </requirement>
-      </requirements>
-    </component>
-    <component>
-      <role>org.apache.maven.toolchain.ToolchainManager</role>
-      <implementation>org.apache.maven.toolchain.DefaultToolchainManager</implementation>
-    </component>
-    <component>
-      <role>org.apache.maven.toolchain.ToolchainManagerPrivate</role>
-      <implementation>org.apache.maven.toolchain.DefaultToolchainManager</implementation>
-    </component>
-    <component>
-      <role>org.apache.maven.toolchain.ToolchainFactory</role>
-      <role-hint>jdk</role-hint>
-      <implementation>org.apache.maven.toolchain.java.DefaultJavaToolchainFactory</implementation>
-    </component>
-    <component>
-      <role>org.apache.maven.toolchain.ToolchainFactory</role>
-      <role-hint>javac</role-hint>
-      <implementation>org.apache.maven.toolchain.java.DefaultJavaToolchainFactory</implementation>
-    </component>
-  </components>
-</component-set>
\ No newline at end of file
diff --git a/debian/META-INF/plexus/plexus.xml b/debian/META-INF/plexus/plexus.xml
deleted file mode 100644
index 4591a42..0000000
--- a/debian/META-INF/plexus/plexus.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied.  See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-
-<plexus>
-  <component-discoverer-manager implementation="org.codehaus.plexus.component.discovery.DefaultComponentDiscovererManager">
-    <listeners>
-      <listener implementation="org.codehaus.plexus.component.discovery.DiscoveryListenerDescriptor">
-        <role>org.apache.maven.plugin.MavenPluginCollector</role>
-      </listener>
-    </listeners>
-    <component-discoverers>
-      <component-discoverer implementation="org.apache.maven.plugin.MavenPluginDiscoverer"/>
-    </component-discoverers>
-  </component-discoverer-manager>
-  <components>
-    <component>
-      <role>org.apache.maven.plugin.MavenPluginCollector</role>
-      <implementation>org.apache.maven.plugin.MavenPluginCollector</implementation>
-    </component>
-  </components>
-</plexus>
diff --git a/debian/build.properties b/debian/build.properties
index 4df1a8b..c4b0128 100644
--- a/debian/build.properties
+++ b/debian/build.properties
@@ -1,10 +1,16 @@
+maven.home = debian/tmp/maven-${version}
 classpath.compile = \
+		    /usr/share/java/backport-util-concurrent.jar:\
 		    /usr/share/java/doxia-sink-api.jar:\
 		    /usr/share/java/classworlds.jar:\
-                    /usr/share/java/commons-cli.jar:\
-                    /usr/share/java/junit.jar:\
-                    /usr/share/java/modello-core.jar:\
-                    /usr/share/java/plexus-container-default.jar:\
-                    /usr/share/java/plexus-interactivity-api.jar:\
-                    /usr/share/java/plexus-utils.jar:\
-                    /usr/share/java/wagon-provider-api.jar
+            /usr/share/java/commons-cli.jar:\
+            /usr/share/java/junit.jar:\
+            /usr/share/java/modello-core.jar:\
+            /usr/share/java/plexus-cipher.jar:\
+            /usr/share/java/plexus-container-default-alpha.jar:\
+            /usr/share/java/plexus-interactivity-api.jar:\
+            /usr/share/java/plexus-interpolation.jar:\
+            /usr/share/java/plexus-sec-dispatcher.jar:\
+            /usr/share/java/plexus-utils.jar:\
+            /usr/share/java/wagon-provider-api.jar
+
diff --git a/debian/build.xml b/debian/build.xml
deleted file mode 100644
index 31c9923..0000000
--- a/debian/build.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0"?>
-
-<!--
-      This build.xml file was written for the Debian project.
-      This file copyright (c) Paul Cager <paul-debian at home.paulcager.org>
-
-        This software and documentation is provided "as is," and
-        the copyright holders and contributing author(s) make no
-        representations or warranties, express or implied, including
-        but not limited to, warranties of merchantability or fitness
-        for any particular purpose or that the use of the software or
-        documentation will not infringe any third party patents,
-        copyrights, trademarks or other rights. 
-
-        The copyright holders and contributing author(s) will not be
-        liable for any direct, indirect, special or consequential damages
-        arising out of any use of the software or documentation, even if
-        advised of the possibility of such damage.
-
-        Permission is hereby granted to use, copy, modify, and distribute
-        this source code, or portions hereof, documentation and executables,
-        for any purpose, without fee, subject to the following restrictions:
-
-        1. The origin of this source code must not be misrepresented.
-        2. Altered versions must be plainly marked as such and must
-           not be misrepresented as being the original source.
-        3. This Copyright notice may not be removed or altered from any
-           source or altered source distribution.
--->
-
-<project name="pkg-java" default="package" basedir="..">
-
-<target name="package" depends="jar,javadoc"/>
-
-    <property file="debian/build.properties"/>
-    <property name="maven.mainSourceRoots" value="maven-monitor/src/main/java:maven-core/src/main/java:maven-artifact/src/main/java:maven-error-diagnostics/src/main/java:maven-profile/src/main/java:maven-settings/src/main/java:maven-plugin-registry/src/main/java:maven-plugin-api/src/main/java:maven-artifact-manager/src/main/java:maven-project/src/main/java:bootstrap/bootstrap-mini/src/main/java:bootstrap/bootstrap-installer/src/main/java:maven-reporting/maven-reporting-api/src/main/java: [...]
-    <property name="maven.generatedSourceRoots" value="maven-plugin-parameter-documenter/build/generated-sources:maven-repository-metadata/build/generated-sources:maven-model/build/generated-sources:maven-profile/build/generated-sources:maven-settings/build/generated-sources:maven-plugin-registry/build/generated-sources:maven-plugin-descriptor/build/generated-sources:maven-toolchain/build/generated-sources"/>
-    <property name="maven.sourceRoots" value="${maven.mainSourceRoots}:${maven.generatedSourceRoots}"/>
-
-<target name="init">
-	<property name="src.dir" value="."/>
-	<property name="build.dir" value="build"/>
-	<property name="jar.suffix" value="-${version}.jar"/>
-	<property name="jar" value="${build.dir}/${package}-${version}.jar"/>
-	<property name="javadoc.dir" value="${build.dir}/doc/api"/>
-	<echo message="Classpath: ${java.class.path}" />
-	<echo message="Compile classpath: ${classpath.compile}" />
-</target>
-
-<target name="generate-sources">
-    <taskdef name="modello" classname="ModelloTask" classpath="/usr/share/java/maven-ant-helper.jar:/usr/share/java/modello-core.jar:/usr/share/java/modello-plugin-xml.jar:/usr/share/java/modello-plugin-xpp3.jar"/>
-    <modello model="maven-plugin-parameter-documenter/src/main/mdo/paramdoc.mdo" plugin="java" output="maven-plugin-parameter-documenter/build/generated-sources" version="1.0.0"/>
-    <modello model="maven-plugin-parameter-documenter/src/main/mdo/paramdoc.mdo" plugin="xpp3-reader" output="maven-plugin-parameter-documenter/build/generated-sources" version="1.0.0"/>
-    <modello model="maven-plugin-parameter-documenter/src/main/mdo/paramdoc.mdo" plugin="xpp3-writer" output="maven-plugin-parameter-documenter/build/generated-sources" version="1.0.0"/>
-    <modello model="maven-repository-metadata/src/main/mdo/metadata.mdo" plugin="java" output="maven-repository-metadata/build/generated-sources" version="1.0.0"/>
-    <modello model="maven-repository-metadata/src/main/mdo/metadata.mdo" plugin="xpp3-reader" output="maven-repository-metadata/build/generated-sources" version="1.0.0"/>
-    <modello model="maven-repository-metadata/src/main/mdo/metadata.mdo" plugin="xpp3-writer" output="maven-repository-metadata/build/generated-sources" version="1.0.0"/>
-    <modello model="maven-model/src/main/mdo/maven.mdo" plugin="java" output="maven-model/build/generated-sources" version="4.0.0"/>
-    <modello model="maven-model/src/main/mdo/maven.mdo" plugin="xpp3-reader" output="maven-model/build/generated-sources" version="4.0.0"/>
-    <modello model="maven-model/src/main/mdo/maven.mdo" plugin="xpp3-writer" output="maven-model/build/generated-sources" version="4.0.0"/>
-    <modello model="maven-profile/src/main/mdo/profiles.mdo" plugin="java" output="maven-profile/build/generated-sources" version="1.0.0"/>
-    <modello model="maven-profile/src/main/mdo/profiles.mdo" plugin="xpp3-reader" output="maven-profile/build/generated-sources" version="1.0.0"/>
-    <modello model="maven-profile/src/main/mdo/profiles.mdo" plugin="xpp3-writer" output="maven-profile/build/generated-sources" version="1.0.0"/>
-    <modello model="maven-settings/src/main/mdo/settings.mdo" plugin="java" output="maven-settings/build/generated-sources" version="1.0.0"/>
-    <modello model="maven-settings/src/main/mdo/settings.mdo" plugin="xpp3-reader" output="maven-settings/build/generated-sources" version="1.0.0"/>
-    <modello model="maven-settings/src/main/mdo/settings.mdo" plugin="xpp3-writer" output="maven-settings/build/generated-sources" version="1.0.0"/>
-    <modello model="maven-plugin-registry/plugin-registry.mdo" plugin="java" output="maven-plugin-registry/build/generated-sources" version="1.0.0"/>
-    <modello model="maven-plugin-registry/plugin-registry.mdo" plugin="xpp3-reader" output="maven-plugin-registry/build/generated-sources" version="1.0.0"/>
-    <modello model="maven-plugin-registry/plugin-registry.mdo" plugin="xpp3-writer" output="maven-plugin-registry/build/generated-sources" version="1.0.0"/>
-    <modello model="maven-plugin-descriptor/src/main/mdo/lifecycle.mdo" plugin="java" output="maven-plugin-descriptor/build/generated-sources" version="1.0.0"/>
-    <modello model="maven-plugin-descriptor/src/main/mdo/lifecycle.mdo" plugin="xpp3-reader" output="maven-plugin-descriptor/build/generated-sources" version="1.0.0"/>
-    <modello model="maven-plugin-descriptor/src/main/mdo/lifecycle.mdo" plugin="xpp3-writer" output="maven-plugin-descriptor/build/generated-sources" version="1.0.0"/>
-    <modello model="maven-toolchain/src/main/mdo/toolchains.xml" plugin="java" output="maven-toolchain/build/generated-sources" version="1.0.0"/>
-    <modello model="maven-toolchain/src/main/mdo/toolchains.xml" plugin="xpp3-reader" output="maven-toolchain/build/generated-sources" version="1.0.0"/>
-    <modello model="maven-toolchain/src/main/mdo/toolchains.xml" plugin="xpp3-writer" output="maven-toolchain/build/generated-sources" version="1.0.0"/>
-</target>
-
-<target name="compile" depends="init, generate-sources">
-	<mkdir dir="${build.dir}"/>
-	<javac 
-        srcdir="${maven.sourceRoots}"
-        classpath="${classpath.compile}"
-        destdir="${build.dir}"
-        debug="on">
-	</javac>
-</target>
-
-<target name="jar" depends="compile">
-	<delete file="${jar}"/>
-
-	<!-- TODO - Need to generate the META-INF, rather than save in debian dir -->
-
-	<mkdir dir="${build.dir}/META-INF"/>
-
-	<copy todir="${build.dir}/META-INF">
-	    <fileset dir="debian/META-INF" />
-	</copy>
-
-	<copy todir="${build.dir}">
-		<fileset dir="maven-artifact/src/main/resources" />
-		<fileset dir="maven-reporting/maven-reporting-api/src/main/resources" />
-		<fileset dir="maven-error-diagnostics/src/main/resources" />
-		<fileset dir="maven-plugin-registry/src/main/resources" />
-		<fileset dir="maven-profile/src/main/resources" />
-		<fileset dir="maven-core/src/main/resources" />
-		<fileset dir="maven-artifact-manager/src/main/resources" />
-		<fileset dir="bootstrap/bootstrap-installer/src/main/resources" />
-		<fileset dir="bootstrap/bootstrap-mini/src/main/resources" />
-		<fileset dir="maven-settings/src/main/resources" />
-		<fileset dir="maven-script/maven-script-ant/src/main/resources" />
-		<fileset dir="maven-project/src/main/resources" />
-		<fileset dir="maven-toolchain/src/main/resources" />
-	</copy>
-
-	<jar jarfile="${build.dir}/${package}${jar.suffix}"
-		basedir="${build.dir}"/>
-</target>
-
-<target name="javadoc" depends="init">
-    <!-- Are javadocs useful?
-    <ant target="javadoc" antfile="${maven.build.xml}" dir="."/>
-    -->
-</target>
-
-<target name="clean" depends="init">
-	<delete dir="${build.dir}"/>
-        <delete dir="maven-plugin-parameter-documenter/build/generated-sources"/>
-        <delete dir="maven-repository-metadata/build/generated-sources"/>
-        <delete dir="maven-model/build/generated-sources"/>
-        <delete dir="maven-profile/build/generated-sources"/>
-        <delete dir="maven-settings/build/generated-sources"/>
-        <delete dir="maven-plugin-registry/build/generated-sources"/>
-        <delete dir="maven-plugin-descriptor/build/generated-sources"/>
-        <delete dir="maven-toolchain/build/generated-sources"/>
-</target>
-</project>
diff --git a/debian/changelog b/debian/changelog
index a5875b3..2c9e665 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,31 @@
+maven2 (2.2.0-1) experimental; urgency=low
+
+  * New upstream version
+  * Added myself to Uploaders.
+  * Change section to java, bump Standards-Version to 3.8.1
+  * Add a Build-Depends-Indep dependency on maven-repo-helper
+  * Move ant to Build-Depends (needed for clean target)
+  * Add dependency on java runtimes for the maven2 binary.
+  * Change the dependency on java-gcj to default-jdk (Closes: #526295)
+  * Update watch and added orig-tar.sh to download the sources, 
+    get-orig-source in rules now uses uscan
+  * Use quilt to manage the patches, add a patch to use the upstream
+    build.xml as the build file, disabling all dependency downloading from it
+  * Split the package in 2 parts: maven2-core contains all libraries,
+    this package contains only the uber jar and the scripts
+  * Updated the build to use Maven and its plugins to bootstrap itself,
+    based on a patched version of the build.xml boostrap script provided
+    with Maven. In particular, it now generates properly the shaded uber-jar,
+    this will avoid potential class versionning conflicts for the shared 
+    libraries used in the plugins.
+  * Added Build-Depends-Indep on libmaven-clean-plugin-java,
+    libmaven-compiler-plugin-java, libmaven-install-plugin-java, 
+    libmaven-jar-plugin-java, libmaven-resources-plugin-java, 
+    libmaven-shade-plugin-java and add a Recommends on those libraries.
+  * Remove debian/META-INF as this information is now generated by the build.
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Mon, 02 Mar 2009 15:04:20 +0000
+
 maven2 (2.0.9-2) unstable; urgency=low
 
   [ Michael Koch ]
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..1e8b314 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+6
diff --git a/debian/components.xml b/debian/components.xml
new file mode 100644
index 0000000..fdc41a7
--- /dev/null
+++ b/debian/components.xml
@@ -0,0 +1,414 @@
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<!-- Minimum version of the Maven components used only for bootstraping
+  the Maven build -->
+
+<component-set>
+  <components>
+    <component>
+      <role>org.apache.maven.plugin.PluginManager</role>
+      <implementation>org.apache.maven.plugin.DefaultPluginManager</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.project.path.PathTranslator</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.plugin.MavenPluginCollector</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.plugin.version.PluginVersionManager</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.plugin.PluginMappingManager</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.execution.RuntimeInformation</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.project.MavenProjectBuilder</role>
+        </requirement>
+      </requirements>
+    </component>
+
+    <component>
+      <role>org.apache.maven.extension.ExtensionManager</role>
+      <implementation>org.apache.maven.extension.DefaultExtensionManager</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.manager.WagonManager</role>
+        </requirement>
+      </requirements>
+    </component>
+
+    <component>
+      <role>org.apache.maven.plugin.PluginMappingManager</role>
+      <implementation>org.apache.maven.plugin.DefaultPluginMappingManager</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.artifact.repository.metadata.RepositoryMetadataManager</role>
+        </requirement>
+      </requirements>
+    </component>
+
+    <!-- Duplicated from Maven core as it is used in the plugin manager -->
+    <component>
+      <role>org.apache.maven.project.path.PathTranslator</role>
+      <implementation>org.apache.maven.project.path.DefaultPathTranslator</implementation>
+    </component>
+    <!--
+     |
+     |
+     |
+     -->
+    <component>
+      <role>org.apache.maven.Maven</role>
+      <implementation>org.apache.maven.DefaultMaven</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.project.MavenProjectBuilder</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.lifecycle.LifecycleExecutor</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.usability.diagnostics.ErrorDiagnostics</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.execution.RuntimeInformation</role>
+        </requirement>
+      </requirements>
+    </component>
+
+    <component>
+      <role>org.apache.maven.execution.RuntimeInformation</role>
+      <implementation>org.apache.maven.execution.DefaultRuntimeInformation</implementation>
+    </component>
+    <!--
+    |
+    |MojoExecutionExceptionDiagnoser
+    |
+    -->
+    <component>
+      <role>org.apache.maven.usability.diagnostics.ErrorDiagnoser</role>
+      <role-hint>MojoExecutionExceptionDiagnoser</role-hint>
+      <implementation>org.apache.maven.usability.MojoExecutionExceptionDiagnoser</implementation>
+    </component>
+    <!--
+    |
+    |MojoFailureExceptionDiagnoser
+    |
+    -->
+    <component>
+      <role>org.apache.maven.usability.diagnostics.ErrorDiagnoser</role>
+      <role-hint>MojoFailureExceptionDiagnoser</role-hint>
+      <implementation>org.apache.maven.usability.MojoFailureExceptionDiagnoser</implementation>
+    </component>
+    <!--
+    |
+    |ProjectBuildDiagnoser
+    |
+    -->
+    <component>
+      <role>org.apache.maven.usability.diagnostics.ErrorDiagnoser</role>
+      <role-hint>ProjectBuildDiagnoser</role-hint>
+      <implementation>org.apache.maven.usability.ProjectBuildDiagnoser</implementation>
+    </component>
+    <!--
+    |
+    |ProfileActivationDiagnoser
+    |
+    -->
+    <component>
+      <role>org.apache.maven.usability.diagnostics.ErrorDiagnoser</role>
+      <role-hint>ProfileActivationDiagnoser</role-hint>
+      <implementation>org.apache.maven.usability.ProfileActivationDiagnoser</implementation>
+    </component>
+    <!--
+    |
+    |PluginConfigurationDiagnoser
+    |
+    -->
+    <component>
+      <role>org.apache.maven.usability.diagnostics.ErrorDiagnoser</role>
+      <role-hint>PluginConfigurationDiagnoser</role-hint>
+      <implementation>org.apache.maven.usability.PluginConfigurationDiagnoser</implementation>
+    </component>
+    <!--
+    |
+    |ArtifactNotFoundDiagnoser
+    |
+    -->
+    <component>
+      <role>org.apache.maven.usability.diagnostics.ErrorDiagnoser</role>
+      <role-hint>ArtifactNotFoundDiagnoser</role-hint>
+      <implementation>org.apache.maven.usability.ArtifactNotFoundDiagnoser</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.artifact.manager.WagonManager</role>
+        </requirement>
+      </requirements>
+    </component>
+    <!--
+     |
+     |ArtifactResolverDiagnoser
+     |
+     -->
+    <component>
+      <role>org.apache.maven.usability.diagnostics.ErrorDiagnoser</role>
+      <role-hint>ArtifactResolverDiagnoser</role-hint>
+      <implementation>org.apache.maven.usability.ArtifactResolverDiagnoser</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.artifact.manager.WagonManager</role>
+        </requirement>
+      </requirements>
+    </component>
+    <!--
+     |
+     |InvalidArtifactDiagnoser
+     |
+     -->
+    <component>
+      <role>org.apache.maven.usability.diagnostics.ErrorDiagnoser</role>
+      <role-hint>InvalidArtifactDiagnoser</role-hint>
+      <implementation>org.apache.maven.usability.InvalidArtifactDiagnoser</implementation>
+    </component>
+
+    <component>
+      <role>org.apache.maven.ConfigurationInterpolator</role>
+      <implementation>org.apache.maven.ReflectionConfigurationInterpolator</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.project.path.PathTranslator</role>
+        </requirement>
+      </requirements>
+    </component>
+    
+    <!--
+     |
+     | Lifecycle executor
+     |
+     -->
+    <component>
+      <role>org.apache.maven.lifecycle.LifecycleExecutor</role>
+      <implementation>org.apache.maven.lifecycle.DefaultLifecycleExecutor</implementation>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.plugin.PluginManager</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.extension.ExtensionManager</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.handler.manager.ArtifactHandlerManager</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.project.MavenProjectBuilder</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.project.interpolation.ModelInterpolator</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.ConfigurationInterpolator</role>
+        </requirement>
+      </requirements>
+      <configuration>
+        <lifecycles>
+          <lifecycle>
+            <id>default</id>
+            <!-- START SNIPPET: lifecycle -->
+            <phases>
+              <phase>validate</phase>
+              <phase>initialize</phase>
+              <phase>generate-sources</phase>
+              <phase>process-sources</phase>
+              <phase>generate-resources</phase>
+              <phase>process-resources</phase>
+              <phase>compile</phase>
+              <phase>process-classes</phase>
+              <phase>generate-test-sources</phase>
+              <phase>process-test-sources</phase>
+              <phase>generate-test-resources</phase>
+              <phase>process-test-resources</phase>
+              <phase>test-compile</phase>
+              <phase>process-test-classes</phase>
+              <phase>test</phase>
+              <phase>prepare-package</phase>
+              <phase>package</phase>
+              <phase>pre-integration-test</phase>
+              <phase>integration-test</phase>
+              <phase>post-integration-test</phase>
+              <phase>verify</phase>
+              <phase>install</phase>
+              <phase>deploy</phase>
+            </phases>
+            <!-- END SNIPPET: lifecycle -->
+          </lifecycle>
+          <lifecycle>
+            <id>clean</id>
+            <phases>
+              <phase>pre-clean</phase>
+              <phase>clean</phase>
+              <phase>post-clean</phase>
+            </phases>
+            <default-phases>
+              <clean>org.apache.maven.plugins:maven-clean-plugin:clean</clean>
+            </default-phases>
+          </lifecycle>
+        </lifecycles>
+        <!-- START SNIPPET: default-reports -->
+        <defaultReports>
+        </defaultReports>
+        <!-- END SNIPPET: default-reports -->
+        <!-- START SNIPPET: default-lifecycle -->
+        <!-- NOT USED, ACCORDING TO CODE.
+        <defaultPhases>
+          <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
+          <compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
+          <process-test-resources>org.apache.maven.plugins:maven-resources-plugin:testResources</process-test-resources>
+          <test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
+          <test>org.apache.maven.plugins:maven-surefire-plugin:test</test>
+          <package>
+            org.apache.maven.plugins:maven-jar-plugin:jar,
+            org.apache.maven.plugins:maven-source-plugin:jar
+          </package>
+          <install>org.apache.maven.plugins:maven-install-plugin:install</install>
+          <deploy>org.apache.maven.plugins:maven-deploy-plugin:deploy</deploy>
+        </defaultPhases>
+        -->
+        <!-- END SNIPPET: default-lifecycle -->
+      </configuration>
+    </component>
+
+    <!-- TODO: issues with the lifecycle:
+     - manually configured lifecycles will not pick up any later additions to the defaults where they are intended to extend defaults (have configuration <includeDefaults/> ?)
+     -->
+    <component>
+      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+      <role-hint>pom</role-hint>
+      <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
+      <configuration>
+        <lifecycles>
+          <lifecycle>
+            <id>default</id>
+            <!-- START SNIPPET: pom-lifecycle -->
+            <phases>
+              <install>org.apache.maven.plugins:maven-install-plugin:install</install>
+              <deploy></deploy>
+            </phases>
+            <optional-mojos>
+            </optional-mojos>
+            <!-- END SNIPPET: pom-lifecycle -->
+          </lifecycle>
+        </lifecycles>
+      </configuration>
+    </component>
+
+    <component>
+      <role>org.apache.maven.lifecycle.mapping.LifecycleMapping</role>
+      <role-hint>jar</role-hint>
+      <implementation>org.apache.maven.lifecycle.mapping.DefaultLifecycleMapping</implementation>
+      <configuration>
+        <lifecycles>
+          <lifecycle>
+            <id>default</id>
+            <!-- START SNIPPET: jar-lifecycle -->
+            <phases>
+              <process-resources>org.apache.maven.plugins:maven-resources-plugin:resources</process-resources>
+              <compile>org.apache.maven.plugins:maven-compiler-plugin:compile</compile>
+              <process-test-resources>
+                org.apache.maven.plugins:maven-resources-plugin:testResources
+              </process-test-resources>
+              <test-compile>org.apache.maven.plugins:maven-compiler-plugin:testCompile</test-compile>
+              <test></test>
+              <package>
+                org.apache.maven.plugins:maven-jar-plugin:jar
+              </package>
+              <install>org.apache.maven.plugins:maven-install-plugin:install</install>
+              <deploy></deploy>
+            </phases>
+            <!-- END SNIPPET: jar-lifecycle -->
+          </lifecycle>
+        </lifecycles>
+      </configuration>
+    </component>
+
+    <component>
+      <role>org.apache.maven.plugin.version.PluginVersionManager</role>
+      <role-hint>default</role-hint>
+      <implementation>org.apache.maven.plugin.version.DefaultPluginVersionManager</implementation>
+      <instantiation-strategy>per-lookup</instantiation-strategy>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.plugin.registry.MavenPluginRegistryBuilder</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
+        </requirement>
+        <requirement>
+          <role>org.codehaus.plexus.components.interactivity.InputHandler</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.project.MavenProjectBuilder</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.execution.RuntimeInformation</role>
+        </requirement>
+      </requirements>
+    </component>
+
+    <component>
+      <role>org.sonatype.plexus.components.sec.dispatcher.SecDispatcher</role>
+      <role-hint>maven</role-hint>
+      <implementation>org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher</implementation>
+      <description>Maven Security dispatcher</description>
+      <requirements>
+        <requirement>
+          <role>org.sonatype.plexus.components.cipher.PlexusCipher</role>
+          <field-name>_cipher</field-name>
+        </requirement>
+      </requirements>
+      <configuration>
+        <_configuration-file>~/.m2/settings-security.xml</_configuration-file>
+      </configuration>
+    </component>    
+  </components>
+</component-set>
diff --git a/debian/control b/debian/control
index ecb3abc..b022472 100644
--- a/debian/control
+++ b/debian/control
@@ -1,27 +1,26 @@
 Source: maven2
-Section: devel
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Paul Cager <paul-debian at home.paulcager.org>, Michael Koch <konqueror at gmx.de>
-Build-Depends-Indep: java-gcj-compat-dev (>=1.0.65), ant-optional,
-  libxalan2-java, junit, libbcpg-java,
-  libbcprov-java, libclassworlds-java, libcommons-cli-java,
-  libdoxia-java, libmodello-java, libplexus-container-default-java,
-  libplexus-interactivity-api-java, libplexus-utils-java (>=1:1.4.8), libwagon-java,
-  maven-ant-helper
-Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3)
-Standards-Version: 3.8.0
+Uploaders: Paul Cager <paul-debian at home.paulcager.org>, Michael Koch <konqueror at gmx.de>,
+  Ludovic Claude <ludovic.claude at laposte.net>
+Build-Depends-Indep: maven-repo-helper, ant-optional, junit, libmaven-clean-plugin-java,
+  libmaven-compiler-plugin-java, libmaven-install-plugin-java, libmaven-jar-plugin-java,  
+  libmaven-resources-plugin-java, libmaven-shade-plugin-java,
+  libmaven2-core-java, maven-ant-helper
+Build-Depends: debhelper (>= 6), cdbs (>= 0.4.5.3), default-jdk, ant, quilt
+Standards-Version: 3.8.1
 Homepage: http://maven.apache.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven2
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven2
 
 Package: maven2
 Architecture: all
-Section: devel
-Depends: libcommons-cli-java (>= 1.1-2), libjsch-java, libxalan2-java,
-  libdoxia-java, libjtidy-java,
-  libplexus-interactivity-api-java (>=1.0-alpha-6-2), libwagon-java,
-  libplexus-utils-java (>=1:1.4.8)
+Depends: ${misc:Depends}, libmaven2-core-java,
+  default-jre (>= 1.4) | default-jre-headless (>= 1.4) | java2-runtime | java2-runtime-headless
+Recommends: libmaven-clean-plugin-java,
+  libmaven-compiler-plugin-java, libmaven-install-plugin-java, libmaven-jar-plugin-java,  
+  libmaven-resources-plugin-java, libmaven-shade-plugin-java
 Conflicts: maven2-binary
 Replaces: maven2-binary
 Description: Java software project management and comprehension tool
diff --git a/debian/m2.1 b/debian/m2.1
deleted file mode 100644
index 074b292..0000000
--- a/debian/m2.1
+++ /dev/null
@@ -1,92 +0,0 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH M2 "1" "July 2007" "m2 " "User Commands"
-.SH NAME
-m2 \- Command to start the maven system (deprecated)
-.SH DESCRIPTION
-THE m2 COMMMAND IS DEPRECATED \- PLEASE RUN mvn INSTEAD
-.PP
-usage: mvn [options] [<goal(s)>] [<phase(s)>]
-.SH OPTIONS
-.TP
-\fB\-q\fR,\-\-quiet
-Quiet output \- only show errors
-.TP
-\fB\-C\fR,\-\-strict\-checksums
-Fail the build if checksums don't match
-.TP
-\fB\-c\fR,\-\-lax\-checksums
-Warn if checksums don't match
-.TP
-\fB\-P\fR,\-\-activate\-profiles
-Comma\-delimited list of profiles to
-activate
-.TP
-\fB\-ff\fR,\-\-fail\-fast
-Stop at first failure in reactorized builds
-.TP
-\fB\-fae\fR,\-\-fail\-at\-end
-Only fail the build afterwards; allow all
-non\-impacted builds to continue
-.TP
-\fB\-B\fR,\-\-batch\-mode
-Run in non\-interactive (batch) mode
-.TP
-\fB\-fn\fR,\-\-fail\-never
-NEVER fail the build, regardless of project
-result
-.TP
-\fB\-up\fR,\-\-update\-plugins
-Synonym for cpu
-.TP
-\fB\-N\fR,\-\-non\-recursive
-Do not recurse into sub\-projects
-.TP
-\fB\-npr\fR,\-\-no\-plugin\-registry
-Don't use ~/.m2/plugin\-registry.xml for
-plugin versions
-.TP
-\fB\-U\fR,\-\-update\-snapshots
-Forces a check for updated releases and
-snapshots on remote repositories
-.TP
-\fB\-cpu\fR,\-\-check\-plugin\-updates
-Force upToDate check for any relevant
-registered plugins
-.TP
-\fB\-npu\fR,\-\-no\-plugin\-updates
-Suppress upToDate check for any relevant
-registered plugins
-.TP
-\fB\-D\fR,\-\-define
-Define a system property
-.TP
-\fB\-X\fR,\-\-debug
-Produce execution debug output
-.TP
-\fB\-e\fR,\-\-errors
-Produce execution error messages
-.TP
-\fB\-f\fR,\-\-file
-Force the use of an alternate POM file.
-.TP
-\fB\-h\fR,\-\-help
-Display help information
-.TP
-\fB\-o\fR,\-\-offline
-Work offline
-.TP
-\fB\-r\fR,\-\-reactor
-Execute goals for project found in the
-reactor
-.TP
-\fB\-s\fR,\-\-settings
-Alternate path for the user settings file
-.TP
-\fB\-v\fR,\-\-version
-Display version information
-.PP
-THE m2 COMMMAND IS DEPRECATED \- PLEASE RUN mvn INSTEAD
-.PP
-Maven version: 2.0.8
-.SH "SEE ALSO"
-.IR mvn (1)
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..70fd14b
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,7 @@
+org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/
+# force version 2.3 of Maven Clean plugin
+org.apache.maven.plugins maven-clean-plugin maven-plugin s/(.*)/2.3/
+# keep the version for all Maven plugins as versionless plugins don't work
+* * maven-plugin *
+junit junit jar s/3\..*/3.x/
+
diff --git a/debian/maven2.install b/debian/maven2.install
index 769ec21..393e65c 100644
--- a/debian/maven2.install
+++ b/debian/maven2.install
@@ -1,5 +1,5 @@
 apache-maven/src/bin/mvn usr/bin
-apache-maven/src/bin/m2 usr/bin
+apache-maven/src/bin/mvnDebug usr/bin
 
 apache-maven/src/bin/m2.conf etc/maven2
 apache-maven/src/conf/settings.xml /etc/maven2
diff --git a/debian/maven2.links b/debian/maven2.links
index 47807e0..344aca6 100644
--- a/debian/maven2.links
+++ b/debian/maven2.links
@@ -3,24 +3,7 @@
 /usr/share/maven2/conf/m2.conf /usr/share/maven2/bin/m2.conf
 
 /usr/bin/mvn /usr/share/maven2/bin/mvn
-/usr/bin/m2 /usr/share/maven2/bin/m2
+/usr/bin/mvnDebug /usr/share/maven2/bin/mvnDebug
 
 /usr/share/java/classworlds.jar usr/share/maven2/boot/classworlds.jar
 
-/usr/share/java/commons-cli.jar usr/share/maven2/lib/commons-cli.jar
-/usr/share/java/commons-cli.jar /usr/share/maven2/lib/commons-cli.jar
-/usr/share/java/doxia-sink-api.jar usr/share/maven2/lib/doxia-sink-api.jar
-/usr/share/java/jsch.jar /usr/share/maven2/lib/jsch.jar
-/usr/share/java/jtidy.jar usr/share/maven2/lib/jtidy.jar
-/usr/share/java/maven2.jar usr/share/maven2/lib/maven2.jar
-/usr/share/java/plexus-container-default.jar usr/share/maven2/lib/plexus-container-default.jar
-/usr/share/java/plexus-interactivity-api.jar usr/share/maven2/lib/plexus-interactivity-api.jar
-/usr/share/java/plexus-utils.jar usr/share/maven2/lib/plexus-utils.jar
-/usr/share/java/wagon-file.jar usr/share/maven2/lib/wagon-file.jar
-/usr/share/java/wagon-http-lightweight.jar usr/share/maven2/lib/wagon-http-lightweight.jar
-/usr/share/java/wagon-http-shared.jar usr/share/maven2/lib/wagon-http-shared.jar
-/usr/share/java/wagon-provider-api.jar usr/share/maven2/lib/wagon-provider-api.jar
-/usr/share/java/wagon-ssh-common.jar usr/share/maven2/lib/wagon-ssh-common.jar
-/usr/share/java/wagon-ssh-external.jar usr/share/maven2/lib/wagon-ssh-external.jar
-/usr/share/java/wagon-ssh.jar usr/share/maven2/lib/wagon-ssh.jar
-/usr/share/java/xml-apis.jar /usr/share/maven2/lib/xml-apis.jar
diff --git a/debian/maven2.manpages b/debian/maven2.manpages
index de16520..f132f38 100644
--- a/debian/maven2.manpages
+++ b/debian/maven2.manpages
@@ -1,2 +1,2 @@
 debian/mvn.1
-debian/m2.1
+debian/mvnDebug.1
diff --git a/debian/maven2.poms b/debian/maven2.poms
new file mode 100644
index 0000000..0502b0f
--- /dev/null
+++ b/debian/maven2.poms
@@ -0,0 +1,2 @@
+pom.xml --no-parent
+apache-maven/pom.xml
diff --git a/debian/mvn.1 b/debian/mvn.1
index d2c07ff..523898c 100644
--- a/debian/mvn.1
+++ b/debian/mvn.1
@@ -1,88 +1,137 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
-.TH MAVEN "1" "July 2007" "Maven version: 2.0.8" "User Commands"
+.TH APACHE "1" "July 2009" "Apache Maven 2.2.0" "User Commands"
 .SH NAME
 mvn \- Command to start the Maven system
 .SH DESCRIPTION
 usage: mvn [options] [<goal(s)>] [<phase(s)>]
 .SH OPTIONS
 .TP
-\fB\-q\fR,\-\-quiet
-Quiet output \- only show errors
+\fB\-am\fR,\-\-also\-make
+If project list is specified, also
+build projects required by the
+list
+.TP
+\fB\-amd\fR,\-\-also\-make\-dependents
+If project list is specified, also
+build projects that depend on
+projects on the list
+.TP
+\fB\-B\fR,\-\-batch\-mode
+Run in non\-interactive (batch)
+mode
 .TP
 \fB\-C\fR,\-\-strict\-checksums
-Fail the build if checksums don't match
+Fail the build if checksums don't
+match
 .TP
 \fB\-c\fR,\-\-lax\-checksums
 Warn if checksums don't match
 .TP
-\fB\-P\fR,\-\-activate\-profiles
-Comma\-delimited list of profiles to
-activate
+\fB\-cpu\fR,\-\-check\-plugin\-updates
+Force upToDate check for any
+relevant registered plugins
 .TP
-\fB\-ff\fR,\-\-fail\-fast
-Stop at first failure in reactorized builds
+\fB\-D\fR,\-\-define <arg>
+Define a system property
+.TP
+\fB\-e\fR,\-\-errors
+Produce execution error messages
+.TP
+\fB\-emp\fR,\-\-encrypt\-master\-password <arg>
+Encrypt master security password
+.TP
+\fB\-ep\fR,\-\-encrypt\-password <arg>
+Encrypt server password
+.TP
+\fB\-f\fR,\-\-file
+Force the use of an alternate POM
+file.
 .TP
 \fB\-fae\fR,\-\-fail\-at\-end
-Only fail the build afterwards; allow all
-non\-impacted builds to continue
+Only fail the build afterwards;
+allow all non\-impacted builds to
+continue
 .TP
-\fB\-B\fR,\-\-batch\-mode
-Run in non\-interactive (batch) mode
+\fB\-ff\fR,\-\-fail\-fast
+Stop at first failure in
+reactorized builds
 .TP
 \fB\-fn\fR,\-\-fail\-never
-NEVER fail the build, regardless of project
-result
+NEVER fail the build, regardless
+of project result
 .TP
-\fB\-up\fR,\-\-update\-plugins
-Synonym for cpu
+\fB\-gs\fR,\-\-global\-settings <arg>
+Alternate path for the global
+settings file
+.TP
+\fB\-h\fR,\-\-help
+Display help information
 .TP
 \fB\-N\fR,\-\-non\-recursive
 Do not recurse into sub\-projects
 .TP
 \fB\-npr\fR,\-\-no\-plugin\-registry
-Don't use ~/.m2/plugin\-registry.xml for
+Don't use
+~/.m2/plugin\-registry.xml for
 plugin versions
 .TP
-\fB\-U\fR,\-\-update\-snapshots
-Forces a check for updated releases and
-snapshots on remote repositories
+\fB\-npu\fR,\-\-no\-plugin\-updates
+Suppress upToDate check for any
+relevant registered plugins
 .TP
-\fB\-cpu\fR,\-\-check\-plugin\-updates
-Force upToDate check for any relevant
-registered plugins
+\fB\-o\fR,\-\-offline
+Work offline
 .TP
-\fB\-npu\fR,\-\-no\-plugin\-updates
-Suppress upToDate check for any relevant
-registered plugins
+\fB\-P\fR,\-\-activate\-profiles <arg>
+Comma\-delimited list of profiles
+to activate
 .TP
-\fB\-D\fR,\-\-define
-Define a system property
+\fB\-pl\fR,\-\-projects <arg>
+Build specified reactor projects
+instead of all projects
 .TP
-\fB\-X\fR,\-\-debug
-Produce execution debug output
+\fB\-q\fR,\-\-quiet
+Quiet output \- only show errors
 .TP
-\fB\-e\fR,\-\-errors
-Produce execution error messages
+\fB\-r\fR,\-\-reactor
+Dynamically build reactor from
+subdirectories
 .TP
-\fB\-f\fR,\-\-file
-Force the use of an alternate POM file.
+\fB\-rf\fR,\-\-resume\-from <arg>
+Resume reactor from specified
+project
 .TP
-\fB\-h\fR,\-\-help
-Display help information
+\fB\-s\fR,\-\-settings <arg>
+Alternate path for the user
+settings file
 .TP
-\fB\-o\fR,\-\-offline
-Work offline
+\fB\-U\fR,\-\-update\-snapshots
+Forces a check for updated
+releases and snapshots on remote
+repositories
 .TP
-\fB\-r\fR,\-\-reactor
-Execute goals for project found in the
-reactor
+\fB\-up\fR,\-\-update\-plugins
+Synonym for cpu
 .TP
-\fB\-s\fR,\-\-settings
-Alternate path for the user settings file
+\fB\-V\fR,\-\-show\-version
+Display version information
+WITHOUT stopping build
 .TP
 \fB\-v\fR,\-\-version
 Display version information
+.TP
+\fB\-X\fR,\-\-debug
+Produce execution debug output
+.PP
 .SH "SEE ALSO"
 The full documentation for
-.B Maven
-is available at http://maven.apache.org/
+.B Apache
+is maintained as a Texinfo manual.  If the
+.B info
+and
+.B Apache
+programs are properly installed at your site, the command
+.IP
+.B info Apache
+.PP
+should give you access to the complete manual.
diff --git a/debian/mvnDebug.1 b/debian/mvnDebug.1
new file mode 100644
index 0000000..d8889e7
--- /dev/null
+++ b/debian/mvnDebug.1
@@ -0,0 +1,137 @@
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.36.
+.TH APACHE "1" "July 2009" "Apache Maven 2.2.0" "User Commands"
+.SH NAME
+mvnDebug \- Command to start the Maven system in Debug mode
+.SH DESCRIPTION
+usage: mvn [options] [<goal(s)>] [<phase(s)>]
+.SH OPTIONS
+.TP
+\fB\-am\fR,\-\-also\-make
+If project list is specified, also
+build projects required by the
+list
+.TP
+\fB\-amd\fR,\-\-also\-make\-dependents
+If project list is specified, also
+build projects that depend on
+projects on the list
+.TP
+\fB\-B\fR,\-\-batch\-mode
+Run in non\-interactive (batch)
+mode
+.TP
+\fB\-C\fR,\-\-strict\-checksums
+Fail the build if checksums don't
+match
+.TP
+\fB\-c\fR,\-\-lax\-checksums
+Warn if checksums don't match
+.TP
+\fB\-cpu\fR,\-\-check\-plugin\-updates
+Force upToDate check for any
+relevant registered plugins
+.TP
+\fB\-D\fR,\-\-define <arg>
+Define a system property
+.TP
+\fB\-e\fR,\-\-errors
+Produce execution error messages
+.TP
+\fB\-emp\fR,\-\-encrypt\-master\-password <arg>
+Encrypt master security password
+.TP
+\fB\-ep\fR,\-\-encrypt\-password <arg>
+Encrypt server password
+.TP
+\fB\-f\fR,\-\-file
+Force the use of an alternate POM
+file.
+.TP
+\fB\-fae\fR,\-\-fail\-at\-end
+Only fail the build afterwards;
+allow all non\-impacted builds to
+continue
+.TP
+\fB\-ff\fR,\-\-fail\-fast
+Stop at first failure in
+reactorized builds
+.TP
+\fB\-fn\fR,\-\-fail\-never
+NEVER fail the build, regardless
+of project result
+.TP
+\fB\-gs\fR,\-\-global\-settings <arg>
+Alternate path for the global
+settings file
+.TP
+\fB\-h\fR,\-\-help
+Display help information
+.TP
+\fB\-N\fR,\-\-non\-recursive
+Do not recurse into sub\-projects
+.TP
+\fB\-npr\fR,\-\-no\-plugin\-registry
+Don't use
+~/.m2/plugin\-registry.xml for
+plugin versions
+.TP
+\fB\-npu\fR,\-\-no\-plugin\-updates
+Suppress upToDate check for any
+relevant registered plugins
+.TP
+\fB\-o\fR,\-\-offline
+Work offline
+.TP
+\fB\-P\fR,\-\-activate\-profiles <arg>
+Comma\-delimited list of profiles
+to activate
+.TP
+\fB\-pl\fR,\-\-projects <arg>
+Build specified reactor projects
+instead of all projects
+.TP
+\fB\-q\fR,\-\-quiet
+Quiet output \- only show errors
+.TP
+\fB\-r\fR,\-\-reactor
+Dynamically build reactor from
+subdirectories
+.TP
+\fB\-rf\fR,\-\-resume\-from <arg>
+Resume reactor from specified
+project
+.TP
+\fB\-s\fR,\-\-settings <arg>
+Alternate path for the user
+settings file
+.TP
+\fB\-U\fR,\-\-update\-snapshots
+Forces a check for updated
+releases and snapshots on remote
+repositories
+.TP
+\fB\-up\fR,\-\-update\-plugins
+Synonym for cpu
+.TP
+\fB\-V\fR,\-\-show\-version
+Display version information
+WITHOUT stopping build
+.TP
+\fB\-v\fR,\-\-version
+Display version information
+.TP
+\fB\-X\fR,\-\-debug
+Produce execution debug output
+.PP
+.SH "SEE ALSO"
+The full documentation for
+.B Apache
+is maintained as a Texinfo manual.  If the
+.B info
+and
+.B Apache
+programs are properly installed at your site, the command
+.IP
+.B info Apache
+.PP
+should give you access to the complete manual.
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
new file mode 100755
index 0000000..189f232
--- /dev/null
+++ b/debian/orig-tar.sh
@@ -0,0 +1,21 @@
+#!/bin/sh -e
+
+VERSION=$2
+TAR=../maven2_$VERSION.orig.tar.gz
+DIR=maven2-$VERSION
+TAG=$(echo maven-$2 | sed s/~RC/-RC/ )
+
+svn export http://svn.apache.org/repos/asf/maven/components/tags/$TAG $DIR
+# remove the jar as Debian requires everything to be built from source, it will be rebuild from source
+rm $DIR/maven-ant-tasks*.jar
+# remove the maven- code as it is built in the package maven2-core
+rm -r $DIR/maven-*
+tar -c -z -f $TAR $DIR
+rm -rf $DIR ../$TAG
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+  . .svn/deb-layout
+  mv $TAR $origDir
+  echo "moved $TAR to $origDir"
+fi
diff --git a/debian/patches/build.patch b/debian/patches/build.patch
new file mode 100644
index 0000000..48bbaeb
--- /dev/null
+++ b/debian/patches/build.patch
@@ -0,0 +1,195 @@
+--- a/build.xml
++++ b/build.xml
+@@ -33,21 +33,16 @@
+ 
+ -->
+ 
+-<project default="all" basedir="." xmlns:artifact="urn:maven-artifact-ant">
++<project default="all" basedir=".">
+ 
+-  <target name="initTaskDefs" unless="taskdefs.inited">
+-    <xmlproperty file="pom.xml" prefix="pom.xml" />
+-    <path id="maven-ant-tasks.classpath" path="maven-ant-tasks-2.0.8.jar"/>
+-    <typedef resource="org/apache/maven/artifact/ant/antlib.xml" uri="urn:maven-artifact-ant" classpathref="maven-ant-tasks.classpath"/>
+-    <property name="taskdefs.inited" value="true"/>
+-  </target>
++  <property file="debian/build.properties" />
+ 
+   <target name="initLocalRepo">
+     <property name="maven.repo.local" location="${user.home}/.m2/repository"/>
+     <echo>Using the local repository at: ${maven.repo.local}</echo>
+   </target>
+ 
+-  <target name="isMavenHomeSet" depends="initTaskDefs">
++  <target name="isMavenHomeSet">
+     <property environment="env"/>
+     <condition property="maven.home" value="${env.M2_HOME}">
+       <isset property="env.M2_HOME"/>
+@@ -65,22 +60,13 @@
+     <echo>Using Maven home at: ${maven.home}</echo>
+   </target>
+ 
+-  <target name="read-poms" depends="initTaskDefs,initLocalRepo" unless="pom.version">
+-    <copy file="pom.xml" tofile="dependencies.xml"/>
+-    <replace file="${basedir}/dependencies.xml" token="<!--start-->" value="<!--"/>
+-    <replace file="${basedir}/dependencies.xml" token="<!--end-->" value="-->"/>
+-    <artifact:pom file="${basedir}/dependencies.xml" id="pom">
+-      <localRepository path="${maven.repo.local}"/>
+-    </artifact:pom>
+-    <delete file="${basedir}/dependencies.xml"/>
+-
+-    <artifact:pom file="${basedir}/maven-integration-tests/pom.xml" id="itPom">
+-      <localRepository path="${maven.repo.local}"/>
+-    </artifact:pom>
+-  </target>
+-
+   <target name="init" depends="isMavenHomeSet,initLocalRepo">
+-    <xmlproperty prefix="pom" file="pom.xml"/>
++    <xmlproperty file="pom.xml" prefix="pom" />
++    <property name="pom.version" value="${pom.project.version}" />
++    <xmlproperty file="${basedir}/maven-integration-tests/pom.xml" prefix="itPom" />
++    <property name="itPom.artifactId" value="${itPom.project.artifactId}" />
++    <property name="itPom.version" value="${itPom.project.version}" />
++    <path id="pom.pathid" path="${classpath.compile}" />
+     <basename file="${maven.home}" property="maven.home.basename"/>
+     <dirname file="${maven.home}" property="maven.home.dirname"/>
+     <!-- Initialize properties -->
+@@ -88,6 +74,7 @@
+     <property name="maven.assembly" location="apache-maven/target/${maven.home.basename.expected}-bin.zip"/>
+     <property name="surefire.useFile" value="true"/>
+     <echo>maven.home = ${maven.home}</echo>
++    <echo>maven.repo.local = ${maven.repo.local}</echo>
+     <echo>maven.assembly = ${maven.assembly}</echo>
+   </target>
+ 
+@@ -95,44 +82,8 @@
+     <delete dir="bootstrap"/>
+   </target>
+ 
+-  <target name="pull" depends="init, read-poms" unless="skip.pull">
+-    <property name="verbose" value="false"/>
+-    <!-- Pull the dependencies that Maven needs to build -->
+-    <artifact:dependencies pathId="pom.pathid" filesetId="pom.fileset" verbose="${verbose}" useScope="compile">
+-       <localRepository path="${maven.repo.local}"/>
+-       <pom refid="pom"/>
+-    </artifact:dependencies>
+-
+-    <!-- Pull the dependencies for Modello -->
+-    <artifact:dependencies pathId="modello.pathid" filesetId="modello.fileset" verbose="${verbose}">
+-       <localRepository path="${maven.repo.local}"/>
+-       <dependency groupId="org.codehaus.modello" artifactId="modello-maven-plugin" version="1.0"/>
+-       <dependency groupId="org.codehaus.modello" artifactId="modello-core" version="1.0"/>
+-    </artifact:dependencies>
+-  </target>
+-
+-  <target name="generate-sources" depends="pull" description="generates Java sources from Modello mdo model files">
+-    <mkdir dir="bootstrap/target"/>
+-    <mkdir dir="bootstrap/target/generated-sources"/>
+-
+-    <macrodef name="modello-single-mode">
+-      <attribute name="file"/>
+-      <attribute name="mode"/>
+-      <attribute name="version"/>
+-      <sequential>
+-        <java fork="fork" classname="org.codehaus.modello.ModelloCli" failonerror="true">
+-          <classpath refid="modello.pathid"/>
+-          <arg file="@{file}"/> <!-- model file -->
+-          <arg value="@{mode}"/> <!-- output type -->
+-          <arg file="bootstrap/target/generated-sources"/> <!-- output directory -->
+-          <arg value="@{version}"/> <!-- model version -->
+-          <arg value="false"/> <!-- package with version -->
+-          <arg value="true"/> <!-- use Java 5 -->
+-          <arg value="UTF-8"/> <!-- encoding -->
+-        </java>
+-      </sequential>
+-    </macrodef>
+-
++  <target name="generate-sources" description="generates Java sources from Modello mdo model files" />
++<!--
+     <macrodef name="modello">
+       <attribute name="file"/>
+       <attribute name="version" default="1.0.0"/>
+@@ -154,8 +105,9 @@
+     <modello file="maven-toolchain/src/main/mdo/toolchains.mdo"/>
+ 
+   </target>
+-
++-->
+   <target name="compile-boot" depends="generate-sources" description="compiles the bootstrap sources">
++<!--
+     <path id="sources">
+       <dirset dir=".">
+         <include name="bootstrap/target/generated-sources"/>
+@@ -170,16 +122,49 @@
+       <src refid="sources"/>
+       <classpath refid="pom.pathid"/>
+     </javac>
+-
++-->
+     <!-- DGF generating a fake pom.properties so Maven thinks it has a version number -->
++<!--
+     <mkdir dir="bootstrap/target/classes/META-INF/maven/org.apache.maven/maven-core"/>
+     <echo message="version=${pom.project.version}"
+           file="bootstrap/target/classes/META-INF/maven/org.apache.maven/maven-core/pom.properties"/>
+-
++-->
+     <path id="maven.classpath">
+-      <pathelement location="bootstrap/target/classes"/>
+-      <path refid="sources"/>
+-      <path refid="pom.pathid"/>
++      <pathelement location="debian/tmp/bootstrap"/>
++      <fileset dir="/usr/share/maven-repo">
++        <include name="backport-util-concurrent/backport-util-concurrent/debian/backport-util-concurrent-debian.jar"/>
++        <include name="classworlds/classworlds/debian/classworlds-debian.jar"/>
++        <include name="com/jcraft/jsch/debian/jsch-debian.jar"/>
++        <include name="commons-cli/commons-cli/debian/commons-cli-debian.jar"/>
++        <include name="junit/junit/debian/junit-debian.jar"/>
++        <include name="org/apache/maven/doxia/doxia-logging-api/debian/doxia-logging-api-debian.jar"/>
++        <include name="org/apache/maven/doxia/doxia-sink-api/debian/doxia-sink-api-debian.jar"/>
++        <include name="org/apache/maven/maven-artifact/debian/maven-artifact-debian.jar"/>
++        <include name="org/apache/maven/maven-artifact-manager/debian/maven-artifact-manager-debian.jar"/>
++        <include name="org/apache/maven/maven-compat/debian/maven-compat-debian.jar"/>
++        <include name="org/apache/maven/maven-core/debian/maven-core-debian.jar"/>
++        <include name="org/apache/maven/maven-error-diagnostics/debian/maven-error-diagnostics-debian.jar"/>
++        <include name="org/apache/maven/maven-model/debian/maven-model-debian.jar"/>
++        <include name="org/apache/maven/maven-monitor/debian/maven-monitor-debian.jar"/>
++        <include name="org/apache/maven/maven-plugin-api/debian/maven-plugin-api-debian.jar"/>
++        <include name="org/apache/maven/maven-plugin-descriptor/debian/maven-plugin-descriptor-debian.jar"/>
++        <include name="org/apache/maven/maven-plugin-parameter-documenter/debian/maven-plugin-parameter-documenter-debian.jar"/>
++        <include name="org/apache/maven/maven-plugin-registry/debian/maven-plugin-registry-debian.jar"/>
++        <include name="org/apache/maven/maven-profile/debian/maven-profile-debian.jar"/>
++        <include name="org/apache/maven/maven-project/debian/maven-project-debian.jar"/>
++        <include name="org/apache/maven/maven-repository-metadata/debian/maven-repository-metadata-debian.jar"/>
++        <include name="org/apache/maven/maven-settings/debian/maven-settings-debian.jar"/>
++        <include name="org/apache/maven/reporting/maven-reporting-api/debian/maven-reporting-api-debian.jar"/>
++        <include name="org/apache/maven/wagon/wagon-provider-api/debian/wagon-provider-api-debian.jar"/>
++        <include name="org/apache/maven/wagon/wagon-ssh-common/debian/wagon-ssh-common-debian.jar"/>
++        <include name="org/apache/maven/wagon/wagon-ssh/debian/wagon-ssh-debian.jar"/>
++        <include name="org/codehaus/plexus/plexus-container-default/1.0-alpha/plexus-container-default-1.0-alpha.jar"/>
++        <include name="org/codehaus/plexus/plexus-interactivity-api/debian/plexus-interactivity-api-debian.jar"/>
++        <include name="org/codehaus/plexus/plexus-interpolation/debian/plexus-interpolation-debian.jar"/>
++        <include name="org/codehaus/plexus/plexus-utils/debian/plexus-utils-debian.jar"/>
++        <include name="org/sonatype/plexus/plexus-cipher/debian/plexus-cipher-debian.jar"/>
++        <include name="org/sonatype/plexus/plexus-sec-dispatcher/debian/plexus-sec-dispatcher-debian.jar"/>
++      </fileset>
+     </path>
+   </target>
+ 
+@@ -193,6 +178,7 @@
+       <jvmarg value="-Djava.compiler=NONE"/> -->
+ 
+       <classpath refid="maven.classpath"/>
++      <arg value="--offline"/>
+       <arg value="-e"/>
+       <arg value="-B"/>
+       <arg value="clean"/>
+@@ -314,9 +300,4 @@
+ 
+   <target name="with-its" depends="all,run-its"/>
+ 
+-  <target name="set-temp-maven-home" depends="read-poms">
+-    <property name="maven.home" location="${java.io.tmpdir}/apache-maven-${pom.version}"/>
+-    <echo>Using temporary maven install directory: ${maven.home}</echo>
+-  </target>
+-
+ </project>
diff --git a/debian/patches/mvn-cmd.patch b/debian/patches/mvn-cmd.patch
index f124d67..0fbf02b 100644
--- a/debian/patches/mvn-cmd.patch
+++ b/debian/patches/mvn-cmd.patch
@@ -1,7 +1,6 @@
-diff -Nur maven2-2.0.7/maven-core/src/bin/mvn maven2-2.0.7.new/maven-core/src/bin/mvn
---- maven2-2.0.7/apache-maven/src/bin/mvn	2007-03-25 06:06:10.000000000 +0100
-+++ maven2-2.0.7.new/apache-maven/src/bin/mvn	2007-10-28 14:05:21.000000000 +0000
-@@ -72,9 +72,80 @@
+--- a/apache-maven/src/bin/mvn
++++ b/apache-maven/src/bin/mvn
+@@ -68,9 +68,80 @@
             ;;
  esac
  
@@ -82,7 +81,7 @@ diff -Nur maven2-2.0.7/maven-core/src/bin/mvn maven2-2.0.7.new/maven-core/src/bi
    fi
  fi
  
-@@ -160,7 +231,7 @@
+@@ -156,7 +227,7 @@
  
  exec "$JAVACMD" \
    $MAVEN_OPTS \
diff --git a/debian/patches/pom.patch b/debian/patches/pom.patch
new file mode 100644
index 0000000..0ea60b9
--- /dev/null
+++ b/debian/patches/pom.patch
@@ -0,0 +1,111 @@
+--- a/pom.xml
++++ b/pom.xml
+@@ -20,13 +20,7 @@
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+   <modelVersion>4.0.0</modelVersion>
+ 
+-  <parent>
+-    <groupId>org.apache.maven</groupId>
+-    <artifactId>maven-parent</artifactId>
+-    <version>11</version>
+-    <relativePath>../pom/maven/pom.xml</relativePath>
+-  </parent>
+-
++  <groupId>org.apache.maven</groupId>
+   <artifactId>maven</artifactId>
+   <version>2.2.0</version>
+   <packaging>pom</packaging>
+@@ -121,6 +115,7 @@
+     <url>http://svn.apache.org/viewvc/maven/components/tags/maven-2.2.0</url>
+   </scm>
+ 
++<!-- disable build section -
+   <build>
+     <pluginManagement>
+       <plugins>
+@@ -214,7 +209,7 @@
+           <artifactId>clirr-maven-plugin</artifactId>
+           <version>2.2.1</version>
+           <configuration>
+-            <!-- needed for release: default value "(,${project.version})" for 2.0.10 is 2.0.10-SNAPSHOT -->
++            <- needed for release: default value "(,${project.version})" for 2.0.10 is 2.0.10-SNAPSHOT ->
+             <comparisonVersion>2.1.0</comparisonVersion>
+             <excludes>
+               <exclude>org/apache/maven/project/artifact/ArtifactWithProject*</exclude>
+@@ -248,8 +243,10 @@
+       </plugin>
+     </plugins>
+   </build>
++-->
+ 
+   <modules>
++<!-- keep only the modules required for the build -
+     <module>maven-artifact</module>
+     <module>maven-artifact-manager</module>
+     <module>maven-artifact-test</module>
+@@ -269,6 +266,7 @@
+     <module>maven-script</module>
+     <module>maven-settings</module>
+     <module>maven-toolchain</module>
++-->
+     <module>apache-maven</module>
+   </modules>
+ 
+--- a/apache-maven/pom.xml
++++ b/apache-maven/pom.xml
+@@ -32,19 +32,8 @@
+   <build>
+     <plugins>
+       <plugin>
+-        <artifactId>maven-surefire-plugin</artifactId>
+-        <configuration>
+-          <systemProperties>
+-            <property>
+-              <name>basedir</name>
+-              <value>${basedir}</value>
+-            </property>
+-          </systemProperties>
+-        </configuration>
+-      </plugin>
+-      <plugin>
+         <artifactId>maven-shade-plugin</artifactId>
+-        <version>1.2</version>
++        <version>1.2.1</version>
+         <executions>
+           <execution>
+             <phase>package</phase>
+@@ -60,8 +49,17 @@
+                 true
+               </keepDependenciesWithProvidedScope>
+               <transformers>
+-                <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer" />
++                <org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer />
+               </transformers>
++              <filters>
++                <!-- remove the META-INF/services folder from xerces as we want to use the default Jdk-provided services -->
++                <filter>
++                  <artifact>xerces:xercesImpl</artifact>
++                  <excludes>
++                    <exclude>META-INF/services/**</exclude>
++                  </excludes>
++                </filter>
++              </filters>
+               <artifactSet>
+                 <excludes>
+                   <exclude>
+@@ -122,6 +120,7 @@
+           </execution>
+         </executions>
+       </plugin>
++<!-- disable the assembly plugin -
+       <plugin>
+         <artifactId>maven-assembly-plugin</artifactId>
+         <version>2.2-beta-4</version>
+@@ -140,6 +139,7 @@
+           </execution>
+         </executions>
+       </plugin>
++-->
+     </plugins>
+   </build>
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4752dad
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+mvn-cmd.patch
+build.patch
+pom.patch
diff --git a/debian/rules b/debian/rules
index c6484ee..c8c3547 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,33 +2,41 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-
-PACKAGE              := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ')
-VERSION              := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | sed 's/-[0-9\.]*$$//')
-JAVA_HOME            := /usr/lib/jvm/java-gcj
-ANT_HOME             := /usr/share/ant
-DEB_JARS             := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar
-
-
-DEB_ANT_BUILD_TARGET := package
-DEB_ANT_BUILDFILE    := ./debian/build.xml
-DEB_ANT_ARGS         := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
-#DEB_ANT_INVOKE       := ant -verbose -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -f $(BUILD_FILE)
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+
+PACKAGE              := $(DEB_SOURCE_PACKAGE)
+VERSION              := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME            := /usr/lib/jvm/default-java
+DEB_JARS             := ant-trax
+DEB_ANT_BUILD_TARGET := maven-compile
+DEB_ANT_BUILDFILE    := build.xml
+DEB_ANT_ARGS         := -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -Dmaven.repo.local=$(realpath $(DEB_BUILDDIR))/debian/tmp/maven-repo
 API_DOCS             := build/doc/api
-SVN                  := http://svn.apache.org/repos/asf/maven/components/tags/maven-$(VERSION)
+BASE_MODULES         := apache-maven maven-artifact-manager maven-artifact \
+			maven-core maven-error-diagnostics maven-model maven-monitor \
+			maven-plugin-api maven-plugin-descriptor maven-plugin-parameter-documenter \
+			maven-plugin-registry maven-profile maven-project maven-repository-metadata \
+			maven-settings maven-toolchain
 
 get-orig-source:
-	echo "Getting version $(VERSION) from $(SVN)"
-	mkdir orig_tmp
-	cd orig_tmp && \
-		svn export -q $(SVN) maven && \
-		tar czf ../../$(PACKAGE)_$(VERSION).orig.tar.gz maven
-	rm -rf orig_tmp
+	-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+
+configure/$(PACKAGE)::
+	mh_patchpoms -p$(PACKAGE)
+
+makebuilddir/$(PACKAGE)::
+	install -d $(DEB_BUILDDIR)/debian/tmp/bootstrap/META-INF/plexus
+	install debian/components.xml $(DEB_BUILDDIR)/debian/tmp/bootstrap/META-INF/plexus/
+	install -d $(DEB_BUILDDIR)/debian/tmp/maven-repo
+	cp -rL /usr/share/maven-repo/* $(DEB_BUILDDIR)/debian/tmp/maven-repo/
 
 binary-post-install/$(PACKAGE)::
-	dh_install -p$(PACKAGE) build/$(PACKAGE)-$(VERSION).jar usr/share/java
-	dh_link -p$(PACKAGE) usr/share/java/$(PACKAGE)-$(VERSION).jar usr/share/java/$(PACKAGE).jar
+	dh_install -p$(PACKAGE) apache-maven/target/maven-debian-uber.jar usr/share/maven2/lib/
+
+clean::
+	mh_unpatchpoms -p$(PACKAGE)
+	-rm -rf debian/tmp/mvn-repo
+	-find . -name target -type d | xargs rm -rf
 
 # No documentation released yet.
 #binary-post-install/$(PACKAGE)-doc::
diff --git a/debian/watch b/debian/watch
index 0d6970f..1b8b7dc 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,4 @@
 version=3
-# The "." at the end of the pattern will always be a "/", but
-# uscan does not allow us to specify a "/"
 opts=uversionmangle=s/-RC/~RC/ \
-http://svn.apache.org/repos/asf/maven/components/tags/maven-([0-9].*). debian uupdate
+  http://svn.apache.org/repos/asf/maven/components/tags/ \
+  maven-(2.*)/ debian debian/orig-tar.sh

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven2.git



More information about the pkg-java-commits mailing list