Author: ludovicc-guest Date: 2009-07-04 15:48:19 +0000 (Sat, 04 Jul 2009) New Revision: 8843
Modified: trunk/maven-repo-helper/debian/compat trunk/maven-repo-helper/debian/control 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/java/org/debian/maven/repo/POMCleaner.java trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMTransformer.java trunk/maven-repo-helper/src/main/share/mh_lib.sh Log: * Add support for Java 1.4/1.5 Modified: trunk/maven-repo-helper/debian/compat =================================================================== --- trunk/maven-repo-helper/debian/compat 2009-07-04 15:11:56 UTC (rev 8842) +++ trunk/maven-repo-helper/debian/compat 2009-07-04 15:48:19 UTC (rev 8843) @@ -1 +1 @@ -5 +7 Modified: trunk/maven-repo-helper/debian/control =================================================================== --- trunk/maven-repo-helper/debian/control 2009-07-04 15:11:56 UTC (rev 8842) +++ trunk/maven-repo-helper/debian/control 2009-07-04 15:48:19 UTC (rev 8843) @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Ludovic Claude <[email protected]> -Build-Depends: debhelper (>= 5), cdbs, default-jdk, ant, help2man +Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant, help2man, libstax-java Standards-Version: 3.8.1 Vcs-Bzr: lp:~ludovicc/maven-packaging-support/maven-repo-helper Vcs-Browser: http://bazaar.launchpad.net/~ludovicc/maven-packaging-support/maven-repo-helper/files @@ -11,7 +11,7 @@ Package: maven-repo-helper Architecture: all -Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless +Depends: ${misc:Depends}, default-jre-headless | java2-runtime-headless, libstax-java Suggests: maven-debian-helper Description: Helper tools for including Maven metatada in Debian packages Maven is a software project management and comprehension tool. Based on the Modified: trunk/maven-repo-helper/debian/rules =================================================================== --- trunk/maven-repo-helper/debian/rules 2009-07-04 15:11:56 UTC (rev 8842) +++ trunk/maven-repo-helper/debian/rules 2009-07-04 15:48:19 UTC (rev 8843) @@ -6,10 +6,11 @@ PACKAGE := $(DEB_SOURCE_PACKAGE) VERSION := $(DEB_UPSTREAM_VERSION) JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := +DEB_JARS := stax-api xml-apis DEB_ANT_BUILD_TARGET := package 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 # Generation of man pages SCRIPTS := $(wildcard src/main/bin/mh_*) @@ -45,7 +46,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 build/$(PACKAGE)-debian.jar 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) 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-04 15:11:56 UTC (rev 8842) +++ trunk/maven-repo-helper/src/main/bin/mh_checkrepo 2009-07-04 15:48:19 UTC (rev 8843) @@ -30,4 +30,4 @@ REPO="/usr/share/maven-repo" fi -java -cp /usr/share/java/maven-repo-helper.jar org.debian.maven.repo.Repository $REPO +java -cp $CLASSPATH 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-04 15:11:56 UTC (rev 8842) +++ trunk/maven-repo-helper/src/main/bin/mh_cleanpom 2009-07-04 15:48:19 UTC (rev 8843) @@ -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 /usr/share/java/maven-repo-helper.jar org.debian.maven.repo.POMCleaner $CLEAN_ARGS $POM $TARGET $POM_PROPS + java -cp $CLASSPATH 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-04 15:11:56 UTC (rev 8842) +++ trunk/maven-repo-helper/src/main/bin/mh_patchpoms 2009-07-04 15:48:19 UTC (rev 8843) @@ -57,6 +57,6 @@ cp $POM $POM.save fi done - java -cp /usr/share/java/maven-repo-helper.jar org.debian.maven.repo.POMTransformer $DH_OPTS $MH_ARGS + java -cp $CLASSPATH org.debian.maven.repo.POMTransformer $DH_OPTS $MH_ARGS fi Modified: trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMCleaner.java =================================================================== --- trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMCleaner.java 2009-07-04 15:11:56 UTC (rev 8842) +++ trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMCleaner.java 2009-07-04 15:48:19 UTC (rev 8843) @@ -166,7 +166,7 @@ String debianPackage = ""; File rulesFile = null; File publishedRulesFile = new File("debian/maven.publishedRules"); - while (i < args.length && (args[i].trim().startsWith("-") || args[i].trim().isEmpty())) { + while (i < args.length && (args[i].trim().startsWith("-") || args[i].trim().length() == 0)) { String arg = args[i].trim(); if ("--verbose".equals(arg) || "-v".equals(arg)) { verbose = true; @@ -226,7 +226,7 @@ private static int inc(int i, String[] args) { do { i++; - } while (i < args.length && args[i].isEmpty()); + } while (i < args.length && args[i].length() == 0); return i; } } Modified: trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMTransformer.java =================================================================== --- trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMTransformer.java 2009-07-04 15:11:56 UTC (rev 8842) +++ trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMTransformer.java 2009-07-04 15:48:19 UTC (rev 8843) @@ -1,7 +1,3 @@ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ package org.debian.maven.repo; import java.io.BufferedReader; @@ -82,7 +78,7 @@ String line = null; while ((line = lnr.readLine()) != null) { line = line.trim(); - if (!line.isEmpty() && !line.startsWith("#")) { + if (line.length() > 0 && !line.startsWith("#")) { if (verbose) { System.out.println(" " + line); } @@ -300,7 +296,7 @@ } } writer.writeCharacters(value); - afterText = value != null && !value.isEmpty(); + afterText = value != null && value.length() > 0; } break; } @@ -556,7 +552,7 @@ String debianPackage = ""; File rulesFile = null; File publishedRulesFile = new File("debian/maven.publishedRules"); - while (i < args.length && (args[i].trim().startsWith("-") || args[i].trim().isEmpty())) { + while (i < args.length && (args[i].trim().startsWith("-") || args[i].trim().length() == 0)) { String arg = args[i].trim(); if ("--verbose".equals(arg) || "-v".equals(arg)) { verbose = true; @@ -615,7 +611,7 @@ private static int inc(int i, String[] args) { do { i++; - } while (i < args.length && args[i].isEmpty()); + } while (i < args.length && args[i].length() == 0); return i; } } Modified: trunk/maven-repo-helper/src/main/share/mh_lib.sh =================================================================== --- trunk/maven-repo-helper/src/main/share/mh_lib.sh 2009-07-04 15:11:56 UTC (rev 8842) +++ trunk/maven-repo-helper/src/main/share/mh_lib.sh 2009-07-04 15:48:19 UTC (rev 8843) @@ -5,6 +5,7 @@ # 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 parseargs() { _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
