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

[Ludovic Claude]

Author: ludovicc-guest
Date: 2009-07-13 19:20:16 +0000 (Mon, 13 Jul 2009)
New Revision: 9220

Modified:
   trunk/maven-ant-helper/debian/changelog
   trunk/maven-ant-helper/maven-build.xml
Log:
Add more workaround to use gcj with maven-ant-helper, this time
avoid using gnu xml stream when reading XML documents.

Modified: trunk/maven-ant-helper/debian/changelog
===================================================================
--- trunk/maven-ant-helper/debian/changelog	2009-07-13 19:18:06 UTC (rev 9219)
+++ trunk/maven-ant-helper/debian/changelog	2009-07-13 19:20:16 UTC (rev 9220)
@@ -1,7 +1,9 @@
-maven-ant-helper (6.2) unstable; urgency=low
+maven-ant-helper (6.2) experimental; urgency=low
 
   * Fix a bug introduced by previous version. It was affecting
     only the builds which execute a Maven plugin.
+  * Add more workaround to use gcj with maven-ant-helper, this time
+    avoid using gnu xml stream when reading XML documents.
 
  -- Ludovic Claude <ludovic.claude at laposte.net>  Wed, 08 Jul 2009 23:41:02 +0100
 

Modified: trunk/maven-ant-helper/maven-build.xml
===================================================================
--- trunk/maven-ant-helper/maven-build.xml	2009-07-13 19:18:06 UTC (rev 9219)
+++ trunk/maven-ant-helper/maven-build.xml	2009-07-13 19:20:16 UTC (rev 9220)
@@ -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-input-factory" value="com.bea.xml.stream.MXParserFactory" />
     <property name="xml-output-factory" value="com.bea.xml.stream.XMLOutputFactoryBase" />
 
     <target name="init.pom">
@@ -151,6 +152,7 @@
         <java fork="true" dir="." 
            classname="org.debian.maven.repo.POMCleaner">
            <classpath refid="repo-helper.classpath"/>
+           <sysproperty key="javax.xml.stream.XMLInputFactory" value="${xml-input-factory}" />
            <sysproperty key="javax.xml.stream.XMLOutputFactory" value="${xml-output-factory}" />
            <arg value="-p${bin.package}" />
            <arg value="-r${debian.dir}/maven.rules" />
@@ -341,6 +343,7 @@
         <java fork="true" dir="." 
            classname="org.debian.maven.repo.POMCleaner">
            <classpath refid="repo-helper.classpath"/>
+           <sysproperty key="javax.xml.stream.XMLInputFactory" value="${xml-input-factory}" />
            <sysproperty key="javax.xml.stream.XMLOutputFactory" value="${xml-output-factory}" />
            <arg value="-p${bin.package}" />
            <arg value="-r${debian.dir}/maven.rules" />