[pkg-java] r8862 - in trunk/maven-repo-helper: debian src/main/bin src/main/share

[Ludovic Claude]

Author: ludovicc-guest
Date: 2009-07-05 13:43:07 +0000 (Sun, 05 Jul 2009)
New Revision: 8862

Modified:
   trunk/maven-repo-helper/debian/rules
   trunk/maven-repo-helper/src/main/bin/mh_checkrepo
   trunk/maven-repo-helper/src/main/bin/mh_cleanpom
   trunk/maven-repo-helper/src/main/bin/mh_patchpoms
   trunk/maven-repo-helper/src/main/share/mh_lib.sh
Log:
* Fix issue with gcj

Modified: trunk/maven-repo-helper/debian/rules
===================================================================
--- trunk/maven-repo-helper/debian/rules	2009-07-05 00:19:23 UTC (rev 8861)
+++ trunk/maven-repo-helper/debian/rules	2009-07-05 13:43:07 UTC (rev 8862)
@@ -11,6 +11,7 @@
 DEB_ANT_BUILDFILE    := ./debian/build.xml
 DEB_ANT_ARGS         := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
 CLASSPATH            := build/$(PACKAGE)-debian.jar:/usr/share/java/stax-api.jar:/usr/share/java/stax.jar:/usr/share/java/xml-apis.jar
+JAVA_OPTIONS         := -Djavax.xml.stream.XMLOutputFactory=com.bea.xml.stream.XMLOutputFactoryBase
 
 # Generation of man pages
 SCRIPTS       := $(wildcard src/main/bin/mh_*)
@@ -46,7 +47,7 @@
 	dh_link -p$(PACKAGE) /usr/share/maven-repo/org/debian/maven/$(PACKAGE)/debian/$(PACKAGE)-debian.jar /usr/share/java/$(PACKAGE).jar
 	dh_installman $(MAN_PAGES)
 	mkdir -p debian/tmp
-	java -cp $(CLASSPATH) org.debian.maven.repo.POMCleaner --no-parent --rules=debian/maven.rules pom.xml debian/tmp/$(PACKAGE)-debian.pom debian/tmp/pom.properties 
+	java -cp $(CLASSPATH) $(JAVA_OPTIONS) org.debian.maven.repo.POMCleaner --no-parent --rules=debian/maven.rules pom.xml debian/tmp/$(PACKAGE)-debian.pom debian/tmp/pom.properties 
 	dh_install -p$(PACKAGE) --sourcedir=debian/tmp $(PACKAGE)-debian.pom \
 		usr/share/maven-repo/org/debian/maven/$(PACKAGE)/debian
 

Modified: trunk/maven-repo-helper/src/main/bin/mh_checkrepo
===================================================================
--- trunk/maven-repo-helper/src/main/bin/mh_checkrepo	2009-07-05 00:19:23 UTC (rev 8861)
+++ trunk/maven-repo-helper/src/main/bin/mh_checkrepo	2009-07-05 13:43:07 UTC (rev 8862)
@@ -30,4 +30,4 @@
 	REPO="/usr/share/maven-repo"
 fi
 
-java -cp $CLASSPATH org.debian.maven.repo.Repository $REPO
+java -cp $CLASSPATH $JAVA_OPTIONS org.debian.maven.repo.Repository $REPO

Modified: trunk/maven-repo-helper/src/main/bin/mh_cleanpom
===================================================================
--- trunk/maven-repo-helper/src/main/bin/mh_cleanpom	2009-07-05 00:19:23 UTC (rev 8861)
+++ trunk/maven-repo-helper/src/main/bin/mh_cleanpom	2009-07-05 13:43:07 UTC (rev 8862)
@@ -133,6 +133,6 @@
 CLEAN_ARGS="--package=${PACKAGE} ${VERBOSE:+--verbose} ${NOPARENT:+--no-parent} ${KEEPVERSION:+--keep-pom-version} ${RULES:+--rules=$RULES} ${PUBLISHED_RULES:+--published-rules=$PUBLISHED_RULES} ${NORULES:+--no-rules}"
 
 if [ -z "$NOACT" ]; then
-	java -cp $CLASSPATH org.debian.maven.repo.POMCleaner $CLEAN_ARGS $POM $TARGET $POM_PROPS
+	java -cp $CLASSPATH $JAVA_OPTIONS org.debian.maven.repo.POMCleaner $CLEAN_ARGS $POM $TARGET $POM_PROPS
 fi
 

Modified: trunk/maven-repo-helper/src/main/bin/mh_patchpoms
===================================================================
--- trunk/maven-repo-helper/src/main/bin/mh_patchpoms	2009-07-05 00:19:23 UTC (rev 8861)
+++ trunk/maven-repo-helper/src/main/bin/mh_patchpoms	2009-07-05 13:43:07 UTC (rev 8862)
@@ -57,6 +57,6 @@
             cp $POM $POM.save
         fi
     done
-	java -cp $CLASSPATH org.debian.maven.repo.POMTransformer $DH_OPTS $MH_ARGS
+	java -cp $CLASSPATH $JAVA_OPTIONS org.debian.maven.repo.POMTransformer $DH_OPTS $MH_ARGS
 fi
 

Modified: trunk/maven-repo-helper/src/main/share/mh_lib.sh
===================================================================
--- trunk/maven-repo-helper/src/main/share/mh_lib.sh	2009-07-05 00:19:23 UTC (rev 8861)
+++ trunk/maven-repo-helper/src/main/share/mh_lib.sh	2009-07-05 13:43:07 UTC (rev 8862)
@@ -5,7 +5,8 @@
 #
 
 MH_VERSION=${MH_VERSION:-0.5}
-CLASSPATH=/usr/share/java/maven-repo-helper.jar:/usr/share/java/stax-api.jar:/usr/share/java/stax.jar:/usr/share/java/xml-apis.jar
+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
 
 parseargs()
 {