This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository surefire.
commit 48e05723a19a394920a010a50be2a6fd670a129a Author: Emmanuel Bourg <[email protected]> Date: Fri Sep 15 00:06:03 2017 +0200 Returned to a simple single pass build --- debian/changelog | 1 + debian/libsurefire-java.poms | 2 +- debian/patches/series | 1 - ...refire-execution-parameters-compatibility.patch | 48 ---------------------- debian/rules | 23 ----------- 5 files changed, 2 insertions(+), 73 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7799c90..1428eb2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,7 @@ surefire (2.20-1) UNRELEASED; urgency=medium - Refreshed the patches - Build the new surefire-logger-api module - New build dependency on libbuild-helper-maven-plugin-java + * Returned to a simple single pass build -- Emmanuel Bourg <[email protected]> Thu, 14 Sep 2017 12:43:01 +0200 diff --git a/debian/libsurefire-java.poms b/debian/libsurefire-java.poms index 1cb5c90..7892880 100644 --- a/debian/libsurefire-java.poms +++ b/debian/libsurefire-java.poms @@ -44,7 +44,7 @@ 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-plugin/pom.xml --has-package-version --relocate=org.apache.maven.plugins:maven-surefire-plugin:2.12.4,org.apache.maven.plugins:maven-surefire-plugin:2.17 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/patches/series b/debian/patches/series index 7e4bd7b..e71738f 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,6 +2,5 @@ fix-junit-provider-selection.patch bypass-testng-version-check.patch dependency-plugin-configuration.patch -surefire-execution-parameters-compatibility.patch doxia-compatibility.patch maven-compatibility.patch diff --git a/debian/patches/surefire-execution-parameters-compatibility.patch b/debian/patches/surefire-execution-parameters-compatibility.patch deleted file mode 100644 index 81be283..0000000 --- a/debian/patches/surefire-execution-parameters-compatibility.patch +++ /dev/null @@ -1,48 +0,0 @@ -Description: For some reason SurefirePlugin.java is compiled against the old SurefireExecutionParameters - from Surefire 2.17, and the compilation fails due to incompatible changes in the interface. This patch - restores the binary compatibility but doesn't fix the underlying classpath issue. The compilation errors - are likely to go away once the updated Surefire is in Debian. -Author: Emmanuel Bourg <[email protected]> -Forwarded: not-needed ---- a/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java -+++ b/maven-surefire-plugin/src/main/java/org/apache/maven/plugin/surefire/SurefirePlugin.java -@@ -448,6 +448,11 @@ - return test; - } - -+ public String getTestMethod() -+ { -+ return null; -+ } -+ - public boolean isUseSystemClassLoader() - { - return useSystemClassLoader; -@@ -478,6 +483,11 @@ - this.failIfNoSpecifiedTests = failIfNoSpecifiedTests; - } - -+ public void setFailIfNoSpecifiedTests( Boolean failIfNoSpecifiedTests ) -+ { -+ this.failIfNoSpecifiedTests = failIfNoSpecifiedTests; -+ } -+ - public int getSkipAfterFailureCount() - { - return skipAfterFailureCount; -@@ -619,13 +629,13 @@ - return excludesFile; - } - -- @Override -+ //@Override - protected final List<File> suiteXmlFiles() - { - return hasSuiteXmlFiles() ? Arrays.asList( suiteXmlFiles ) : Collections.<File>emptyList(); - } - -- @Override -+ //@Override - protected final boolean hasSuiteXmlFiles() - { - return suiteXmlFiles != null && suiteXmlFiles.length != 0; diff --git a/debian/rules b/debian/rules index 1bd019e..2d33f6a 100755 --- a/debian/rules +++ b/debian/rules @@ -2,26 +2,3 @@ %: dh $@ - -override_dh_auto_configure: - dh_auto_configure - - # 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 - rm -Rf debian/maven-repo/org/apache/maven/plugins/maven-surefire-report-plugin - mv debian/maven-repo/org/apache/maven/surefire.tmp debian/maven-repo/org/apache/maven/surefire - -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 - - # build the plugin separately - mh_patchpom -plibsurefire-java maven-surefire-plugin/pom.xml - dh_auto_build -- package -DskipTests -f maven-surefire-plugin/pom.xml - -override_dh_auto_install: - dh_auto_install - mh_installpom -plibsurefire-java maven-surefire-plugin/pom.xml --relocate=org.apache.maven.plugins:maven-surefire-plugin:2.12.4,org.apache.maven.plugins:maven-surefire-plugin:2.17 - mh_installjar -plibsurefire-java maven-surefire-plugin/pom.xml maven-surefire-plugin/target/maven-surefire-plugin*.jar -- 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
