[pkg-java] r17453 - in trunk/maven-ant-helper: . debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-11-08 14:15:27 +0000 (Fri, 08 Nov 2013)
New Revision: 17453

Modified:
   trunk/maven-ant-helper/debian/changelog
   trunk/maven-ant-helper/debian/control
   trunk/maven-ant-helper/maven-build.xml
Log:
Added a process-classes target to allow the post processing of the compiled classes. This enables the generation of plugin and component descriptors when Java annotations are used instead of Javadoc tags.
Propagate the source/target level set with the javaVersion property to Maven
Removed backport-util-concurrent from the Maven classpath
Updated Standards-Version to 3.9.5 (no changes)




Modified: trunk/maven-ant-helper/debian/changelog
===================================================================
--- trunk/maven-ant-helper/debian/changelog	2013-11-07 23:33:12 UTC (rev 17452)
+++ trunk/maven-ant-helper/debian/changelog	2013-11-08 14:15:27 UTC (rev 17453)
@@ -1,3 +1,15 @@
+maven-ant-helper (7.9) unstable; urgency=low
+
+  * Team upload.
+  * Added a process-classes target to allow the post processing of the compiled
+    classes. This enables the generation of plugin and component descriptors
+    when Java annotations are used instead of Javadoc tags.
+  * Propagate the source/target level set with the javaVersion property to Maven
+  * Removed backport-util-concurrent from the Maven classpath
+  * Updated Standards-Version to 3.9.5 (no changes)
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 08 Nov 2013 15:11:54 +0100
+
 maven-ant-helper (7.8) unstable; urgency=low
 
   * Team upload.

Modified: trunk/maven-ant-helper/debian/control
===================================================================
--- trunk/maven-ant-helper/debian/control	2013-11-07 23:33:12 UTC (rev 17452)
+++ trunk/maven-ant-helper/debian/control	2013-11-08 14:15:27 UTC (rev 17453)
@@ -7,7 +7,7 @@
            Damien Raude-Morvan <drazzib at debian.org>
 Build-Depends: cdbs, debhelper (>= 9), default-jdk
 Build-Depends-Indep: ant, ant-contrib, ant-optional
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/maven-ant-helper
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/maven-ant-helper/
 Homepage: http://svn.debian.org/wsvn/pkg-java/trunk/maven-ant-helper

Modified: trunk/maven-ant-helper/maven-build.xml
===================================================================
--- trunk/maven-ant-helper/maven-build.xml	2013-11-07 23:33:12 UTC (rev 17452)
+++ trunk/maven-ant-helper/maven-build.xml	2013-11-08 14:15:27 UTC (rev 17453)
@@ -26,6 +26,8 @@
        maven.generate.target2: if set, calls Maven with another given target before compiling code. For example, use
           maven.generate.target2 = org.codehaus.plexus:plexus-component-metadata:${plexus-component-metadata.version}:generate-metadata
           to generate the Plexus components descriptor.
+       maven.process-classes.target: if set, calls Maven with the given target after compiling the code. For example, use
+          maven.process-classes.target = plugin:generate to generate the plugin descriptor for a Maven plugin using annotations.
        maven.package.target: if set, calls Maven with the given target after packaging the jar. For example, use
           maven.target.target = shade:shade to use the shade plugin and repackage the contents of the jar.
        keep-cleaned-pom: if set, keeps the cleaned pom after packaging. If can be restored later by calling
@@ -97,7 +99,6 @@
         <path id="maven.classpath">
           <pathelement location="/usr/share/maven-ant-helper/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"/>
@@ -267,6 +268,9 @@
         <java fork="true" dir="." classname="org.apache.maven.cli.MavenCli" failonerror="true">
           <jvmarg value="-Xmx256M"/>
           <classpath refid="maven.classpath"/>
+          <arg value="-Dmaven.compiler.source=${build.javaVersion}"/>
+          <arg value="-Dmaven.compiler.target=${build.javaVersion}"/>
+          <arg value="-Dmaven.plugin.skipErrorNoDescriptorsFound=true"/>
           <arg value="-Dmaven.test.skip"/>
           <arg value="--offline"/>
           <arg value="-e"/>
@@ -292,12 +296,14 @@
         <java fork="true" dir="." classname="org.apache.maven.cli.MavenCli" failonerror="true">
           <jvmarg value="-Xmx256M"/>
           <classpath refid="maven.classpath"/>
+          <arg value="-Dmaven.compiler.source=${build.javaVersion}"/>
+          <arg value="-Dmaven.compiler.target=${build.javaVersion}"/>
+          <arg value="-Dmaven.plugin.skipErrorNoDescriptorsFound=true"/>
           <arg value="-Dmaven.test.skip"/>
           <arg value="--offline"/>
           <arg value="-e"/>
           <arg value="-B"/>
           <arg value="-N"/>
-          <arg value="--offline"/>
           <arg value="-Dmaven.repo.local=${debian.dir}/.mh/maven-repo"/>
           <arg value="@{target}"/>
         </java>
@@ -340,7 +346,14 @@
         </javac>
     </target>
 
-    <target name="process-test-resources" depends="compile" if="available.testResources" unless="maven.test.skip">
+    <target name="process-classes" depends="compile" if="maven.process-classes.target">
+        <echo message="Processing compiled classes with ${maven.process-classes.target}..."/>
+        <antcall target="mvn" inheritRefs="true">
+            <param name="_target" value="${maven.process-classes.target}" />
+        </antcall>
+    </target>
+
+    <target name="process-test-resources" depends="process-classes" if="available.testResources" unless="maven.test.skip">
         <mkdir dir="${build.testOutputDirectory}"/>
         <copy todir="${build.testOutputDirectory}">
             <fileset dir="${build.testResourcesDirectory}">