[pkg-java] r8948 - in trunk/maven-plugin-tools/debian: . patches

Ludovic Claude ludovicc-guest at alioth.debian.org
Wed Jul 8 00:06:02 UTC 2009 

Author: ludovicc-guest
Date: 2009-07-08 00:06:00 +0000 (Wed, 08 Jul 2009)
New Revision: 8948

Added:
   trunk/maven-plugin-tools/debian/libmaven-plugin-tools-java.poms
   trunk/maven-plugin-tools/debian/maven.rules
   trunk/maven-plugin-tools/debian/plugin.xml
Modified:
   trunk/maven-plugin-tools/debian/build.properties
   trunk/maven-plugin-tools/debian/build.xml
   trunk/maven-plugin-tools/debian/changelog
   trunk/maven-plugin-tools/debian/control
   trunk/maven-plugin-tools/debian/copyright
   trunk/maven-plugin-tools/debian/maven-settings.xml
   trunk/maven-plugin-tools/debian/orig-tar.sh
   trunk/maven-plugin-tools/debian/patches/pom.diff
   trunk/maven-plugin-tools/debian/rules
   trunk/maven-plugin-tools/debian/watch
Log:
* New version

Modified: trunk/maven-plugin-tools/debian/build.properties
===================================================================
--- trunk/maven-plugin-tools/debian/build.properties	2009-07-07 23:59:02 UTC (rev 8947)
+++ trunk/maven-plugin-tools/debian/build.properties	2009-07-08 00:06:00 UTC (rev 8948)
@@ -1,3 +1,30 @@
-javadoc.dir=build/api
+javadoc.dir=target/api
 build.directory=target
-build.outputDirectory=target/classes
+maven.test.skip=true
+classpath.compile = \
+            ${basedir}/maven-plugin-tools-api/target/classes:\
+            ${basedir}/maven-plugin-tools-model/target/classes:\
+            ${basedir}/maven-plugin-tools-java/target/classes:\
+            /usr/share/java/maven-artifact.jar:\
+            /usr/share/java/maven-artifact-manager.jar:\
+            /usr/share/java/maven-core.jar:\
+            /usr/share/java/maven-model.jar:\
+            /usr/share/java/maven-plugin-api.jar:\
+            /usr/share/java/maven-plugin-descriptor.jar:\
+            /usr/share/java/maven-plugin-registry.jar:\
+            /usr/share/java/maven-project.jar:\
+            /usr/share/java/maven-reporting-api.jar:\
+            /usr/share/java/maven-reporting-impl.jar:\
+            /usr/share/java/maven-repository-metadata.jar:\
+            /usr/share/java/ant.jar:\
+            /usr/share/java/jtidy.jar:\
+            /usr/share/java/doxia-core.jar:\
+            /usr/share/java/doxia-logging-api.jar:\
+            /usr/share/java/doxia-sink-api.jar:\
+            /usr/share/java/doxia-site-renderer.jar:\
+            /usr/share/java/xbean-reflect.jar:\
+            /usr/share/java/qdox.jar:\
+            /usr/share/java/bsh.jar:\
+            /usr/share/java/plexus-utils.jar:\
+            /usr/share/java/plexus-classworlds.jar:\
+            /usr/share/java/plexus-container-default-alpha.jar

Modified: trunk/maven-plugin-tools/debian/build.xml
===================================================================
--- trunk/maven-plugin-tools/debian/build.xml	2009-07-07 23:59:02 UTC (rev 8947)
+++ trunk/maven-plugin-tools/debian/build.xml	2009-07-08 00:06:00 UTC (rev 8948)
@@ -2,48 +2,191 @@
 
 <project name="pkg-java" default="package" basedir="..">
 
-  <property file="debian/build.properties"/>
-  <property name="maven.test.skip" value="true"/>
-  <property name="maven.build.xml" value="/usr/share/maven-ant-helper/maven-build.xml"/>
-  <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
+    <property file="debian/build.properties"/>
+    <property name="maven.build" value="/usr/share/maven-ant-helper/maven-build.xml"/>
+    <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
 
-  <target name="clean">
-    <ant target="clean" antfile="${maven.build.xml}" dir="maven-plugin-tools-api"/>
-    <ant target="clean" antfile="${maven.build.xml}" dir="maven-plugin-tools-beanshell"/>
-    <ant target="clean" antfile="${maven.build.xml}" dir="maven-plugin-tools-java"/>
-    <ant target="clean" antfile="${maven.build.xml}" dir="maven-plugin-plugin"/>
-  </target>
+    <macrodef name="cleanmodule">
+	    <attribute name="dir"/>
+	    <sequential>
+		  <ant target="clean" antfile="${maven.build}" dir="@{dir}">
+            <property name="debian.dir" location="debian" />
+            <property name="project.dir" value="@{dir}" />
+          </ant> 
+	    </sequential>
+    </macrodef>
 
+    <macrodef name="packagemodule">
+	    <attribute name="dir"/>
+	    <sequential>
+		<ant target="package" antfile="${maven.build}" dir="@{dir}">
+          <property name="debian.dir" location="debian" />
+          <property name="project.dir" value="@{dir}" />
+		</ant>
+	    </sequential>
+    </macrodef>
+
+    <target name="clean">
+        <cleanmodule dir=""/>
+        <cleanmodule dir="maven-plugin-tools-api"/>
+        <cleanmodule dir="maven-plugin-tools-beanshell"/>
+        <cleanmodule dir="maven-plugin-tools-java"/>
+        <cleanmodule dir="maven-plugin-plugin"/>
+    </target>
+
   <target name="generate-sources">
-    <taskdef name="modello" classname="ModelloTask"/>
+    <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-tools-model/src/main/mdo/plugin-metadata.mdo"
+      plugin="java" output="maven-plugin-tools-model/target/generated-sources"
+      version="1.0.0"/>
+    <modello
+      model="maven-plugin-tools-model/src/main/mdo/plugin-metadata.mdo"
+      plugin="xpp3-reader" output="maven-plugin-tools-model/target/generated-sources"
+      version="1.0.0"/>
+    <modello
+      model="maven-plugin-tools-model/src/main/mdo/plugin-metadata.mdo"
+      plugin="xpp3-writer" output="maven-plugin-tools-model/target/generated-sources"
+      version="1.0.0"/>
+    <modello
       model="maven-plugin-plugin/src/main/mdo/pluginRequirements.mdo"
       plugin="java" output="maven-plugin-plugin/target/generated-sources"
       version="1.0.0"/>
   </target>
 
+  <macrodef name="patchpom">
+    <attribute name="dir"/>
+    <attribute name="args" default="" />
+    <sequential>
+      <java classpath="/usr/share/maven-repo/org/debian/maven/maven-repo-helper/debian/maven-repo-helper-debian.jar"
+         classname="org.debian.maven.repo.POMCleaner" fork="true" dir="@{dir}" >
+          <arg value="-plib${package}-java" />
+         <arg value="-r${basedir}/debian/maven.rules" />
+         <arg line="--keep-pom-version @{args}" />
+         <arg value="pom.xml.save" />
+         <arg value="pom.xml" />
+         <arg value="pom.properties" />
+      </java> 
+    </sequential>
+  </macrodef>
+
+  <macrodef name="package-and-local-deploy">
+      <attribute name="dir"/>
+      <attribute name="artifactId" default="@{dir}"/>
+      <attribute name="group" default="plugin-tools"/>
+      <sequential>
+        <packagemodule dir="@{dir}"/>
+        <mkdir dir="debian/tmp/maven-repo/org/apache/maven/@{group}/@{artifactId}/${version}" />
+        <mkdir dir="debian/tmp/maven-repo/org/apache/maven/@{group}/@{artifactId}/debian" />
+        <copy file="@{dir}/pom.xml" 
+          tofile="debian/tmp/maven-repo/org/apache/maven/@{group}/@{artifactId}/${version}/@{artifactId}-${version}.pom" />
+        <copy file="@{dir}/${build.directory}/@{artifactId}-${version}.jar" 
+          tofile="debian/tmp/maven-repo/org/apache/maven/@{group}/@{artifactId}/${version}/@{artifactId}-${version}.jar" />
+        <copy file="@{dir}/pom.xml" 
+          tofile="debian/tmp/maven-repo/org/apache/maven/@{group}/@{artifactId}/debian/@{artifactId}-debian.pom" />
+        <copy file="@{dir}/${build.directory}/@{artifactId}-${version}.jar" 
+          tofile="debian/tmp/maven-repo/org/apache/maven/@{group}/@{artifactId}/debian/@{artifactId}-debian.jar" />
+      </sequential>
+  </macrodef>
+
   <target name="package" depends="generate-sources">
-    <java classname="org.codehaus.classworlds.Launcher"
-      classpath="/usr/share/maven2/boot/classworlds.jar"
-      failonerror="true" fork="true" dir="maven-plugin-plugin">
-      <sysproperty key="classworlds.conf" value="/etc/maven2/m2.conf"/>
-      <sysproperty key="maven.home" value="/usr/share/maven2"/>
+    <copy todir=".">
+      <fileset dir="." includes="**/pom.xml" />
+      <globmapper from="*" to="*.save"/>
+    </copy>
+
+    <patchpom dir="." args="--no-parent" />
+    <mkdir dir="debian/tmp/maven-repo/org/apache/maven/plugin-tools/maven-plugin-tools/${version}" />
+    <copy file="pom.xml" tofile="debian/tmp/maven-repo/org/apache/maven/plugin-tools/maven-plugin-tools/${version}/maven-plugin-tools-${version}.pom" />
+
+    <patchpom dir="maven-plugin-tools-api" />
+    <patchpom dir="maven-plugin-tools-model" />
+    <patchpom dir="maven-plugin-tools-ant" />
+    <patchpom dir="maven-plugin-tools-beanshell" />
+    <patchpom dir="maven-plugin-tools-java" />
+    <patchpom dir="maven-plugin-tools-javadoc" />
+    <patchpom dir="maven-plugin-plugin" args="--no-parent" />
+
+    <!-- Create a dummy plugin descriptor to help plugin-plugin to bootstrap itself. 
+      The real descriptor will be generated by calling mvn plugin:descriptor -->
+    <mkdir dir="maven-plugin-plugin/${build.outputDirectory}/META-INF/maven/" />
+    <copy file="debian/plugin.xml" todir="maven-plugin-plugin/${build.outputDirectory}/META-INF/maven/" >
+      <filterset>
+        <filter token="VERSION" value="${version}"/>
+      </filterset>
+    </copy>
+
+    <package-and-local-deploy dir="maven-plugin-tools-api" />
+    <package-and-local-deploy dir="maven-plugin-tools-model" />
+    <package-and-local-deploy dir="maven-plugin-tools-ant"/>
+    <package-and-local-deploy dir="maven-plugin-tools-beanshell"/>
+    <package-and-local-deploy dir="maven-plugin-tools-java"/>
+    <package-and-local-deploy dir="maven-plugin-tools-javadoc"/>
+    <package-and-local-deploy dir="maven-plugin-plugin" group="plugins"/>
+
+    <!-- Calls mvn plugin:descriptor on maven-plugin-plugin -->
+    <path id="maven.classpath">
+      <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="xml-apis/xml-apis/debian/xml-apis-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-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>
+    <java fork="true" dir="maven-plugin-plugin" classname="org.apache.maven.cli.MavenCli" failonerror="true">
+      <jvmarg value="-Xmx256M"/>
+      <classpath refid="maven.classpath"/>
       <arg value="-Dmaven.test.skip"/>
-      <arg value="-s${basedir}/debian/maven-settings.xml"/>
+      <arg value="--offline"/>
+      <arg value="-e"/>
+      <arg value="-B"/>
+      <arg value="-s${basedir}/debian/tmp/maven-settings.xml"/>
       <arg value="plugin:descriptor"/>
     </java>
-    <ant target="package" antfile="${maven.build.xml}" dir="maven-plugin-tools-api">
-      <property name="artifactId" value="maven-plugin-tools-api"/>
-    </ant>
-    <ant target="package" antfile="${maven.build.xml}" dir="maven-plugin-tools-beanshell">
-      <property name="artifactId" value="maven-plugin-tools-beanshell"/>
-    </ant>
-    <ant target="package" antfile="${maven.build.xml}" dir="maven-plugin-tools-java">
-      <property name="artifactId" value="maven-plugin-tools-java"/>
-    </ant>
-    <ant target="package" antfile="${maven.build.xml}" dir="maven-plugin-plugin">
-      <property name="artifactId" value="maven-plugin-plugin"/>
-    </ant>
+
+    <copy todir="." overwrite="true" >
+      <fileset dir="." includes="**/pom.xml.save" />
+      <globmapper from="*.save" to="*"/>
+    </copy>
+
+    <!-- re-package, this time with the correct pom files -->
+    <packagemodule dir="" />
+    <packagemodule dir="maven-plugin-tools-api" />
+    <packagemodule dir="maven-plugin-tools-model" />
+    <packagemodule dir="maven-plugin-tools-ant"/>
+    <packagemodule dir="maven-plugin-tools-beanshell"/>
+    <packagemodule dir="maven-plugin-tools-java"/>
+    <packagemodule dir="maven-plugin-tools-javadoc"/>
+    <packagemodule dir="maven-plugin-plugin"/>
+
   </target>
 
   <target name="javadoc">
@@ -51,6 +194,7 @@
       <packageset dir="maven-plugin-tools-api/src/main/java/"/>
       <packageset dir="maven-plugin-tools-beanshell/src/main/java/"/>
       <packageset dir="maven-plugin-tools-java/src/main/java/"/>
+      <packageset dir="maven-plugin-tools-javadoc/src/main/java/"/>
       <packageset dir="maven-plugin-plugin/src/main/java/"/>
     </javadoc>
   </target>

Modified: trunk/maven-plugin-tools/debian/changelog
===================================================================
--- trunk/maven-plugin-tools/debian/changelog	2009-07-07 23:59:02 UTC (rev 8947)
+++ trunk/maven-plugin-tools/debian/changelog	2009-07-08 00:06:00 UTC (rev 8948)
@@ -1,3 +1,20 @@
+maven-plugin-tools (2.5-0ubuntu1~ppa23) jaunty; urgency=low
+
+  * New upstream version, add myself to Uploaders
+  * Change section to java, bump up Standards-Version to 3.8.1
+  * Remove the dependency on java runtimes as it is a library.
+  * Remove the recursive dependency on libmaven-plugin-tools-java, 
+    it's not needed
+  * Add a Build-Depends-Indep dependency on maven-repo-helper
+  * Use mh_installpom and mh_installjar to install the POM and the jar to the
+    Maven repository
+  * Remove the patch for the POMs as it's no longer needed, use another patch
+    to ignore old artifacts
+  * Add a dependency on libjtidy-java and libmaven2-core-java
+  * Add a Build-Depends on libclassworlds-java
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Wed, 13 May 2009 12:04:41 +0100
+
 maven-plugin-tools (2.4.3-1) unstable; urgency=low
 
   * Initial release. (Closes: #507922)

Modified: trunk/maven-plugin-tools/debian/control
===================================================================
--- trunk/maven-plugin-tools/debian/control	2009-07-07 23:59:02 UTC (rev 8947)
+++ trunk/maven-plugin-tools/debian/control	2009-07-08 00:06:00 UTC (rev 8948)
@@ -1,22 +1,24 @@
 Source: maven-plugin-tools
-Section: devel
+Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Torsten Werner <twerner at debian.org>
-Build-Depends: ant, debhelper (>= 5), cdbs, default-jdk, quilt,
- libmaven-plugin-tools-java, maven-ant-helper, libmodello-java,
- libmaven-reporting-impl-java, libplexus-containers-java, libgoogle-collections-java,
- libxbean-java, libqdox-java, bsh
-Standards-Version: 3.8.0
+Uploaders: Torsten Werner <twerner at debian.org>, Ludovic Claude <ludovic.claude at laposte.net>
+Build-Depends: ant, debhelper (>= 5), cdbs, default-jdk, quilt, libjaxp1.3-java
+Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional, 
+ libmodello-java, libclassworlds-java, junit, libplexus-velocity-java, velocity,
+ libmaven-reporting-impl-java, libdoxia-sitetools-java,
+ libplexus-container-default-java, libgoogle-collections-java,
+ libxbean-java, libqdox-java, bsh, libjtidy-java, libmaven2-core-java
+Standards-Version: 3.8.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-plugin-tools
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-plugin-tools/
 Homepage: http://maven.apache.org
 
 Package: libmaven-plugin-tools-java
 Architecture: all
-Depends: default-jre | java2-runtime, ${misc:Depends}, libmaven-reporting-impl-java,
- libplexus-containers-java, libgoogle-collections-java, libxbean-java, libqdox-java,
- bsh
+Depends: ${misc:Depends}, libmaven-reporting-impl-java, libdoxia-sitetools-java,
+ libplexus-container-default-java, libgoogle-collections-java, 
+ libxbean-java, libqdox-java, bsh, libjtidy-java, libmaven2-core-java
 Description: Maven Plugin Tools Base POM
  Maven is a software project management and comprehension tool. Based on the
  concept of a project object model (POM), Maven can manage a project's build,

Modified: trunk/maven-plugin-tools/debian/copyright
===================================================================
--- trunk/maven-plugin-tools/debian/copyright	2009-07-07 23:59:02 UTC (rev 8947)
+++ trunk/maven-plugin-tools/debian/copyright	2009-07-08 00:06:00 UTC (rev 8948)
@@ -3,7 +3,7 @@
 The Debian packaging is Copyright (c) 2008 Torsten Werner and is
 licensed under the GNU General Public License version 3. On Debian
 systems, the complete text of the GNU General Public License can be
-found in '/usr/share/common-licenses/GPL'.
+found in '/usr/share/common-licenses/GPL-3'.
 
 The package was downloaded from <http://maven.apache.org>.
 

Added: trunk/maven-plugin-tools/debian/libmaven-plugin-tools-java.poms
===================================================================
--- trunk/maven-plugin-tools/debian/libmaven-plugin-tools-java.poms	                        (rev 0)
+++ trunk/maven-plugin-tools/debian/libmaven-plugin-tools-java.poms	2009-07-08 00:06:00 UTC (rev 8948)
@@ -0,0 +1,8 @@
+pom.xml --no-parent
+maven-plugin-plugin/pom.xml --no-parent
+maven-plugin-tools-ant/pom.xml
+maven-plugin-tools-api/pom.xml
+maven-plugin-tools-model/pom.xml
+maven-plugin-tools-beanshell/pom.xml
+maven-plugin-tools-java/pom.xml
+maven-plugin-tools-javadoc/pom.xml

Modified: trunk/maven-plugin-tools/debian/maven-settings.xml
===================================================================
--- trunk/maven-plugin-tools/debian/maven-settings.xml	2009-07-07 23:59:02 UTC (rev 8947)
+++ trunk/maven-plugin-tools/debian/maven-settings.xml	2009-07-08 00:06:00 UTC (rev 8948)
@@ -1,4 +1,9 @@
+<!--
+  This is a minimal settings.xml that switches maven to offline mode
+  and uses the Debian repo as the local repo.
+-->
+
 <settings>
-  <localRepository>/usr/share/maven-repo</localRepository>
+  <localRepository>BASEDIR/debian/tmp/maven-repo/</localRepository>
   <offline>true</offline>
 </settings>

Added: trunk/maven-plugin-tools/debian/maven.rules
===================================================================
--- trunk/maven-plugin-tools/debian/maven.rules	                        (rev 0)
+++ trunk/maven-plugin-tools/debian/maven.rules	2009-07-08 00:06:00 UTC (rev 8948)
@@ -0,0 +1,6 @@
+# newer beanshell versions use the group org.beanshell instead of bsh
+s/bsh/org.beanshell/ bsh jar s/.*/debian/
+# keep the version for all Maven plugins as versionless plugins don't work
+* * maven-plugin *
+org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/
+junit junit jar s/3\..*/3.x/


Property changes on: trunk/maven-plugin-tools/debian/orig-tar.sh
___________________________________________________________________
Modified: svn:executable
   - 
   + *

Modified: trunk/maven-plugin-tools/debian/patches/pom.diff
===================================================================
--- trunk/maven-plugin-tools/debian/patches/pom.diff	2009-07-07 23:59:02 UTC (rev 8947)
+++ trunk/maven-plugin-tools/debian/patches/pom.diff	2009-07-08 00:06:00 UTC (rev 8948)
@@ -1,273 +1,28 @@
-Index: maven-plugin-tools-2.4.3/maven-plugin-plugin/pom.xml
-===================================================================
---- maven-plugin-tools-2.4.3.orig/maven-plugin-plugin/pom.xml	2008-08-14 13:35:08.000000000 +0200
-+++ maven-plugin-tools-2.4.3/maven-plugin-plugin/pom.xml	2008-12-06 22:15:30.000000000 +0100
-@@ -20,11 +20,13 @@
- <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>
-     <groupId>org.apache.maven.plugins</groupId>
-     <artifactId>maven-plugins</artifactId>
-     <version>11</version>
-   </parent>
-+  -->
- 
-   <groupId>org.apache.maven.plugins</groupId>
-   <artifactId>maven-plugin-plugin</artifactId>
-@@ -73,16 +75,19 @@
-         <artifactId>maven-plugin-tools-api</artifactId>
-         <version>${pluginToolsVersion}</version>
-       </dependency>
-+      <!--
-       <dependency>
-         <groupId>org.apache.maven.plugin-tools</groupId>
-         <artifactId>maven-plugin-tools-model</artifactId>
-         <version>${pluginToolsVersion}</version>
-       </dependency>
-+      -->
-       <dependency>
-         <groupId>org.apache.maven.plugin-tools</groupId>
-         <artifactId>maven-plugin-tools-java</artifactId>
-         <version>${pluginToolsVersion}</version>
-       </dependency>
-+      <!--
-       <dependency>
-         <groupId>org.apache.maven.plugin-tools</groupId>
-         <artifactId>maven-plugin-tools-beanshell</artifactId>
-@@ -93,18 +98,22 @@
-         <artifactId>maven-plugin-descriptor</artifactId>
-         <version>2.0.6</version>
-       </dependency>
-+      -->
- 
-       <!-- plexus -->
-       <dependency>
-         <groupId>org.codehaus.plexus</groupId>
-         <artifactId>plexus-utils</artifactId>
--        <version>1.5.6</version>
-+        <version>1.4.8</version>
-+	<scope>system</scope>
-+	<systemPath>/usr/share/java/plexus-utils.jar</systemPath>
-       </dependency>
-     </dependencies>
-   </dependencyManagement>
- 
-   <dependencies>
-     <!-- doxia -->
-+    <!--
-     <dependency>
-       <groupId>org.apache.maven.doxia</groupId>
-       <artifactId>doxia-sink-api</artifactId>
-@@ -125,8 +134,10 @@
-         </exclusion>
-       </exclusions>
-     </dependency>
-+    -->
- 
-     <!-- maven -->
-+    <!--
-     <dependency>
-       <groupId>org.apache.maven</groupId>
-       <artifactId>maven-plugin-api</artifactId>
-@@ -157,10 +168,12 @@
-       <artifactId>maven-plugin-registry</artifactId>
-       <version>2.0.6</version>
-     </dependency>
-+    -->
-     <dependency>
-       <groupId>org.apache.maven.plugin-tools</groupId>
-       <artifactId>maven-plugin-tools-api</artifactId>
-     </dependency>
-+    <!--
-     <dependency>
-       <groupId>org.apache.maven</groupId>
-       <artifactId>maven-artifact-manager</artifactId>
-@@ -181,6 +194,7 @@
-       <artifactId>maven-reporting-api</artifactId>
-       <version>2.0.4</version>
-     </dependency>
-+    -->
- 
-     <!-- Maven runtime -->
-     <dependency>
-@@ -188,11 +202,13 @@
-       <artifactId>maven-plugin-tools-java</artifactId>
-       <scope>runtime</scope>
-     </dependency>
-+    <!--
-     <dependency>
-       <groupId>org.apache.maven.plugin-tools</groupId>
-       <artifactId>maven-plugin-tools-beanshell</artifactId>
-       <scope>runtime</scope>
-     </dependency>
-+    -->
- 
-     <!-- plexus -->
-     <dependency>
-@@ -208,13 +224,15 @@
-         <plugin>
-           <groupId>org.apache.maven.plugins</groupId>
-           <artifactId>maven-plugin-plugin</artifactId>
--          <version>2.4.2</version>
-+          <version>2.4.3</version>
-         </plugin>
-+	<!--
-         <plugin>
-           <groupId>org.apache.maven.plugins</groupId>
-           <artifactId>maven-javadoc-plugin</artifactId>
-           <version>2.4</version>
--        </plugin>
-+	</plugin>
-+	-->
-       </plugins>
-     </pluginManagement>
-     <plugins>
-@@ -228,8 +246,9 @@
-               <goal>helpmojo</goal>
-             </goals>
-           </execution>
--        </executions>
-+	</executions>
-       </plugin>
-+      <!--
-       <plugin>
-         <groupId>org.codehaus.modello</groupId>
-         <artifactId>modello-maven-plugin</artifactId>
-@@ -248,6 +267,7 @@
-           </models>
-         </configuration>
-       </plugin>
-+      -->
-     </plugins>
-   </build>
- 
-Index: maven-plugin-tools-2.4.3/maven-plugin-tools-api/pom.xml
-===================================================================
---- maven-plugin-tools-2.4.3.orig/maven-plugin-tools-api/pom.xml	2008-08-14 13:35:08.000000000 +0200
-+++ maven-plugin-tools-2.4.3/maven-plugin-tools-api/pom.xml	2008-12-06 22:14:20.000000000 +0100
-@@ -41,6 +43,7 @@
- 
-   <dependencies>
-     <!-- maven -->
-+    <!--
-     <dependency>
-       <groupId>org.apache.maven</groupId>
-       <artifactId>maven-project</artifactId>
-@@ -70,8 +73,10 @@
-       <groupId>org.apache.maven</groupId>
-       <artifactId>maven-plugin-descriptor</artifactId>
-     </dependency>
-+    -->
- 
-     <!-- plexus -->
-+    <!--
-     <dependency>
-       <groupId>org.codehaus.plexus</groupId>
-       <artifactId>plexus-utils</artifactId>
-@@ -80,22 +85,28 @@
-       <groupId>org.codehaus.plexus</groupId>
-       <artifactId>plexus-container-default</artifactId>
-     </dependency>
-+    -->
- 
-     <!-- misc -->
-+    <!--
-     <dependency>
-       <groupId>jtidy</groupId>
-       <artifactId>jtidy</artifactId>
+--- a/maven-plugin-tools-api/pom.xml
++++ b/maven-plugin-tools-api/pom.xml
+@@ -88,25 +88,6 @@
        <version>4aug2000r7-dev</version>
      </dependency>
-+    -->
  
-     <!-- test -->
-+    <!--
-     <dependency>
-       <groupId>org.apache.maven.reporting</groupId>
-       <artifactId>maven-reporting-impl</artifactId>
-       <version>2.0.4.1</version>
-       <scope>test</scope>
-       <exclusions>
+-    <!-- test -->
+-    <dependency>
+-      <groupId>org.apache.maven.reporting</groupId>
+-      <artifactId>maven-reporting-impl</artifactId>
+-      <version>2.0.4.1</version>
+-      <scope>test</scope>
+-      <exclusions>
 -        <!-- Using org.codehaus.plexus:plexus-utils instead of -->
-+	-->
-+	<!-- Using org.codehaus.plexus:plexus-utils instead of -->
-+	<!--
-         <exclusion>
-           <groupId>plexus</groupId>
-           <artifactId>plexus-utils</artifactId>
-@@ -107,8 +118,10 @@
-       <artifactId>maven-plugin-testing-harness</artifactId>
-       <scope>test</scope>
-     </dependency>
-+    -->
+-        <exclusion>
+-          <groupId>plexus</groupId>
+-          <artifactId>plexus-utils</artifactId>
+-        </exclusion>
+-      </exclusions>
+-    </dependency>
+-    <dependency>
+-      <groupId>org.apache.maven.plugin-testing</groupId>
+-      <artifactId>maven-plugin-testing-harness</artifactId>
+-      <scope>test</scope>
+-    </dependency>
    </dependencies>
  
-+  <!--
    <profiles>
-     <profile>
-       <id>reporting</id>
-@@ -129,4 +142,5 @@
-       </reporting>
-     </profile>
-   </profiles>
-+  -->
- </project>
-Index: maven-plugin-tools-2.4.3/maven-plugin-tools-java/pom.xml
-===================================================================
---- maven-plugin-tools-2.4.3.orig/maven-plugin-tools-java/pom.xml	2008-08-14 13:35:08.000000000 +0200
-+++ maven-plugin-tools-2.4.3/maven-plugin-tools-java/pom.xml	2008-12-06 22:14:20.000000000 +0100
-@@ -41,6 +43,7 @@
- 
-   <dependencies>
-     <!-- maven -->
-+    <!--
-     <dependency>
-       <groupId>org.apache.maven</groupId>
-       <artifactId>maven-project</artifactId>
-@@ -59,8 +62,10 @@
-       <groupId>org.apache.maven.plugin-tools</groupId>
-       <artifactId>maven-plugin-tools-api</artifactId>
-     </dependency>
-+    -->
- 
-     <!-- plexus -->
-+    <!--
-     <dependency>
-       <groupId>org.codehaus.plexus</groupId>
-       <artifactId>plexus-utils</artifactId>
-@@ -69,12 +74,15 @@
-       <groupId>org.codehaus.plexus</groupId>
-       <artifactId>plexus-container-default</artifactId>
-     </dependency>
-+    -->
- 
-     <!-- misc -->
-     <dependency>
-       <groupId>com.thoughtworks.qdox</groupId>
-       <artifactId>qdox</artifactId>
-       <version>1.6.3</version>
-+      <scope>system</scope>
-+      <systemPath>/usr/share/java/qdox.jar</systemPath>
-     </dependency>
-   </dependencies>
- </project>
-Index: maven-plugin-tools-2.4.3/pom.xml
-===================================================================
---- maven-plugin-tools-2.4.3.orig/pom.xml	2008-08-14 13:35:08.000000000 +0200
-+++ maven-plugin-tools-2.4.3/pom.xml	2008-12-06 22:14:20.000000000 +0100
-@@ -22,12 +22,14 @@
- <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-parent</artifactId>
-     <groupId>org.apache.maven</groupId>
-     <version>8</version>
-     <relativePath>../pom/maven/pom.xml</relativePath>
-   </parent>
-+  -->
- 
-   <groupId>org.apache.maven.plugin-tools</groupId>
-   <artifactId>maven-plugin-tools</artifactId>

Added: trunk/maven-plugin-tools/debian/plugin.xml
===================================================================
--- trunk/maven-plugin-tools/debian/plugin.xml	                        (rev 0)
+++ trunk/maven-plugin-tools/debian/plugin.xml	2009-07-08 00:06:00 UTC (rev 8948)
@@ -0,0 +1,715 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- dummy plugin descriptor used to bootstrap -->
+<plugin>
+  <description>The Plugin Plugin is used to create a Maven plugin descriptor for any Mojo&apos;s found in the source tree,
+    to include in the JAR. It is also used to generate Xdoc files for the Mojos as well as for updating the
+    plugin registry, the artifact metadata and a generic help goal.</description>
+  <groupId>org.apache.maven.plugins</groupId>
+  <artifactId>maven-plugin-plugin</artifactId>
+  <version>@VERSION@</version>
+  <goalPrefix>plugin</goalPrefix>
+  <isolatedRealm>false</isolatedRealm>
+  <inheritedByDefault>true</inheritedByDefault>
+  <mojos>
+    <mojo>
+      <goal>helpmojo</goal>
+      <description>Generates a &lt;code&gt;HelpMojo&lt;/code&gt; class.</description>
+      <requiresDirectInvocation>false</requiresDirectInvocation>
+      <requiresProject>true</requiresProject>
+      <requiresReports>false</requiresReports>
+      <aggregator>false</aggregator>
+      <requiresOnline>false</requiresOnline>
+      <inheritedByDefault>true</inheritedByDefault>
+      <phase>generate-sources</phase>
+      <implementation>org.apache.maven.plugin.plugin.HelpGeneratorMojo</implementation>
+      <language>java</language>
+      <instantiationStrategy>per-lookup</instantiationStrategy>
+      <executionStrategy>once-per-session</executionStrategy>
+      <parameters>
+        <parameter>
+          <name>extractors</name>
+          <type>java.util.Set</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>The names of extractors to use.
+&lt;p/&gt;
+If not set, all extractors will be used. If set to an empty extractor name, no extractors
+will be used.
+&lt;p/&gt;
+Example:
+&lt;p/&gt;
+&lt;pre&gt;
+&amp;lt;!-- Use all extractors --&amp;gt;
+&amp;lt;extractors/&amp;gt;
+&amp;lt;!-- Use no extractors --&amp;gt;
+&amp;lt;extractors&amp;gt;
+&amp;lt;extractor/&amp;gt;
+&amp;lt;/extractors&amp;gt;
+&amp;lt;!-- Use only bsh extractor --&amp;gt;
+&amp;lt;extractors&amp;gt;
+&amp;lt;extractor&amp;gt;bsh&amp;lt;/extractor&amp;gt;
+&amp;lt;/extractors&amp;gt;
+&lt;/pre&gt;</description>
+        </parameter>
+        <parameter>
+          <name>goalPrefix</name>
+          <type>java.lang.String</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>The goal prefix that will appear before the &quot;:&quot;.</description>
+        </parameter>
+        <parameter>
+          <name>outputDirectory</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>The directory where the generated &lt;code&gt;HelpMojo&lt;/code&gt; file will be put.</description>
+        </parameter>
+        <parameter>
+          <name>project</name>
+          <type>org.apache.maven.project.MavenProject</type>
+          <required>true</required>
+          <editable>false</editable>
+          <description>The project currently being built.</description>
+        </parameter>
+      </parameters>
+      <configuration>
+        <outputDirectory implementation="java.io.File" default-value="${project.build.directory}/generated-sources/plugin"/>
+        <project implementation="org.apache.maven.project.MavenProject">${project}</project>
+      </configuration>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.tools.plugin.scanner.MojoScanner</role>
+          <field-name>mojoScanner</field-name>
+        </requirement>
+      </requirements>
+    </mojo>
+    <mojo>
+      <goal>xdoc</goal>
+      <description>Generate Xdoc files for the project mojos or goals.</description>
+      <requiresDirectInvocation>false</requiresDirectInvocation>
+      <requiresProject>true</requiresProject>
+      <requiresReports>false</requiresReports>
+      <aggregator>false</aggregator>
+      <requiresOnline>false</requiresOnline>
+      <inheritedByDefault>true</inheritedByDefault>
+      <implementation>org.apache.maven.plugin.plugin.XdocGeneratorMojo</implementation>
+      <language>java</language>
+      <instantiationStrategy>per-lookup</instantiationStrategy>
+      <executionStrategy>once-per-session</executionStrategy>
+      <parameters>
+        <parameter>
+          <name>extractors</name>
+          <type>java.util.Set</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>The names of extractors to use.
+&lt;p/&gt;
+If not set, all extractors will be used. If set to an empty extractor name, no extractors
+will be used.
+&lt;p/&gt;
+Example:
+&lt;p/&gt;
+&lt;pre&gt;
+&amp;lt;!-- Use all extractors --&amp;gt;
+&amp;lt;extractors/&amp;gt;
+&amp;lt;!-- Use no extractors --&amp;gt;
+&amp;lt;extractors&amp;gt;
+&amp;lt;extractor/&amp;gt;
+&amp;lt;/extractors&amp;gt;
+&amp;lt;!-- Use only bsh extractor --&amp;gt;
+&amp;lt;extractors&amp;gt;
+&amp;lt;extractor&amp;gt;bsh&amp;lt;/extractor&amp;gt;
+&amp;lt;/extractors&amp;gt;
+&lt;/pre&gt;</description>
+        </parameter>
+        <parameter>
+          <name>goalPrefix</name>
+          <type>java.lang.String</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>The goal prefix that will appear before the &quot;:&quot;.</description>
+        </parameter>
+        <parameter>
+          <name>outputDirectory</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>The directory where the generated Xdoc files will be put.</description>
+        </parameter>
+        <parameter>
+          <name>project</name>
+          <type>org.apache.maven.project.MavenProject</type>
+          <required>true</required>
+          <editable>false</editable>
+          <description>The project currently being built.</description>
+        </parameter>
+      </parameters>
+      <configuration>
+        <outputDirectory implementation="java.io.File" default-value="${project.build.directory}/generated-site/xdoc"/>
+        <project implementation="org.apache.maven.project.MavenProject">${project}</project>
+      </configuration>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.tools.plugin.scanner.MojoScanner</role>
+          <field-name>mojoScanner</field-name>
+        </requirement>
+      </requirements>
+    </mojo>
+    <mojo>
+      <goal>updateRegistry</goal>
+      <description>Update the user plugin registry (if it&apos;s in use) to reflect the version we&apos;re installing.</description>
+      <requiresDirectInvocation>false</requiresDirectInvocation>
+      <requiresProject>true</requiresProject>
+      <requiresReports>false</requiresReports>
+      <aggregator>false</aggregator>
+      <requiresOnline>false</requiresOnline>
+      <inheritedByDefault>true</inheritedByDefault>
+      <phase>install</phase>
+      <implementation>org.apache.maven.plugin.plugin.UpdatePluginRegistryMojo</implementation>
+      <language>java</language>
+      <instantiationStrategy>per-lookup</instantiationStrategy>
+      <executionStrategy>once-per-session</executionStrategy>
+      <parameters>
+        <parameter>
+          <name>artifactId</name>
+          <type>java.lang.String</type>
+          <required>true</required>
+          <editable>false</editable>
+          <description>The artifact id of the project currently being built.</description>
+        </parameter>
+        <parameter>
+          <name>groupId</name>
+          <type>java.lang.String</type>
+          <required>true</required>
+          <editable>false</editable>
+          <description>The group id of the project currently being built.</description>
+        </parameter>
+        <parameter>
+          <name>usePluginRegistry</name>
+          <type>boolean</type>
+          <required>true</required>
+          <editable>false</editable>
+          <description>Indicates whether the &lt;code&gt;plugin-registry.xml&lt;/code&gt; file is used by Maven or not
+to manage plugin versions.</description>
+        </parameter>
+        <parameter>
+          <name>version</name>
+          <type>java.lang.String</type>
+          <required>true</required>
+          <editable>false</editable>
+          <description>The version of the project currently being built.</description>
+        </parameter>
+      </parameters>
+      <configuration>
+        <groupId implementation="java.lang.String" default-value="${project.groupId}"/>
+        <usePluginRegistry implementation="boolean" default-value="${settings.usePluginRegistry}"/>
+        <version implementation="java.lang.String" default-value="${project.artifact.version}"/>
+        <artifactId implementation="java.lang.String" default-value="${project.artifactId}"/>
+      </configuration>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.plugin.registry.MavenPluginRegistryBuilder</role>
+          <field-name>pluginRegistryBuilder</field-name>
+        </requirement>
+      </requirements>
+    </mojo>
+    <mojo>
+      <goal>report</goal>
+      <description>Generates the Plugin&apos;s documentation report.</description>
+      <requiresDirectInvocation>false</requiresDirectInvocation>
+      <requiresProject>true</requiresProject>
+      <requiresReports>false</requiresReports>
+      <aggregator>false</aggregator>
+      <requiresOnline>false</requiresOnline>
+      <inheritedByDefault>true</inheritedByDefault>
+      <executePhase>compile</executePhase>
+      <implementation>org.apache.maven.plugin.plugin.PluginReport</implementation>
+      <language>java</language>
+      <instantiationStrategy>per-lookup</instantiationStrategy>
+      <executionStrategy>once-per-session</executionStrategy>
+      <parameters>
+        <parameter>
+          <name>goalPrefix</name>
+          <type>java.lang.String</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>The goal prefix that will appear before the &quot;:&quot;.</description>
+        </parameter>
+        <parameter>
+          <name>outputDirectory</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>Report output directory.</description>
+        </parameter>
+        <parameter>
+          <name>project</name>
+          <type>org.apache.maven.project.MavenProject</type>
+          <required>true</required>
+          <editable>false</editable>
+          <description>The Maven Project.</description>
+        </parameter>
+        <parameter>
+          <name>requirements</name>
+          <type>org.apache.maven.plugin.plugin.Requirements</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>Specify some requirements to execute this plugin.
+Example:
+&lt;pre&gt;
+&amp;lt;requirements&amp;gt;&lt;br/&gt;
+&amp;lt;maven&amp;gt;2.0&amp;lt;/maven&amp;gt;&lt;br/&gt;
+&amp;lt;jdk&amp;gt;1.4&amp;lt;/jdk&amp;gt;&lt;br/&gt;
+&amp;lt;memory&amp;gt;256m&amp;lt;/memory&amp;gt;&lt;br/&gt;
+&amp;lt;diskSpace&amp;gt;1m&amp;lt;/diskSpace&amp;gt;&lt;br/&gt;
+&amp;lt;others&amp;gt;&lt;br/&gt;
+&amp;lt;property&amp;gt;&lt;br/&gt;
+&amp;lt;name&amp;gt;SVN&amp;lt;/name&amp;gt;&lt;br/&gt;
+&amp;lt;value&amp;gt;1.4.6&amp;lt;/value&amp;gt;&lt;br/&gt;
+&amp;lt;/property&amp;gt;&lt;br/&gt;
+&amp;lt;/others&amp;gt;&lt;br/&gt;
+&amp;lt;/requirements&amp;gt;
+&lt;/pre&gt;</description>
+        </parameter>
+      </parameters>
+      <configuration>
+        <goalPrefix implementation="java.lang.String">${goalPrefix}</goalPrefix>
+        <outputDirectory implementation="java.io.File" default-value="${project.build.directory}/generated-site/xdoc"/>
+        <project implementation="org.apache.maven.project.MavenProject">${project}</project>
+      </configuration>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.tools.plugin.scanner.MojoScanner</role>
+          <field-name>mojoScanner</field-name>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.doxia.siterenderer.Renderer</role>
+          <field-name>siteRenderer</field-name>
+        </requirement>
+      </requirements>
+    </mojo>
+    <mojo>
+      <goal>addPluginArtifactMetadata</goal>
+      <description>Inject any plugin-specific artifact metadata to the project&apos;s artifact, for subsequent installation
+and deployment. The first use-case for this is to add the LATEST metadata (which is plugin-specific)
+for shipping alongside the plugin&apos;s artifact.</description>
+      <requiresDirectInvocation>false</requiresDirectInvocation>
+      <requiresProject>true</requiresProject>
+      <requiresReports>false</requiresReports>
+      <aggregator>false</aggregator>
+      <requiresOnline>false</requiresOnline>
+      <inheritedByDefault>true</inheritedByDefault>
+      <phase>package</phase>
+      <implementation>org.apache.maven.plugin.plugin.metadata.AddPluginArtifactMetadataMojo</implementation>
+      <language>java</language>
+      <instantiationStrategy>per-lookup</instantiationStrategy>
+      <executionStrategy>once-per-session</executionStrategy>
+      <parameters>
+        <parameter>
+          <name>goalPrefix</name>
+          <type>java.lang.String</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>The prefix for the plugin goal.</description>
+        </parameter>
+        <parameter>
+          <name>project</name>
+          <type>org.apache.maven.project.MavenProject</type>
+          <required>true</required>
+          <editable>false</editable>
+          <description>The project artifact, which should have the LATEST metadata added to it.</description>
+        </parameter>
+      </parameters>
+      <configuration>
+        <project implementation="org.apache.maven.project.MavenProject">${project}</project>
+      </configuration>
+    </mojo>
+    <mojo>
+      <goal>help</goal>
+      <description>Display help information on maven-plugin-plugin. Call &lt;pre&gt; mvn plugin:help -Ddetail=true -Dgoal=&amp;lt;goal-name&amp;gt;&lt;/pre&gt; to display parameter details.</description>
+      <requiresDirectInvocation>false</requiresDirectInvocation>
+      <requiresProject>false</requiresProject>
+      <requiresReports>false</requiresReports>
+      <aggregator>false</aggregator>
+      <requiresOnline>false</requiresOnline>
+      <inheritedByDefault>true</inheritedByDefault>
+      <implementation>org.apache.maven.plugin.plugin.HelpMojo</implementation>
+      <language>java</language>
+      <instantiationStrategy>per-lookup</instantiationStrategy>
+      <executionStrategy>once-per-session</executionStrategy>
+      <parameters>
+        <parameter>
+          <name>detail</name>
+          <type>boolean</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>If &lt;code&gt;true&lt;/code&gt;, display all settable properties for each goal.</description>
+        </parameter>
+        <parameter>
+          <name>goal</name>
+          <type>java.lang.String</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>The name of the goal for which to show help. If unspecified, all goals will be displayed.</description>
+        </parameter>
+        <parameter>
+          <name>indentSize</name>
+          <type>int</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>The number of spaces per indentation level.</description>
+        </parameter>
+        <parameter>
+          <name>lineLength</name>
+          <type>int</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>The maximum length of a display line.</description>
+        </parameter>
+      </parameters>
+      <configuration>
+        <goal implementation="java.lang.String">${goal}</goal>
+        <lineLength implementation="int" default-value="80">${lineLength}</lineLength>
+        <indentSize implementation="int" default-value="2">${indentSize}</indentSize>
+        <detail implementation="boolean" default-value="false">${detail}</detail>
+      </configuration>
+    </mojo>
+    <mojo>
+      <goal>descriptor</goal>
+      <description>Generate a plugin descriptor.
+&lt;br/&gt;
+&lt;b&gt;Note:&lt;/b&gt; Phase is after the &quot;compilation&quot; of any scripts.</description>
+      <requiresDependencyResolution>runtime</requiresDependencyResolution>
+      <requiresDirectInvocation>false</requiresDirectInvocation>
+      <requiresProject>true</requiresProject>
+      <requiresReports>false</requiresReports>
+      <aggregator>false</aggregator>
+      <requiresOnline>false</requiresOnline>
+      <inheritedByDefault>true</inheritedByDefault>
+      <phase>generate-resources</phase>
+      <implementation>org.apache.maven.plugin.plugin.DescriptorGeneratorMojo</implementation>
+      <language>java</language>
+      <instantiationStrategy>per-lookup</instantiationStrategy>
+      <executionStrategy>once-per-session</executionStrategy>
+      <parameters>
+        <parameter>
+          <name>extractors</name>
+          <type>java.util.Set</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>The names of extractors to use.
+&lt;p/&gt;
+If not set, all extractors will be used. If set to an empty extractor name, no extractors
+will be used.
+&lt;p/&gt;
+Example:
+&lt;p/&gt;
+&lt;pre&gt;
+&amp;lt;!-- Use all extractors --&amp;gt;
+&amp;lt;extractors/&amp;gt;
+&amp;lt;!-- Use no extractors --&amp;gt;
+&amp;lt;extractors&amp;gt;
+&amp;lt;extractor/&amp;gt;
+&amp;lt;/extractors&amp;gt;
+&amp;lt;!-- Use only bsh extractor --&amp;gt;
+&amp;lt;extractors&amp;gt;
+&amp;lt;extractor&amp;gt;bsh&amp;lt;/extractor&amp;gt;
+&amp;lt;/extractors&amp;gt;
+&lt;/pre&gt;</description>
+        </parameter>
+        <parameter>
+          <name>goalPrefix</name>
+          <type>java.lang.String</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>The goal prefix that will appear before the &quot;:&quot;.</description>
+        </parameter>
+        <parameter>
+          <name>outputDirectory</name>
+          <type>java.io.File</type>
+          <required>false</required>
+          <editable>true</editable>
+          <description>The directory where the generated &lt;code&gt;plugin.xml&lt;/code&gt; file will be put.</description>
+        </parameter>
+        <parameter>
+          <name>project</name>
+          <type>org.apache.maven.project.MavenProject</type>
+          <required>true</required>
+          <editable>false</editable>
+          <description>The project currently being built.</description>
+        </parameter>
+      </parameters>
+      <configuration>
+        <outputDirectory implementation="java.io.File" default-value="${project.build.outputDirectory}/META-INF/maven"/>
+        <project implementation="org.apache.maven.project.MavenProject">${project}</project>
+      </configuration>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.tools.plugin.scanner.MojoScanner</role>
+          <field-name>mojoScanner</field-name>
+        </requirement>
+      </requirements>
+    </mojo>
+  </mojos>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-sink-api</artifactId>
+      <type>jar</type>
+      <version>debian</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.reporting</groupId>
+      <artifactId>maven-reporting-api</artifactId>
+      <type>jar</type>
+      <version>debian</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.plugin-tools</groupId>
+      <artifactId>maven-plugin-tools-java</artifactId>
+      <type>jar</type>
+      <version>debian</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-project</artifactId>
+      <type>jar</type>
+      <version>debian</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-profile</artifactId>
+      <type>jar</type>
+      <version>debian</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-model</artifactId>
+      <type>jar</type>
+      <version>debian</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+      <type>jar</type>
+      <version>debian</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-container-default</artifactId>
+      <type>jar</type>
+      <version>1.0-alpha</version>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <type>jar</type>
+      <version>debian</version>
+    </dependency>
+    <dependency>
+      <groupId>classworlds</groupId>
+      <artifactId>classworlds</artifactId>
+      <type>jar</type>
+      <version>debian</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-artifact-manager</artifactId>
+      <type>jar</type>
+      <version>debian</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-repository-metadata</artifactId>
+      <type>jar</type>
+      <version>debian</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-artifact</artifactId>
+      <type>jar</type>
+      <version>debian</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.wagon</groupId>
+      <artifactId>wagon-provider-api</artifactId>
+      <type>jar</type>
+      <version>debian</version>
+    </dependency>
+    <dependency>
+      <groupId>com.thoughtworks.qdox</groupId>
+      <artifactId>qdox</artifactId>
+      <type>jar</type>
+      <version>debian</version>
+    </dependency>
+    <dependency>
+      <groupId>ant</groupId>
+      <artifactId>ant</artifactId>
+      <type>jar</type>
+      <version>debian</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-plugin-descriptor</artifactId>
+      <type>jar</type>
+      <version>debian</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-plugin-api</artifactId>
+      <type>jar</type>
+      <version>debian</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.plugin-tools</groupId>
+      <artifactId>maven-plugin-tools-api</artifactId>
+      <type>jar</type>
+      <version>debian</version>
+    </dependency>
+    <dependency>
+      <groupId>jtidy</groupId>
+      <artifactId>jtidy</artifactId>
+      <type>jar</type>
+      <version>debian</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.reporting</groupId>
+      <artifactId>maven-reporting-impl</artifactId>
+      <type>jar</type>
+      <version>debian</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-settings</artifactId>
+      <type>jar</type>
+      <version>debian</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-validator</groupId>
+      <artifactId>commons-validator</artifactId>
+      <type>jar</type>
+      <version>1.2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-beanutils</groupId>
+      <artifactId>commons-beanutils</artifactId>
+      <type>jar</type>
+      <version>debian</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+      <type>jar</type>
+      <version>debian</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-digester</groupId>
+      <artifactId>commons-digester</artifactId>
+      <type>jar</type>
+      <version>debian</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <type>jar</type>
+      <version>3.x</version>
+    </dependency>
+    <dependency>
+      <groupId>xml-apis</groupId>
+      <artifactId>xml-apis</artifactId>
+      <type>jar</type>
+      <version>debian</version>
+    </dependency>
+    <dependency>
+      <groupId>oro</groupId>
+      <artifactId>oro</artifactId>
+      <type>jar</type>
+      <version>debian</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-core</artifactId>
+      <type>jar</type>
+      <version>debian</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-site-renderer</artifactId>
+      <type>jar</type>
+      <version>debian</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-i18n</artifactId>
+      <type>jar</type>
+      <version>debian</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-velocity</artifactId>
+      <type>jar</type>
+      <version>debian</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.velocity</groupId>
+      <artifactId>velocity</artifactId>
+      <type>jar</type>
+      <version>debian</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-lang</groupId>
+      <artifactId>commons-lang</artifactId>
+      <type>jar</type>
+      <version>debian</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-decoration-model</artifactId>
+      <type>jar</type>
+      <version>debian</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-module-apt</artifactId>
+      <type>jar</type>
+      <version>debian</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-module-fml</artifactId>
+      <type>jar</type>
+      <version>debian</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-module-xdoc</artifactId>
+      <type>jar</type>
+      <version>debian</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.doxia</groupId>
+      <artifactId>doxia-module-xhtml</artifactId>
+      <type>jar</type>
+      <version>debian</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-plugin-registry</artifactId>
+      <type>jar</type>
+      <version>debian</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.plugin-tools</groupId>
+      <artifactId>maven-plugin-tools-beanshell</artifactId>
+      <type>jar</type>
+      <version>debian</version>
+    </dependency>
+    <dependency>
+      <groupId>org.beanshell</groupId>
+      <artifactId>bsh</artifactId>
+      <type>jar</type>
+      <version>debian</version>
+    </dependency>
+  </dependencies>
+</plugin>

Modified: trunk/maven-plugin-tools/debian/rules
===================================================================
--- trunk/maven-plugin-tools/debian/rules	2009-07-07 23:59:02 UTC (rev 8947)
+++ trunk/maven-plugin-tools/debian/rules	2009-07-08 00:06:00 UTC (rev 8948)
@@ -4,36 +4,33 @@
 include /usr/share/cdbs/1/class/ant.mk
 include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
-PACKAGE              := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ')
-VERSION              := $(shell dpkg-parsechangelog | egrep '^Version:' | sed 's/Version: \(.*\)-.*/\1/')
+PACKAGE              := $(DEB_SOURCE_PACKAGE)
+VERSION              := $(DEB_UPSTREAM_VERSION)
 JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_JARS             := maven2 plexus-container-default-1.0 plexus-utils jtidy \
-  doxia-sink-api doxia-site-renderer maven-reporting-impl maven-ant-helper \
-  plexus-classworlds google-collect xbean-reflect qdox bsh
+DEB_JARS             := ant-nodeps maven-repo-helper
 DEB_ANT_BUILD_TARGET := package #javadoc
 DEB_ANT_BUILDFILE    := debian/build.xml
-DEB_ANT_ARGS         := -Dversion=$(VERSION)
-API_DOCS             := build/api
+DEB_ANT_ARGS         := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
+API_DOCS             := target/api
 DEB_CLASSPATH        := $(DEB_CLASSPATH):maven-plugin-tools-api/target/classes
 
 get-orig-source:
-	uscan --force-download
+	-uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
 
-REPO := /usr/share/maven-repo
-MPT  := $(REPO)/org/apache/maven
+makebuilddir/lib$(PACKAGE)-java::
+	install -d debian/tmp/maven-repo
+	cp -rL /usr/share/maven-repo/* debian/tmp/maven-repo/
+	-rm -rf debian/tmp/maven-repo/org/apache/maven/plugins/
+	-rm -rf debian/tmp/maven-repo/org/apache/maven/plugin-tools/
+	cat debian/maven-settings.xml | sed 's|BASEDIR|$(realpath $(DEB_BUILDDIR))|g' > debian/tmp/maven-settings.xml
 
 binary-post-install/lib$(PACKAGE)-java::
-	# parent POM
-	install -D -m644 pom.xml $(DEB_DESTDIR)$(MPT)/plugin-tools/maven-plugin-tools/$(VERSION)/maven-plugin-tools-$(VERSION).pom
-	# maven-plugin-tools-api
-	dh_install maven-plugin-tools-api/target/*.jar $(MPT)/plugin-tools/maven-plugin-tools-api/$(VERSION)/
-	install -m644 maven-plugin-tools-api/pom.xml $(DEB_DESTDIR)$(MPT)/plugin-tools/maven-plugin-tools-api/$(VERSION)/maven-plugin-tools-api-$(VERSION).pom
-	# maven-plugin-tools-java
-	dh_install maven-plugin-tools-java/target/*.jar $(MPT)/plugin-tools/maven-plugin-tools-java/$(VERSION)/
-	install -m644 maven-plugin-tools-java/pom.xml $(DEB_DESTDIR)$(MPT)/plugin-tools/maven-plugin-tools-java/$(VERSION)/maven-plugin-tools-java-$(VERSION).pom
-	# maven-plugin-tools-beanshell
-	dh_install maven-plugin-tools-beanshell/target/*.jar $(MPT)/plugin-tools/maven-plugin-tools-beanshell/$(VERSION)/
-	install -m644 maven-plugin-tools-beanshell/pom.xml $(DEB_DESTDIR)$(MPT)/plugin-tools/maven-plugin-tools-beanshell/$(VERSION)/maven-plugin-tools-beanshell-$(VERSION).pom
-	# maven-plugin-plugin
-	dh_install maven-plugin-plugin/target/*.jar $(MPT)/plugins/maven-plugin-plugin/$(VERSION)/
-	install -m644 maven-plugin-plugin/pom.xml $(DEB_DESTDIR)$(MPT)/plugins/maven-plugin-plugin/$(VERSION)/maven-plugin-plugin-$(VERSION).pom
+	mh_installpoms -plib$(PACKAGE)-java
+	mh_installjar -plib$(PACKAGE)-java -l maven-plugin-plugin/pom.xml maven-plugin-plugin/target/maven-plugin-plugin-$(VERSION).jar
+	mh_installjar -plib$(PACKAGE)-java -l maven-plugin-tools-ant/pom.xml maven-plugin-tools-ant/target/maven-plugin-tools-ant-$(VERSION).jar
+	mh_installjar -plib$(PACKAGE)-java -l maven-plugin-tools-api/pom.xml maven-plugin-tools-api/target/maven-plugin-tools-api-$(VERSION).jar
+	mh_installjar -plib$(PACKAGE)-java -l maven-plugin-tools-model/pom.xml maven-plugin-tools-model/target/maven-plugin-tools-model-$(VERSION).jar
+	mh_installjar -plib$(PACKAGE)-java -l maven-plugin-tools-beanshell/pom.xml maven-plugin-tools-beanshell/target/maven-plugin-tools-beanshell-$(VERSION).jar
+	mh_installjar -plib$(PACKAGE)-java -l maven-plugin-tools-java/pom.xml maven-plugin-tools-java/target/maven-plugin-tools-java-$(VERSION).jar
+	mh_installjar -plib$(PACKAGE)-java -l maven-plugin-tools-javadoc/pom.xml maven-plugin-tools-javadoc/target/maven-plugin-tools-javadoc-$(VERSION).jar
+


Property changes on: trunk/maven-plugin-tools/debian/rules
___________________________________________________________________
Modified: svn:executable
   - 
   + *

Modified: trunk/maven-plugin-tools/debian/watch
===================================================================
--- trunk/maven-plugin-tools/debian/watch	2009-07-07 23:59:02 UTC (rev 8947)
+++ trunk/maven-plugin-tools/debian/watch	2009-07-08 00:06:00 UTC (rev 8948)
@@ -1,4 +1,3 @@
 version=3
-
 http://svn.apache.org/repos/asf/maven/plugin-tools/tags/ \
   maven-plugin-tools-(.*)/ debian debian/orig-tar.sh

More information about the pkg-java-commits mailing list