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

[Ludovic Claude]

Author: ludovicc-guest
Date: 2009-07-07 21:49:33 +0000 (Tue, 07 Jul 2009)
New Revision: 8926

Modified:
   trunk/maven-ant-helper/debian/changelog
   trunk/maven-ant-helper/maven-build.xml
Log:
Provide a workaround to use gcj with maven-ant-helper

Modified: trunk/maven-ant-helper/debian/changelog
===================================================================
--- trunk/maven-ant-helper/debian/changelog	2009-07-07 21:27:34 UTC (rev 8925)
+++ trunk/maven-ant-helper/debian/changelog	2009-07-07 21:49:33 UTC (rev 8926)
@@ -1,3 +1,9 @@
+maven-ant-helper (6.1) unstable; urgency=low
+
+  * Provide a workaround to use gcj with maven-ant-helper
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Tue, 07 Jul 2009 22:46:18 +0100
+
 maven-ant-helper (6) unstable; urgency=low
 
   * Add support for custom manifest

Modified: trunk/maven-ant-helper/maven-build.xml
===================================================================
--- trunk/maven-ant-helper/maven-build.xml	2009-07-07 21:27:34 UTC (rev 8925)
+++ trunk/maven-ant-helper/maven-build.xml	2009-07-07 21:49:33 UTC (rev 8926)
@@ -47,6 +47,7 @@
     <property name="project.dir" value="" />
     <property file="${debian.dir}/build.properties"/>
     <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
+    <property name="xml-output-factory" value="com.bea.xml.stream.XMLOutputFactoryBase" />
 
     <target name="init.pom">
         <condition property="use-local-repo" value="true">
@@ -67,6 +68,15 @@
         <echo message="Pom name in ${bin.package}.poms: ${pom.name}" />
         <echo message="Pom file ${pom.file} available? ${available.pom}" />
 
+        <path id="repo-helper.classpath">
+          <fileset dir="/usr/share/maven-repo">
+            <include name="org/debian/maven/maven-repo-helper/debian/maven-repo-helper-debian.jar" />
+            <include name="stax/stax-api/debian/stax-api-debian.jar" />
+            <include name="stax/stax/debian/stax-debian.jar" />
+            <include name="xml-apis/xml-apis/debian/xml-apis-debian.jar" />
+          </fileset>
+        </path>
+
         <path id="maven.classpath">
           <pathelement location="/usr/share/maven-ant-helper/bootstrap"/>
           <fileset dir="/usr/share/maven-repo">
@@ -139,8 +149,9 @@
         <echo message="Cleaning pom ${pom.loc}" />
 
         <java fork="true" dir="." 
-           classpath="/usr/share/maven-repo/org/debian/maven/maven-repo-helper/debian/maven-repo-helper-debian.jar"
            classname="org.debian.maven.repo.POMCleaner">
+           <classpath refid="repo-helper.classpath"/>
+           <sysproperty key="javax.xml.stream.XMLOutputFactory" value="${xml-output-factory}" />
            <arg value="-p${bin.package}" />
            <arg value="-r${debian.dir}/maven.rules" />
            <arg value="-i${debian.dir}/maven.publishedRules" />
@@ -209,7 +220,7 @@
       <attribute name="target"/>
       <sequential>
         <java fork="true" dir="." classname="org.apache.maven.cli.MavenCli" failonerror="true">
-          <jvmarg value="-Xmx256M"/>
+          <sysproperty value="-Xmx256M"/>
           <classpath refid="maven.classpath"/>
           <arg value="-Dmaven.test.skip"/>
           <arg value="--offline"/>
@@ -230,7 +241,7 @@
         </copy>
 
         <java fork="true" dir="." classname="org.apache.maven.cli.MavenCli" failonerror="true">
-          <jvmarg value="-Xmx256M"/>
+          <sysproperty value="-Xmx256M"/>
           <classpath refid="maven.classpath"/>
           <arg value="-Dmaven.test.skip"/>
           <arg value="--offline"/>
@@ -328,8 +339,9 @@
         <delete file="${pom.file}" />
         <echo message="Transform ${pom.file}" />
         <java fork="true" dir="." 
-           classpath="/usr/share/maven-repo/org/debian/maven/maven-repo-helper/debian/maven-repo-helper-debian.jar"
            classname="org.debian.maven.repo.POMCleaner">
+           <classpath refid="repo-helper.classpath"/>
+           <sysproperty key="javax.xml.stream.XMLOutputFactory" value="${xml-output-factory}" />
            <arg value="-p${bin.package}" />
            <arg value="-r${debian.dir}/maven.rules" />
            <arg value="-i${debian.dir}/maven.publishedRules" />