[pkg-java] r13043 - in trunk/maven-debian-helper: . bin debian etc maven-build-nodocs maven-debian-helper maven-debian-plugin maven-packager-utils maven-packager-utils/src/main/java/org/debian/maven/packager maven-packager-utils/src/main/resources maven-packager-utils/src/test/java/org/debian/maven/packager maven-packager-utils/src/test/resources maven-packager-utils/src/test/resources/openmrs maven-packager-utils/src/test/resources/openmrs/api maven-packager-utils/src/test/resources/plexus-active-collections maven-packager-utils/src/test/resources/plexus-utils2 maven-packager-utils/src/test/resources/repository maven-packager-utils/src/test/resources/repository/junit maven-packager-utils/src/test/resources/repository/junit/junit maven-packager-utils/src/test/resources/repository/junit/junit/3.8.2 maven-packager-utils/src/test/resources/repository/junit/junit/3.x maven-packager-utils/src/test/resources/repository/junit/junit/4.8.2 maven-packager-utils/src/test/resources/repository/junit/junit/4.x maven-packager-utils/src/test/resources/repository/org maven-packager-utils/src/test/resources/repository/org/apache maven-packager-utils/src/test/resources/repository/org/apache/maven maven-packager-utils/src/test/resources/repository/org/apache/maven/plugins maven-packager-utils/src/test/resources/repository/org/apache/maven/plugins/maven-compiler-plugin maven-packager-utils/src/test/resources/repository/org/apache/maven/plugins/maven-compiler-plugin/2.0.2 maven-packager-utils/src/test/resources/repository/org/apache/maven/plugins/maven-javadoc-plugin maven-packager-utils/src/test/resources/repository/org/apache/maven/plugins/maven-javadoc-plugin/2.6.1 maven-packager-utils/src/test/resources/repository/org/apache/maven/plugins/maven-surefire-plugin maven-packager-utils/src/test/resources/repository/org/apache/maven/plugins/maven-surefire-plugin/2.4.3 maven-packager-utils/src/test/resources/repository/org/apache/maven/surefire maven-packager-utils/src/test/resources/repository/org/apache/maven/surefire/surefire maven-packager-utils/src/test/resources/repository/org/apache/maven/surefire/surefire/2.4.3 maven-packager-utils/src/test/resources/repository/org/apache/maven/surefire/surefire/debian maven-packager-utils/src/test/resources/repository/org/codehaus maven-packager-utils/src/test/resources/repository/org/codehaus/plexus maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus/2.0.7 maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus/2.x maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-component-api maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-component-api/1.0-alpha-22 maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-component-api/debian maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-container-default maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1 maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-container-default/1.0-beta-3.0.7 maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-container-default/debian maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-maven-plugin maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-maven-plugin/1.3.8 share/cdbs/1/class
Ludovic Claude
ludovicc-guest at alioth.debian.org
Fri Oct 29 23:19:18 UTC 2010
Author: ludovicc-guest
Date: 2010-10-29 23:19:18 +0000 (Fri, 29 Oct 2010)
New Revision: 13043
Added:
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/libplexus-utils2-java.ignoreRules
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/libplexus-utils2-java.poms
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/libplexus-utils2-java.rules
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/libplexus-utils2-java.substvars
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/openmrs-api.poms
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/openmrs.poms
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/openmrs.rules
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/openmrs.substvars
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/openmrs/
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/openmrs/api/
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/openmrs/api/pom.xml
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/openmrs/pom.xml
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/plexus-active-collections/
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/plexus-active-collections/pom.xml
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/plexus-utils2/
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/plexus-utils2/pom.xml
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/junit/
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/junit/junit/
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/junit/junit/3.8.2/
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/junit/junit/3.8.2/junit-3.8.2.jar
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/junit/junit/3.8.2/junit-3.8.2.pom
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/junit/junit/3.x/
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/junit/junit/3.x/junit-3.x.jar
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/junit/junit/3.x/junit-3.x.pom
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/junit/junit/4.8.2/
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/junit/junit/4.8.2/junit-4.8.2.jar
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/junit/junit/4.8.2/junit-4.8.2.pom
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/junit/junit/4.x/
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/junit/junit/4.x/junit-4.x.jar
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/junit/junit/4.x/junit-4.x.pom
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/plugins/
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/plugins/maven-compiler-plugin/
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/plugins/maven-compiler-plugin/2.0.2/
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/plugins/maven-compiler-plugin/2.0.2/maven-compiler-plugin-2.0.2.jar
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/plugins/maven-compiler-plugin/2.0.2/maven-compiler-plugin-2.0.2.pom
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/plugins/maven-javadoc-plugin/
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/plugins/maven-javadoc-plugin/2.6.1/
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/plugins/maven-javadoc-plugin/2.6.1/maven-javadoc-plugin-2.6.1.jar
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/plugins/maven-javadoc-plugin/2.6.1/maven-javadoc-plugin-2.6.1.pom
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/plugins/maven-surefire-plugin/
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/plugins/maven-surefire-plugin/2.4.3/
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/plugins/maven-surefire-plugin/2.4.3/maven-surefire-plugin-2.4.3.jar
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/plugins/maven-surefire-plugin/2.4.3/maven-surefire-plugin-2.4.3.pom
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/surefire/
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/surefire/surefire/
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/surefire/surefire/2.4.3/
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/surefire/surefire/2.4.3/surefire-2.4.3.pom
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/surefire/surefire/debian/
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/surefire/surefire/debian/surefire-debian.pom
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-component-api/
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-component-api/1.0-alpha-22/
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-component-api/1.0-alpha-22/plexus-component-api-1.0-alpha-22.jar
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-component-api/1.0-alpha-22/plexus-component-api-1.0-alpha-22.pom
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-component-api/debian/
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-component-api/debian/plexus-component-api-debian.jar
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-component-api/debian/plexus-component-api-debian.pom
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-container-default/
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.jar
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha/
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha/plexus-container-default-1.0-alpha.jar
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha/plexus-container-default-1.0-alpha.pom
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-container-default/1.0-beta-3.0.7/
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-container-default/1.0-beta-3.0.7/plexus-container-default-1.0-beta-3.0.7.jar
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-container-default/1.0-beta-3.0.7/plexus-container-default-1.0-beta-3.0.7.pom
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-container-default/debian/
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-container-default/debian/plexus-container-default-debian.jar
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-container-default/debian/plexus-container-default-debian.pom
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-maven-plugin/
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-maven-plugin/1.3.8/
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-maven-plugin/1.3.8/plexus-maven-plugin-1.3.8.jar
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-maven-plugin/1.3.8/plexus-maven-plugin-1.3.8.pom
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus/
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus/2.0.7/
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus/2.x/
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus/2.x/plexus-2.x.pom
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/root.dir
Modified:
trunk/maven-debian-helper/bin/mh_genrules
trunk/maven-debian-helper/bin/mh_lspoms
trunk/maven-debian-helper/bin/mh_make
trunk/maven-debian-helper/bin/mh_resolve_dependencies
trunk/maven-debian-helper/debian/build.xml
trunk/maven-debian-helper/debian/changelog
trunk/maven-debian-helper/debian/control
trunk/maven-debian-helper/debian/maven-debian-helper.poms
trunk/maven-debian-helper/debian/rules
trunk/maven-debian-helper/etc/fake-poms.conf
trunk/maven-debian-helper/maven-build-nodocs/pom.xml
trunk/maven-debian-helper/maven-debian-helper/pom.xml
trunk/maven-debian-helper/maven-debian-plugin/pom.xml
trunk/maven-debian-helper/maven-packager-utils/pom.xml
trunk/maven-debian-helper/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesMojo.java
trunk/maven-debian-helper/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java
trunk/maven-debian-helper/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java
trunk/maven-debian-helper/maven-packager-utils/src/main/resources/control.ant.vm
trunk/maven-debian-helper/maven-packager-utils/src/main/resources/control.vm
trunk/maven-debian-helper/maven-packager-utils/src/main/resources/copyright.vm
trunk/maven-debian-helper/maven-packager-utils/src/main/resources/rules.ant.vm
trunk/maven-debian-helper/maven-packager-utils/src/test/java/org/debian/maven/packager/DependenciesSolverTest.java
trunk/maven-debian-helper/maven-packager-utils/src/test/resources/libplexus-active-collections-java.substvars
trunk/maven-debian-helper/pom.xml
trunk/maven-debian-helper/share/cdbs/1/class/maven-vars.mk
trunk/maven-debian-helper/share/cdbs/1/class/maven.mk
Log:
* ${maven:Depends} and similar substitution vars: add
version constraints when possible
* Use dpkg to resolve the dependent packages in ${maven:DocDepends}
(Closes: #588114)
* Use dpkg to search for the documentation package (Closes: #588114)
* mh_make: suggest installing missing dependencies which are not ignored
during the build
* add property debian.hasPackageVersion property, if true in the
repository POM then other packages depending on a POM with this property on
will have an addition version constraint generated in ${maven:Depends}
* mh_make: detect when debian.hasPackageVersion can be used, ask for the
upstream version of the package for confirmation.
* d/control: add Recommends: on subversion as it's used by mh_make,
add Build-Depends on libmaven-plugin-tools-java and junit
* d/build.xml: fix build when previous versions of this package are
not already installed on the system.
* d/rules: use debian/.mh instead of debian/tmp as temp directory to better
comply with Debian policy.
Modified: trunk/maven-debian-helper/bin/mh_genrules
===================================================================
--- trunk/maven-debian-helper/bin/mh_genrules 2010-10-29 23:12:54 UTC (rev 13042)
+++ trunk/maven-debian-helper/bin/mh_genrules 2010-10-29 23:19:18 UTC (rev 13043)
@@ -1,5 +1,6 @@
#!/bin/bash --
+MH_VERSION=$(ls /usr/share/maven-repo/org/debian/maven/maven-packager-utils/ | sed 's|/||')
. /usr/share/maven-repo-helper/mh_lib.sh
syntax()
Modified: trunk/maven-debian-helper/bin/mh_lspoms
===================================================================
--- trunk/maven-debian-helper/bin/mh_lspoms 2010-10-29 23:12:54 UTC (rev 13042)
+++ trunk/maven-debian-helper/bin/mh_lspoms 2010-10-29 23:19:18 UTC (rev 13043)
@@ -1,5 +1,6 @@
#!/bin/bash --
+MH_VERSION=$(ls /usr/share/maven-repo/org/debian/maven/maven-packager-utils/ | sed 's|/||')
. /usr/share/maven-repo-helper/mh_lib.sh
syntax()
@@ -19,6 +20,8 @@
echo -e "\t Only maven.rules will be created, assuming that it"
echo -e "\t did not exist before."
echo -e "\t-n --non-interactive: non interactive session, don't ask questions."
+ echo -e "\t-o --offline: don't ever connect to the internet, for Debian build"
+ echo -e "\t compatibility."
echo -e ""
echo -e "You need to execute it on the unpacked origial source tree, merged with the"
echo -e "debian/ folder. It will create the file debian/<binary package>.poms which"
@@ -27,17 +30,18 @@
echo -e ""
echo -e "The contents of debian/<binary package>.poms should be:"
echo -e "\t* one POM file location per line,"
- echo -e "\t* optionaly, the location is followed by the option --no-parent"
+ echo -e "\t* optionally, the location is followed by the option --no-parent"
echo -e "\t to indicate that if this POM inherits from a parent, the parent"
echo -e "\t element will be removed."
exit 1
}
-ARGS="p package f force n non-interactive" parseargs "$@"
+ARGS="p package f force n non-interactive o offline" parseargs "$@"
PACKAGE=$(getarg p package)
FORCE=$(getarg f force)
NON_INTERACTIVE=$(getarg n non-interactive)
+OFFLINE=$(getarg o offline)
if [ -z "$PACKAGE" ]; then
if [ "$ARGC" -gt "0" ]; then
@@ -51,7 +55,7 @@
echo "debian/$PACKAGE.poms already exist. Please delete it if you want to regenerate it."
else
mkdir -p debian
- java -cp /usr/share/java/maven-project.jar:/usr/share/java/maven-repo-helper.jar:/usr/share/java/maven-packager-utils.jar org.debian.maven.packager.DependenciesSolver ${NON_INTERACTIVE:+--non-interactive} --package=$PACKAGE --maven-repo=/usr/share/maven-repo
+ java -cp /usr/share/java/maven-project.jar:/usr/share/java/maven-repo-helper.jar:/usr/share/java/maven-packager-utils.jar org.debian.maven.packager.DependenciesSolver ${NON_INTERACTIVE:+--non-interactive} ${OFFLINE:+--offline} --package=$PACKAGE --maven-repo=/usr/share/maven-repo
rm debian/$PACKAGE.substvars
echo "The list of POM files is now in debian/$PACKAGE.poms"
fi
Modified: trunk/maven-debian-helper/bin/mh_make
===================================================================
--- trunk/maven-debian-helper/bin/mh_make 2010-10-29 23:12:54 UTC (rev 13042)
+++ trunk/maven-debian-helper/bin/mh_make 2010-10-29 23:19:18 UTC (rev 13043)
@@ -69,12 +69,18 @@
ANT=$(getarg a ant)
FROM_SVN=$(getarg s from-svn)
+if [ "$FROM_SVN" == "true" ]; then
+ echo "The syntax for the --for-svn option is --from-svn=<url>, please try again"
+ exit 1
+fi
+
if [ -z "$PACKAGE" ]; then
PACKAGE="$(basename $(pwd) | sed 's/-[0-9\.].*//')"
- if [ -n "$FROM_SVN" ]; then
- PACKAGE=$(basename ${FROM_SVN%%/tags/*} | sed 's/-[0-9\.].*//' )
- fi
- echo
+ if [ -n "$FROM_SVN" ]; then
+ PACKAGE=$(echo "$FROM_SVN" | sed 's/-[0-9].*//')
+ PACKAGE=$(echo "$PACKAGE" | sed 's|.*/||' )
+ fi
+ echo
echo "Enter the name of the new Debian source package. If empty, it will defaults to $PACKAGE"
read -p ">" USER_PACKAGE
if [ -n "$USER_PACKAGE" ]; then
@@ -134,22 +140,23 @@
java -cp /usr/share/java/maven-project.jar:/usr/share/java/maven-repo-helper.jar:/usr/share/java/maven-packager-utils.jar:/usr/share/maven2/lib/maven-debian-uber.jar org.debian.maven.packager.DependenciesSolver --package="$BIN_PACKAGE" ${ANT:+--ant} ${GEN_JAVADOC:+--generate-javadoc} ${RUN_TESTS:+--run-tests} --maven-repo=/usr/share/maven-repo
if [ $? != 0 ]; then
- return
+ exit 1
fi
+eval $(cat debian/$BIN_PACKAGE.substvars | sed -e 's/maven\./maven_/' | grep maven_UpstreamPackageVersion)
+
mh_patchpoms -p$BIN_PACKAGE -rdebian/maven.rules -idebian/maven.ignoreRules --keep-pom-version
mvn org.debian.maven:maven-packager-utils:$MH_VERSION:generate -Demail="$DEBEMAIL" -Dpackager="$DEBFULLNAME" -DpackagerLicense="$DEBLICENSE" -Dpackage="$PACKAGE" -Dbin.package="$BIN_PACKAGE" -DrunTests="$RUN_TESTS" -DgenerateJavadoc="$GEN_JAVADOC" -Dmaven.repo.local=/usr/share/maven-repo ${ANT:+-DpackageType=ant} ${FROM_SVN:+-DdownloadUrl=scm:svn:$FROM_SVN} --offline
-rm -f debian/*.substvars
+if [ $? != 0 ]; then
+ exit 1
+fi
if [ ! -f debian/changelog ]; then
- mkdir -p debian/tmp
- mh_cleanpom -p$PACKAGE pom.xml.save debian/tmp/pom.xml debian/tmp/pom.properties
- source debian/tmp/pom.properties
- rm -R debian/tmp
- version=$(echo $version | sed -re's/-(alpha|beta)-?/~\1/')
- dch --create --newversion=${version}-1 --package=$PACKAGE "Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP>"
+ debianVersion=$(echo ${maven_UpstreamPackageVersion} | sed -re's/-(alpha|beta)-?/~\1/')
+ dch --create --newversion=${debianVersion}-1 --package=$PACKAGE "Initial release (Closes: #nnnn) <nnnn is the bug number of your ITP>"
fi
mh_unpatchpoms -p$BIN_PACKAGE
+rm -f debian/*.substvars
\ No newline at end of file
Modified: trunk/maven-debian-helper/bin/mh_resolve_dependencies
===================================================================
--- trunk/maven-debian-helper/bin/mh_resolve_dependencies 2010-10-29 23:12:54 UTC (rev 13042)
+++ trunk/maven-debian-helper/bin/mh_resolve_dependencies 2010-10-29 23:19:18 UTC (rev 13043)
@@ -19,6 +19,8 @@
echo -e "\t-p<package> --package=<package>: name of the package"
echo -e "\t-a --ant: use Ant for the packaging instead of Maven"
echo -e "\t-n --non-interactive: non interactive mode, don't ask questions"
+ echo -e "\t-o --offline: don't ever connect to the internet, for Debian build"
+ echo -e "\t compatibility."
echo -e "\t-v --verbose: show more information while running"
echo -e ""
echo -e "Description:"
@@ -35,11 +37,12 @@
exit 1
}
-ARGS="p package a ant v verbose n non-interactive" parseargs "$@"
+ARGS="p package a ant v verbose n non-interactive o offline" parseargs "$@"
PACKAGE=$(getarg p package)
ANT=$(getarg a ant)
NON_INTERACTIVE=$(getarg n non-interactive)
+OFFLINE=$(getarg o offline)
if [ -z "$PACKAGE" ]; then
if [ "$ARGC" -gt "0" ]; then
@@ -62,6 +65,6 @@
fi
fi
-mvn org.debian.maven:maven-packager-utils:$MH_VERSION:dependencies -Dpackage="$PACKAGE" ${ANT:+-DpackageType=ant} -Dmaven.repo.local=/usr/share/maven-repo ${NON_INTERACTIVE:+-DnonInteractive=true} --offline
+mvn org.debian.maven:maven-packager-utils:$MH_VERSION:dependencies -Dpackage="$PACKAGE" ${ANT:+-DpackageType=ant} -Dmaven.repo.local=/usr/share/maven-repo ${NON_INTERACTIVE:+-Dinteractive=false} ${OFFLINE:+-Doffline=true}
perl -p -i -e 's/maven\./maven:/' debian/${PACKAGE}.substvars
Modified: trunk/maven-debian-helper/debian/build.xml
===================================================================
--- trunk/maven-debian-helper/debian/build.xml 2010-10-29 23:12:54 UTC (rev 13042)
+++ trunk/maven-debian-helper/debian/build.xml 2010-10-29 23:19:18 UTC (rev 13043)
@@ -7,37 +7,37 @@
<property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
<macrodef name="cleanmodule">
- <attribute name="dir"/>
- <sequential>
- <ant target="clean" antfile="${maven.build}" dir="@{dir}">
+ <attribute name="dir"/>
+ <sequential>
+ <ant target="clean" antfile="${maven.build}" dir="@{dir}">
<property name="debian.dir" location="debian" />
<property name="project.dir" value="@{dir}" />
</ant>
- </sequential>
+ </sequential>
</macrodef>
<macrodef name="packagemodule">
- <attribute name="dir"/>
- <sequential>
- <ant target="package" antfile="${maven.build}" dir="@{dir}">
- <property name="debian.dir" location="debian" />
- <property name="project.dir" value="@{dir}" />
- <property name="keep-cleaned-pom" value="true" />
- </ant>
- </sequential>
+ <attribute name="dir"/>
+ <sequential>
+ <ant target="package-and-local-install" antfile="${maven.build}" dir="@{dir}">
+ <property name="debian.dir" location="debian" />
+ <property name="project.dir" value="@{dir}" />
+ <property name="keep-cleaned-pom" value="true" />
+ </ant>
+ </sequential>
</macrodef>
<macrodef name="package-plugin-module">
- <attribute name="dir"/>
- <sequential>
- <ant target="package" antfile="${maven.build}" dir="@{dir}">
- <property name="debian.dir" location="debian" />
- <property name="project.dir" value="@{dir}" />
- <property name="maven.generate.target" value="plugin:descriptor" />
- <property name="keep-cleaned-pom" value="true" />
- <property name="use-local-repo" value="true" />
- </ant>
- </sequential>
+ <attribute name="dir"/>
+ <sequential>
+ <ant target="package-and-local-install" antfile="${maven.build}" dir="@{dir}">
+ <property name="debian.dir" location="debian" />
+ <property name="project.dir" value="@{dir}" />
+ <property name="maven.generate.target" value="plugin:descriptor" />
+ <property name="keep-cleaned-pom" value="true" />
+ <property name="use-local-repo" value="true" />
+ </ant>
+ </sequential>
</macrodef>
<target name="clean">
Modified: trunk/maven-debian-helper/debian/changelog
===================================================================
--- trunk/maven-debian-helper/debian/changelog 2010-10-29 23:12:54 UTC (rev 13042)
+++ trunk/maven-debian-helper/debian/changelog 2010-10-29 23:19:18 UTC (rev 13043)
@@ -1,5 +1,28 @@
-maven-debian-helper (1.2) experimental; urgency=low
+maven-debian-helper (1.3) UNRELEASED; urgency=low
+ * ${maven:Depends} and similar substitution vars: add
+ version constraints when possible
+ * Use dpkg to resolve the dependent packages in ${maven:DocDepends}
+ (Closes: #588114)
+ * Use dpkg to search for the documentation package (Closes: #588114)
+ * mh_make: suggest installing missing dependencies which are not ignored
+ during the build
+ * add property debian.hasPackageVersion property, if true in the
+ repository POM then other packages depending on a POM with this property on
+ will have an addition version constraint generated in ${maven:Depends}
+ * mh_make: detect when debian.hasPackageVersion can be used, ask for the
+ upstream version of the package for confirmation.
+ * d/control: add Recommends: on subversion as it's used by mh_make,
+ add Build-Depends on libmaven-plugin-tools-java and junit
+ * d/build.xml: fix build when previous versions of this package are
+ not already installed on the system.
+ * d/rules: use debian/.mh instead of debian/tmp as temp directory to better
+ comply with Debian policy.
+
+ -- Ludovic Claude <ludovic.claude at laposte.net> Wed, 29 Sep 2010 00:17:34 +0200
+
+maven-debian-helper (1.2) unstable; urgency=low
+
[ Ludovic Claude ]
* debian/control: Update Standards-Version to 3.9.1, no changes
* mh_make: fix issue when no-parent option is needed. Thanks Torsten
Modified: trunk/maven-debian-helper/debian/control
===================================================================
--- trunk/maven-debian-helper/debian/control 2010-10-29 23:12:54 UTC (rev 13042)
+++ trunk/maven-debian-helper/debian/control 2010-10-29 23:19:18 UTC (rev 13043)
@@ -4,10 +4,9 @@
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 (>> 4), ant-optional, help2man
-Build-Depends-Indep: maven-repo-helper (>= 1.3),
- junit, testng, libmaven-plugin-tools-java, libplexus-velocity-java, velocity,
- libmaven2-core-java
+Build-Depends: cdbs, debhelper (>= 7), default-jdk, maven-ant-helper (>> 6.7), ant-optional, help2man
+Build-Depends-Indep: maven-repo-helper (>= 1.3), junit, libmaven-plugin-tools-java,
+ libplexus-velocity-java
Standards-Version: 3.9.1
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-debian-helper
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-debian-helper/
@@ -19,7 +18,7 @@
libmaven-clean-plugin-java, libmaven-resources-plugin-java,
libmaven-compiler-plugin-java, libmaven-jar-plugin-java, libmaven-site-plugin-java,
libsurefire-java, velocity, libplexus-velocity-java
-Recommends: apt-file
+Recommends: apt-file, subversion
Suggests: libmaven-javadoc-plugin-java
Description: Helper tools for building Debian packages with Maven
Maven is a software project management and comprehension tool. Based on the
Modified: trunk/maven-debian-helper/debian/maven-debian-helper.poms
===================================================================
--- trunk/maven-debian-helper/debian/maven-debian-helper.poms 2010-10-29 23:12:54 UTC (rev 13042)
+++ trunk/maven-debian-helper/debian/maven-debian-helper.poms 2010-10-29 23:19:18 UTC (rev 13043)
@@ -1,5 +1,5 @@
-pom.xml --no-parent
-maven-debian-helper/pom.xml
-maven-debian-plugin/pom.xml
-maven-build-nodocs/pom.xml
-maven-packager-utils/pom.xml
+pom.xml --no-parent --has-package-version
+maven-debian-helper/pom.xml --has-package-version --artifact=maven-debian-helper/target/maven-debian-helper-*.jar --java-lib
+maven-debian-plugin/pom.xml --has-package-version --artifact=maven-debian-plugin/target/maven-debian-plugin-*.jar --java-lib
+maven-build-nodocs/pom.xml --has-package-version --artifact=maven-build-nodocs/target/maven-build-nodocs-*.jar --java-lib
+maven-packager-utils/pom.xml --has-package-version --artifact=maven-packager-utils/target/maven-packager-utils-*.jar --java-lib
Modified: trunk/maven-debian-helper/debian/rules
===================================================================
--- trunk/maven-debian-helper/debian/rules 2010-10-29 23:12:54 UTC (rev 13042)
+++ trunk/maven-debian-helper/debian/rules 2010-10-29 23:19:18 UTC (rev 13043)
@@ -4,56 +4,59 @@
include /usr/share/cdbs/1/class/ant.mk
PACKAGE := $(DEB_SOURCE_PACKAGE)
-VERSION := $(DEB_UPSTREAM_VERSION)
+VERSION := $(shell echo ${DEB_UPSTREAM_VERSION} | sed -r 's/([0-9\.]+).*/\1/')
JAVA_HOME := /usr/lib/jvm/default-java
DEB_JARS := ant-nodeps classworlds maven-core maven-artifact maven-artifact-manager maven-model \
maven-compat maven-plugin-api maven-project maven-scm-api velocity file-management plexus-utils \
plexus-container-default-alpha maven-repo-helper
DEB_ANT_BUILD_TARGET := package #javadoc
DEB_ANT_BUILDFILE := debian/build.xml
-DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -Dbin.package=$(PACKAGE) -Dversion=$(VERSION)
+DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -Dbin.package=$(PACKAGE)
API_DOCS := target/api
-debian/tmp:
- mkdir -p debian/tmp
+debian/.mh:
+ mkdir -p debian/.mh
-debian/tmp/bin: debian/tmp
- cp -R bin debian/tmp/
+debian/.mh/bin: debian/.mh
+ cp -R bin debian/.mh/
-debian/tmp/etc: debian/tmp
- cp -R etc debian/tmp/
+debian/.mh/etc: debian/.mh
+ cp -R etc debian/.mh/
-debian/tmp/share: debian/tmp
- cp -R share debian/tmp/
+debian/.mh/share: debian/.mh
+ cp -R share debian/.mh/
-makebuilddir/$(PACKAGE):: debian/tmp/bin debian/tmp/etc debian/tmp/share
+makebuilddir/$(PACKAGE):: debian/.mh/bin debian/.mh/etc debian/.mh/share
# Generation of man pages
SCRIPTS := $(wildcard bin/mh_*)
-MAN_PAGES := $(addprefix debian/tmp/doc/,$(addsuffix .1, $(notdir $(SCRIPTS))))
-debian/tmp/mh_% : bin/mh_%
- mkdir -p debian/tmp
+MAN_PAGES := $(addprefix debian/.mh/doc/,$(addsuffix .1, $(notdir $(SCRIPTS))))
+debian/.mh/mh_% : bin/mh_%
+ mkdir -p debian/.mh
cp $< $@
chmod +x $@
-debian/tmp/doc/mh_%.1 : debian/tmp/mh_%
- mkdir -p debian/tmp/doc
+debian/.mh/doc/mh_%.1 : debian/.mh/mh_%
+ mkdir -p debian/.mh/doc
help2man -N -o $@ $<
man-pages: $(MAN_PAGES)
build/$(PACKAGE):: man-pages
install/$(PACKAGE)::
- mh_installpoms -p$(PACKAGE)
- mh_installjar -p$(PACKAGE) -l maven-debian-helper/pom.xml maven-debian-helper/target/maven-debian-helper-$(VERSION).jar
- mh_installjar -p$(PACKAGE) -l maven-debian-plugin/pom.xml maven-debian-plugin/target/maven-debian-plugin-$(VERSION).jar
- mh_installjar -p$(PACKAGE) -l maven-build-nodocs/pom.xml maven-build-nodocs/target/maven-build-nodocs-$(VERSION).jar
- mh_installjar -p$(PACKAGE) -l maven-packager-utils/pom.xml maven-packager-utils/target/maven-packager-utils-$(VERSION).jar
+ mh_install -p$(PACKAGE)
pod2man -c 'Maven for Debian GNU/Linux' \
-r maven-debian-helper-$(DEB_UPSTREAM_VERSION) \
man/mvn-debian.pod > man/mvn-debian.1
dh_installman $(MAN_PAGES) man/mvn-debian.1
clean::
- -rm -rf debian/tmp
-$(RM) man/mvn-debian.1
mh_unpatchpoms -p$(PACKAGE)
mh_clean
+
+# Helper target, to use when updating the version of this package
+update-package-version:
+ perl -p -i -e "s/^ <version>([0-9\.]+<)/ <version>${VERSION}</" pom.xml
+ perl -p -i -e "s/^ <version>([0-9\.]+<)/ <version>${VERSION}</" maven-build-nodocs/pom.xml maven-debian-helper/pom.xml maven-debian-plugin/pom.xml
+ perl -p -i -e "s/maven-debian-helper \(>= ([0-9\.]+\)/maven-debian-helper \(>= ${VERSION})/" share/cdbs/1/class/maven-vars.mk maven-packager-utils/src/main/resources/control.vm
+
+
Modified: trunk/maven-debian-helper/etc/fake-poms.conf
===================================================================
--- trunk/maven-debian-helper/etc/fake-poms.conf 2010-10-29 23:12:54 UTC (rev 13042)
+++ trunk/maven-debian-helper/etc/fake-poms.conf 2010-10-29 23:19:18 UTC (rev 13043)
@@ -5,8 +5,6 @@
javax.activation activation /usr/share/java/glassfish-activation.jar
javax.ejb ejb-api /usr/share/java/glassfish-ejb-api.jar
javax.mail mail /usr/share/java/glassfish-mail.jar
-javax.servlet servlet-api /usr/share/java/servlet-api-2.4.jar 2.4
-javax.servlet.jsp jsp-api /usr/share/java/jsp-api-2.0.jar 2.0
jboss.common jboss-common
jmock jmock
org.apache.geronimo.specs specs
Modified: trunk/maven-debian-helper/maven-build-nodocs/pom.xml
===================================================================
--- trunk/maven-debian-helper/maven-build-nodocs/pom.xml 2010-10-29 23:12:54 UTC (rev 13042)
+++ trunk/maven-debian-helper/maven-build-nodocs/pom.xml 2010-10-29 23:19:18 UTC (rev 13043)
@@ -1,20 +1,20 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.debian.maven</groupId>
- <artifactId>maven-debian</artifactId>
- <version>1.2</version>
- </parent>
+ <parent>
+ <groupId>org.debian.maven</groupId>
+ <artifactId>maven-debian</artifactId>
+ <version>1.3</version>
+ </parent>
- <artifactId>maven-build-nodocs</artifactId>
- <packaging>jar</packaging>
- <name>build with no docs patch for Maven</name>
+ <artifactId>maven-build-nodocs</artifactId>
+ <packaging>jar</packaging>
+ <name>build with no docs patch for Maven</name>
- <description>
- Patch to prevent Maven from calling maven-site-plugin when
- we run a build that does not need to produce any documentation
- </description>
+ <description>
+ Patch to prevent Maven from calling maven-site-plugin when
+ we run a build that does not need to produce any documentation
+ </description>
</project>
Modified: trunk/maven-debian-helper/maven-debian-helper/pom.xml
===================================================================
--- trunk/maven-debian-helper/maven-debian-helper/pom.xml 2010-10-29 23:12:54 UTC (rev 13042)
+++ trunk/maven-debian-helper/maven-debian-helper/pom.xml 2010-10-29 23:19:18 UTC (rev 13043)
@@ -1,22 +1,22 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.debian.maven</groupId>
- <artifactId>maven-debian</artifactId>
- <version>1.2</version>
- </parent>
+ <parent>
+ <groupId>org.debian.maven</groupId>
+ <artifactId>maven-debian</artifactId>
+ <version>1.3</version>
+ </parent>
- <artifactId>maven-debian-helper</artifactId>
- <packaging>jar</packaging>
- <name>wrapper for maven's main function</name>
+ <artifactId>maven-debian-helper</artifactId>
+ <packaging>jar</packaging>
+ <name>wrapper for maven's main function</name>
- <dependencies>
- <dependency>
- <groupId>classworlds</groupId>
- <artifactId>classworlds</artifactId>
- <version>1.1</version>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>classworlds</groupId>
+ <artifactId>classworlds</artifactId>
+ <version>1.1</version>
+ </dependency>
+ </dependencies>
</project>
Modified: trunk/maven-debian-helper/maven-debian-plugin/pom.xml
===================================================================
--- trunk/maven-debian-helper/maven-debian-plugin/pom.xml 2010-10-29 23:12:54 UTC (rev 13042)
+++ trunk/maven-debian-helper/maven-debian-plugin/pom.xml 2010-10-29 23:19:18 UTC (rev 13043)
@@ -1,22 +1,22 @@
<?xml version='1.0' encoding='UTF-8'?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>maven-debian</artifactId>
- <groupId>org.debian.maven</groupId>
- <version>1.2</version>
- </parent>
-
- <artifactId>maven-debian-plugin</artifactId>
- <packaging>maven-plugin</packaging>
- <name>Maven Debian Plugin</name>
+ <parent>
+ <artifactId>maven-debian</artifactId>
+ <groupId>org.debian.maven</groupId>
+ <version>1.3</version>
+ </parent>
- <dependencies>
- <dependency>
- <groupId>org.debian.maven</groupId>
- <artifactId>maven-repo-helper</artifactId>
- <version>1.3</version>
- </dependency>
- </dependencies>
+ <artifactId>maven-debian-plugin</artifactId>
+ <packaging>maven-plugin</packaging>
+ <name>Maven Debian Plugin</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.debian.maven</groupId>
+ <artifactId>maven-repo-helper</artifactId>
+ </dependency>
+ </dependencies>
</project>
Modified: trunk/maven-debian-helper/maven-packager-utils/pom.xml
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/pom.xml 2010-10-29 23:12:54 UTC (rev 13042)
+++ trunk/maven-debian-helper/maven-packager-utils/pom.xml 2010-10-29 23:19:18 UTC (rev 13043)
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>maven-debian</artifactId>
- <groupId>org.debian.maven</groupId>
- <version>1.2</version>
+ <artifactId>maven-debian</artifactId>
+ <groupId>org.debian.maven</groupId>
+ <version>1.2</version>
</parent>
<artifactId>maven-packager-utils</artifactId>
@@ -47,7 +48,6 @@
<dependency>
<groupId>org.debian.maven</groupId>
<artifactId>maven-repo-helper</artifactId>
- <version>1.3</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
Modified: trunk/maven-debian-helper/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesMojo.java
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesMojo.java 2010-10-29 23:12:54 UTC (rev 13042)
+++ trunk/maven-debian-helper/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesMojo.java 2010-10-29 23:19:18 UTC (rev 13043)
@@ -86,6 +86,11 @@
* @parameter expression="${interactive}" default-value="true"
*/
protected boolean interactive;
+ /**
+ * Offline prevents any download from Internet
+ * @parameter expression="${offline}" default-value="false"
+ */
+ protected boolean offline;
public void execute()
throws MojoExecutionException {
@@ -106,15 +111,22 @@
}
}
- solver.setProjects(projects);
solver.setBaseDir(basedir);
solver.setMavenRepo(mavenRepo);
solver.setOutputDirectory(outputDirectory);
solver.setPackageName(packageName);
solver.setPackageType(packageType);
solver.setInteractive(interactive);
+ solver.setOffline(offline);
solver.setListOfPoms(listOfPoms);
+ if (solver.getListOfPOMs().getFirstPOM() == null && collectedProjects != null) {
+ for (Iterator i = collectedProjects.iterator(); i.hasNext();) {
+ MavenProject subProject = (MavenProject) i.next();
+ solver.getListOfPOMs().addPOM(subProject.getFile());
+ }
+ }
+
solver.solveDependencies();
solver.saveListOfPoms();
Modified: trunk/maven-debian-helper/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java 2010-10-29 23:12:54 UTC (rev 13042)
+++ trunk/maven-debian-helper/maven-packager-utils/src/main/java/org/debian/maven/packager/DependenciesSolver.java 2010-10-29 23:19:18 UTC (rev 13043)
@@ -43,12 +43,10 @@
// Plugins not useful for the build or whose use is against the
// Debian policy
private static final String[][] PLUGINS_TO_IGNORE = {
- {"org.apache.maven.plugins", "maven-ant-plugin"},
{"org.apache.maven.plugins", "maven-archetype-plugin"},
{"org.apache.maven.plugins", "changelog-maven-plugin"},
{"org.apache.maven.plugins", "maven-deploy-plugin"},
{"org.apache.maven.plugins", "maven-release-plugin"},
- {"org.apache.maven.plugins", "maven-remote-resources-plugin"},
{"org.apache.maven.plugins", "maven-repository-plugin"},
{"org.apache.maven.plugins", "maven-scm-plugin"},
{"org.apache.maven.plugins", "maven-stage-plugin"},
@@ -61,6 +59,7 @@
{"org.codehaus.mojo", "ideauidesigner-maven-plugin"},
{"org.codehaus.mojo", "scmchangelog-maven-plugin"},};
private static final String[][] PLUGINS_THAT_CAN_BE_IGNORED = {
+ {"org.apache.maven.plugins", "maven-ant-plugin"},
{"org.apache.maven.plugins", "maven-assembly-plugin"},
{"org.codehaus.mojo", "buildnumber-maven-plugin"},
{"org.apache.maven.plugins", "maven-verifier-plugin"},
@@ -125,9 +124,9 @@
protected File outputDirectory;
protected String packageName;
protected String packageType;
+ private String packageVersion;
protected File mavenRepo = new File("/usr/share/maven-repo");
protected boolean exploreProjects;
- protected List projects = new ArrayList();
private Repository repository;
private List issues = new ArrayList();
private List projectPoms = new ArrayList();
@@ -140,6 +139,7 @@
private Set optionalDepends = new TreeSet();
private DependencyRuleSet cleanIgnoreRules = new DependencyRuleSet("Ignore rules to be applied during the Maven clean phase",
new File("debian/maven.cleanIgnoreRules"));
+ private boolean offline;
private boolean checkedAptFile;
private boolean runTests;
private boolean generateJavadoc;
@@ -149,6 +149,8 @@
private Map pomInfoCache = new HashMap();
// Keep the previous selected rule for a given version
private Map versionToRules = new HashMap();
+ // Keep the list of known files and their package
+ private Map filesInPackages = new HashMap();
private List defaultRules = new ArrayList();
public DependenciesSolver() {
@@ -190,6 +192,10 @@
this.runTests = b;
}
+ public void setOffline(boolean offline) {
+ this.offline = offline;
+ }
+
private void setGenerateJavadoc(boolean b) {
this.generateJavadoc = b;
}
@@ -255,7 +261,7 @@
} else {
System.out.print("y/[n] > ");
}
- String s = readLine().trim().toLowerCase();
+ String s = readLine().toLowerCase();
if (defaultToIgnore) {
return !s.startsWith("n");
} else {
@@ -263,10 +269,22 @@
}
}
+ public boolean isInteractive() {
+ return interactive;
+ }
+
public void setInteractive(boolean interactive) {
this.interactive = interactive;
}
+ POMTransformer getPomTransformer() {
+ return pomTransformer;
+ }
+
+ public ListOfPOMs getListOfPOMs() {
+ return pomTransformer.getListOfPOMs();
+ }
+
private class ToResolve {
private final File sourcePom;
@@ -287,7 +305,7 @@
try {
resolveDependencies(sourcePom, listType, buildTime, mavenExtension, management);
} catch (Exception e) {
- log.log(Level.SEVERE, "Cannot resolve dependencies on " + sourcePom, e);
+ log.log(Level.SEVERE, "Cannot resolve dependencies in " + sourcePom + ": " + e.getMessage());
}
}
}
@@ -330,17 +348,36 @@
depVars.put("maven.TestDepends", toString(testDepends));
depVars.put("maven.Depends", toString(runtimeDepends));
depVars.put("maven.OptionalDepends", toString(optionalDepends));
- Set docRuntimeDepends = new TreeSet();
- docRuntimeDepends.add("default-jdk-doc");
- for (Iterator i = runtimeDepends.iterator(); i.hasNext();) {
- docRuntimeDepends.add(i.next() + "-doc");
+ if (generateJavadoc) {
+ Set docRuntimeDepends = new TreeSet();
+ docRuntimeDepends.add("default-jdk-doc");
+ for (Iterator i = runtimeDepends.iterator(); i.hasNext();) {
+ String dependency = (String) i.next();
+ if (dependency.indexOf(' ') > 0) {
+ dependency = dependency.substring(0, dependency.indexOf(' '));
+ }
+ String docPkg = searchPkg(new File("/usr/share/doc/" + dependency + "/api/index.html"));
+ if (docPkg != null) {
+ docRuntimeDepends.add(docPkg);
+ }
+ }
+ Set docOptionalDepends = new TreeSet();
+ for (Iterator i = optionalDepends.iterator(); i.hasNext();) {
+ String dependency = (String) i.next();
+ if (dependency.indexOf(' ') > 0) {
+ dependency = dependency.substring(0, dependency.indexOf(' '));
+ }
+ String docPkg = searchPkg(new File("/usr/share/doc/" + dependency + "/api/index.html"));
+ if (docPkg != null) {
+ docOptionalDepends.add(docPkg);
+ }
+ }
+ depVars.put("maven.DocDepends", toString(docRuntimeDepends));
+ depVars.put("maven.DocOptionalDepends", toString(docOptionalDepends));
}
- Set docOptionalDepends = new TreeSet();
- for (Iterator i = optionalDepends.iterator(); i.hasNext();) {
- docOptionalDepends.add(i.next() + "-doc");
+ if (packageVersion != null) {
+ depVars.put("maven.UpstreamPackageVersion", packageVersion);
}
- depVars.put("maven.DocDepends", toString(docRuntimeDepends));
- depVars.put("maven.DocOptionalDepends", toString(docOptionalDepends));
try {
depVars.store(new FileOutputStream(dependencies), "List of dependencies for " + packageName + ", generated for use by debian/control");
} catch (IOException ex) {
@@ -350,6 +387,9 @@
public void setBaseDir(File baseDir) {
this.baseDir = baseDir;
+ if (pomTransformer.getListOfPOMs() != null) {
+ pomTransformer.getListOfPOMs().setBaseDir(baseDir);
+ }
}
public void setListOfPoms(File listOfPoms) {
@@ -358,6 +398,7 @@
} else {
pomTransformer.getListOfPOMs().setListOfPOMsFile(listOfPoms);
}
+ pomTransformer.getListOfPOMs().setBaseDir(baseDir);
}
public boolean isExploreProjects() {
@@ -404,14 +445,6 @@
this.packageType = packageType;
}
- public List getProjects() {
- return projects;
- }
-
- public void setProjects(List projects) {
- this.projects = projects;
- }
-
public List getIssues() {
return issues;
}
@@ -438,11 +471,11 @@
if (pomTransformer.getListOfPOMs().getPomOptions().isEmpty()) {
pom = new File(baseDir, "pom.xml");
if (pom.exists()) {
- projects.add(pom);
+ pomTransformer.getListOfPOMs().addPOM("pom.xml");
} else {
pom = new File(baseDir, "debian/pom.xml");
if (pom.exists()) {
- projects.add(pom);
+ pomTransformer.getListOfPOMs().addPOM("debian/pom.xml");
} else {
System.err.println("Cannot find the POM file");
return;
@@ -453,10 +486,15 @@
}
resolveDependencies(pom);
} else {
- for (Iterator i = projects.iterator(); i.hasNext();) {
- File pom = (File) i.next();
- resolveDependencies(pom);
- }
+ pomTransformer.getListOfPOMs().foreachPoms(new POMHandler() {
+
+ public void handlePOM(File pomFile, boolean noParent, boolean hasPackageVersion) throws Exception {
+ resolveDependencies(pomFile);
+ }
+
+ public void ignorePOM(File pomFile) throws Exception {
+ }
+ });
}
resolveDependenciesNow();
@@ -478,16 +516,19 @@
}
String pomRelPath = projectPom.getAbsolutePath().substring(baseDir.getAbsolutePath().length() + 1);
- boolean noParent = false;
+ boolean noParent = getPOMOptions(projectPom).isNoParent();
try {
POMInfo pom = getPOM(projectPom);
pom.setProperties(new HashMap());
pom.getProperties().put("debian.package", getPackageName());
-// System.out.println("Register POM " + pom.getThisPom().getGroupId() + ":" + pom.getThisPom().getArtifactId()
-// + ":" + pom.getThisPom().getVersion());
+
try {
- getRepository().registerPom(projectPom, pom);
+ if (noParent) {
+ pom.setParent(null);
+ } else if (pom.getParent() != null) {
+ pom.setParent(resolveDependency(pom.getParent(), projectPom, true, false, false));
+ }
} catch (DependencyNotFoundException e) {
System.out.println("Cannot find parent dependency " + e.getDependency());
if (interactive) {
@@ -499,8 +540,7 @@
} catch (DependencyNotFoundException e1) {
// ignore
}
- ListOfPOMs.POMOptions options = pomTransformer.getListOfPOMs().getOrCreatePOMOptions(pomRelPath);
- options.setNoParent(true);
+ getPOMOptions(projectPom).setNoParent(true);
resetPOM(projectPom);
pom = getPOM(projectPom);
try {
@@ -510,16 +550,32 @@
}
}
+ getRepository().registerPom(projectPom, pom);
+
knownProjectDependencies.add(pom.getThisPom());
+ if (interactive && packageVersion == null) {
+ System.out.println("Enter the upstream version for the package. If you press <Enter> it will default to " + pom.getOriginalVersion());
+ System.out.print("> ");
+ String v = readLine();
+ if (v.isEmpty()) {
+ v = pom.getOriginalVersion();
+ }
+ packageVersion = v;
+ }
+
+ if (pom.getOriginalVersion().equals(packageVersion)) {
+ pom.getProperties().put("debian.hasPackageVersion", "true");
+ getPOMOptions(projectPom).setHasPackageVersion(true);
+ }
+
if (filterModules) {
System.out.println("Include the module " + pomRelPath + " ?");
System.out.print("[y]/n > ");
- String s = readLine().trim().toLowerCase();
+ String s = readLine().toLowerCase();
boolean includeModule = !s.startsWith("n");
if (!includeModule) {
- ListOfPOMs.POMOptions options = pomTransformer.getListOfPOMs().getOrCreatePOMOptions(pomRelPath);
- options.setIgnore(true);
+ getPOMOptions(projectPom).setIgnore(true);
String type = "*";
if (pom.getThisPom().getType() != null) {
type = pom.getThisPom().getType();
@@ -544,7 +600,7 @@
}
}
- if (interactive && !explicitlyMentionedInRules) {
+ if (interactive && !explicitlyMentionedInRules && !"maven-plugin".equals(pom.getThisPom().getType())) {
String version = pom.getThisPom().getVersion();
System.out.println("Version of " + pom.getThisPom().getGroupId() + ":"
+ pom.getThisPom().getArtifactId() + " is " + version);
@@ -559,10 +615,10 @@
Matcher matcher = p.matcher(version);
if (matcher.matches()) {
String mainVersion = matcher.group(1);
- Rule mainVersionRule = new Rule("s/" + mainVersion + "\\../" +
+ Rule mainVersionRule = new Rule("s/" + mainVersion + "\\..*/" +
mainVersion + ".x/");
- mainVersionRule.setDescription("Replace all versions starting with "
- + mainVersion + ". by " + mainVersion + ".x");
+ mainVersionRule.setDescription("Replace all versions starting by "
+ + mainVersion + ". with " + mainVersion + ".x");
if (!choices.contains(mainVersionRule)) {
choices.add(mainVersionRule);
}
@@ -585,7 +641,7 @@
System.out.println(" - " + rule.getDescription());
}
System.out.print("> ");
- String s = readLine().trim().toLowerCase();
+ String s = readLine().toLowerCase();
int choice = 1;
try {
choice = Integer.parseInt(s);
@@ -597,7 +653,7 @@
if (selectedRule.getPattern().equals("CUSTOM")) {
System.out.println("Enter the pattern for your custom rule (in the form s/regex/replace/)");
System.out.print("> ");
- s = readLine().trim().toLowerCase();
+ s = readLine().toLowerCase();
selectedRule = new Rule(s);
selectedRule.setDescription("My custom rule " + s);
defaultRules.add(selectedRule);
@@ -620,7 +676,7 @@
}
projectPoms.add(pom.getThisPom());
- pomTransformer.getListOfPOMs().getOrCreatePOMOptions(pomRelPath).setNoParent(noParent);
+ getPOMOptions(projectPom).setNoParent(noParent);
resolveDependenciesLater(projectPom, POMInfo.DEPENDENCIES, false, false, false);
resolveDependenciesLater(projectPom, POMInfo.DEPENDENCY_MANAGEMENT_LIST, false, false, true);
@@ -634,7 +690,7 @@
if (interactive && !askedToFilterModules) {
System.out.println("This project contains modules. Include all modules?");
System.out.print("[y]/n > ");
- String s = readLine().trim().toLowerCase();
+ String s = readLine().toLowerCase();
filterModules = s.startsWith("n");
askedToFilterModules = true;
}
@@ -658,18 +714,18 @@
tmpDest.deleteOnExit();
ListOfPOMs.POMOptions options = getPOMOptions(projectPom);
boolean noParent = false;
+ boolean hasPackageVersion = false;
if (options != null) {
noParent = options.isNoParent();
+ hasPackageVersion = options.getHasPackageVersion();
}
- info = pomTransformer.transformPom(projectPom, tmpDest, noParent, false, null, null);
+ info = pomTransformer.transformPom(projectPom, tmpDest, noParent, hasPackageVersion, false, null, null, true);
pomInfoCache.put(projectPom.getAbsolutePath(), info);
return info;
}
private ListOfPOMs.POMOptions getPOMOptions(File pom) {
- String pomRelPath = pom.getAbsolutePath().substring(baseDir.getAbsolutePath().length() + 1);
- ListOfPOMs.POMOptions options = pomTransformer.getListOfPOMs().getPOMOptions(pomRelPath);
- return options;
+ return pomTransformer.getListOfPOMs().getOrCreatePOMOptions(pom);
}
private void resetPOM(File projectPom) {
@@ -679,7 +735,7 @@
private String readLine() {
LineNumberReader consoleReader = new LineNumberReader(new InputStreamReader(System.in));
try {
- return consoleReader.readLine();
+ return consoleReader.readLine().trim();
} catch (IOException e) {
e.printStackTrace();
return "";
@@ -699,155 +755,185 @@
}
private void resolveDependencies(File sourcePom, String listType, boolean buildTime, boolean mavenExtension, boolean management) throws Exception {
+ List poms = getPOM(sourcePom).getAllDependencies(listType);
+
+ for (Iterator i = poms.iterator(); i.hasNext();) {
+ Dependency dependency = (Dependency) i.next();
+ resolveDependency(dependency, sourcePom, buildTime, mavenExtension, management);
+ }
+ }
+
+ public Dependency resolveDependency(Dependency dependency, File sourcePom, boolean buildTime, boolean mavenExtension, boolean management) throws DependencyNotFoundException {
+ if (containsDependencyIgnoreVersion(ignoredDependencies, dependency) ||
+ containsDependencyIgnoreVersion(knownProjectDependencies, dependency) ||
+ (management && isDefaultMavenPlugin(dependency))) {
+ return null;
+ }
+
String sourcePomLoc = sourcePom.getAbsolutePath();
String baseDirPath = baseDir.getAbsolutePath();
sourcePomLoc = sourcePomLoc.substring(baseDirPath.length() + 1, sourcePomLoc.length());
- List poms = getPOM(sourcePom).getDependencyList(listType);
-
- nextDependency:
- for (Iterator i = poms.iterator(); i.hasNext();) {
- Dependency dependency = (Dependency) i.next();
- if (containsDependencyIgnoreVersion(ignoredDependencies, dependency) ||
- containsDependencyIgnoreVersion(knownProjectDependencies, dependency) ||
- (management && isDefaultMavenPlugin(dependency))) {
- continue;
+ boolean ignoreDependency = false;
+ if (canIgnorePlugin(dependency)) {
+ ignoreDependency = askIgnoreDependency(sourcePomLoc, dependency, "This plugin is not useful for the build or its use is against Debian policies. Ignore this plugin?");
+ } else if (canIgnoreExtension(dependency)) {
+ ignoreDependency = askIgnoreDependency(sourcePomLoc, dependency, "This extension is not useful for the build or its use is against Debian policies. Ignore this extension?");
+ } else if (canBeIgnoredPlugin(dependency)) {
+ ignoreDependency = askIgnoreDependency(sourcePomLoc, dependency, "This plugin may be ignored in some cases. Ignore this plugin?");
+ } else if (!runTests) {
+ if ("test".equals(dependency.getScope())) {
+ ignoreDependency = askIgnoreDependency(sourcePomLoc, dependency, "Tests are turned off. Ignore this test dependency?");
+ } else if (isTestPlugin(dependency)) {
+ ignoreDependency = askIgnoreDependency(sourcePomLoc, dependency, "Tests are turned off. Ignore this test plugin?");
}
+ } else if (!generateJavadoc && isDocumentationOrReportPlugin(dependency)) {
+ ignoreDependency = askIgnoreDependency(sourcePomLoc, dependency, "Documentation is turned off. Ignore this documentation plugin?");
+ }
- boolean ignoreDependency = false;
- if (canIgnorePlugin(dependency)) {
- ignoreDependency = askIgnoreDependency(sourcePomLoc, dependency, "This plugin is not useful for the build or its use is against Debian policies. Ignore this plugin?");
- } else if (canIgnoreExtension(dependency)) {
- ignoreDependency = askIgnoreDependency(sourcePomLoc, dependency, "This extension is not useful for the build or its use is against Debian policies. Ignore this extension?");
- } else if (canBeIgnoredPlugin(dependency)) {
- ignoreDependency = askIgnoreDependency(sourcePomLoc, dependency, "This plugin may be ignored in some cases. Ignore this plugin?");
- } else if (!runTests) {
- if ("test".equals(dependency.getScope())) {
- ignoreDependency = askIgnoreDependency(sourcePomLoc, dependency, "Tests are turned off. Ignore this test dependency?");
- } else if (isTestPlugin(dependency)) {
- ignoreDependency = askIgnoreDependency(sourcePomLoc, dependency, "Tests are turned off. Ignore this test plugin?");
+ if (ignoreDependency) {
+ ignoredDependencies.add(dependency);
+ String ruleDef = dependency.getGroupId() + " " + dependency.getArtifactId() + " * *";
+ pomTransformer.getIgnoreRules().add(new DependencyRule(ruleDef));
+ return null;
+ }
+
+ POMInfo pom = getRepository().searchMatchingPOM(dependency);
+ if (pom == null && dependency.getVersion() == null) {
+ // Set a dummy version and try again
+ for (int version = 0; version < 10; version++) {
+ dependency.setVersion(version + ".0");
+ pom = getRepository().searchMatchingPOM(dependency);
+ if (pom != null) {
+ break;
}
- } else if (!generateJavadoc && isDocumentationOrReportPlugin(dependency)) {
- ignoreDependency = askIgnoreDependency(sourcePomLoc, dependency, "Documentation is turned off. Ignore this documentation plugin?");
+ dependency.setVersion(null);
}
+ }
- if (ignoreDependency) {
- ignoredDependencies.add(dependency);
- String ruleDef = dependency.getGroupId() + " " + dependency.getArtifactId() + " * *";
- pomTransformer.getIgnoreRules().add(new DependencyRule(ruleDef));
- continue;
+ if (pom == null && "maven-plugin".equals(dependency.getType())) {
+ List matchingPoms = getRepository().searchMatchingPOMsIgnoreVersion(dependency);
+ if (matchingPoms.size() > 1) {
+ issues.add(sourcePomLoc + ": More than one version matches the plugin " + dependency.getGroupId() + ":"
+ + dependency.getArtifactId() + ":" + dependency.getVersion());
}
-
- POMInfo pom = getRepository().searchMatchingPOM(dependency);
- if (pom == null && dependency.getVersion() == null) {
- // Set a dummy version and try again
- for (int version = 0; version < 10; version++) {
- dependency.setVersion(version + ".0");
- pom = getRepository().searchMatchingPOM(dependency);
- if (pom != null) {
- break;
- }
- }
+ if (!matchingPoms.isEmpty()) {
+ pom = (POMInfo) matchingPoms.get(0);
+ // Don't add a rule to force the version of a Maven plugin, it's now done
+ // automatically at build time
}
+ }
- if (pom == null && "maven-plugin".equals(dependency.getType())) {
- List matchingPoms = getRepository().searchMatchingPOMsIgnoreVersion(dependency);
- if (matchingPoms.size() > 1) {
- issues.add(sourcePomLoc + ": More than one version matches the plugin " + dependency.getGroupId() + ":"
- + dependency.getArtifactId() + ":" + dependency.getVersion());
+ if (pom == null) {
+ if (management) {
+ return null;
+ } else {
+ if ("maven-plugin".equals(dependency.getType()) && packageType.equals("ant")) {
+ ignoreDependency = true;
}
- if (!matchingPoms.isEmpty()) {
- pom = (POMInfo) matchingPoms.get(0);
- // Don't add a rule to force the version of a Maven plugin, it's now done
- // automatically at build time
- }
- }
-
- if (pom == null) {
- if (!management) {
- if ("maven-plugin".equals(dependency.getType()) && packageType.equals("ant")) {
- ignoreDependency = true;
- }
- if (!ignoreDependency && isDocumentationOrReportPlugin(dependency)) {
+ if (!ignoreDependency) {
+ if ("maven-plugin".equals(dependency.getType())) {
+ issues.add(sourcePomLoc + ": Plugin is not packaged in the Maven repository for Debian: " + dependency.getGroupId() + ":"
+ + dependency.getArtifactId() + ":" + dependency.getVersion());
+ ignoreDependency = askIgnoreDependency(sourcePomLoc, dependency, "This plugin cannot be found in the Debian Maven repository. Ignore this plugin?", false);
+ } else if (isDocumentationOrReportPlugin(dependency)) {
ignoreDependency = askIgnoreDependency(sourcePomLoc, dependency,
"This documentation or report plugin cannot be found in the Maven repository for Debian. Ignore this plugin?");
+ } else {
+ issues.add(sourcePomLoc + ": Dependency is not packaged in the Maven repository for Debian: " + dependency.getGroupId() + ":"
+ + dependency.getArtifactId() + ":" + dependency.getVersion());
+ ignoreDependency = askIgnoreDependency(sourcePomLoc, dependency, "This dependency cannot be found in the Debian Maven repository. Ignore this dependency?", false);
}
- if (!ignoreDependency) {
- if ("maven-plugin".equals(dependency.getType())) {
- issues.add(sourcePomLoc + ": Plugin is not packaged in the Maven repository for Debian: " + dependency.getGroupId() + ":"
- + dependency.getArtifactId() + ":" + dependency.getVersion());
- ignoreDependency = askIgnoreDependency(sourcePomLoc, dependency, "This plugin cannot be found in the Debian Maven repository. Ignore this plugin?", false);
- } else {
- issues.add(sourcePomLoc + ": Dependency is not packaged in the Maven repository for Debian: " + dependency.getGroupId() + ":"
- + dependency.getArtifactId() + ":" + dependency.getVersion());
- ignoreDependency = askIgnoreDependency(sourcePomLoc, dependency, "This dependency cannot be found in the Debian Maven repository. Ignore this dependency?", false);
- }
+ }
+ if (ignoreDependency) {
+ ignoredDependencies.add(dependency);
+ String ruleDef = dependency.getGroupId() + " " + dependency.getArtifactId() + " * *";
+ pomTransformer.getIgnoreRules().add(new DependencyRule(ruleDef));
+ return null;
+ } else {
+ String pkg = searchPkg(new File("/usr/share/maven-repo/"
+ + dependency.getGroupId().replace('.', '/')
+ + "/" + dependency.getArtifactId()));
+ if (pkg != null) {
+ System.out.println("Please install the missing dependency using");
+ System.out.println(" sudo apt-get install " + pkg);
}
- if (ignoreDependency) {
- ignoredDependencies.add(dependency);
- String ruleDef = dependency.getGroupId() + " " + dependency.getArtifactId() + " * *";
- pomTransformer.getIgnoreRules().add(new DependencyRule(ruleDef));
- continue;
+ if (interactive) {
+ System.out.println("Try again to resolve the dependency?");
+ System.out.print("[y]/n > ");
+ String s = readLine().trim().toLowerCase();
+ if (!s.startsWith("n")) {
+ return resolveDependency(dependency, sourcePom, buildTime, mavenExtension, management);
+ }
}
+ throw new DependencyNotFoundException(dependency);
}
-
- return;
}
- // Handle the case of Maven plugins built and used in a multi-module build:
- // they need to be added to maven.cleanIgnoreRules to avoid errors during
- // a mvn clean
- if ("maven-plugin".equals(dependency.getType()) && containsDependencyIgnoreVersion(projectPoms, dependency)) {
- String ruleDef = dependency.getGroupId() + " " + dependency.getArtifactId() + " maven-plugin *";
- cleanIgnoreRules.add(new DependencyRule(ruleDef));
- }
+ }
- // Discover the library to import for the dependency
- String library = null;
- if (pom.getProperties() != null) {
- library = (String) pom.getProperties().get("debian.package");
+ // Handle the case of Maven plugins built and used in a multi-module build:
+ // they need to be added to maven.cleanIgnoreRules to avoid errors during
+ // a mvn clean
+ if ("maven-plugin".equals(dependency.getType()) && containsDependencyIgnoreVersion(projectPoms, dependency)) {
+ String ruleDef = dependency.getGroupId() + " " + dependency.getArtifactId() + " maven-plugin *";
+ cleanIgnoreRules.add(new DependencyRule(ruleDef));
+ }
+
+ // Discover the library to import for the dependency
+ String library = null;
+ if (pom.getProperties() != null) {
+ library = (String) pom.getProperties().get("debian.package");
+ }
+ if (library == null) {
+ issues.add(sourcePomLoc + ": Dependency is missing the Debian properties in its POM: " + dependency.getGroupId() + ":"
+ + dependency.getArtifactId() + ":" + dependency.getVersion());
+ File pomFile = new File(mavenRepo, dependency.getGroupId().replace(".", "/") + "/" + dependency.getArtifactId() + "/" + dependency.getVersion() + "/" + dependency.getArtifactId() + "-" + dependency.getVersion() + ".pom");
+ library = searchPkg(pomFile);
+ }
+ if (library != null && !library.equals(getPackageName())) {
+ String libraryWithVersionConstraint = library;
+ String version = dependency.getVersion();
+ if (version == null || (pom.getOriginalVersion() != null && version.compareTo(pom.getOriginalVersion()) > 0)) {
+ version = pom.getOriginalVersion();
}
- if (library == null) {
- issues.add(sourcePomLoc + ": Dependency is missing the Debian properties in its POM: " + dependency.getGroupId() + ":"
- + dependency.getArtifactId() + ":" + dependency.getVersion());
- File pomFile = new File(mavenRepo, dependency.getGroupId().replace(".", "/") + "/" + dependency.getArtifactId() + "/" + dependency.getVersion() + "/" + dependency.getArtifactId() + "-" + dependency.getVersion() + ".pom");
- library = searchPkg(pomFile);
+ if (pom.getOriginalVersion() != null && (pom.getProperties().containsKey("debian.hasPackageVersion"))) {
+ libraryWithVersionConstraint += " (>= " + version + ")";
}
- if (library != null && !library.equals(getPackageName())) {
- if (buildTime) {
- if ("test".equals(dependency.getScope())) {
- testDepends.add(library);
- } else if ("maven-plugin".equals(dependency.getType())) {
- if (!packageType.equals("ant")) {
- compileDepends.add(library + " (>= " + pom.getOriginalVersion() + ")");
- }
- } else if (mavenExtension) {
- if (!packageType.equals("ant")) {
- compileDepends.add(library);
- }
- } else {
- compileDepends.add(library);
+ if (buildTime) {
+ if ("test".equals(dependency.getScope())) {
+ testDepends.add(libraryWithVersionConstraint);
+ } else if ("maven-plugin".equals(dependency.getType())) {
+ if (!packageType.equals("ant")) {
+ compileDepends.add(libraryWithVersionConstraint);
}
+ } else if (mavenExtension) {
+ if (!packageType.equals("ant")) {
+ compileDepends.add(libraryWithVersionConstraint);
+ }
} else {
- if (dependency.isOptional()) {
- optionalDepends.add(library);
- } else if ("test".equals(dependency.getScope())) {
- testDepends.add(library);
- } else {
- runtimeDepends.add(library);
- }
+ compileDepends.add(libraryWithVersionConstraint);
}
+ } else {
+ if (dependency.isOptional()) {
+ optionalDepends.add(libraryWithVersionConstraint);
+ } else if ("test".equals(dependency.getScope())) {
+ testDepends.add(libraryWithVersionConstraint);
+ } else {
+ runtimeDepends.add(libraryWithVersionConstraint);
+ }
}
+ }
- String mavenRules = (String) pom.getProperties().get("debian.mavenRules");
- if (mavenRules != null) {
- StringTokenizer st = new StringTokenizer(mavenRules, ",");
- while (st.hasMoreTokens()) {
- String ruleDef = st.nextToken().trim();
- pomTransformer.getRules().add(new DependencyRule(ruleDef));
- }
+ String mavenRules = (String) pom.getProperties().get("debian.mavenRules");
+ if (mavenRules != null) {
+ StringTokenizer st = new StringTokenizer(mavenRules, ",");
+ while (st.hasMoreTokens()) {
+ String ruleDef = st.nextToken().trim();
+ pomTransformer.getRules().add(new DependencyRule(ruleDef));
}
}
+ return pom.getThisPom();
}
private boolean containsDependencyIgnoreVersion(Collection dependencies, Dependency dependency) {
@@ -860,24 +946,50 @@
return false;
}
- private String searchPkg(File pomFile) {
+ private String searchPkg(File file) {
+ if (filesInPackages.containsKey(file)) {
+ return (String) filesInPackages.get(file);
+ }
+
GetPackageResult packageResult = new GetPackageResult();
- executeProcess(new String[]{"dpkg", "--search", pomFile.getAbsolutePath()}, packageResult);
+ executeProcess(new String[]{"dpkg", "--search", file.getAbsolutePath()}, packageResult);
if (packageResult.getResult() != null) {
- return packageResult.getResult();
+ String pkg = packageResult.getResult();
+ if (pkg != null) {
+ filesInPackages.put(file, pkg);
+ }
+ return pkg;
}
+ // Debian policy prevents the use of apt-file during a build
+ if (offline) {
+ return null;
+ }
+
if (!checkedAptFile) {
- if (!"maven2".equals(searchPkg(new File("/usr/bin/mvn")))) {
- System.err.println("Warning: apt-file doesn't seem to be configured");
- System.err.println("Please run the following command and start again:");
+ System.out.println("Checking that apt-file is installed and has been configured...");
+ if (new File("/usr/bin/apt-file").exists()) {
+ executeProcess(new String[]{"apt-file", "search", "/usr/bin/mvnDebug"}, packageResult);
+ String checkMvnPkg = packageResult.getResult();
+ if ("maven2".equals(checkMvnPkg)) {
+ checkedAptFile = true;
+ }
+ packageResult.setResult(null);
+ }
+ if (!checkedAptFile) {
+ System.err.println("Warning: apt-file doesn't seem to be installed or configured");
+ System.err.println("Please run the following commands and start again:");
+ System.err.println(" sudo apt-get install apt-file");
System.err.println(" sudo apt-file update");
return null;
}
- checkedAptFile = true;
}
- executeProcess(new String[]{"apt-file", "search", pomFile.getAbsolutePath()}, packageResult);
- return packageResult.getResult();
+ executeProcess(new String[]{"apt-file", "search", file.getAbsolutePath()}, packageResult);
+ String pkg = packageResult.getResult();
+ if (pkg != null) {
+ filesInPackages.put(file, pkg);
+ }
+ return pkg;
}
public static void executeProcess(final String[] cmd, final OutputHandler handler) {
@@ -924,7 +1036,7 @@
executor.awaitTermination(5, TimeUnit.SECONDS);
if (process.exitValue() == 0) {
} else {
- System.out.println("Cannot execute " + cmd[0]);
+ System.out.println(cmd[0] + " failed to execute successfully");
}
process.destroy();
} catch (InterruptedException ex) {
@@ -979,6 +1091,10 @@
public String getResult() {
return result;
}
+
+ public void setResult(String result) {
+ this.result = result;
+ }
}
public static void main(String[] args) {
@@ -998,6 +1114,7 @@
System.out.println(" --run-tests: run the unit tests");
System.out.println(" --generate-javadoc: generate Javadoc");
System.out.println(" --non-interactive: non interactive session");
+ System.out.println(" --offline: offline mode for Debian build compatibility");
return;
}
DependenciesSolver solver = new DependenciesSolver();
@@ -1026,6 +1143,8 @@
solver.setGenerateJavadoc(true);
} else if (arg.equals("--non-interactive")) {
solver.setInteractive(false);
+ } else if (arg.equals("--offline")) {
+ solver.setOffline(true);
}
i = inc(i, args);
}
Modified: trunk/maven-debian-helper/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java 2010-10-29 23:12:54 UTC (rev 13042)
+++ trunk/maven-debian-helper/maven-packager-utils/src/main/java/org/debian/maven/packager/GenerateDebianFilesMojo.java 2010-10-29 23:19:18 UTC (rev 13043)
@@ -15,12 +15,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+import org.apache.maven.model.License;
import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException;
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
+import java.io.*;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.GregorianCalendar;
@@ -34,6 +33,7 @@
import org.apache.maven.project.MavenProject;
import org.apache.velocity.VelocityContext;
import org.apache.velocity.app.Velocity;
+import org.debian.maven.repo.ListOfPOMs;
/**
* Generate the Debian files for packaging the current Maven project.
@@ -142,7 +142,6 @@
}
try {
-
Properties velocityProperties = new Properties();
velocityProperties.put("resource.loader", "class");
velocityProperties.put("class.resource.loader.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
@@ -153,11 +152,113 @@
context.put("binPackage", binPackageName);
context.put("packager", packager);
context.put("packagerEmail", email);
- context.put("packagerLicense", packagerLicense);
context.put("project", project);
context.put("runTests", Boolean.valueOf(runTests));
context.put("generateJavadoc", Boolean.valueOf(generateJavadoc));
+ if (project.getName() == null || project.getName().isEmpty()) {
+ System.out.println("POM does not contain the project name. Please enter the name of the project:");
+ project.setName(readLine());
+ }
+ if (project.getUrl() == null || project.getUrl().isEmpty()) {
+ System.out.println("\"POM does not contain the project URL. Please enter the URL of the project:");
+ project.setUrl(readLine());
+ }
+
+ Set licenses = new TreeSet();
+ String[] knownLicenses = {"Apache-2.0", "GFDL-1.2", "GFDL-1.3", "GPL-2", "LGPL-2.1", "Artistic", "GPL-3", "LGPL-2", "LGPL-3"};
+ for (Iterator i = project.getLicenses().iterator(); i.hasNext(); ) {
+ License license = (License) i.next();
+ String licenseName = "";
+ if (license.getName() != null) {
+ licenseName = license.getName() + " ";
+ }
+ String licenseUrl = "";
+ if (license.getUrl() != null) {
+ licenseUrl = license.getUrl().toLowerCase();
+ }
+ boolean recognized = false;
+ if (licenseName.indexOf("mit ") >= 0 || licenseUrl.indexOf("mit-license") >= 0) {
+ licenses.add("MIT");
+ recognized = true;
+ } else if (licenseName.indexOf("bsd ") >= 0 || licenseUrl.indexOf("bsd-license") >= 0) {
+ licenses.add("BSD");
+ recognized = true;
+ } else if (licenseName.indexOf("artistic ") >= 0 || licenseUrl.indexOf("artistic-license") >= 0) {
+ licenses.add("Artistic");
+ recognized = true;
+ } else if (licenseName.indexOf("apache ") >= 0 || licenseUrl.indexOf("apache") >= 0) {
+ if (licenseName.indexOf("2.") >= 0 || licenseUrl.indexOf("2.") >= 0) {
+ licenses.add("Apache-2.0");
+ recognized = true;
+ } else if (licenseName.indexOf("1.0") >= 0 || licenseUrl.indexOf("1.0") >= 0) {
+ licenses.add("Apache-1.0");
+ recognized = true;
+ } else if (licenseName.indexOf("1.1") >= 0 || licenseUrl.indexOf("1.1") >= 0) {
+ licenses.add("Apache-1.1");
+ recognized = true;
+ }
+ } else if (licenseName.indexOf("lgpl ") >= 0 || licenseUrl.indexOf("lgpl") >= 0) {
+ if (licenseName.indexOf("2.1") >= 0 || licenseUrl.indexOf("2.1") >= 0) {
+ licenses.add("LGPL-2.1");
+ recognized = true;
+ } else if (licenseName.indexOf("2") >= 0 || licenseUrl.indexOf("2") >= 0) {
+ licenses.add("LGPL-2");
+ recognized = true;
+ } else if (licenseName.indexOf("3") >= 0 || licenseUrl.indexOf("3") >= 0) {
+ licenses.add("LGPL-2");
+ recognized = true;
+ }
+ } else if (licenseName.indexOf("gpl ") >= 0 || licenseUrl.indexOf("gpl") >= 0) {
+ if (licenseName.indexOf("2") >= 0 || licenseUrl.indexOf("2") >= 0) {
+ licenses.add("GPL-2");
+ recognized = true;
+ } else if (licenseName.indexOf("3") >= 0 || licenseUrl.indexOf("3") >= 0) {
+ licenses.add("GPL-3");
+ recognized = true;
+ }
+ }
+ if (!recognized) {
+ System.out.println("License " + licenseName + licenseUrl + " was not recognized, please enter a license name preferably in one of:");
+ System.out.println("Apache Artistic BSD FreeBSD ISC CC-BY CC-BY-SA CC-BY-ND CC-BY-NC CC-BY-NC-SA CC-BY-NC-ND CC0 CDDL CPL Eiffel");
+ System.out.println("Expat GPL LGPL GFDL GFDL-NIV LPPL MPL Perl PSF QPL W3C-Software ZLIB Zope");
+ String s = readLine();
+ if (s.length() > 0) {
+ licenses.add(s);
+ }
+ }
+ }
+ if (licenses.isEmpty()) {
+ System.out.println("License was not found, please enter a license name preferably in one of:");
+ System.out.println("Apache Artistic BSD FreeBSD ISC CC-BY CC-BY-SA CC-BY-ND CC-BY-NC CC-BY-NC-SA CC-BY-NC-ND CC0 CDDL CPL Eiffel");
+ System.out.println("Expat GPL LGPL GFDL GFDL-NIV LPPL MPL Perl PSF QPL W3C-Software ZLIB Zope");
+ String s = readLine();
+ if (s.length() > 0) {
+ licenses.add(s);
+ }
+ }
+ context.put("licenses", licenses);
+
+ if (licenses.size() == 1) {
+ packagerLicense = (String) licenses.iterator().next();
+ } else {
+ // TODO - ask for the chosen packager license
+ }
+ context.put("packagerLicense", packagerLicense);
+
+ String copyrightOwner = "";
+ if (project.getOrganization() != null) {
+ copyrightOwner = project.getOrganization().getName();
+ }
+ if (copyrightOwner == null || copyrightOwner.isEmpty()) {
+ Iterator devs = project.getDevelopers().iterator();
+ if (devs.hasNext()) {
+ copyrightOwner = (String) devs.next();
+ }
+ }
+ // TODO - ask for the copyright owner
+ context.put("copyrightOwner", copyrightOwner);
+
String copyrightYear;
int currentYear = new GregorianCalendar().get(Calendar.YEAR);
if (project.getInceptionYear() != null) {
@@ -170,8 +271,27 @@
}
context.put("copyrightYear", copyrightYear);
context.put("currentYear", new Integer(currentYear));
- context.put("licenses", new TreeSet());
+
List description = new ArrayList();
+ if (project.getDescription() == null || project.getDescription().trim().isEmpty()) {
+ System.out.println("Please enter a short description of the project, press Enter twice to stop.");
+ StringBuffer sb = new StringBuffer();
+ int emptyEnterCount = 0;
+ while (emptyEnterCount < 2) {
+ String s = readLine();
+ if (s.isEmpty()) {
+ emptyEnterCount++;
+ } else {
+ if (emptyEnterCount > 0) {
+ emptyEnterCount = 0;
+ sb.append("\n");
+ }
+ sb.append(s);
+ sb.append("\n");
+ }
+ }
+ project.setDescription(sb.toString());
+ }
if (project.getDescription() != null) {
StringTokenizer st = new StringTokenizer(project.getDescription().trim(), "\n\t ");
StringBuffer descLine = new StringBuffer();
@@ -205,20 +325,36 @@
depends.addAll(split(substvars.getProperty("maven.DocOptionalDepends")));
}
if ("maven".equals(packageType)) {
+ boolean seenJavadocPlugin = false;
// Remove dependencies that are implied by maven-debian-helper
- depends.remove("libmaven-clean-plugin-java");
- depends.remove("libmaven-resources-plugin-java");
- depends.remove("libmaven-compiler-plugin-java");
- depends.remove("libmaven-jar-plugin-java");
- depends.remove("libmaven-site-plugin-java");
- depends.remove("libsurefire-java");
- depends.remove("velocity");
- depends.remove("libplexus-velocity-java");
- if (generateJavadoc) {
+ for (Iterator i = depends.iterator(); i.hasNext();) {
+ String dependency = (String) i.next();
+ if (dependency.startsWith("libmaven-clean-plugin-java") ||
+ dependency.startsWith("libmaven-resources-plugin-java") ||
+ dependency.startsWith("libmaven-compiler-plugin-java") ||
+ dependency.startsWith("libmaven-jar-plugin-java") ||
+ dependency.startsWith("libmaven-site-plugin-java") ||
+ dependency.startsWith("libsurefire-java") ||
+ dependency.startsWith("velocity") ||
+ dependency.startsWith("libplexus-velocity-java")) {
+ i.remove();
+ } else if (dependency.startsWith("libmaven-javadoc-plugin-java")) {
+ seenJavadocPlugin = true;
+ }
+ }
+ if (generateJavadoc && !seenJavadocPlugin) {
depends.add("libmaven-javadoc-plugin-java");
}
} else if ("ant".equals(packageType)) {
// Remove dependencies that are implied by ant packaging
+ for (Iterator i = depends.iterator(); i.hasNext(); ) {
+ String dependency = (String) i.next();
+ if (dependency.equals("ant") ||
+ dependency.startsWith("ant ") ||
+ dependency.startsWith("ant-optional")) {
+ i.remove();
+ }
+ }
depends.remove("ant");
depends.remove("ant-optional");
}
@@ -232,6 +368,7 @@
String library = (String) i.next();
buildJars.addAll(listSharedJars(library));
}
+ buildJars.add("ant-junit");
context.put("buildJars", buildJars);
}
} else {
@@ -239,17 +376,30 @@
}
if ("ant".equals(packageType)) {
- List pomDirs = new ArrayList();
- if (collectedProjects.isEmpty()) {
- pomDirs.add("");
- }
+ ListOfPOMs listOfPOMs = new ListOfPOMs(new File(outputDirectory, "debian/" + binPackageName + ".poms"));
for (Iterator i = collectedProjects.iterator(); i.hasNext();) {
MavenProject mavenProject = (MavenProject) i.next();
String basedir = project.getBasedir().getAbsolutePath();
String dirRelPath = mavenProject.getBasedir().getAbsolutePath().substring(basedir.length() + 1);
- pomDirs.add(dirRelPath);
+ if (! "pom".equals(mavenProject.getPackaging())) {
+ String pomFile = dirRelPath + "/pom.xml";
+ listOfPOMs.getOrCreatePOMOptions(pomFile).setJavaLib(true);
+ String extension = mavenProject.getPackaging();
+ if (extension.equals("bundle")) {
+ extension = "jar";
+ }
+ if (extension.equals("webapp")) {
+ extension = "war";
+ }
+ if (mavenProject.getArtifact() != null && mavenProject.getArtifact().getFile() != null) {
+ extension = mavenProject.getArtifact().getFile().toString();
+ extension = extension.substring(extension.lastIndexOf('.') + 1);
+ }
+ listOfPOMs.getOrCreatePOMOptions(pomFile).setArtifact(dirRelPath + "/" + mavenProject.getArtifactId() + "-*."
+ + extension);
+ }
}
- context.put("pomDirs", pomDirs);
+ listOfPOMs.save();
}
String projectVersion = project.getVersion();
@@ -377,6 +527,16 @@
return jars;
}
+ private String readLine() {
+ LineNumberReader consoleReader = new LineNumberReader(new InputStreamReader(System.in));
+ try {
+ return consoleReader.readLine().trim();
+ } catch (IOException e) {
+ e.printStackTrace();
+ return "";
+ }
+ }
+
private List split(String s) {
List l = new ArrayList();
StringTokenizer st = new StringTokenizer(s, ",");
@@ -398,3 +558,4 @@
int TARBALL = 3;
}
}
+
Modified: trunk/maven-debian-helper/maven-packager-utils/src/main/resources/control.ant.vm
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/main/resources/control.ant.vm 2010-10-29 23:12:54 UTC (rev 13042)
+++ trunk/maven-debian-helper/maven-packager-utils/src/main/resources/control.ant.vm 2010-10-29 23:19:18 UTC (rev 13043)
@@ -18,10 +18,10 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: ${packager} <${packagerEmail}>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant-optional, maven-ant-helper (>> 4)
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, ant-optional, maven-ant-helper (>> 6.7)
Build-Depends-Indep: maven-repo-helper,
#printDependencies($compileDependencies)$space
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/${package}
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/${package}
Homepage:#if(${project.Url}) ${project.Url} #else TODO #end
@@ -47,7 +47,6 @@
#end
#end
-
#if ($generateJavadoc)
Package: ${binPackage}-doc
Architecture: all
@@ -66,7 +65,6 @@
#end
#end
#end
-
.
This package provides the API documentation for ${binPackage}.
#end
Modified: trunk/maven-debian-helper/maven-packager-utils/src/main/resources/control.vm
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/main/resources/control.vm 2010-10-29 23:12:54 UTC (rev 13042)
+++ trunk/maven-debian-helper/maven-packager-utils/src/main/resources/control.vm 2010-10-29 23:19:18 UTC (rev 13043)
@@ -18,9 +18,9 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: ${packager} <${packagerEmail}>
-Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper
+Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.3)
Build-Depends-Indep:#printDependencies($compileDependencies)$space
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/${package}
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/${package}
Homepage:#if(${project.Url}) ${project.Url} #else TODO #end
@@ -43,7 +43,6 @@
#end
#end
-
#if ($generateJavadoc)
Package: ${binPackage}-doc
Architecture: all
@@ -62,7 +61,6 @@
#end
#end
#end
-
.
This package provides the API documentation for ${binPackage}.
#end
Modified: trunk/maven-debian-helper/maven-packager-utils/src/main/resources/copyright.vm
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/main/resources/copyright.vm 2010-10-29 23:12:54 UTC (rev 13042)
+++ trunk/maven-debian-helper/maven-packager-utils/src/main/resources/copyright.vm 2010-10-29 23:19:18 UTC (rev 13043)
@@ -1,72 +1,29 @@
#set ($space = " ")
Format-Specification: http://dep.debian.net/deps/dep5/
Name: ${project.Name}
-Maintainer: ${project.Organization.Name}
-Source: ${project.Url}
-
-Files: *
-#set ($copyrightHeader = "Copyright: ")
+#set ($maintainerHeader = "Maintainer: ")
#foreach ($developer in $project.Developers)
-${copyrightHeader} ${copyrightYear}, ${developer.Name} #if (${developer.Email})<${developer.Email}>
-#set ($copyrightHeader = " ")
+${maintainerHeader} ${developer.Name} #if (${developer.Email})<${developer.Email}> as developer
+#set ($maintainerHeader = " ")
#else $space
#end
#end
#foreach ($contributor in $project.Contributors)
-${copyrightHeader} ${copyrightYear}, ${contributor.Name} #if (${contributor.Email})<${contributor.Email}>
-#set ($copyrightHeader = " ")
+${maintainerHeader} ${contributor.Name} #if (${contributor.Email})<${contributor.Email}> as contributor
+#set ($maintainerHeader = " ")
#else $space
#end
#end
-#set ($knownLicenses = ["Apache-2.0", "BSD", "GFDL-1.2", "GPL-2", "LGPL-2.1", "Artistic", "GPL-3", "LGPL-2", "LGPL-3"])
-#foreach ($license in $project.Licenses)
-#set ($licenseName = "")
-#if ($license.Name)#set ($licenseName = $license.Name.toLowerCase() + " ")#end
-#set ($licenseUrl = "")
-#if ($license.Url)#set ($licenseUrl = $license.Url.toLowerCase())#end
-#if ($licenseName.indexOf("mit ") >= 0 || $licenseUrl.indexOf("mit-license") >= 0)
-#set ($x = $licenses.add("MIT"))
-#elseif ($licenseName.indexOf("bsd ") >= 0 || $licenseUrl.indexOf("bsd-license") >= 0)
-#set ($x = $licenses.add("BSD"))
-#elseif ($licenseName.indexOf("artistic ") >= 0 || $licenseUrl.indexOf("artistic-license") >= 0)
-#set ($x = $licenses.add("Artistic"))
-#elseif ($licenseName.indexOf("apache ") >= 0 || $licenseUrl.indexOf("apache") >= 0)
-#if ($licenseName.indexOf("2.") >= 0 || $licenseUrl.indexOf("2.") >= 0)
-#set ($x = $licenses.add("Apache-2.0"))
-#end
-#elseif ($licenseName.indexOf("lgpl ") >= 0 || $licenseUrl.indexOf("lgpl") >= 0)
-#if ($licenseName.indexOf("2.1") >= 0 || $licenseUrl.indexOf("2.1") >= 0)
-#set ($x = $licenses.add("LGPL-2.1"))
-#elseif ($licenseName.indexOf("2") >= 0 || $licenseUrl.indexOf("2") >= 0)
-#set ($x = $licenses.add("LGPL-2"))
-#elseif ($licenseName.indexOf("3") >= 0 || $licenseUrl.indexOf("3") >= 0)
-#set ($x = $licenses.add("LGPL-2"))
-#end
-#elseif ($licenseName.indexOf("gpl ") >= 0 || $licenseUrl.indexOf("gpl") >= 0)
-#if ($licenseName.indexOf("2") >= 0 || $licenseUrl.indexOf("2") >= 0)
-#set ($x = $licenses.add("GPL-2"))
-#elseif ($licenseName.indexOf("3") >= 0 || $licenseUrl.indexOf("3") >= 0)
-#set ($x = $licenses.add("GPL-3"))
-#else
-#if ($licenseName)#set ($x = $licenses.add("$licenseName"))#set ($packagerLicense="$licenseName")
-#elseif($licenseUrl)#set ($x = $licenses.add("$licenseUrl"))
-#else#set ($x = $licenses.add("UNKNOWN-LICENSE"))
-#end
-#end
-#end
-#end
-#if ($licenses.isEmpty())
-#set ($x = $licenses.add("NOT-FOUND"))
-#end
+Source: ${project.Url}
+
+Files: *
+Copyright: ${copyrightYear}, ${copyrightOwner}
License: #foreach($license in $licenses)${license}#if($velocityHasNext) or #end#end
-
Files: debian/*
Copyright: ${currentYear}, ${packager} <${packagerEmail}>
License: ${packagerLicense}
-#set ($license = "${packagerLicense}")
-#set ($license = $license.replace("+",""))
-#set ($x = $licenses.add("${license}"))
+#set ($x = $licenses.add("${packagerLicense}"))
#foreach ($license in $licenses)
License: $license
Modified: trunk/maven-debian-helper/maven-packager-utils/src/main/resources/rules.ant.vm
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/main/resources/rules.ant.vm 2010-10-29 23:12:54 UTC (rev 13042)
+++ trunk/maven-debian-helper/maven-packager-utils/src/main/resources/rules.ant.vm 2010-10-29 23:19:18 UTC (rev 13043)
@@ -15,30 +15,26 @@
#end
#end
-PACKAGE := $(DEB_SOURCE_PACKAGE)
-VERSION := $(DEB_UPSTREAM_VERSION)
JAVA_HOME := /usr/lib/jvm/default-java
DEB_JARS := ant-nodeps #if (!$buildJars.isEmpty()) #printJars($buildJars)#end $space
DEB_ANT_BUILDFILE := /usr/share/maven-ant-helper/maven-build.xml
-DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
+DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE)
#if ($generateJavadoc)
+DEB_ANT_BUILD_TARGET := package javadoc
API_DOCS := target/docs/api
#end
get-orig-source:
uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
-binary-post-install/lib$(PACKAGE)-java::
- mh_installpoms -plib$(PACKAGE)-java
-#foreach ( $dir in $pomDirs )
-#if ($dir != '') #set ($dir = '$dir/') #end
- mh_installjar -plib$(PACKAGE)-java -l ${dir}pom.xml ${dir}target/$(PACKAGE)-$(VERSION).jar
-#end
+binary-post-install/$binPackage::
+ mh_install -p$binPackage
#if ($generateJavadoc)
-binary-post-install/lib$(PACKAGE)-java-doc::
- dh_install -plib$(PACKAGE)-java-doc $(API_DOCS) usr/share/doc/lib$(PACKAGE)-java
+binary-post-install/$binPackage-doc::
+ dh_install -p$binPackage-doc $(API_DOCS) usr/share/doc/$binPackage
#end
clean::
- -rm -rf debian/tmp
+ -mh_clean
+
Modified: trunk/maven-debian-helper/maven-packager-utils/src/test/java/org/debian/maven/packager/DependenciesSolverTest.java
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/test/java/org/debian/maven/packager/DependenciesSolverTest.java 2010-10-29 23:12:54 UTC (rev 13042)
+++ trunk/maven-debian-helper/maven-packager-utils/src/test/java/org/debian/maven/packager/DependenciesSolverTest.java 2010-10-29 23:19:18 UTC (rev 13043)
@@ -12,6 +12,8 @@
import java.io.InputStreamReader;
import java.io.LineNumberReader;
import java.io.Reader;
+import java.net.URISyntaxException;
+import java.net.URL;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
@@ -20,6 +22,9 @@
import junit.framework.TestCase;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
+import org.debian.maven.repo.DependencyRule;
+import org.debian.maven.repo.ListOfPOMs;
+import org.debian.maven.repo.Repository;
/**
*
@@ -33,7 +38,7 @@
protected void setUp() throws Exception {
super.setUp();
- testDir.mkdir();
+ testDir.mkdirs();
}
protected void tearDown() throws Exception {
@@ -53,21 +58,27 @@
/**
* Test of solveDependencies method, of class DependenciesSolver.
*/
- public void testSolveDependencies() throws Exception {
- useFile("plexus-active-collections.pom", pomFile);
+ public void testSolvePlexusActiveCollectionsDependencies() throws Exception {
+ useFile("plexus-active-collections/pom.xml", pomFile);
DependenciesSolver solver = new DependenciesSolver();
- solver.setBaseDir(testDir);
+ solver.setMavenRepo(getFileInClasspath("repository/root.dir").getParentFile());
solver.setOutputDirectory(testDir);
solver.setExploreProjects(true);
solver.setPackageName("libplexus-active-collections-java");
solver.setPackageType("maven");
- solver.setListOfPoms(new File(testDir, "libplexus-active-collections-java.poms"));
+ File listOfPoms = getFileInClasspath("libplexus-active-collections-java.poms");
+ solver.setBaseDir(getFileInClasspath("plexus-active-collections/pom.xml").getParentFile());
+ solver.setListOfPoms(new File(listOfPoms.getParent(), listOfPoms.getName()));
solver.setInteractive(false);
+ solver.setOffline(true);
solver.solveDependencies();
assertTrue("Did not expect any issues", solver.getIssues().isEmpty());
+ solver.setBaseDir(testDir);
+ solver.setListOfPoms(new File(testDir, "libplexus-active-collections-java.poms"));
+
solver.saveListOfPoms();
solver.saveMavenRules();
solver.saveSubstvars();
@@ -77,6 +88,131 @@
assertFileEquals("libplexus-active-collections-java.rules", "maven.rules");
}
+ /**
+ * Test of solveDependencies method, of class DependenciesSolver.
+ */
+ public void testSolvePlexusUtils2Dependencies() throws Exception {
+ useFile("plexus-utils2/pom.xml", pomFile);
+ DependenciesSolver solver = new DependenciesSolver();
+ solver.setMavenRepo(getFileInClasspath("repository/root.dir").getParentFile());
+ solver.setOutputDirectory(testDir);
+ solver.setExploreProjects(true);
+ solver.setPackageName("libplexus-utils2-java");
+ solver.setPackageType("maven");
+ solver.getPomTransformer().addIgnoreRule(new DependencyRule("org.apache.maven.plugins maven-release-plugin * *"));
+ File listOfPoms = getFileInClasspath("libplexus-utils2-java.poms");
+ solver.setBaseDir(getFileInClasspath("plexus-utils2/pom.xml").getParentFile());
+ solver.setListOfPoms(new File(listOfPoms.getParent(), listOfPoms.getName()));
+ solver.setInteractive(false);
+ solver.setOffline(true);
+
+ solver.solveDependencies();
+
+ assertTrue("Did not expect any issues", solver.getIssues().isEmpty());
+
+ solver.setBaseDir(testDir);
+ solver.setListOfPoms(new File(testDir, "libplexus-utils2-java.poms"));
+
+ solver.saveListOfPoms();
+ solver.saveMavenRules();
+ solver.saveSubstvars();
+
+ assertFileEquals("libplexus-utils2-java.poms", "libplexus-utils2-java.poms");
+ assertFileEquals("libplexus-utils2-java.substvars", "libplexus-utils2-java.substvars");
+ assertFileEquals("libplexus-utils2-java.rules", "maven.rules");
+ }
+
+ /**
+ * Test of solveDependencies method, of class DependenciesSolver.
+ */
+ public void testSolveOpenMRSDependenciesWithErrors() throws Exception {
+ useFile("openmrs/pom.xml", pomFile);
+ DependenciesSolver solver = new DependenciesSolver();
+ solver.setMavenRepo(getFileInClasspath("repository/root.dir").getParentFile());
+ solver.setOutputDirectory(testDir);
+ solver.setExploreProjects(false);
+ solver.setPackageName("openmrs");
+ solver.setPackageType("maven");
+ //solver.getPomTransformer().addIgnoreRule(new DependencyRule("org.apache.maven.plugins maven-release-plugin * *"));
+ File listOfPoms = getFileInClasspath("openmrs.poms");
+ solver.setBaseDir(getFileInClasspath("openmrs/pom.xml").getParentFile());
+ solver.setListOfPoms(new File(listOfPoms.getParent(), listOfPoms.getName()));
+ solver.setInteractive(false);
+ solver.setOffline(true);
+
+ solver.solveDependencies();
+
+ assertEquals(1, solver.getIssues().size());
+ assertTrue(solver.getIssues().get(0).toString().indexOf("buildnumber-maven-plugin") > 0);
+ }
+
+ public void testSolveOpenMRSDependencies() throws Exception {
+ useFile("openmrs/pom.xml", pomFile);
+ DependenciesSolver solver = new DependenciesSolver();
+ solver.setMavenRepo(getFileInClasspath("repository/root.dir").getParentFile());
+ solver.setOutputDirectory(testDir);
+ solver.setExploreProjects(false);
+ solver.setPackageName("openmrs");
+ solver.setPackageType("maven");
+ solver.getPomTransformer().addIgnoreRule(new DependencyRule("org.openmrs.codehaus.mojo buildnumber-maven-plugin * *"));
+ solver.getPomTransformer().addIgnoreRule(new DependencyRule("org.codehaus.mojo build-helper-maven-plugin * *"));
+ solver.getPomTransformer().addIgnoreRule(new DependencyRule("org.apache.maven.plugins maven-assembly-plugin * *"));
+ File listOfPoms = getFileInClasspath("openmrs.poms");
+ solver.setBaseDir(getFileInClasspath("openmrs/pom.xml").getParentFile());
+ solver.setListOfPoms(new File(listOfPoms.getParent(), listOfPoms.getName()));
+ solver.setInteractive(false);
+ solver.setOffline(true);
+
+ solver.solveDependencies();
+
+ assertTrue("Did not expect any issues", solver.getIssues().isEmpty());
+
+ solver.setBaseDir(testDir);
+ solver.setListOfPoms(new File(testDir, "openmrs.poms"));
+
+ solver.saveListOfPoms();
+ solver.saveMavenRules();
+ solver.saveSubstvars();
+
+ assertFileEquals("openmrs.poms", "openmrs.poms");
+ assertFileEquals("openmrs.substvars", "openmrs.substvars");
+ assertFileEquals("openmrs.rules", "maven.rules");
+ }
+
+ public void testSolveOpenMRSApiDependencies() throws Exception {
+ useFile("openmrs/pom.xml", pomFile);
+ DependenciesSolver solver = new DependenciesSolver();
+ solver.setMavenRepo(getFileInClasspath("repository/root.dir").getParentFile());
+ solver.setOutputDirectory(testDir);
+ solver.setExploreProjects(false);
+ solver.setPackageName("openmrs");
+ solver.setPackageType("maven");
+ solver.getPomTransformer().addIgnoreRule(new DependencyRule("org.openmrs.codehaus.mojo buildnumber-maven-plugin * *"));
+ solver.getPomTransformer().addIgnoreRule(new DependencyRule("org.codehaus.mojo build-helper-maven-plugin * *"));
+ solver.getPomTransformer().addIgnoreRule(new DependencyRule("org.apache.maven.plugins maven-assembly-plugin * *"));
+ solver.getPomTransformer().addIgnoreRule(new DependencyRule("org.springframework * * *"));
+ File listOfPoms = getFileInClasspath("openmrs-api.poms");
+ solver.setBaseDir(getFileInClasspath("openmrs/pom.xml").getParentFile());
+ solver.setListOfPoms(new File(listOfPoms.getParent(), listOfPoms.getName()));
+ solver.setInteractive(false);
+ solver.setOffline(true);
+
+ solver.solveDependencies();
+
+ assertTrue("Did not expect any issues", solver.getIssues().isEmpty());
+
+ solver.setBaseDir(testDir);
+ solver.setListOfPoms(new File(testDir, "openmrs.poms"));
+
+ solver.saveListOfPoms();
+ solver.saveMavenRules();
+ solver.saveSubstvars();
+
+ assertFileEquals("openmrs.poms", "openmrs.poms");
+ assertFileEquals("openmrs.substvars", "openmrs.substvars");
+ assertFileEquals("openmrs.rules", "maven.rules");
+ }
+
protected void assertFileEquals(String resource, String fileName) throws Exception {
File file = new File(testDir, fileName);
assertTrue(file.exists());
@@ -121,4 +257,18 @@
return r;
}
+ protected File getFileInClasspath(String resource) {
+ if (! resource.startsWith("/")) {
+ resource = "/" + resource;
+ }
+ URL url = this.getClass().getResource(resource);
+ File f;
+ try {
+ f = new File(url.toURI());
+ } catch(URISyntaxException e) {
+ f = new File(url.getPath());
+ }
+ return f;
+ }
+
}
Modified: trunk/maven-debian-helper/maven-packager-utils/src/test/resources/libplexus-active-collections-java.substvars
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/test/resources/libplexus-active-collections-java.substvars 2010-10-29 23:12:54 UTC (rev 13042)
+++ trunk/maven-debian-helper/maven-packager-utils/src/test/resources/libplexus-active-collections-java.substvars 2010-10-29 23:19:18 UTC (rev 13043)
@@ -1,6 +1,6 @@
#List of dependencies for libplexus-active-collections-java, generated for use by debian/control
#Wed Jun 24 22:57:35 BST 2009
-maven.CompileDepends=libplexus-maven-plugin-java (>\= 1.3.8), libsurefire-java (>\= 2.4.3)
+maven.CompileDepends=libplexus-maven-plugin-java (>\= 1.3), libsurefire-java
maven.Depends=libplexus-component-api-java, libplexus-containers-java
maven.OptionalDepends=
-maven.TestDepends=junit
+maven.TestDepends=junit (>\= 3.8.1)
Added: trunk/maven-debian-helper/maven-packager-utils/src/test/resources/libplexus-utils2-java.ignoreRules
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/test/resources/libplexus-utils2-java.ignoreRules (rev 0)
+++ trunk/maven-debian-helper/maven-packager-utils/src/test/resources/libplexus-utils2-java.ignoreRules 2010-10-29 23:19:18 UTC (rev 13043)
@@ -0,0 +1 @@
+org.apache.maven.plugins maven-release-plugin * *
Added: trunk/maven-debian-helper/maven-packager-utils/src/test/resources/libplexus-utils2-java.poms
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/test/resources/libplexus-utils2-java.poms (rev 0)
+++ trunk/maven-debian-helper/maven-packager-utils/src/test/resources/libplexus-utils2-java.poms 2010-10-29 23:19:18 UTC (rev 13043)
@@ -0,0 +1 @@
+pom.xml --no-parent
Added: trunk/maven-debian-helper/maven-packager-utils/src/test/resources/libplexus-utils2-java.substvars
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/test/resources/libplexus-utils2-java.substvars (rev 0)
+++ trunk/maven-debian-helper/maven-packager-utils/src/test/resources/libplexus-utils2-java.substvars 2010-10-29 23:19:18 UTC (rev 13043)
@@ -0,0 +1,6 @@
+#List of dependencies for libplexus-utils2-java, generated for use by debian/control
+#Sun Oct 10 23:31:00 CEST 2010
+maven.CompileDepends=libmaven-compiler-plugin-java (>\= 2.0.2), libsurefire-java
+maven.Depends=
+maven.OptionalDepends=
+maven.TestDepends=
Added: trunk/maven-debian-helper/maven-packager-utils/src/test/resources/openmrs/api/pom.xml
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/test/resources/openmrs/api/pom.xml (rev 0)
+++ trunk/maven-debian-helper/maven-packager-utils/src/test/resources/openmrs/api/pom.xml 2010-10-29 23:19:18 UTC (rev 13043)
@@ -0,0 +1,200 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.openmrs</groupId>
+ <artifactId>openmrs</artifactId>
+ <version>1.8.0-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.openmrs.api</groupId>
+ <artifactId>openmrs-api</artifactId>
+ <name>openmrs-api</name>
+ <description>The api that is re-used across web and modules</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.openmrs.test</groupId>
+ <artifactId>openmrs-test</artifactId>
+ <version>${project.version}</version>
+ <type>pom</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.azeckoski</groupId>
+ <artifactId>reflectutils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-orm</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr-runtime</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-util</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>ca.uhn.hapi</groupId>
+ <artifactId>hapi</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.openmrs.simpleframework</groupId>
+ <artifactId>simple-xml</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.openmrs.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>c3p0</groupId>
+ <artifactId>c3p0</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.openmrs.liquibase</groupId>
+ <artifactId>liquibase-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xml-resolver</groupId>
+ <artifactId>xml-resolver</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ </manifest>
+ <manifestSections>
+ <manifestSection>
+ <name>org/openmrs/util/</name>
+ <manifestEntries>
+ <Package-Title>org.openmrs.util</Package-Title>
+ <Specification-Title>OpenMRS Build Version and Short Version</Specification-Title>
+ <Specification-Vendor>${openmrs.version.long}</Specification-Vendor>
+ <Specification-Version>${openmrs.version.shortnumericonly}</Specification-Version>
+ </manifestEntries>
+ </manifestSection>
+ </manifestSections>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/test/*</exclude>
+ <!-- Exclude mail test, slows build, breaks portability with requirements on port 25 -->
+ <exclude>**/notification/MessageServiceTest.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>antlr-maven-plugin</artifactId>
+ <version>2.1</version>
+ <configuration>
+ <outputDirectory>src/main/java</outputDirectory>
+ <grammars>ArdenRecognizer.g</grammars>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
Added: trunk/maven-debian-helper/maven-packager-utils/src/test/resources/openmrs/pom.xml
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/test/resources/openmrs/pom.xml (rev 0)
+++ trunk/maven-debian-helper/maven-packager-utils/src/test/resources/openmrs/pom.xml 2010-10-29 23:19:18 UTC (rev 13043)
@@ -0,0 +1,679 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.openmrs</groupId>
+ <artifactId>openmrs</artifactId>
+ <version>1.8.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>OpenMRS</name>
+ <description>Master project for the modules of OpenMRS</description>
+ <url>http://openmrs.org</url>
+
+ <issueManagement>
+ <system>JIRA</system>
+ <url>http://tickets.openmrs.org/</url>
+ </issueManagement>
+
+ <licenses>
+ <license>
+ <name>OpenMRS Public License</name>
+ <url>http://openmrs.org/wiki/License</url>
+ </license>
+ </licenses>
+
+ <organization>
+ <name>OpenMRS LLC.</name>
+ <url>http://openmrs.org</url>
+ </organization>
+
+ <scm>
+ <connection>scm:svn:http://svn.openmrs.org/openmrs/trunk/</connection>
+ <developerConnection>scm:svn:http://svn.openmrs.org/openmrs/trunk/</developerConnection>
+ <url>http://svn.openmrs.org/openmrs/trunk/</url>
+ </scm>
+
+ <modules>
+ <module>test</module>
+ <module>api</module>
+ <module>web</module>
+ <module>webapp</module>
+ </modules>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jstl</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>request</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>response</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>standard</artifactId>
+ <version>1.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>taglibs</groupId>
+ <artifactId>page</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.openmrs.directwebremoting</groupId>
+ <artifactId>dwr</artifactId>
+ <version>2.0.5-mod</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.velocity</groupId>
+ <artifactId>velocity</artifactId>
+ <version>1.6.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>3.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.4</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-core</artifactId>
+ <version>${springVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-beans</artifactId>
+ <version>${springVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${springVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-aop</artifactId>
+ <version>${springVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-orm</artifactId>
+ <version>${springVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-tx</artifactId>
+ <version>${springVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-jdbc</artifactId>
+ <version>${springVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${springVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ <version>${springVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!--
+ For the upgrade to Spring 3.0, antlr-runtime-3.2.jar is required. However, Hibernate 3.25 needs antlr_2.7.6.jar and they can
+ both exist because their packaging is different. The earlier version, 2.7.6, is antlr.* whereas 3.2 is org.antlr.*, so
+ they can co-habitate here just fine.
+ For more information, see this article: http://blog.newsplore.com/2009/03/07/upgrading-to-spring-30
+ -->
+ <dependency>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr-runtime</artifactId>
+ <version>3.2</version>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm</artifactId>
+ <version>2.2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-commons</artifactId>
+ <version>2.2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>asm</groupId>
+ <artifactId>asm-util</artifactId>
+ <version>2.2.3</version>
+ </dependency>
+ <dependency>
+ <groupId>cglib</groupId>
+ <artifactId>cglib-nodep</artifactId>
+ <version>2.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.openmrs.hibernate</groupId>
+ <artifactId>hibernate</artifactId>
+ <version>3.2.5.ga-mod</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>asm</groupId>
+ <artifactId>asm-attrs</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>cglib</groupId>
+ <artifactId>cglib</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.openmrs.liquibase</groupId>
+ <artifactId>liquibase-core</artifactId>
+ <version>1.9.4-mod</version>
+ </dependency>
+
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.15</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.jms</groupId>
+ <artifactId>jms</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jdmk</groupId>
+ <artifactId>jmxtools</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.sun.jmx</groupId>
+ <artifactId>jmxri</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.5.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>jcl-over-slf4j</artifactId>
+ <version>1.5.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>1.5.6</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>ca.uhn.hapi</groupId>
+ <artifactId>hapi</artifactId>
+ <version>0.5</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.jdom</groupId>
+ <artifactId>jdom</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>xalan</groupId>
+ <artifactId>xalan</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.openmrs.simpleframework</groupId>
+ <artifactId>simple-xml</artifactId>
+ <version>1.6.1-mod</version>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax</artifactId>
+ <version>1.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>1.6.1</version>
+ </dependency>
+ <dependency>
+ <groupId>c3p0</groupId>
+ <artifactId>c3p0</artifactId>
+ <version>0.9.1</version>
+ </dependency>
+ <dependency>
+ <groupId>com.thoughtworks.xstream</groupId>
+ <artifactId>xstream</artifactId>
+ <version>1.3.1</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3_min</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javax.mail</groupId>
+ <artifactId>mail</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.8.0</version>
+ </dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.3.03</version>
+ </dependency>
+ <dependency>
+ <groupId>xml-resolver</groupId>
+ <artifactId>xml-resolver</artifactId>
+ <version>1.1</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ <version>1.7.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils-bean-collections</artifactId>
+ <version>1.7.0</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils-core</artifactId>
+ <version>1.7.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>saxon</artifactId>
+ <version>8.7</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.saxon</groupId>
+ <artifactId>saxon-dom</artifactId>
+ <version>8.7</version>
+ </dependency>
+ <dependency>
+ <groupId>jfree</groupId>
+ <artifactId>jfreechart</artifactId>
+ <version>1.0.12</version>
+ </dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <version>5.1.8</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-core-asl</artifactId>
+ <version>1.5.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.jackson</groupId>
+ <artifactId>jackson-mapper-asl</artifactId>
+ <version>1.5.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.azeckoski</groupId>
+ <artifactId>reflectutils</artifactId>
+ <version>0.9.14</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${springVersion}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.databene</groupId>
+ <artifactId>databene-benerator</artifactId>
+ <version>0.5.9</version>
+ <exclusions>
+ <exclusion>
+ <groupId>hsqldb</groupId>
+ <artifactId>hsqldb</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>1.2.135</version>
+ </dependency>
+ <dependency>
+ <groupId>org.dbunit</groupId>
+ <artifactId>dbunit</artifactId>
+ <version>2.4.7</version>
+ </dependency>
+ <dependency>
+ <groupId>xmlunit</groupId>
+ <artifactId>xmlunit</artifactId>
+ <version>1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.ehcache</groupId>
+ <artifactId>ehcache-core</artifactId>
+ <version>2.2.0</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ <configuration>
+ <encoding>UTF-8</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <target>1.6</target>
+ <source>1.6</source>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Build-Timestamp>${TIMESTAMP}</Build-Timestamp>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ <executions>
+ <execution>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <!--
+ Using modified version of plugin with patch applied from issue:
+ http://jira.codehaus.org/browse/MOJO-1539
+ Allows building without svn using revisionOnScmFailure
+ -->
+ <plugin>
+ <groupId>org.openmrs.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <version>1.0-beta-4-mod</version>
+ <configuration>
+ <doCheck>false</doCheck>
+ <doUpdate>false</doUpdate>
+ <getRevisionOnlyOnce>true</getRevisionOnlyOnce>
+ <buildNumberPropertyName>revisionNumber</buildNumberPropertyName>
+ <revisionOnScmFailure>0</revisionOnScmFailure>
+ <providerImplementations>
+ <svn>javasvn</svn>
+ </providerImplementations>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.6.1</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-eclipse-plugin</artifactId>
+ <version>2.8</version>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>1.5</version>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ <plugins>
+ <plugin>
+ <groupId>org.openmrs.codehaus.mojo</groupId>
+ <artifactId>buildnumber-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>validate</phase>
+ <goals>
+ <goal>create</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>parse-version</id>
+ <goals>
+ <goal>parse-version</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.2-beta-5</version>
+ <configuration>
+ <descriptorRefs>
+ <descriptorRef>project</descriptorRef>
+ </descriptorRefs>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <reporting>
+ <plugins>
+ <!-- docfilessubdirs config set to include image resource -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <docfilessubdirs>true</docfilessubdirs>
+ <bottom><em><small> Generated ${TIMESTAMP} NOTE - these libraries are in active
+ development and subject to change</small></em></bottom>
+ <header><a href="http://www.openmrs.org"
+ target=_top><img
+ src="resources/openmrs-logo-small.gif"
+ border=0/></a></header>
+ <footer><a href="http://www.openmrs.org"
+ target=_top>${project.name}</a></footer>
+ </configuration>
+ </plugin>
+ </plugins>
+ </reporting>
+
+ <repositories>
+ <repository>
+ <id>openmrs-repo</id>
+ <name>OpenMRS Nexus Repository</name>
+ <url>http://mavenrepo.openmrs.org/nexus/content/repositories/public</url>
+ </repository>
+ </repositories>
+
+ <pluginRepositories>
+ <pluginRepository>
+ <id>openmrs-repo</id>
+ <name>OpenMRS Nexus Repository</name>
+ <url>http://mavenrepo.openmrs.org/nexus/content/repositories/public</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+
+ <distributionManagement>
+ <repository>
+ <id>openmrs-repo-releases</id>
+ <name>OpenMRS Nexus Releases</name>
+ <url>http://mavenrepo.openmrs.org/nexus/content/repositories/releases</url>
+ </repository>
+ <snapshotRepository>
+ <id>openmrs-repo-snapshots</id>
+ <name>OpenMRS Nexus Snapshots</name>
+ <url>http://mavenrepo.openmrs.org/nexus/content/repositories/snapshots</url>
+ </snapshotRepository>
+ </distributionManagement>
+
+ <properties>
+ <maven.build.timestamp.format>MMM dd yyyy hh:mm aa</maven.build.timestamp.format>
+ <TIMESTAMP>${maven.build.timestamp}</TIMESTAMP>
+
+ <openmrs.version.long>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion} ${parsedVersion.qualifier} Build ${revisionNumber}</openmrs.version.long>
+ <openmrs.version.short>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.${revisionNumber}-${parsedVersion.qualifier}</openmrs.version.short>
+ <openmrs.version.shortnumericonly>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}.${revisionNumber}</openmrs.version.shortnumericonly>
+
+ <springVersion>3.0.2.RELEASE</springVersion>
+ </properties>
+
+</project>
Added: trunk/maven-debian-helper/maven-packager-utils/src/test/resources/openmrs-api.poms
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/test/resources/openmrs-api.poms (rev 0)
+++ trunk/maven-debian-helper/maven-packager-utils/src/test/resources/openmrs-api.poms 2010-10-29 23:19:18 UTC (rev 13043)
@@ -0,0 +1,2 @@
+pom.xml --no-parent
+api/pom.xml
Added: trunk/maven-debian-helper/maven-packager-utils/src/test/resources/openmrs.poms
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/test/resources/openmrs.poms (rev 0)
+++ trunk/maven-debian-helper/maven-packager-utils/src/test/resources/openmrs.poms 2010-10-29 23:19:18 UTC (rev 13043)
@@ -0,0 +1 @@
+pom.xml --no-parent
Added: trunk/maven-debian-helper/maven-packager-utils/src/test/resources/openmrs.rules
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/test/resources/openmrs.rules (rev 0)
+++ trunk/maven-debian-helper/maven-packager-utils/src/test/resources/openmrs.rules 2010-10-29 23:19:18 UTC (rev 13043)
@@ -0,0 +1,2 @@
+
+junit junit jar s/4\..*/4.x/ * *
Added: trunk/maven-debian-helper/maven-packager-utils/src/test/resources/openmrs.substvars
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/test/resources/openmrs.substvars (rev 0)
+++ trunk/maven-debian-helper/maven-packager-utils/src/test/resources/openmrs.substvars 2010-10-29 23:19:18 UTC (rev 13043)
@@ -0,0 +1,6 @@
+#List of dependencies for openmrs, generated for use by debian/control
+#Sun Oct 24 23:51:45 CEST 2010
+maven.CompileDepends=libmaven-javadoc-plugin-java
+maven.Depends=junit4
+maven.OptionalDepends=
+maven.TestDepends=
\ No newline at end of file
Added: trunk/maven-debian-helper/maven-packager-utils/src/test/resources/plexus-active-collections/pom.xml
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/test/resources/plexus-active-collections/pom.xml (rev 0)
+++ trunk/maven-debian-helper/maven-packager-utils/src/test/resources/plexus-active-collections/pom.xml 2010-10-29 23:19:18 UTC (rev 13043)
@@ -0,0 +1,81 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>plexus-components</artifactId>
+ <groupId>org.codehaus.plexus</groupId>
+ <version>1.1.6</version>
+ </parent>
+
+ <artifactId>plexus-active-collections</artifactId>
+ <version>1.0-beta-2</version>
+ <name>Plexus Container-Backed Active Collections</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-api</artifactId>
+ <version>1.0-beta-2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <version>1.0-beta-2</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/TestComponent.java</exclude>
+ <exclude>**/TestBadComponent.java</exclude>
+ <exclude>**/*TCK.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-maven-plugin</artifactId>
+ <version>1.3</version>
+ <executions>
+ <execution>
+ <id>create-component-descriptor</id>
+ <goals>
+ <goal>descriptor</goal>
+ </goals>
+ </execution>
+ <!--
+ <execution>
+ <id>merge</id>
+ <configuration>
+ <output>${project.build.outputDirectory}/META-INF/plexus/components.xml</output>
+ <descriptors>
+ <descriptor>${project.build.directory}/generated-resources/plexus/META-INF/plexus/components.xml</descriptor>
+ <descriptor>src/main/resources/META-INF/plexus/components.xml</descriptor>
+ </descriptors>
+ </configuration>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>merge-descriptors</goal>
+ </goals>
+ </execution>
+ -->
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+ <scm>
+ <connection>scm:svn:http://svn.codehaus.org/plexus/tags/plexus-active-collections-1.0-beta-2</connection>
+ <developerConnection>scm:svn:https://svn.codehaus.org/plexus/tags/plexus-active-collections-1.0-beta-2</developerConnection>
+ </scm>
+</project>
\ No newline at end of file
Added: trunk/maven-debian-helper/maven-packager-utils/src/test/resources/plexus-utils2/pom.xml
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/test/resources/plexus-utils2/pom.xml (rev 0)
+++ trunk/maven-debian-helper/maven-packager-utils/src/test/resources/plexus-utils2/pom.xml 2010-10-29 23:19:18 UTC (rev 13043)
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Copyright The Codehaus Foundation.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus</artifactId>
+ <version>2.0.6</version>
+ <relativePath>../pom/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>plexus-utils</artifactId>
+ <version>2.0.5</version>
+
+ <name>Plexus Common Utilities</name>
+ <description>A collection of various utility classes to ease working with strings, files, command lines, XML and more.</description>
+ <url>http://plexus.codehaus.org/plexus-utils</url>
+
+ <scm>
+ <connection>scm:svn:http://svn.codehaus.org/plexus/plexus-utils/tags/plexus-utils-2.0.5</connection>
+ <developerConnection>scm:svn:https://svn.codehaus.org/plexus/plexus-utils/tags/plexus-utils-2.0.5</developerConnection>
+ <url>http://fisheye.codehaus.org/browse/plexus/plexus-utils/tags/plexus-utils-2.0.5</url>
+ </scm>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>http://jira.codehaus.org/browse/PLXUTILS</url>
+ </issueManagement>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <!-- surefire requires plexus-utils to be jdk 1.3 compatible -->
+ <source>1.3</source>
+ <target>1.3</target>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <!-- required to ensure the test classes are used, not surefire's plexus-utils -->
+ <childDelegation>true</childDelegation>
+ <excludes>
+ <exclude>org/codehaus/plexus/util/FileBasedTestCase.java</exclude>
+ <exclude>**/Test*.java</exclude>
+ </excludes>
+ <systemProperties>
+ <property>
+ <name>JAVA_HOME</name>
+ <value>${JAVA_HOME}</value>
+ </property>
+ <property>
+ <name>M2_HOME</name>
+ <value>${M2_HOME}</value>
+ </property>
+ </systemProperties>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <configuration>
+ <tagBase>https://svn.codehaus.org/plexus/plexus-utils/tags/</tagBase>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/junit/junit/3.8.2/junit-3.8.2.pom
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/junit/junit/3.8.2/junit-3.8.2.pom (rev 0)
+++ trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/junit/junit/3.8.2/junit-3.8.2.pom 2010-10-29 23:19:18 UTC (rev 13043)
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.2</version>
+ <packaging>jar</packaging>
+ <properties>
+ <debian.hasPackageVersion/>
+ <debian.mavenRules>junit junit jar s/3\..*/3.x/ * *</debian.mavenRules>
+ <debian.originalVersion>3.8.2</debian.originalVersion>
+ <debian.package>junit</debian.package>
+ </properties>
+
+ <name>JUnit</name>
+ <url>http://junit.org</url>
+ <description>JUnit is a regression testing framework written by Erich Gamma and Kent Beck. It is used by the developer who implements unit tests in Java.</description>
+ <organization>
+ <name>JUnit</name>
+ <url>http://www.junit.org</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>Common Public License Version 1.0</name>
+ <url>http://www.opensource.org/licenses/cpl1.0.txt</url>
+ </license>
+ </licenses>
+ <scm>
+ <url>http://junit.cvs.sourceforge.net/junit/</url>
+ </scm>
+ <dependencies>
+ </dependencies>
+</project>
\ No newline at end of file
Added: trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/junit/junit/3.x/junit-3.x.pom
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/junit/junit/3.x/junit-3.x.pom (rev 0)
+++ trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/junit/junit/3.x/junit-3.x.pom 2010-10-29 23:19:18 UTC (rev 13043)
@@ -0,0 +1,33 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.x</version>
+ <packaging>jar</packaging>
+ <properties>
+ <debian.hasPackageVersion/>
+ <debian.mavenRules>junit junit jar s/3\..*/3.x/ * *</debian.mavenRules>
+ <debian.originalVersion>3.8.2</debian.originalVersion>
+ <debian.package>junit</debian.package>
+ </properties>
+
+ <name>JUnit</name>
+ <url>http://junit.org</url>
+ <description>JUnit is a regression testing framework written by Erich Gamma and Kent Beck. It is used by the developer who implements unit tests in Java.</description>
+ <organization>
+ <name>JUnit</name>
+ <url>http://www.junit.org</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>Common Public License Version 1.0</name>
+ <url>http://www.opensource.org/licenses/cpl1.0.txt</url>
+ </license>
+ </licenses>
+ <scm>
+ <url>http://junit.cvs.sourceforge.net/junit/</url>
+ </scm>
+ <dependencies>
+ </dependencies>
+</project>
\ No newline at end of file
Added: trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/junit/junit/4.8.2/junit-4.8.2.pom
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/junit/junit/4.8.2/junit-4.8.2.pom (rev 0)
+++ trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/junit/junit/4.8.2/junit-4.8.2.pom 2010-10-29 23:19:18 UTC (rev 13043)
@@ -0,0 +1,50 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.8.2</version>
+ <packaging>jar</packaging>
+
+ <name>JUnit</name>
+ <url>http://junit.org</url>
+ <description>JUnit is a regression testing framework written by Erich Gamma and Kent Beck. It is used by the developer who
+ implements unit tests in Java.</description>
+ <organization>
+ <name>JUnit</name>
+ <url>http://www.junit.org</url>
+ </organization>
+ <mailingLists>
+ <mailingList>
+ <name>JUnit Mailing List</name>
+ <post>junit at yahoogroups.com</post>
+ <archive>http://tech.groups.yahoo.com/group/junit/</archive>
+ </mailingList>
+ </mailingLists>
+ <licenses>
+ <license>
+ <name>Common Public License Version 1.0</name>
+ <url>http://www.opensource.org/licenses/cpl1.0.txt</url>
+ </license>
+ </licenses>
+ <scm>
+ <connection>scm:git:git://github.com/KentBeck/junit.git</connection>
+ <developerConnection>scm:git:git at github.com:KentBeck/junit.git</developerConnection>
+ <url>http://github.com/KentBeck/junit/tree/master</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <version>debian</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <properties>
+ <jdk.version>1.5</jdk.version>
+ <debian.originalVersion>4.8.2</debian.originalVersion>
+ <debian.package>junit4</debian.package>
+ <debian.mavenRules><![CDATA[junit junit jar s/4\..*/4.x/ * *]]></debian.mavenRules>
+ <debian.org.hamcrest.hamcrest-core.originalVersion>1.1</debian.org.hamcrest.hamcrest-core.originalVersion>
+ </properties>
+</project>
\ No newline at end of file
Added: trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/junit/junit/4.x/junit-4.x.pom
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/junit/junit/4.x/junit-4.x.pom (rev 0)
+++ trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/junit/junit/4.x/junit-4.x.pom 2010-10-29 23:19:18 UTC (rev 13043)
@@ -0,0 +1,50 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd ">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.x</version>
+ <packaging>jar</packaging>
+
+ <name>JUnit</name>
+ <url>http://junit.org</url>
+ <description>JUnit is a regression testing framework written by Erich Gamma and Kent Beck. It is used by the developer who
+ implements unit tests in Java.</description>
+ <organization>
+ <name>JUnit</name>
+ <url>http://www.junit.org</url>
+ </organization>
+ <mailingLists>
+ <mailingList>
+ <name>JUnit Mailing List</name>
+ <post>junit at yahoogroups.com</post>
+ <archive>http://tech.groups.yahoo.com/group/junit/</archive>
+ </mailingList>
+ </mailingLists>
+ <licenses>
+ <license>
+ <name>Common Public License Version 1.0</name>
+ <url>http://www.opensource.org/licenses/cpl1.0.txt</url>
+ </license>
+ </licenses>
+ <scm>
+ <connection>scm:git:git://github.com/KentBeck/junit.git</connection>
+ <developerConnection>scm:git:git at github.com:KentBeck/junit.git</developerConnection>
+ <url>http://github.com/KentBeck/junit/tree/master</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-core</artifactId>
+ <version>debian</version>
+ <scope>compile</scope>
+ </dependency>
+ </dependencies>
+ <properties>
+ <jdk.version>1.5</jdk.version>
+ <debian.originalVersion>4.8.2</debian.originalVersion>
+ <debian.package>junit4</debian.package>
+ <debian.mavenRules><![CDATA[junit junit jar s/4\..*/4.x/ * *]]></debian.mavenRules>
+ <debian.org.hamcrest.hamcrest-core.originalVersion>1.1</debian.org.hamcrest.hamcrest-core.originalVersion>
+ </properties>
+</project>
\ No newline at end of file
Added: trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/plugins/maven-compiler-plugin/2.0.2/maven-compiler-plugin-2.0.2.pom
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/plugins/maven-compiler-plugin/2.0.2/maven-compiler-plugin-2.0.2.pom (rev 0)
+++ trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/plugins/maven-compiler-plugin/2.0.2/maven-compiler-plugin-2.0.2.pom 2010-10-29 23:19:18 UTC (rev 13043)
@@ -0,0 +1,58 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0.2</version>
+ <packaging>maven-plugin</packaging>
+ <properties>
+ <debian.hasPackageVersion/>
+ <debian.originalVersion>2.0.2</debian.originalVersion>
+ <debian.package>libmaven-compiler-plugin-java</debian.package>
+ </properties>
+
+ <name>Maven Compiler Plugin</name>
+ <inceptionYear>2001</inceptionYear>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>http://jira.codehaus.org/browse/MCOMPILER</url>
+ </issueManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-compiler-api</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-compiler-manager</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-compiler-javac</artifactId>
+ <version>debian</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>debian</version>
+ </dependency>
+ </dependencies>
+ <scm>
+ <connection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-compiler-plugin-2.0.2</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-compiler-plugin-2.0.2</developerConnection>
+ <url>https://svn.apache.org/repos/asf/maven/plugins/tags/maven-compiler-plugin-2.0.2</url>
+ </scm>
+</project>
Added: trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/plugins/maven-javadoc-plugin/2.6.1/maven-javadoc-plugin-2.6.1.pom
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/plugins/maven-javadoc-plugin/2.6.1/maven-javadoc-plugin-2.6.1.pom (rev 0)
+++ trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/plugins/maven-javadoc-plugin/2.6.1/maven-javadoc-plugin-2.6.1.pom 2010-10-29 23:19:18 UTC (rev 13043)
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.6.1</version>
+ <packaging>maven-plugin</packaging>
+
+ <name>Maven Javadoc Plugin</name>
+ <description>The Maven Javadoc Plugin is a plugin that uses the javadoc tool for
+ generating javadocs for the specified project.
+ </description>
+ <inceptionYear>2004</inceptionYear>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/plugins/tags/maven-javadoc-plugin-2.6.1</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/plugins/tags/maven-javadoc-plugin-2.6.1</developerConnection>
+ <url>http://svn.apache.org/viewvc/maven/plugins/tags/maven-javadoc-plugin-2.6.1</url>
+ </scm>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://jira.codehaus.org/browse/MJAVADOC</url>
+ </issueManagement>
+ <properties>
+ <doxiaVersion>1.0</doxiaVersion>
+ <doxia-sitetoolsVersion>1.0</doxia-sitetoolsVersion>
+ <wagonVersion>1.0-beta-6</wagonVersion>
+ <sitePluginVersion>2.0.1</sitePluginVersion>
+ <projectInfoReportsPluginVersion>2.1.2</projectInfoReportsPluginVersion>
+ <debian.originalVersion>2.6.1</debian.originalVersion>
+ <debian.package>libmaven-javadoc-plugin-java</debian.package>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-settings</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-api</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact-manager</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-archiver</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-invoker</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-sink-api</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.doxia</groupId>
+ <artifactId>doxia-site-renderer</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.wagon</groupId>
+ <artifactId>wagon-provider-api</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-httpclient</groupId>
+ <artifactId>commons-httpclient</artifactId>
+ <version>3.x</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.x</version>
+ </dependency>
+ <dependency>
+ <groupId>com.thoughtworks.qdox</groupId>
+ <artifactId>qdox</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-archiver</artifactId>
+ <version>debian</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-toolchain</artifactId>
+ <version>debian</version>
+ <exclusions>
+ <exclusion>
+ <groupId>plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>debian</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Added: trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/plugins/maven-surefire-plugin/2.4.3/maven-surefire-plugin-2.4.3.pom
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/plugins/maven-surefire-plugin/2.4.3/maven-surefire-plugin-2.4.3.pom (rev 0)
+++ trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/plugins/maven-surefire-plugin/2.4.3/maven-surefire-plugin-2.4.3.pom 2010-10-29 23:19:18 UTC (rev 13043)
@@ -0,0 +1,110 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.4.3</version>
+ <packaging>maven-plugin</packaging>
+ <parent>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire</artifactId>
+ <version>debian</version>
+ </parent>
+ <properties>
+ <debian.originalVersion>2.4.3</debian.originalVersion>
+ <debian.package>libsurefire-java</debian.package>
+ </properties>
+
+ <name>Maven Surefire Plugin</name>
+ <mailingLists>
+ <mailingList>
+ <name>Maven User List</name>
+ <subscribe>users-subscribe at maven.apache.org</subscribe>
+ <unsubscribe>users-unsubscribe at maven.apache.org</unsubscribe>
+ <post>users at maven.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/maven-users</archive>
+ <otherArchives>
+ <otherArchive>http://www.mail-archive.com/users@maven.apache.org/</otherArchive>
+ <otherArchive>http://www.nabble.com/Maven---Users-f178.html</otherArchive>
+ </otherArchives>
+ </mailingList>
+ <mailingList>
+ <name>Maven Developer List</name>
+ <subscribe>dev-subscribe at maven.apache.org</subscribe>
+ <unsubscribe>dev-unsubscribe at maven.apache.org</unsubscribe>
+ <post>dev at maven.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/maven-dev</archive>
+ </mailingList>
+ <mailingList>
+ <name>Maven Commits List</name>
+ <subscribe>commits-subscribe at maven.apache.org</subscribe>
+ <unsubscribe>commits-unsubscribe at maven.apache.org</unsubscribe>
+ <post>commits at maven.apache.org</post>
+ <archive>http://mail-archives.apache.org/mod_mbox/maven-dev</archive>
+ </mailingList>
+ <mailingList>
+ <name>Maven Announcements List</name>
+ <post>announce at maven.apache.org</post>
+ <subscribe>announce-subscribe at maven.apache.org</subscribe>
+ <unsubscribe>announce-unsubscribe at maven.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/maven-announce/</archive>
+ </mailingList>
+ <mailingList>
+ <name>Maven Issues List</name>
+ <post>issues at maven.apache.org</post>
+ <subscribe>issues-subscribe at maven.apache.org</subscribe>
+ <unsubscribe>issues-unsubscribe at maven.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/maven-issues/</archive>
+ </mailingList>
+ <mailingList>
+ <name>Maven Notifications List</name>
+ <post>notifications at maven.apache.org</post>
+ <subscribe>notifications-subscribe at maven.apache.org</subscribe>
+ <unsubscribe>notifications-unsubscribe at maven.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/maven-notifications/</archive>
+ </mailingList>
+ </mailingLists>
+ <contributors>
+ <contributor>
+ <name>Joakim Erdfelt</name>
+ <email>joakim at erdfelt.com</email>
+ </contributor>
+ </contributors>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-booter</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-toolchain</artifactId>
+ <version>debian</version>
+ </dependency>
+ </dependencies>
+</project>
Added: trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/surefire/surefire/2.4.3/surefire-2.4.3.pom
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/surefire/surefire/2.4.3/surefire-2.4.3.pom (rev 0)
+++ trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/surefire/surefire/2.4.3/surefire-2.4.3.pom 2010-10-29 23:19:18 UTC (rev 13043)
@@ -0,0 +1,114 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire</artifactId>
+ <version>2.4.3</version>
+ <packaging>pom</packaging>
+ <properties>
+ <debian.originalVersion>2.4.3</debian.originalVersion>
+ <debian.package>libsurefire-java</debian.package>
+ </properties>
+
+ <name>SureFire</name>
+ <description>Surefire is a test framework project.</description>
+ <url>http://maven.apache.org/surefire</url>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://jira.codehaus.org/browse/SUREFIRE</url>
+ </issueManagement>
+ <inceptionYear>2004</inceptionYear>
+ <mailingLists>
+ <mailingList>
+ <name>Surefire User List</name>
+ <post>surefire-users at maven.apache.org</post>
+ <subscribe>surefire-users-subscribe at maven.apache.org</subscribe>
+ <unsubscribe>surefire-users-unsubscribe at maven.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/maven-surefire-users/</archive>
+ <otherArchives>
+ <otherArchive>http://www.mail-archive.com/surefire-users@maven.apache.org</otherArchive>
+ <otherArchive>http://maven.surefire.users.markmail.org/</otherArchive>
+ </otherArchives>
+ </mailingList>
+ <mailingList>
+ <name>Surefire Developer List</name>
+ <post>surefire-dev at maven.apache.org</post>
+ <subscribe>surefire-dev-subscribe at maven.apache.org</subscribe>
+ <unsubscribe>surfire-dev-unsubscribe at maven.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/maven-surefire-dev/</archive>
+ <otherArchives>
+ <otherArchive>http://www.mail-archive.com/surefire-dev@maven.apache.org</otherArchive>
+ <otherArchive>http://maven.surefire.dev.markmail.org/</otherArchive>
+ </otherArchives>
+ </mailingList>
+ <mailingList>
+ <name>Surefire Commits List</name>
+ <subscribe>surefire-commits-subscribe at maven.apache.org</subscribe>
+ <unsubscribe>surefire-commits-unsubscribe at maven.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/maven-surefire-commits/</archive>
+ <otherArchives>
+ <otherArchive>http://www.mail-archive.com/surefire-commits@maven.apache.org</otherArchive>
+ <otherArchive>http://maven.surefire.commits.markmail.org/</otherArchive>
+ </otherArchives>
+ </mailingList>
+ </mailingLists>
+ <contributors>
+ <contributor>
+ <name>Jesse Kuhnert</name>
+ </contributor>
+ <contributor>
+ <name>Vincent Siveton</name>
+ <email>vincent.siveton at gmail.com</email>
+ <organization>ASF</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </contributor>
+ </contributors>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/surefire/tags/surefire-2.4.3</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/surefire/tags/surefire-2.4.3</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/maven/surefire/tags/surefire-2.4.3</url>
+ </scm>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-api</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-booter</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>debian</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.x</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jmock</groupId>
+ <artifactId>jmock</artifactId>
+ <version>1.x</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <modules>
+ <module>surefire-api</module>
+ <module>surefire-booter</module>
+ <module>surefire-providers</module>
+ <module>maven-surefire-plugin</module>
+ <module>maven-surefire-report-plugin</module>
+ <module>surefire-integration-tests</module>
+ </modules>
+</project>
\ No newline at end of file
Added: trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/surefire/surefire/debian/surefire-debian.pom
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/surefire/surefire/debian/surefire-debian.pom (rev 0)
+++ trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/apache/maven/surefire/surefire/debian/surefire-debian.pom 2010-10-29 23:19:18 UTC (rev 13043)
@@ -0,0 +1,114 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire</artifactId>
+ <version>debian</version>
+ <packaging>pom</packaging>
+ <properties>
+ <debian.originalVersion>2.4.3</debian.originalVersion>
+ <debian.package>libsurefire-java</debian.package>
+ </properties>
+
+ <name>SureFire</name>
+ <description>Surefire is a test framework project.</description>
+ <url>http://maven.apache.org/surefire</url>
+ <issueManagement>
+ <system>jira</system>
+ <url>http://jira.codehaus.org/browse/SUREFIRE</url>
+ </issueManagement>
+ <inceptionYear>2004</inceptionYear>
+ <mailingLists>
+ <mailingList>
+ <name>Surefire User List</name>
+ <post>surefire-users at maven.apache.org</post>
+ <subscribe>surefire-users-subscribe at maven.apache.org</subscribe>
+ <unsubscribe>surefire-users-unsubscribe at maven.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/maven-surefire-users/</archive>
+ <otherArchives>
+ <otherArchive>http://www.mail-archive.com/surefire-users@maven.apache.org</otherArchive>
+ <otherArchive>http://maven.surefire.users.markmail.org/</otherArchive>
+ </otherArchives>
+ </mailingList>
+ <mailingList>
+ <name>Surefire Developer List</name>
+ <post>surefire-dev at maven.apache.org</post>
+ <subscribe>surefire-dev-subscribe at maven.apache.org</subscribe>
+ <unsubscribe>surfire-dev-unsubscribe at maven.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/maven-surefire-dev/</archive>
+ <otherArchives>
+ <otherArchive>http://www.mail-archive.com/surefire-dev@maven.apache.org</otherArchive>
+ <otherArchive>http://maven.surefire.dev.markmail.org/</otherArchive>
+ </otherArchives>
+ </mailingList>
+ <mailingList>
+ <name>Surefire Commits List</name>
+ <subscribe>surefire-commits-subscribe at maven.apache.org</subscribe>
+ <unsubscribe>surefire-commits-unsubscribe at maven.apache.org</unsubscribe>
+ <archive>http://mail-archives.apache.org/mod_mbox/maven-surefire-commits/</archive>
+ <otherArchives>
+ <otherArchive>http://www.mail-archive.com/surefire-commits@maven.apache.org</otherArchive>
+ <otherArchive>http://maven.surefire.commits.markmail.org/</otherArchive>
+ </otherArchives>
+ </mailingList>
+ </mailingLists>
+ <contributors>
+ <contributor>
+ <name>Jesse Kuhnert</name>
+ </contributor>
+ <contributor>
+ <name>Vincent Siveton</name>
+ <email>vincent.siveton at gmail.com</email>
+ <organization>ASF</organization>
+ <roles>
+ <role>Java Developer</role>
+ </roles>
+ </contributor>
+ </contributors>
+ <scm>
+ <connection>scm:svn:http://svn.apache.org/repos/asf/maven/surefire/tags/surefire-2.4.3</connection>
+ <developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/surefire/tags/surefire-2.4.3</developerConnection>
+ <url>http://svn.apache.org/viewcvs.cgi/maven/surefire/tags/surefire-2.4.3</url>
+ </scm>
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-api</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.surefire</groupId>
+ <artifactId>surefire-booter</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>debian</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.x</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>jmock</groupId>
+ <artifactId>jmock</artifactId>
+ <version>1.x</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <modules>
+ <module>surefire-api</module>
+ <module>surefire-booter</module>
+ <module>surefire-providers</module>
+ <module>maven-surefire-plugin</module>
+ <module>maven-surefire-report-plugin</module>
+ <module>surefire-integration-tests</module>
+ </modules>
+</project>
\ No newline at end of file
Added: trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom (rev 0)
+++ trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus/2.0.7/plexus-2.0.7.pom 2010-10-29 23:19:18 UTC (rev 13043)
@@ -0,0 +1,331 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+Copyright The Codehaus Foundation.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus</artifactId>
+ <version>2.0.7</version>
+ <packaging>pom</packaging>
+
+ <name>Plexus</name>
+ <description>The Plexus project provides a full software stack for creating and executing software projects.</description>
+ <url>http://plexus.codehaus.org/</url>
+ <inceptionYear>2001</inceptionYear>
+ <organization>
+ <name>Codehaus</name>
+ <url>http://www.codehaus.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>jvanzyl</id>
+ <name>Jason van Zyl</name>
+ <email>jason at maven.org</email>
+ <roles>
+ <role>Developer</role>
+ <role>Release Manager</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>kaz</id>
+ <name>Pete Kazmier</name>
+ <email>
+ </email>
+ <organization>
+ </organization>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>jtaylor</id>
+ <name>James Taylor</name>
+ <email>james at jamestaylor.org</email>
+ <organization>
+ </organization>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>dandiep</id>
+ <name>Dan Diephouse</name>
+ <email>dan at envoisolutions.com</email>
+ <organization>Envoi solutions</organization>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>kasper</id>
+ <name>Kasper Nielsen</name>
+ <email>apache at kav.dk</email>
+ <organization>
+ </organization>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>bwalding</id>
+ <name>Ben Walding</name>
+ <email>bwalding at codehaus.org</email>
+ <organization>Walding Consulting Services</organization>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>mhw</id>
+ <name>Mark Wilkinson</name>
+ <email>mhw at kremvax.net</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>michal</id>
+ <name>Michal Maczka</name>
+ <email>mmaczka at interia.pl</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>evenisse</id>
+ <name>Emmanuel Venisse</name>
+ <email>evenisse at codehaus.org</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Trygve Laugstøl</name>
+ <id>trygvis</id>
+ <email>trygvis at codehaus.org</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Kenney Westerhof</name>
+ <id>kenney</id>
+ <email>kenney at codehaus.org</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Carlos Sanchez</name>
+ <id>carlos</id>
+ <email>carlos at codehaus.org</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Brett Porter</name>
+ <id>brett</id>
+ <email>brett at codehaus.org</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>John Casey</name>
+ <id>jdcasey</id>
+ <email>jdcasey at codehaus.org</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Andrew Williams</name>
+ <id>handyande</id>
+ <email>andy at handyande.co.uk</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Rahul Thakur</name>
+ <id>rahul</id>
+ <email>rahul.thakur.xdev at gmail.com</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Joakim Erdfelt</name>
+ <id>joakime</id>
+ <email>joakim at erdfelt.com</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Olivier Lamy</name>
+ <id>olamy</id>
+ <email>olamy at codehaus.org</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Hervé Boutemy</name>
+ <id>hboutemy</id>
+ <email>hboutemy at codehaus.org</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Oleg Gusakov</name>
+ <id>oleg</id>
+ <email>olegy at codehaus.org</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Vincent Siveton</name>
+ <id>vsiveton</id>
+ <email>vsiveton at codehaus.org</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ </developers>
+ <mailingLists>
+ <mailingList>
+ <name>Plexus User List</name>
+ <subscribe>http://xircles.codehaus.org/manage_email/user%40plexus.codehaus.org</subscribe>
+ <unsubscribe>http://xircles.codehaus.org/manage_email/user%40plexus.codehaus.org</unsubscribe>
+ <archive>http://archive.plexus.codehaus.org/user</archive>
+ <post>user at plexus.codehaus.org</post>
+ </mailingList>
+ <mailingList>
+ <name>Plexus Developer List</name>
+ <subscribe>http://xircles.codehaus.org/manage_email/dev%40plexus.codehaus.org</subscribe>
+ <unsubscribe>http://xircles.codehaus.org/manage_email/dev%40plexus.codehaus.org</unsubscribe>
+ <archive>http://archive.plexus.codehaus.org/dev</archive>
+ <post>dev at plexus.codehaus.org</post>
+ </mailingList>
+ <mailingList>
+ <name>Plexus Announce List</name>
+ <subscribe>http://xircles.codehaus.org/manage_email/announce%40plexus.codehaus.org</subscribe>
+ <unsubscribe>http://xircles.codehaus.org/manage_email/announce%40plexus.codehaus.org</unsubscribe>
+ <archive>http://archive.plexus.codehaus.org/announce</archive>
+ </mailingList>
+ <mailingList>
+ <name>Plexus Commit List</name>
+ <subscribe>http://xircles.codehaus.org/manage_email/scm%40plexus.codehaus.org</subscribe>
+ <unsubscribe>http://xircles.codehaus.org/manage_email/scm%40plexus.codehaus.org</unsubscribe>
+ <archive>http://archive.plexus.codehaus.org/scm</archive>
+ </mailingList>
+ </mailingLists>
+ <scm>
+ <connection>scm:svn:http://svn.codehaus.org/plexus/pom/tags/plexus-2.0.7</connection>
+ <developerConnection>scm:svn:https://svn.codehaus.org/plexus/pom/tags/plexus-2.0.7</developerConnection>
+ <url>http://fisheye.codehaus.org/browse/plexus/pom/tags/plexus-2.0.7</url>
+ </scm>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>http://jira.codehaus.org/browse/PLX</url>
+ </issueManagement>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <plexusDistMgmtSnapshotsUrl>https://oss.sonatype.org/content/repositories/plexus-snapshots</plexusDistMgmtSnapshotsUrl>
+ <debian.junit.junit.originalVersion>3.8.2</debian.junit.junit.originalVersion>
+ <debian.mavenRules>org.codehaus.plexus plexus pom s/2\..*/2.x/ * *</debian.mavenRules>
+ <debian.originalVersion>2.0.7</debian.originalVersion>
+ <debian.package>libmaven-parent-poms</debian.package>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>debian</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <!-- set versions of common plugins for reproducibility, ordered alphabetically -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
\ No newline at end of file
Added: trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus/2.x/plexus-2.x.pom
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus/2.x/plexus-2.x.pom (rev 0)
+++ trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus/2.x/plexus-2.x.pom 2010-10-29 23:19:18 UTC (rev 13043)
@@ -0,0 +1,331 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!--
+Copyright The Codehaus Foundation.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus</artifactId>
+ <version>2.x</version>
+ <packaging>pom</packaging>
+
+ <name>Plexus</name>
+ <description>The Plexus project provides a full software stack for creating and executing software projects.</description>
+ <url>http://plexus.codehaus.org/</url>
+ <inceptionYear>2001</inceptionYear>
+ <organization>
+ <name>Codehaus</name>
+ <url>http://www.codehaus.org/</url>
+ </organization>
+ <licenses>
+ <license>
+ <name>The Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ </license>
+ </licenses>
+ <developers>
+ <developer>
+ <id>jvanzyl</id>
+ <name>Jason van Zyl</name>
+ <email>jason at maven.org</email>
+ <roles>
+ <role>Developer</role>
+ <role>Release Manager</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>kaz</id>
+ <name>Pete Kazmier</name>
+ <email>
+ </email>
+ <organization>
+ </organization>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>jtaylor</id>
+ <name>James Taylor</name>
+ <email>james at jamestaylor.org</email>
+ <organization>
+ </organization>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>dandiep</id>
+ <name>Dan Diephouse</name>
+ <email>dan at envoisolutions.com</email>
+ <organization>Envoi solutions</organization>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>kasper</id>
+ <name>Kasper Nielsen</name>
+ <email>apache at kav.dk</email>
+ <organization>
+ </organization>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>bwalding</id>
+ <name>Ben Walding</name>
+ <email>bwalding at codehaus.org</email>
+ <organization>Walding Consulting Services</organization>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>mhw</id>
+ <name>Mark Wilkinson</name>
+ <email>mhw at kremvax.net</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>michal</id>
+ <name>Michal Maczka</name>
+ <email>mmaczka at interia.pl</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <id>evenisse</id>
+ <name>Emmanuel Venisse</name>
+ <email>evenisse at codehaus.org</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Trygve Laugstøl</name>
+ <id>trygvis</id>
+ <email>trygvis at codehaus.org</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Kenney Westerhof</name>
+ <id>kenney</id>
+ <email>kenney at codehaus.org</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Carlos Sanchez</name>
+ <id>carlos</id>
+ <email>carlos at codehaus.org</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Brett Porter</name>
+ <id>brett</id>
+ <email>brett at codehaus.org</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>John Casey</name>
+ <id>jdcasey</id>
+ <email>jdcasey at codehaus.org</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Andrew Williams</name>
+ <id>handyande</id>
+ <email>andy at handyande.co.uk</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Rahul Thakur</name>
+ <id>rahul</id>
+ <email>rahul.thakur.xdev at gmail.com</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Joakim Erdfelt</name>
+ <id>joakime</id>
+ <email>joakim at erdfelt.com</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Olivier Lamy</name>
+ <id>olamy</id>
+ <email>olamy at codehaus.org</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Hervé Boutemy</name>
+ <id>hboutemy</id>
+ <email>hboutemy at codehaus.org</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Oleg Gusakov</name>
+ <id>oleg</id>
+ <email>olegy at codehaus.org</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ <developer>
+ <name>Vincent Siveton</name>
+ <id>vsiveton</id>
+ <email>vsiveton at codehaus.org</email>
+ <roles>
+ <role>Developer</role>
+ </roles>
+ </developer>
+ </developers>
+ <mailingLists>
+ <mailingList>
+ <name>Plexus User List</name>
+ <subscribe>http://xircles.codehaus.org/manage_email/user%40plexus.codehaus.org</subscribe>
+ <unsubscribe>http://xircles.codehaus.org/manage_email/user%40plexus.codehaus.org</unsubscribe>
+ <archive>http://archive.plexus.codehaus.org/user</archive>
+ <post>user at plexus.codehaus.org</post>
+ </mailingList>
+ <mailingList>
+ <name>Plexus Developer List</name>
+ <subscribe>http://xircles.codehaus.org/manage_email/dev%40plexus.codehaus.org</subscribe>
+ <unsubscribe>http://xircles.codehaus.org/manage_email/dev%40plexus.codehaus.org</unsubscribe>
+ <archive>http://archive.plexus.codehaus.org/dev</archive>
+ <post>dev at plexus.codehaus.org</post>
+ </mailingList>
+ <mailingList>
+ <name>Plexus Announce List</name>
+ <subscribe>http://xircles.codehaus.org/manage_email/announce%40plexus.codehaus.org</subscribe>
+ <unsubscribe>http://xircles.codehaus.org/manage_email/announce%40plexus.codehaus.org</unsubscribe>
+ <archive>http://archive.plexus.codehaus.org/announce</archive>
+ </mailingList>
+ <mailingList>
+ <name>Plexus Commit List</name>
+ <subscribe>http://xircles.codehaus.org/manage_email/scm%40plexus.codehaus.org</subscribe>
+ <unsubscribe>http://xircles.codehaus.org/manage_email/scm%40plexus.codehaus.org</unsubscribe>
+ <archive>http://archive.plexus.codehaus.org/scm</archive>
+ </mailingList>
+ </mailingLists>
+ <scm>
+ <connection>scm:svn:http://svn.codehaus.org/plexus/pom/tags/plexus-2.0.7</connection>
+ <developerConnection>scm:svn:https://svn.codehaus.org/plexus/pom/tags/plexus-2.0.7</developerConnection>
+ <url>http://fisheye.codehaus.org/browse/plexus/pom/tags/plexus-2.0.7</url>
+ </scm>
+ <issueManagement>
+ <system>JIRA</system>
+ <url>http://jira.codehaus.org/browse/PLX</url>
+ </issueManagement>
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <plexusDistMgmtSnapshotsUrl>https://oss.sonatype.org/content/repositories/plexus-snapshots</plexusDistMgmtSnapshotsUrl>
+ <debian.junit.junit.originalVersion>3.8.2</debian.junit.junit.originalVersion>
+ <debian.mavenRules>org.codehaus.plexus plexus pom s/2\..*/2.x/ * *</debian.mavenRules>
+ <debian.originalVersion>2.0.7</debian.originalVersion>
+ <debian.package>libmaven-parent-poms</debian.package>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>debian</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <pluginManagement>
+ <plugins>
+ <!-- set versions of common plugins for reproducibility, ordered alphabetically -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-clean-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.4</source>
+ <target>1.4</target>
+ <encoding>${project.build.sourceEncoding}</encoding>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-gpg-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-install-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-plugin-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-resources-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-site-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+ </build>
+ <reporting>
+ <plugins>
+ <plugin>
+ <artifactId>maven-project-info-reports-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+</project>
\ No newline at end of file
Added: trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-component-api/1.0-alpha-22/plexus-component-api-1.0-alpha-22.pom
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-component-api/1.0-alpha-22/plexus-component-api-1.0-alpha-22.pom (rev 0)
+++ trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-component-api/1.0-alpha-22/plexus-component-api-1.0-alpha-22.pom 2010-10-29 23:19:18 UTC (rev 13043)
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-api</artifactId>
+ <version>1.0-alpha-22</version>
+ <packaging>jar</packaging>
+ <parent>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-containers</artifactId>
+ <version>1.0-alpha-22</version>
+ </parent>
+ <properties>
+ <debian.originalVersion>1.0-alpha-22</debian.originalVersion>
+ <debian.package>libplexus-component-api-java</debian.package>
+ </properties>
+
+ <name>Plexus Component API</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-classworlds</artifactId>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Added: trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-component-api/debian/plexus-component-api-debian.pom
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-component-api/debian/plexus-component-api-debian.pom (rev 0)
+++ trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-component-api/debian/plexus-component-api-debian.pom 2010-10-29 23:19:18 UTC (rev 13043)
@@ -0,0 +1,25 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-component-api</artifactId>
+ <version>debian</version>
+ <packaging>jar</packaging>
+ <parent>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-containers</artifactId>
+ <version>debian</version>
+ </parent>
+ <properties>
+ <debian.originalVersion>1.0-alpha-22</debian.originalVersion>
+ <debian.package>libplexus-component-api-java</debian.package>
+ </properties>
+
+ <name>Plexus Component API</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-classworlds</artifactId>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Added: trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha/plexus-container-default-1.0-alpha.pom
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha/plexus-container-default-1.0-alpha.pom (rev 0)
+++ trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha/plexus-container-default-1.0-alpha.pom 2010-10-29 23:19:18 UTC (rev 13043)
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <version>1.0-alpha</version>
+ <packaging>jar</packaging>
+ <properties>
+ <debian.originalVersion>1.0-alpha-9-stable-1</debian.originalVersion>
+ <debian.package>libplexus-container-default-java</debian.package>
+ <debian.mavenRules><![CDATA[org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ *]]></debian.mavenRules>
+ </properties>
+
+ <name>Default Plexus Container</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>classworlds</groupId>
+ <artifactId>classworlds</artifactId>
+ <version>debian</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Added: trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom (rev 0)
+++ trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-container-default/1.0-alpha-9-stable-1/plexus-container-default-1.0-alpha-9-stable-1.pom 2010-10-29 23:19:18 UTC (rev 13043)
@@ -0,0 +1,27 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <version>1.0-alpha-9-stable-1</version>
+ <packaging>jar</packaging>
+ <properties>
+ <debian.originalVersion>1.0-alpha-9-stable-1</debian.originalVersion>
+ <debian.package>libplexus-container-default-java</debian.package>
+ <debian.mavenRules><![CDATA[org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ *]]></debian.mavenRules>
+ </properties>
+
+ <name>Default Plexus Container</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>classworlds</groupId>
+ <artifactId>classworlds</artifactId>
+ <version>debian</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Added: trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-container-default/1.0-beta-3.0.7/plexus-container-default-1.0-beta-3.0.7.pom
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-container-default/1.0-beta-3.0.7/plexus-container-default-1.0-beta-3.0.7.pom (rev 0)
+++ trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-container-default/1.0-beta-3.0.7/plexus-container-default-1.0-beta-3.0.7.pom 2010-10-29 23:19:18 UTC (rev 13043)
@@ -0,0 +1,37 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <version>1.0-beta-3.0.7</version>
+ <packaging>jar</packaging>
+ <parent>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-containers</artifactId>
+ <version>1.0-beta-3.0.7</version>
+ </parent>
+ <properties>
+ <debian.originalVersion>1.0-beta-3.0.7</debian.originalVersion>
+ <debian.package>libplexus-containers-java</debian.package>
+ </properties>
+
+ <name>Plexus :: Default Container</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-classworlds</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-reflect</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.collections</groupId>
+ <artifactId>google-collections</artifactId>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Added: trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-container-default/debian/plexus-container-default-debian.pom
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-container-default/debian/plexus-container-default-debian.pom (rev 0)
+++ trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-container-default/debian/plexus-container-default-debian.pom 2010-10-29 23:19:18 UTC (rev 13043)
@@ -0,0 +1,37 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <version>debian</version>
+ <packaging>jar</packaging>
+ <parent>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-containers</artifactId>
+ <version>debian</version>
+ </parent>
+ <properties>
+ <debian.originalVersion>1.0-beta-3.0.7</debian.originalVersion>
+ <debian.package>libplexus-containers-java</debian.package>
+ </properties>
+
+ <name>Plexus :: Default Container</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-classworlds</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-reflect</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.google.collections</groupId>
+ <artifactId>google-collections</artifactId>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Added: trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-maven-plugin/1.3.8/plexus-maven-plugin-1.3.8.pom
===================================================================
--- trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-maven-plugin/1.3.8/plexus-maven-plugin-1.3.8.pom (rev 0)
+++ trunk/maven-debian-helper/maven-packager-utils/src/test/resources/repository/org/codehaus/plexus/plexus-maven-plugin/1.3.8/plexus-maven-plugin-1.3.8.pom 2010-10-29 23:19:18 UTC (rev 13043)
@@ -0,0 +1,62 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-maven-plugin</artifactId>
+ <version>1.3.8</version>
+ <packaging>maven-plugin</packaging>
+ <properties>
+ <debian.hasPackageVersion/>
+ <debian.originalVersion>1.3.8</debian.originalVersion>
+ <debian.package>libplexus-maven-plugin-java</debian.package>
+ </properties>
+
+ <name>Plexus Maven Plugin</name>
+ <dependencies>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-model</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-api</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.reporting</groupId>
+ <artifactId>maven-reporting-impl</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-cdc</artifactId>
+ <version>debian</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>debian</version>
+ </dependency>
+ </dependencies>
+ <scm>
+ <connection>scm:svn:http://svn.codehaus.org/plexus/plexus-maven-plugin/tags/plexus-maven-plugin-1.3.8</connection>
+ <developerConnection>scm:svn:https://svn.codehaus.org/plexus/plexus-maven-plugin/tags/plexus-maven-plugin-1.3.8</developerConnection>
+ <url>http://fisheye.codehaus.org/browse/plexus/plexus-maven-plugin/tags/plexus-maven-plugin-1.3.8</url>
+ </scm>
+</project>
Modified: trunk/maven-debian-helper/pom.xml
===================================================================
--- trunk/maven-debian-helper/pom.xml 2010-10-29 23:12:54 UTC (rev 13042)
+++ trunk/maven-debian-helper/pom.xml 2010-10-29 23:19:18 UTC (rev 13043)
@@ -1,35 +1,45 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
- <groupId>org.debian.maven</groupId>
- <artifactId>maven-debian</artifactId>
- <version>1.2</version>
- <packaging>pom</packaging>
- <name>helper tools for using Maven to build Debian packages</name>
+ <groupId>org.debian.maven</groupId>
+ <artifactId>maven-debian</artifactId>
+ <version>1.3</version>
+ <packaging>pom</packaging>
+ <name>helper tools for using Maven to build Debian packages</name>
- <modules>
- <module>maven-debian-helper</module>
- <module>maven-debian-plugin</module>
- <module>maven-build-nodocs</module>
- <module>maven-packager-utils</module>
- </modules>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-core</artifactId>
- <version>2.2.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-compat</artifactId>
- <version>2.2.1</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>1.5.8</version>
- </dependency>
- </dependencies>
+ <modules>
+ <module>maven-debian-helper</module>
+ <module>maven-debian-plugin</module>
+ <module>maven-build-nodocs</module>
+ <module>maven-packager-utils</module>
+ </modules>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-core</artifactId>
+ <version>2.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-compat</artifactId>
+ <version>2.2.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.5.8</version>
+ </dependency>
+ </dependencies>
+
+ <dependencyManagement>
+ <dependencies>
+ <dependency>
+ <groupId>org.debian.maven</groupId>
+ <artifactId>maven-repo-helper</artifactId>
+ <version>1.3</version>
+ </dependency>
+ </dependencies>
+ </dependencyManagement>
</project>
Modified: trunk/maven-debian-helper/share/cdbs/1/class/maven-vars.mk
===================================================================
--- trunk/maven-debian-helper/share/cdbs/1/class/maven-vars.mk 2010-10-29 23:12:54 UTC (rev 13042)
+++ trunk/maven-debian-helper/share/cdbs/1/class/maven-vars.mk 2010-10-29 23:19:18 UTC (rev 13043)
@@ -28,7 +28,7 @@
# Declare Build-Deps for packages using this file
CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), cdbs (>= 0.4.43)
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), maven-debian-helper (>= 1.1)
+CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), maven-debian-helper (>= 1.3)
# Maven home directory. Doesn't need to be changed except when using
# nonstandard Maven installations.
Modified: trunk/maven-debian-helper/share/cdbs/1/class/maven.mk
===================================================================
--- trunk/maven-debian-helper/share/cdbs/1/class/maven.mk 2010-10-29 23:12:54 UTC (rev 13042)
+++ trunk/maven-debian-helper/share/cdbs/1/class/maven.mk 2010-10-29 23:19:18 UTC (rev 13043)
@@ -52,10 +52,10 @@
fi
debian/$(DEB_JAR_PACKAGE).poms:
- mh_lspoms --non-interactive -p$(DEB_JAR_PACKAGE)
+ mh_lspoms --non-interactive --offline -p$(DEB_JAR_PACKAGE)
debian/maven.rules:
- mh_lspoms --non-interactive -p$(DEB_JAR_PACKAGE) --force
+ mh_lspoms --non-interactive --offline -p$(DEB_JAR_PACKAGE) --force
ifeq (, $(DEB_DOC_PACKAGE))
DEB_PATCHPOMS_ARGS += --build-no-docs
@@ -109,7 +109,7 @@
common-install-arch common-install-indep:: common-install-impl
common-install-impl::
$(if $(DEB_MAVEN_INSTALL_TARGET),$(DEB_MAVEN_INVOKE) $(PLUGIN_ARGS) $(DEB_MAVEN_INSTALL_TARGET), at echo "DEB_MAVEN_INSTALL_TARGET unset, skipping default maven.mk common-install target")
- $(if $(cdbs_use_maven_substvars), mh_resolve_dependencies --non-interactive -p$(DEB_JAR_PACKAGE))
+ $(if $(cdbs_use_maven_substvars), mh_resolve_dependencies --non-interactive --offline -p$(DEB_JAR_PACKAGE))
ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
common-build-arch common-build-indep:: debian/stamp-maven-check
More information about the pkg-java-commits
mailing list