[pkg-java] r9219 - in trunk/maven-repo-helper: debian src/main/share src/test/java/org/debian/maven/repo

[Ludovic Claude]

Author: ludovicc-guest
Date: 2009-07-13 19:18:06 +0000 (Mon, 13 Jul 2009)
New Revision: 9219

Modified:
   trunk/maven-repo-helper/debian/changelog
   trunk/maven-repo-helper/src/main/share/mh_lib.sh
   trunk/maven-repo-helper/src/test/java/org/debian/maven/repo/POMCleanerTest.java
Log:
  avoid using gnu xml stream when reading or writing XML documents.

Modified: trunk/maven-repo-helper/debian/changelog
===================================================================
--- trunk/maven-repo-helper/debian/changelog	2009-07-13 19:15:39 UTC (rev 9218)
+++ trunk/maven-repo-helper/debian/changelog	2009-07-13 19:18:06 UTC (rev 9219)
@@ -1,3 +1,10 @@
+maven-repo-helper (0.6.1) experimental; urgency=low
+
+ * Add a workaround to use gcj with maven-repo-helper:
+    avoid using gnu xml stream when reading or writing XML documents.
+
+ -- Ludovic Claude <ludovic.claude at laposte.net>  Mon, 13 Jul 2009 20:15:14 +0100
+
 maven-repo-helper (0.6) experimental; urgency=low
 
   * Move mh_genrules scripts to the maven-debian-helper package,

Modified: trunk/maven-repo-helper/src/main/share/mh_lib.sh
===================================================================
--- trunk/maven-repo-helper/src/main/share/mh_lib.sh	2009-07-13 19:15:39 UTC (rev 9218)
+++ trunk/maven-repo-helper/src/main/share/mh_lib.sh	2009-07-13 19:18:06 UTC (rev 9219)
@@ -6,7 +6,7 @@
 
 MH_VERSION=${MH_VERSION:-0.6}
 CLASSPATH=/usr/share/java/stax-api.jar:/usr/share/java/stax.jar:/usr/share/java/xml-apis.jar:/usr/share/java/maven-repo-helper.jar
-JAVA_OPTIONS=-Djavax.xml.stream.XMLOutputFactory=com.bea.xml.stream.XMLOutputFactoryBase
+JAVA_OPTIONS="-Djavax.xml.stream.XMLOutputFactory=com.bea.xml.stream.XMLOutputFactoryBase -Djavax.xml.stream.XMLInputFactory=com.bea.xml.stream.MXParserFactory"
 
 parseargs()
 {

Modified: trunk/maven-repo-helper/src/test/java/org/debian/maven/repo/POMCleanerTest.java
===================================================================
--- trunk/maven-repo-helper/src/test/java/org/debian/maven/repo/POMCleanerTest.java	2009-07-13 19:15:39 UTC (rev 9218)
+++ trunk/maven-repo-helper/src/test/java/org/debian/maven/repo/POMCleanerTest.java	2009-07-13 19:18:06 UTC (rev 9219)
@@ -5,7 +5,7 @@
 package org.debian.maven.repo;
 
 import java.io.File;
-import java.io.FileReader;
+import java.io.FileInputStream;
 import java.util.Properties;
 
 /**
@@ -42,7 +42,7 @@
         instance.cleanPom(pom, updatedPom, pomProperties, noParent, false, "maven2");
         assertXMLEqual(read("maven.cleaned"), read(updatedPom));
         Properties pomInfo = new Properties();
-        pomInfo.load(new FileReader(pomProperties));
+        pomInfo.load(new FileInputStream(pomProperties));
         assertEquals("org.apache.maven", pomInfo.get("groupId"));
         assertEquals("maven", pomInfo.get("artifactId"));
         assertEquals("pom", pomInfo.get("type"));
@@ -62,7 +62,7 @@
         instance.cleanPom(pom, updatedPom, pomProperties, noParent, false, "libmodello-java");
         assertXMLEqual(read("modello-core.cleaned"), read(updatedPom));
         Properties pomInfo = new Properties();
-        pomInfo.load(new FileReader(pomProperties));
+        pomInfo.load(new FileInputStream(pomProperties));
         assertEquals("org.codehaus.modello", pomInfo.get("groupId"));
         assertEquals("modello-core", pomInfo.get("artifactId"));
         assertEquals("jar", pomInfo.get("type"));
@@ -72,7 +72,7 @@
         instance.cleanPom(pom, updatedPom, pomProperties, noParent, true, "libmodello-java");
         assertXMLEqual(read("modello-core.keep.cleaned"), read(updatedPom));
         pomInfo = new Properties();
-        pomInfo.load(new FileReader(pomProperties));
+        pomInfo.load(new FileInputStream(pomProperties));
         assertEquals("org.codehaus.modello", pomInfo.get("groupId"));
         assertEquals("modello-core", pomInfo.get("artifactId"));
         assertEquals("jar", pomInfo.get("type"));
@@ -93,7 +93,7 @@
         instance.cleanPom(pom, updatedPom, pomProperties, noParent, false, "libwagon-java");
         assertXMLEqual(read("wagon-http-lightweight.cleaned"), read(updatedPom));
         Properties pomInfo = new Properties();
-        pomInfo.load(new FileReader(pomProperties));
+        pomInfo.load(new FileInputStream(pomProperties));
         assertEquals("org.apache.maven.wagon", pomInfo.get("groupId"));
         assertEquals("wagon-http-lightweight", pomInfo.get("artifactId"));
         assertEquals("jar", pomInfo.get("type"));
@@ -114,7 +114,7 @@
         instance.cleanPom(pom, updatedPom, pomProperties, noParent, false, "libplexus-container-default-java");
         assertXMLEqual(read("plexus-container-default.cleaned"), read(updatedPom));
         Properties pomInfo = new Properties();
-        pomInfo.load(new FileReader(pomProperties));
+        pomInfo.load(new FileInputStream(pomProperties));
         assertEquals("org.codehaus.plexus", pomInfo.get("groupId"));
         assertEquals("plexus-container-default", pomInfo.get("artifactId"));
         assertEquals("jar", pomInfo.get("type"));
@@ -137,7 +137,7 @@
         instance.cleanPom(pom, updatedPom, pomProperties, noParent, false, "libplexus-active-collections-java");
         assertXMLEqual(read("plexus-active-collections.cleaned"), read(updatedPom));
         Properties pomInfo = new Properties();
-        pomInfo.load(new FileReader(pomProperties));
+        pomInfo.load(new FileInputStream(pomProperties));
         assertEquals("org.codehaus.plexus", pomInfo.get("groupId"));
         assertEquals("plexus-active-collections", pomInfo.get("artifactId"));
         assertEquals("jar", pomInfo.get("type"));
@@ -157,7 +157,7 @@
         instance.cleanPom(pom, updatedPom, pomProperties, noParent, false, "libplexus-archiver-java");
         assertXMLEqual(read("plexus-archiver.cleaned"), read(updatedPom));
         Properties pomInfo = new Properties();
-        pomInfo.load(new FileReader(pomProperties));
+        pomInfo.load(new FileInputStream(pomProperties));
         assertEquals("org.codehaus.plexus", pomInfo.get("groupId"));
         assertEquals("plexus-achiver", pomInfo.get("artifactId"));
         assertEquals("jar", pomInfo.get("type"));
@@ -177,7 +177,7 @@
         instance.cleanPom(pom, updatedPom, pomProperties, noParent, false, "libslf4j-java");
         assertXMLEqual(read("slf4j.cleaned"), read(updatedPom));
         Properties pomInfo = new Properties();
-        pomInfo.load(new FileReader(pomProperties));
+        pomInfo.load(new FileInputStream(pomProperties));
         assertEquals("org.slf4j", pomInfo.get("groupId"));
         assertEquals("slf4j-parent", pomInfo.get("artifactId"));
         assertEquals("pom", pomInfo.get("type"));
@@ -198,7 +198,7 @@
         instance.cleanPom(pom, updatedPom, pomProperties, noParent, false, "libcommons-validator-java");
         assertXMLEqual(read("commons-validator.cleaned"), read(updatedPom));
         Properties pomInfo = new Properties();
-        pomInfo.load(new FileReader(pomProperties));
+        pomInfo.load(new FileInputStream(pomProperties));
         assertEquals("commons-validator", pomInfo.get("groupId"));
         assertEquals("commons-validator", pomInfo.get("artifactId"));
         assertEquals("jar", pomInfo.get("type"));