[pkg-java] r15323 - in trunk/maven-repo-helper: . debian doc doc/ref src/main/bin src/main/java/org/debian/maven/repo src/main/share src/test/resources
Ludovic Claude
ludovicc-guest at alioth.debian.org
Tue Nov 1 23:03:52 UTC 2011
Author: ludovicc-guest
Date: 2011-11-01 23:03:51 +0000 (Tue, 01 Nov 2011)
New Revision: 15323
Modified:
trunk/maven-repo-helper/debian/build.properties
trunk/maven-repo-helper/debian/build.xml
trunk/maven-repo-helper/debian/changelog
trunk/maven-repo-helper/debian/control
trunk/maven-repo-helper/debian/copyright
trunk/maven-repo-helper/debian/rules
trunk/maven-repo-helper/doc/ref/mh_install.txt
trunk/maven-repo-helper/doc/tutorial.txt
trunk/maven-repo-helper/pom.xml
trunk/maven-repo-helper/src/main/bin/mh_install
trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/ListOfPOMs.java
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
trunk/maven-repo-helper/src/test/resources/doxia-module-fml.transformed
trunk/maven-repo-helper/src/test/resources/hibernate-validator.transformed
trunk/maven-repo-helper/src/test/resources/plexus-utils2.transformed
Log:
* add --site-xml=<location> option to mh_install and in the
<package>.poms file to explicitly define the location for site.xml.
Warning: this forces existing packages to add this option if they
need to install site.xml
* update the version in the POM and in the documentation
(Closes: #644258)
* run the unit tests when building the package, fix broken tests after the
introduction of relativePath on the parent element of cleaned POM files.
* d/control: add ant-optional, junit, libxmlunit-java, libcommons-io-java to
Build-Depend-Indep
* d/copyright: update fields to match latest DEP5 spec.
Modified: trunk/maven-repo-helper/debian/build.properties
===================================================================
--- trunk/maven-repo-helper/debian/build.properties 2011-11-01 22:55:46 UTC (rev 15322)
+++ trunk/maven-repo-helper/debian/build.properties 2011-11-01 23:03:51 UTC (rev 15323)
@@ -9,7 +9,7 @@
build.javaVersion=1.4
javadoc.dir=${build.directory}/javadoc
classpath.compile=
-classpath.test=
+classpath.test=/usr/share/java/junit.jar:/usr/share/java/commons-io.jar:/usr/share/java/xmlunit.jar
classpath.full.compile=${build.outputDirectory}:${classpath.compile}
classpath.full.test=${build.testOutputDirectory}:${classpath.test}:${build.outputDirectory}:${classpath.compile}
Modified: trunk/maven-repo-helper/debian/build.xml
===================================================================
--- trunk/maven-repo-helper/debian/build.xml 2011-11-01 22:55:46 UTC (rev 15322)
+++ trunk/maven-repo-helper/debian/build.xml 2011-11-01 23:03:51 UTC (rev 15323)
@@ -1,7 +1,9 @@
<project name="pkg-java" default="package" basedir="..">
<property file="debian/build.properties"/>
- <property name="maven.test.skip" value="true"/>
+ <!-- Uncomment to skip the tests
+ <property name="maven.test.skip" value="true"/>
+ -->
<property name="artifactId" value="maven-repo-helper"/>
<target name="init">
Modified: trunk/maven-repo-helper/debian/changelog
===================================================================
--- trunk/maven-repo-helper/debian/changelog 2011-11-01 22:55:46 UTC (rev 15322)
+++ trunk/maven-repo-helper/debian/changelog 2011-11-01 23:03:51 UTC (rev 15323)
@@ -1,3 +1,19 @@
+maven-repo-helper (1.7) natty; urgency=low
+
+ * add --site-xml=<location> option to mh_install and in the
+ <package>.poms file to explicitly define the location for site.xml.
+ Warning: this forces existing packages to add this option if they
+ need to install site.xml
+ * update the version in the POM and in the documentation
+ (Closes: #644258)
+ * run the unit tests when building the package, fix broken tests after the
+ introduction of relativePath on the parent element of cleaned POM files.
+ * d/control: add ant-optional, junit, libxmlunit-java, libcommons-io-java to
+ Build-Depend-Indep
+ * d/copyright: update fields to match latest DEP5 spec.
+
+ -- Ludovic Claude <ludovic.claude at laposte.net> Tue, 01 Nov 2011 16:32:39 +0200
+
maven-repo-helper (1.6) unstable; urgency=low
[ Ludovic Claude ]
Modified: trunk/maven-repo-helper/debian/control
===================================================================
--- trunk/maven-repo-helper/debian/control 2011-11-01 22:55:46 UTC (rev 15322)
+++ trunk/maven-repo-helper/debian/control 2011-11-01 23:03:51 UTC (rev 15323)
@@ -3,7 +3,8 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Ludovic Claude <ludovic.claude at laposte.net>, Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant, help2man, markdown, libstax-java
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant, help2man, markdown
+Build-Depends-Indep: ant-optional, libstax-java, junit, libxmlunit-java, libcommons-io-java
Standards-Version: 3.9.2
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-repo-helper/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-repo-helper/
Modified: trunk/maven-repo-helper/debian/copyright
===================================================================
--- trunk/maven-repo-helper/debian/copyright 2011-11-01 22:55:46 UTC (rev 15322)
+++ trunk/maven-repo-helper/debian/copyright 2011-11-01 23:03:51 UTC (rev 15323)
@@ -1,6 +1,6 @@
-Format-Specification: http://dep.debian.net/deps/dep5/
-Name: Maven Repo support
-Maintainer: Ludovic Claude
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: Maven Repo support
+Upstream-Contact: Ludovic Claude <ludovic.claude at laposte.net>
Source: https://launchpad.net/maven-packaging-support/
Files: *
Modified: trunk/maven-repo-helper/debian/rules
===================================================================
--- trunk/maven-repo-helper/debian/rules 2011-11-01 22:55:46 UTC (rev 15322)
+++ trunk/maven-repo-helper/debian/rules 2011-11-01 23:03:51 UTC (rev 15323)
@@ -6,11 +6,11 @@
PACKAGE := $(DEB_SOURCE_PACKAGE)
VERSION := $(DEB_UPSTREAM_VERSION)
JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := stax-api xml-apis
+DEB_JARS := ant-junit 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
+CLASSPATH := /usr/share/java/ant-junit.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
@@ -69,7 +69,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/.mh
- java -cp $(CLASSPATH) $(JAVA_OPTIONS) org.debian.maven.repo.POMCleaner --no-parent --has-package-version --rules=debian/maven.rules pom.xml \
+ java -cp build/$(PACKAGE)-debian.jar:$(CLASSPATH) $(JAVA_OPTIONS) org.debian.maven.repo.POMCleaner --no-parent --has-package-version --rules=debian/maven.rules pom.xml \
debian/.mh/$(PACKAGE)-debian.pom debian/.mh/pom.properties
dh_install -p$(PACKAGE) --sourcedir=debian/.mh $(PACKAGE)-debian.pom \
usr/share/maven-repo/org/debian/maven/$(PACKAGE)/debian
Modified: trunk/maven-repo-helper/doc/ref/mh_install.txt
===================================================================
--- trunk/maven-repo-helper/doc/ref/mh_install.txt 2011-11-01 22:55:46 UTC (rev 15322)
+++ trunk/maven-repo-helper/doc/ref/mh_install.txt 2011-11-01 23:03:51 UTC (rev 15323)
@@ -39,4 +39,35 @@
Internally, mh\_installpom is used to install the POM file, mh\_installjar is used to install the jar if --artifact is supplied.
If a project or sub-project contains the file src/site/site.xml, then it will be installed with mh\_installsite.
+The file $package.poms contains the list of POM files and their releated artifacts to install.
+The format of the $package.poms file is:
+ <path to pom file> [option]*
+ <path to second pom file> [option]*
+ [...]
+
+where option can be:
+
+ --ignore: ignore this POM and its artifact if any
+ --ignore-pom: don't install the POM. To use on POM files that are created
+ temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
+ --no-parent: remove the <parent> tag from the POM
+ --package=<package>: an alternative package to use when installing this POM
+ and its artifact
+ --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+ of the version for the package.
+ --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+ during a clean operation with mh_cleanpom or mh_installpom
+ --artifact=<path>: path to the build artifact associated with this POM,
+ it will be installed when using the command mh_install. [mh_install]
+ --java-lib: install the jar into /usr/share/java to comply with Debian
+ packaging guidelines
+ --usj-name=<name>: name to use when installing the library in /usr/share/java
+ --usj-version=<version>: version to use when installing the library in /usr/share/java
+ --no-usj-versionless: don't install the versionless link in /usr/share/java
+ --dest-jar=<path>: the destination for the real jar.
+ It will be installed with mh_install. [mh_install]
+ --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+ --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+ Empty by default. [mh_install]
+
\ No newline at end of file
Modified: trunk/maven-repo-helper/doc/tutorial.txt
===================================================================
--- trunk/maven-repo-helper/doc/tutorial.txt 2011-11-01 22:55:46 UTC (rev 15322)
+++ trunk/maven-repo-helper/doc/tutorial.txt 2011-11-01 23:03:51 UTC (rev 15323)
@@ -34,7 +34,7 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Ludovic Claude <ludovicc at debian.org>
- Build-Depends: debhelper (>= 8), maven-repo-helper (>= 1.6), default-jdk
+ Build-Depends: debhelper (>= 8), maven-repo-helper (>= 1.6.1), default-jdk
Build-Depends-Indep: junit, libosgi-ee-minimum-api-java (>= 1.2.1)
Standards-Version: 3.9.2
Homepage: http://www.aqute.biz/Code/Bnd
@@ -84,7 +84,7 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Ludovic Claude <ludovic.claude at laposte.net>
- Build-Depends: debhelper (>= 7), default-jdk, maven-repo-helper (>= 1.6), ant-optional, maven-ant-helper (>> 6.7)
+ Build-Depends: debhelper (>= 7), default-jdk, maven-repo-helper (>= 1.6.1), ant-optional, maven-ant-helper (>= 7)
Build-Depends-Indep: libplexus-parent-java (>= 2.0.6), junit (>= 3.8.2), default-jdk-doc
Standards-Version: 3.9.2
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-utils2
@@ -177,7 +177,7 @@
debhelper (>= 7.0.50~), rhino (>= 1.7R1-2), libjtidy-java (>= 7+svn20070309-2),
libgnujaf-java (>= 1.1.1-4), junit (>= 3.8.2), libgnumail-java (>= 1.1.2-2),
libservlet2.4-java (>= 5.0.30-8), libxerces2-java (>= 2.9.1-2),
- libnekohtml-java (>= 0.9.5+dfsg-1.1), maven-repo-helper (>= 1.6)
+ libnekohtml-java (>= 0.9.5+dfsg-1.1), maven-repo-helper (>= 1.6.1)
Standards-Version: 3.9.2
Homepage: http://httpunit.org/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/httpunit/
@@ -230,7 +230,7 @@
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Torsten Werner <twerner at debian.org>, Ludovic Claude <ludovic.claude at laposte.net>,
Michael Koch <konqueror at gmx.de>, Damien Raude-Morvan <drazzib at debian.org>
- Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-ant-helper (>> 6.7), maven-repo-helper (>= 1.5), ant-optional, help2man
+ Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-ant-helper (>= 7), maven-repo-helper (>= 1.6.1), ant-optional, help2man
Build-Depends-Indep: junit, libmaven-plugin-tools-java, libplexus-velocity-java
Standards-Version: 3.9.2
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-debian-helper
@@ -301,7 +301,7 @@
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Torsten Werner <twerner at debian.org>, Ludovic Claude <ludovic.claude at laposte.net>
Build-Depends: debhelper (>= 5), cdbs (>= 0.4.5.3), default-jdk
- Build-Depends-Indep: maven-repo-helper (>> 0.5), maven-ant-helper (>> 4), ant, ant-optional,
+ Build-Depends-Indep: maven-repo-helper (>= 1.6.1), maven-ant-helper (>= 7), ant, ant-optional,
libplexus-utils-java, libplexus-containers-java
Standards-Version: 3.8.1
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-io
Modified: trunk/maven-repo-helper/pom.xml
===================================================================
--- trunk/maven-repo-helper/pom.xml 2011-11-01 22:55:46 UTC (rev 15322)
+++ trunk/maven-repo-helper/pom.xml 2011-11-01 23:03:51 UTC (rev 15323)
@@ -5,7 +5,7 @@
<artifactId>maven-repo-helper</artifactId>
<name>Maven Repo helper</name>
<packaging>jar</packaging>
- <version>1.6</version>
+ <version>1.6.1</version>
<description>Provides support for managing the Maven repository in a Debian distribution.</description>
<inceptionYear>2009</inceptionYear>
Modified: trunk/maven-repo-helper/src/main/bin/mh_install
===================================================================
--- trunk/maven-repo-helper/src/main/bin/mh_install 2011-11-01 22:55:46 UTC (rev 15322)
+++ trunk/maven-repo-helper/src/main/bin/mh_install 2011-11-01 23:03:51 UTC (rev 15323)
@@ -80,12 +80,18 @@
if [[ -n "$POM" ]]; then
POM_DIR=$(dirname $POM)
ARTIFACT=
+ SITE_XML=
C=1
_opt=$(eval echo '$OPT'$C)
while [ -n "$_opt" ]; do
if [ "--artifact" = "${_opt%%=*}" ]; then
export ARTIFACT=${_opt##--artifact=}
- # Unset the option where we found the artifact
+ fi
+ if [ "--site-xml" = "${_opt%%=*}" ]; then
+ export SITE_XML=${_opt##--site-xml=}
+ fi
+ if [ "--artifact" = "${_opt%%=*}" ] || [ "--site-xml" = "${_opt%%=*}" ]; then
+ # Unset the option where we found the matching option
eval OPT$C=
# shift all following options
while [ -n "$_opt" ]; do
@@ -109,11 +115,11 @@
fi
mh_installjar --skip-clean-pom $OPT1 $OPT2 $OPT3 $OPT4 $OPT5 $OPT6 $OPT7 $OPT8 $OPT9 $OPT10 $DH_OPTS $MH_ARGS $POM $ARTIFACT
fi
- if [[ -f $POM_DIR/src/site/site.xml ]]; then
+ if [[ -n "$SITE_XML" ]]; then
if [[ ! -z "$VERBOSE" || "$DH_VERBOSE" = "1" ]]; then
- echo mh_installsite --skip-clean-pom $OPT1 $OPT2 $OPT3 $OPT4 $OPT5 $OPT6 $OPT7 $OPT8 $OPT9 $OPT10 $DH_OPTS $MH_ARGS $POM $POM_DIR/src/site/site.xml
+ echo mh_installsite --skip-clean-pom $OPT1 $OPT2 $OPT3 $OPT4 $OPT5 $OPT6 $OPT7 $OPT8 $OPT9 $OPT10 $DH_OPTS $MH_ARGS $POM ${SITE_XML}
fi
- mh_installsite --skip-clean-pom $OPT1 $OPT2 $OPT3 $OPT4 $OPT5 $OPT6 $OPT7 $OPT8 $OPT9 $OPT10 $DH_OPTS $MH_ARGS $POM $POM_DIR/src/site/site.xml
+ mh_installsite --skip-clean-pom $OPT1 $OPT2 $OPT3 $OPT4 $OPT5 $OPT6 $OPT7 $OPT8 $OPT9 $OPT10 $DH_OPTS $MH_ARGS $POM ${SITE_XML}
fi
fi
fi
Modified: trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/ListOfPOMs.java
===================================================================
--- trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/ListOfPOMs.java 2011-11-01 22:55:46 UTC (rev 15322)
+++ trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/ListOfPOMs.java 2011-11-01 23:03:51 UTC (rev 15323)
@@ -208,7 +208,9 @@
} else if (option.startsWith("--dest-jar=")) {
options.setDestJar(option.substring("--dest-jar=".length()));
} else if (option.startsWith("--classifier=")) {
- options.setUsjName(option.substring("--classifier=".length()));
+ options.setClassifier(option.substring("--classifier=".length()));
+ } else if (option.startsWith("--site-xml=")) {
+ options.setSiteXml(option.substring("--site-xml=".length()));
} else if ("--ignore-pom".equals(option)) {
options.setIgnorePOM(true);
}
@@ -235,8 +237,8 @@
out.println("# <path to pom file> [option]*");
out.println("# where option can be:");
out.println("# --ignore: ignore this POM and its artifact if any");
- out.println("# --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created");
- out.println("# temporarily for certain artifacts such as Javadoc jars.");
+ out.println("# --ignore-pom: don't install the POM. To use on POM files that are created");
+ out.println("# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]");
out.println("# --no-parent: remove the <parent> tag from the POM");
out.println("# --package=<package>: an alternative package to use when installing this POM");
out.println("# and its artifact");
@@ -245,15 +247,17 @@
out.println("# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM");
out.println("# during a clean operation with mh_cleanpom or mh_installpom");
out.println("# --artifact=<path>: path to the build artifact associated with this POM,");
- out.println("# it will be installed when using the command mh_install");
+ out.println("# it will be installed when using the command mh_install. [mh_install]");
out.println("# --java-lib: install the jar into /usr/share/java to comply with Debian");
out.println("# packaging guidelines");
out.println("# --usj-name=<name>: name to use when installing the library in /usr/share/java");
out.println("# --usj-version=<version>: version to use when installing the library in /usr/share/java");
out.println("# --no-usj-versionless: don't install the versionless link in /usr/share/java");
- out.println("# --dest-jar=<path>: the destination for the real jar");
- out.println("# it will be installed with mh_install.");
+ out.println("# --dest-jar=<path>: the destination for the real jar.");
+ out.println("# It will be installed with mh_install. [mh_install]");
out.println("# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.");
+ out.println("# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.");
+ out.println("# Empty by default. [mh_install]");
out.println("#");
for (Iterator i = pomList.iterator(); i.hasNext();) {
String pomPath = (String) i.next();
@@ -281,6 +285,7 @@
private String destJar;
private boolean noUsjVersionless;
private String classifier;
+ private String siteXml;
public boolean isIgnore() {
return ignore;
@@ -386,6 +391,14 @@
this.classifier = classifier;
}
+ public String getSiteXml() {
+ return siteXml;
+ }
+
+ public void setSiteXml(String siteXml) {
+ this.siteXml = siteXml;
+ }
+
public String toString() {
if (ignore) {
return " --ignore";
@@ -424,6 +437,9 @@
if (classifier != null) {
options += " --classifier=" + classifier;
}
+ if (siteXml != null) {
+ options += " --site-xml=" + siteXml;
+ }
if (ignorePOM) {
options += " --ignore-pom";
}
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 2011-11-01 22:55:46 UTC (rev 15322)
+++ trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMCleaner.java 2011-11-01 23:03:51 UTC (rev 15323)
@@ -103,6 +103,9 @@
}
protected boolean isWriteIgnoredElement(String element, List path, Dependency dependency) {
+ if ("relativePath".equals(element) && path.size() == 0) {
+ return true;
+ }
boolean ignore = super.isWriteIgnoredElement(element, path, dependency);
if (keepAllElements || ignore) {
return ignore;
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 2011-11-01 22:55:46 UTC (rev 15322)
+++ trunk/maven-repo-helper/src/main/java/org/debian/maven/repo/POMTransformer.java 2011-11-01 23:03:51 UTC (rev 15323)
@@ -715,7 +715,7 @@
writer.writeStartElement("version");
writer.writeCharacters(parent.getVersion());
writer.writeEndElement();
- if (null != parent.getRelativePath()) {
+ if (!isWriteIgnoredElement("relativePath", new ArrayList(), null) && null != parent.getRelativePath()) {
indent(writer, inLevel + 1);
writer.writeStartElement("relativePath");
writer.writeCharacters(parent.getRelativePath());
Modified: trunk/maven-repo-helper/src/main/share/mh_lib.sh
===================================================================
--- trunk/maven-repo-helper/src/main/share/mh_lib.sh 2011-11-01 22:55:46 UTC (rev 15322)
+++ trunk/maven-repo-helper/src/main/share/mh_lib.sh 2011-11-01 23:03:51 UTC (rev 15323)
@@ -4,7 +4,7 @@
# - package selection
#
-MH_VERSION=${MH_VERSION:-1.6}
+MH_VERSION=${MH_VERSION:-1.6.1}
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 -Djavax.xml.stream.XMLInputFactory=com.bea.xml.stream.MXParserFactory"
Modified: trunk/maven-repo-helper/src/test/resources/doxia-module-fml.transformed
===================================================================
--- trunk/maven-repo-helper/src/test/resources/doxia-module-fml.transformed 2011-11-01 22:55:46 UTC (rev 15322)
+++ trunk/maven-repo-helper/src/test/resources/doxia-module-fml.transformed 2011-11-01 23:03:51 UTC (rev 15323)
@@ -27,6 +27,7 @@
<groupId>org.apache.maven.doxia</groupId>
<artifactId>doxia-modules</artifactId>
<version>debian</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<properties>
<debian.hasPackageVersion/>
Modified: trunk/maven-repo-helper/src/test/resources/hibernate-validator.transformed
===================================================================
--- trunk/maven-repo-helper/src/test/resources/hibernate-validator.transformed 2011-11-01 22:55:46 UTC (rev 15322)
+++ trunk/maven-repo-helper/src/test/resources/hibernate-validator.transformed 2011-11-01 23:03:51 UTC (rev 15323)
@@ -9,6 +9,7 @@
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator-parent</artifactId>
<version>4.0.2.GA</version>
+ <relativePath>../pom.xml</relativePath>
</parent>
<properties>
<debian.hasPackageVersion/>
Modified: trunk/maven-repo-helper/src/test/resources/plexus-utils2.transformed
===================================================================
--- trunk/maven-repo-helper/src/test/resources/plexus-utils2.transformed 2011-11-01 22:55:46 UTC (rev 15322)
+++ trunk/maven-repo-helper/src/test/resources/plexus-utils2.transformed 2011-11-01 23:03:51 UTC (rev 15323)
@@ -1,4 +1,4 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright The Codehaus Foundation.
@@ -24,9 +24,10 @@
<groupId>org.codehaus.plexus</groupId>
<artifactId>plexus</artifactId>
<version>2.x</version>
+ <relativePath>../pom/pom.xml</relativePath>
</parent>
<properties>
- <debian.hasPackageVersion/>
+ <debian.hasPackageVersion/>
<debian.originalVersion>2.0.5</debian.originalVersion>
<debian.package>libplexus-utils2-java</debian.package>
</properties>
More information about the pkg-java-commits
mailing list