This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository surefire.
commit fd0c45ff1268cd3bc8f1bccbadb8871a5a48c5a6 Author: Emmanuel Bourg <[email protected]> Date: Mon Jul 3 15:46:05 2017 +0200 Build with maven-debian-helper instead of maven-ant-helper --- debian/build.properties | 36 --------- debian/build.xml | 146 ------------------------------------- debian/changelog | 7 ++ debian/clean | 8 ++ debian/control | 14 ++-- debian/libsurefire-java.poms | 18 ----- debian/libsurefire-java.poms.pass1 | 49 +++++++++++++ debian/libsurefire-java.poms.pass2 | 49 +++++++++++++ debian/maven-settings.xml | 9 --- debian/maven.ignoreRules | 8 ++ debian/maven.properties | 6 ++ debian/maven.rules | 2 +- debian/patches/series | 2 +- debian/rules | 49 ++++--------- 14 files changed, 149 insertions(+), 254 deletions(-) diff --git a/debian/build.properties b/debian/build.properties deleted file mode 100644 index 050c045..0000000 --- a/debian/build.properties +++ /dev/null @@ -1,36 +0,0 @@ -javadoc.dir=target/api -build.directory=target -maven.test.skip=true -classpath.compile = \ - /usr/share/java/commons-io.jar:\ - /usr/share/java/commons-lang.jar:\ - /usr/share/java/commons-lang3.jar:\ - /usr/share/java/plexus-utils.jar:\ - /usr/share/java/jsr305.jar:\ - /usr/share/java/junit.jar:\ - /usr/share/java/junit4.jar:\ - /usr/share/java/testng.jar:\ - /usr/share/java/doxia-core.jar:\ - /usr/share/java/doxia-logging-api.jar:\ - /usr/share/java/doxia-sink-api.jar:\ - /usr/share/java/doxia-site-renderer.jar:\ - /usr/share/java/maven-artifact.jar:\ - /usr/share/java/maven-artifact-manager.jar:\ - /usr/share/java/maven-core.jar:\ - /usr/share/java/maven-plugin-annotations.jar:\ - /usr/share/java/maven-plugin-descriptor.jar:\ - /usr/share/java/maven-project.jar:\ - /usr/share/java/maven-reporting-api.jar:\ - /usr/share/java/maven-reporting-impl.jar:\ - /usr/share/java/maven-shared-utils.jar:\ - /usr/share/java/maven-toolchain.jar:\ - /usr/share/java/maven-common-artifact-filters.jar:\ - ${basedir}/surefire-api/target/surefire-api-${version}.jar:\ - ${basedir}/surefire-booter/target/surefire-booter-${version}.jar:\ - ${basedir}/surefire-grouper/target/surefire-grouper-${version}.jar:\ - ${basedir}/maven-surefire-common/target/maven-surefire-common-${version}.jar:\ - ${basedir}/surefire-providers/common-java5/target/common-java5-${version}.jar:\ - ${basedir}/surefire-providers/common-junit3/target/common-junit3-${version}.jar:\ - ${basedir}/surefire-providers/common-junit4/target/common-junit4-${version}.jar:\ - ${basedir}/surefire-providers/common-junit48/target/common-junit48-${version}.jar -build.javaVersion=1.5 diff --git a/debian/build.xml b/debian/build.xml deleted file mode 100644 index b531256..0000000 --- a/debian/build.xml +++ /dev/null @@ -1,146 +0,0 @@ -<?xml version="1.0"?> - -<project name="pkg-java" default="package" basedir=".."> - - <property file="debian/build.properties"/> - <property name="maven.build" value="/usr/share/maven-ant-helper/maven-build.xml"/> - <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}"> - <property name="debian.dir" location="debian" /> - <property name="project.dir" value="@{dir}" /> - </ant> - </sequential> - </macrodef> - - <macrodef name="packagemodule"> - <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" /> - <property name="use-local-repo" value="true" /> - </ant> - </sequential> - </macrodef> - - <macrodef name="package-plugin-module"> - <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="maven.process-classes.target" value="plugin:descriptor" /> - <property name="keep-cleaned-pom" value="true" /> - <property name="use-local-repo" value="true" /> - </ant> - </sequential> - </macrodef> - - <macrodef name="package-shaded-module"> - <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.package.target" value="install" /> - <property name="keep-cleaned-pom" value="true" /> - <property name="use-local-repo" value="true" /> - </ant> - </sequential> - </macrodef> - - <macrodef name="restore-pom"> - <attribute name="dir"/> - <sequential> - <ant target="restore-pom" antfile="${maven.build}" dir="@{dir}"> - <property name="debian.dir" location="debian" /> - <property name="project.dir" value="@{dir}" /> - </ant> - </sequential> - </macrodef> - - <target name="clean"> - <cleanmodule dir=""/> - <cleanmodule dir="surefire-api"/> - <cleanmodule dir="surefire-booter"/> - <cleanmodule dir="surefire-grouper"/> - <cleanmodule dir="surefire-providers/common-java5"/> - <cleanmodule dir="surefire-providers/common-junit3"/> - <cleanmodule dir="surefire-providers/common-junit4"/> - <cleanmodule dir="surefire-providers/common-junit48"/> - <cleanmodule dir="surefire-providers/surefire-junit3"/> - <cleanmodule dir="surefire-providers/surefire-junit4"/> - <cleanmodule dir="surefire-providers/surefire-junit47"/> - <cleanmodule dir="surefire-providers/surefire-testng"/> - <cleanmodule dir="surefire-providers/surefire-testng-utils"/> - <cleanmodule dir="surefire-report-parser"/> - <cleanmodule dir="maven-surefire-common"/> - <cleanmodule dir="maven-surefire-plugin"/> - <cleanmodule dir="maven-surefire-report-plugin"/> - </target> - - <target name="package"> - <!-- Generate the sources for surefire-grouper with JavaCC --> - <mkdir dir="surefire-grouper/target/generated-sources"/> - <javacc target="surefire-grouper/src/main/javacc/category-expression.jj" - outputdirectory="surefire-grouper/target/generated-sources" - javacchome="/usr/share/java"/> - - <packagemodule dir=""/> - <package-shaded-module dir="surefire-api"/> - <package-shaded-module dir="surefire-booter"/> - <package-shaded-module dir="surefire-grouper"/> - <packagemodule dir="surefire-providers"/> - <packagemodule dir="surefire-providers/common-java5"/> - <packagemodule dir="surefire-providers/common-junit3"/> - <packagemodule dir="surefire-providers/common-junit4"/> - <packagemodule dir="surefire-providers/common-junit48"/> - <packagemodule dir="surefire-providers/surefire-junit3"/> - <packagemodule dir="surefire-providers/surefire-junit4"/> - <packagemodule dir="surefire-providers/surefire-junit47"/> - <packagemodule dir="surefire-providers/surefire-testng"/> - <packagemodule dir="surefire-providers/surefire-testng-utils"/> - <packagemodule dir="surefire-report-parser"/> - <package-plugin-module dir="maven-surefire-common"/> - <package-plugin-module dir="maven-surefire-plugin"/> - <package-plugin-module dir="maven-surefire-report-plugin"/> - <restore-pom dir=""/> - <restore-pom dir="surefire-api"/> - <restore-pom dir="surefire-booter"/> - <restore-pom dir="surefire-grouper"/> - <restore-pom dir="surefire-providers"/> - <restore-pom dir="surefire-providers/common-java5"/> - <restore-pom dir="surefire-providers/common-junit3"/> - <restore-pom dir="surefire-providers/common-junit4"/> - <restore-pom dir="surefire-providers/common-junit48"/> - <restore-pom dir="surefire-providers/surefire-junit3"/> - <restore-pom dir="surefire-providers/surefire-junit4"/> - <restore-pom dir="surefire-providers/surefire-junit47"/> - <restore-pom dir="surefire-providers/surefire-testng"/> - <restore-pom dir="surefire-providers/surefire-testng-utils"/> - <restore-pom dir="surefire-report-parser"/> - <restore-pom dir="maven-surefire-common"/> - <restore-pom dir="maven-surefire-plugin"/> - <restore-pom dir="maven-surefire-report-plugin"/> - </target> - - <target name="javadoc"> - <javadoc destdir="${javadoc.dir}"> - <packageset dir="surefire-api/src/main/java/"/> - <packageset dir="surefire-booter/src/main/java/"/> - <packageset dir="surefire-grouper/src/main/java/"/> - <packageset dir="surefire-providers/surefire-junit3/src/main/java/"/> - <packageset dir="surefire-providers/surefire-junit4/src/main/java/"/> - <packageset dir="surefire-providers/surefire-testng/src/main/java/"/> - <packageset dir="maven-surefire-plugin/src/main/java/"/> - <packageset dir="maven-surefire-report-plugin/src/main/java/"/> - </javadoc> - </target> - -</project> diff --git a/debian/changelog b/debian/changelog index 71a65d7..478e5df 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +surefire (2.17-4) UNRELEASED; urgency=medium + + * Team upload. + * Build with maven-debian-helper instead of maven-ant-helper + + -- Emmanuel Bourg <[email protected]> Mon, 03 Jul 2017 12:40:46 +0200 + surefire (2.17-3) unstable; urgency=medium * Team upload. diff --git a/debian/clean b/debian/clean new file mode 100644 index 0000000..666227b --- /dev/null +++ b/debian/clean @@ -0,0 +1,8 @@ +maven-surefire-common/dependency-reduced-pom.xml +surefire-api/dependency-reduced-pom.xml +surefire-providers/common-java5/dependency-reduced-pom.xml +surefire-providers/surefire-junit3/dependency-reduced-pom.xml +surefire-providers/surefire-junit4/dependency-reduced-pom.xml +surefire-providers/surefire-junit47/dependency-reduced-pom.xml +surefire-providers/surefire-testng-utils/dependency-reduced-pom.xml +surefire-report-parser/dependency-reduced-pom.xml diff --git a/debian/control b/debian/control index acdfe9a..2bc8618 100644 --- a/debian/control +++ b/debian/control @@ -3,28 +3,24 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Torsten Werner <[email protected]> -Build-Depends: cdbs, debhelper (>= 9), default-jdk -Build-Depends-Indep: ant, - ant-optional, - javacc, +Build-Depends: debhelper (>= 9), default-jdk +Build-Depends-Indep: javacc, junit, junit4, libcommons-io-java, libcommons-lang3-java, + libjavacc-maven-plugin-java, libjmock-java, libjsr305-java, - libmaven-clean-plugin-java, libmaven-common-artifact-filters-java, - libmaven-compiler-plugin-2.5-java, libmaven-install-plugin-java, - libmaven-jar-plugin-java, + libmaven-plugin-testing-java, libmaven-plugin-tools-java (>= 3.2), libmaven-resources-plugin-java, libmaven-shade-plugin-java, libmaven-shared-utils-java, libplexus-velocity-java, - maven-ant-helper (>= 7.9), - maven-repo-helper, + maven-debian-helper (>= 2.0), testng, velocity Standards-Version: 3.9.8 diff --git a/debian/libsurefire-java.poms b/debian/libsurefire-java.poms deleted file mode 100644 index d6f97ab..0000000 --- a/debian/libsurefire-java.poms +++ /dev/null @@ -1,18 +0,0 @@ -pom.xml --no-parent -surefire-api/pom.xml -surefire-booter/pom.xml -surefire-grouper/pom.xml -surefire-providers/pom.xml -surefire-providers/common-java5/pom.xml -surefire-providers/common-junit3/pom.xml -surefire-providers/common-junit4/pom.xml -surefire-providers/common-junit48/pom.xml -surefire-providers/surefire-junit3/pom.xml -surefire-providers/surefire-junit4/pom.xml -surefire-providers/surefire-junit47/pom.xml -surefire-providers/surefire-testng/pom.xml -surefire-providers/surefire-testng-utils/pom.xml -surefire-report-parser/pom.xml -maven-surefire-common/pom.xml -maven-surefire-plugin/pom.xml -maven-surefire-report-plugin/pom.xml diff --git a/debian/libsurefire-java.poms.pass1 b/debian/libsurefire-java.poms.pass1 new file mode 100644 index 0000000..b3d0feb --- /dev/null +++ b/debian/libsurefire-java.poms.pass1 @@ -0,0 +1,49 @@ +# List of POM files for the package +# Format of this file is: +# <path to pom file> [option]* +# where option can be: +# --ignore: ignore this POM and its artifact if any +# --ignore-pom: don't install the POM. To use on POM files that are created +# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms] +# --no-parent: remove the <parent> tag from the POM +# --package=<package>: an alternative package to use when installing this POM +# and its artifact +# --has-package-version: to indicate that the original version of the POM is the same as the upstream part +# of the version for the package. +# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM +# during a clean operation with mh_cleanpom or mh_installpom +# --artifact=<path>: path to the build artifact associated with this POM, +# it will be installed when using the command mh_install. [mh_install] +# --java-lib: install the jar into /usr/share/java to comply with Debian +# packaging guidelines +# --usj-name=<name>: name to use when installing the library in /usr/share/java +# --usj-version=<version>: version to use when installing the library in /usr/share/java +# --no-usj-versionless: don't install the versionless link in /usr/share/java +# --dest-jar=<path>: the destination for the real jar. +# It will be installed with mh_install. [mh_install] +# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default. +# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed. +# Empty by default. [mh_install] +# +pom.xml --no-parent --has-package-version +surefire-api/pom.xml --has-package-version +surefire-booter/pom.xml --has-package-version +surefire-grouper/pom.xml --has-package-version +surefire-providers/pom.xml --has-package-version +surefire-providers/common-java5/pom.xml --has-package-version +surefire-providers/common-junit3/pom.xml --has-package-version +surefire-providers/common-junit4/pom.xml --has-package-version +surefire-providers/common-junit48/pom.xml --has-package-version +surefire-providers/surefire-junit3/pom.xml --has-package-version +surefire-providers/surefire-junit4/pom.xml --has-package-version +surefire-providers/surefire-junit47/pom.xml --has-package-version +surefire-providers/surefire-testng/pom.xml --has-package-version +surefire-providers/surefire-testng-utils/pom.xml --has-package-version +surefire-report-parser/pom.xml --has-package-version +surefire-shadefire/pom.xml --ignore +maven-failsafe-plugin/pom.xml --ignore +maven-surefire-common/pom.xml --has-package-version +maven-surefire-plugin/pom.xml --ignore +maven-surefire-report-plugin/pom.xml --ignore +surefire-setup-integration-tests/pom.xml --ignore +surefire-integration-tests/pom.xml --ignore diff --git a/debian/libsurefire-java.poms.pass2 b/debian/libsurefire-java.poms.pass2 new file mode 100644 index 0000000..1452aa1 --- /dev/null +++ b/debian/libsurefire-java.poms.pass2 @@ -0,0 +1,49 @@ +# List of POM files for the package +# Format of this file is: +# <path to pom file> [option]* +# where option can be: +# --ignore: ignore this POM and its artifact if any +# --ignore-pom: don't install the POM. To use on POM files that are created +# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms] +# --no-parent: remove the <parent> tag from the POM +# --package=<package>: an alternative package to use when installing this POM +# and its artifact +# --has-package-version: to indicate that the original version of the POM is the same as the upstream part +# of the version for the package. +# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM +# during a clean operation with mh_cleanpom or mh_installpom +# --artifact=<path>: path to the build artifact associated with this POM, +# it will be installed when using the command mh_install. [mh_install] +# --java-lib: install the jar into /usr/share/java to comply with Debian +# packaging guidelines +# --usj-name=<name>: name to use when installing the library in /usr/share/java +# --usj-version=<version>: version to use when installing the library in /usr/share/java +# --no-usj-versionless: don't install the versionless link in /usr/share/java +# --dest-jar=<path>: the destination for the real jar. +# It will be installed with mh_install. [mh_install] +# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default. +# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed. +# Empty by default. [mh_install] +# +pom.xml --no-parent --has-package-version +surefire-api/pom.xml --has-package-version +surefire-booter/pom.xml --has-package-version +surefire-grouper/pom.xml --has-package-version +surefire-providers/pom.xml --has-package-version +surefire-providers/common-java5/pom.xml --has-package-version +surefire-providers/common-junit3/pom.xml --has-package-version +surefire-providers/common-junit4/pom.xml --has-package-version +surefire-providers/common-junit48/pom.xml --has-package-version +surefire-providers/surefire-junit3/pom.xml --has-package-version +surefire-providers/surefire-junit4/pom.xml --has-package-version +surefire-providers/surefire-junit47/pom.xml --has-package-version +surefire-providers/surefire-testng/pom.xml --has-package-version +surefire-providers/surefire-testng-utils/pom.xml --has-package-version +surefire-report-parser/pom.xml --has-package-version +surefire-shadefire/pom.xml --ignore +maven-failsafe-plugin/pom.xml --ignore +maven-surefire-common/pom.xml --has-package-version +maven-surefire-plugin/pom.xml --has-package-version +maven-surefire-report-plugin/pom.xml --has-package-version +surefire-setup-integration-tests/pom.xml --ignore +surefire-integration-tests/pom.xml --ignore diff --git a/debian/maven-settings.xml b/debian/maven-settings.xml deleted file mode 100644 index 01f8769..0000000 --- a/debian/maven-settings.xml +++ /dev/null @@ -1,9 +0,0 @@ -<!-- - This is a minimal settings.xml that switches maven to offline mode - and uses the Debian repo as the local repo. ---> - -<settings> - <localRepository>/usr/share/maven-repo</localRepository> - <offline>true</offline> -</settings> diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..058140c --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1,8 @@ +org.apache.maven.plugins maven-assembly-plugin * * * * +org.apache.maven.plugins maven-deploy-plugin * * * * +org.apache.maven.plugins maven-enforcer-plugin * * * * +org.apache.maven.plugins maven-site-plugin * * * * +org.apache.maven.plugins maven-failsafe-plugin * * * * +org.apache.maven.plugins maven-scm-publish-plugin * * * * +org.apache.maven.plugins maven-surefire-plugin * * * * +org.apache.rat apache-rat-plugin * * * * diff --git a/debian/maven.properties b/debian/maven.properties index 2722890..2bfa204 100644 --- a/debian/maven.properties +++ b/debian/maven.properties @@ -1,2 +1,8 @@ +# Include here properties to pass to Maven during the build. +# For example: +# maven.test.skip=true + +maven.test.skip=true + maven.compiler.source=1.6 maven.compiler.target=1.6 diff --git a/debian/maven.rules b/debian/maven.rules index ea064a5..ab3ff24 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -4,7 +4,7 @@ junit junit jar s/3\..*/3.x/ junit junit jar s/4\..*/4.x/ jmock jmock jar s/1\..*/1.x/ org.apache.commons commons-lang3 * s/.*/debian/ +org.testng testng * s/.*/6.x/ s/.*// * # fix the version of maven-shade-plugin -org.apache.maven.plugins maven-shade-plugin maven-plugin s/.*/1.2.1 s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-harness diff --git a/debian/patches/series b/debian/patches/series index bc2c071..7c4c2f5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,3 @@ -pom.patch +#pom.patch fix-junit-provider-selection.patch bypass-testng-version-check.patch diff --git a/debian/rules b/debian/rules index ef0263f..a5059ee 100755 --- a/debian/rules +++ b/debian/rules @@ -1,40 +1,21 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk +%: + dh $@ -PACKAGE := $(DEB_SOURCE_PACKAGE) -VERSION := $(DEB_UPSTREAM_VERSION) -JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := ant-nodeps maven-core maven-model maven-plugin-api maven-project file-management plexus-utils plexus-container-default-alpha -DEB_ANT_BUILD_TARGET := package #javadoc -DEB_ANT_BUILDFILE := debian/build.xml -DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -API_DOCS := target/api +override_dh_auto_configure: + cp debian/libsurefire-java.poms.pass1 debian/libsurefire-java.poms + dh_auto_configure -get-orig-source: - -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename + # Make the surefire artifacts overwritable in debian/maven-repo + mkdir debian/maven-repo/org/apache/maven/surefire.tmp + cp -L -Rv debian/maven-repo/org/apache/maven/surefire/* debian/maven-repo/org/apache/maven/surefire.tmp/ + rm -Rf debian/maven-repo/org/apache/maven/surefire + mv debian/maven-repo/org/apache/maven/surefire.tmp debian/maven-repo/org/apache/maven/surefire -binary-post-install/lib$(PACKAGE)-java:: - mh_installpoms -plib$(PACKAGE)-java - mh_installjar -plib$(PACKAGE)-java -l surefire-api/pom.xml surefire-api/target/surefire-api-$(VERSION).jar - mh_installjar -plib$(PACKAGE)-java -l surefire-booter/pom.xml surefire-booter/target/surefire-booter-$(VERSION).jar - mh_installjar -plib$(PACKAGE)-java -l surefire-grouper/pom.xml surefire-grouper/target/surefire-grouper-$(VERSION).jar - mh_installjar -plib$(PACKAGE)-java -l surefire-providers/common-java5/pom.xml surefire-providers/common-java5/target/common-java5-$(VERSION).jar - mh_installjar -plib$(PACKAGE)-java -l surefire-providers/common-junit3/pom.xml surefire-providers/common-junit3/target/common-junit3-$(VERSION).jar - mh_installjar -plib$(PACKAGE)-java -l surefire-providers/common-junit4/pom.xml surefire-providers/common-junit4/target/common-junit4-$(VERSION).jar - mh_installjar -plib$(PACKAGE)-java -l surefire-providers/common-junit48/pom.xml surefire-providers/common-junit48/target/common-junit48-$(VERSION).jar - mh_installjar -plib$(PACKAGE)-java -l surefire-providers/surefire-junit3/pom.xml surefire-providers/surefire-junit3/target/surefire-junit3-$(VERSION).jar - mh_installjar -plib$(PACKAGE)-java -l surefire-providers/surefire-junit4/pom.xml surefire-providers/surefire-junit4/target/surefire-junit4-$(VERSION).jar - mh_installjar -plib$(PACKAGE)-java -l surefire-providers/surefire-junit47/pom.xml surefire-providers/surefire-junit47/target/surefire-junit47-$(VERSION).jar - mh_installjar -plib$(PACKAGE)-java -l surefire-providers/surefire-testng/pom.xml surefire-providers/surefire-testng/target/surefire-testng-$(VERSION).jar - mh_installjar -plib$(PACKAGE)-java -l surefire-providers/surefire-testng-utils/pom.xml surefire-providers/surefire-testng-utils/target/surefire-testng-utils-$(VERSION).jar - mh_installjar -plib$(PACKAGE)-java -l surefire-report-parser/pom.xml surefire-report-parser/target/surefire-report-parser-$(VERSION).jar - mh_installjar -plib$(PACKAGE)-java -l maven-surefire-common/pom.xml maven-surefire-common/target/maven-surefire-common-$(VERSION).jar - mh_installjar -plib$(PACKAGE)-java -l maven-surefire-plugin/pom.xml maven-surefire-plugin/target/maven-surefire-plugin-$(VERSION).jar - mh_installjar -plib$(PACKAGE)-java -l maven-surefire-report-plugin/pom.xml maven-surefire-report-plugin/target/maven-surefire-report-plugin-$(VERSION).jar +override_dh_auto_build: + # two passes build to work around a circular dependency between maven-surefire-common and maven-surefire-plugin + dh_auto_build -- install -DskipTests -clean:: - -rm -rf debian/tmp surefire-providers/target - mh_clean - mh_unpatchpoms -plib$(PACKAGE)-java + cp debian/libsurefire-java.poms.pass2 debian/libsurefire-java.poms + dh_auto_build -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/surefire.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
