This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository surefire.
commit 11ab1ea63926283c83470940c556a599fe502b15 Author: Emmanuel Bourg <[email protected]> Date: Thu Sep 14 12:43:50 2017 +0200 Refreshed the patches --- debian/changelog | 8 ++++++++ debian/patches/bypass-testng-version-check.patch | 4 ++-- debian/patches/doxia-compatibility.patch | 2 +- debian/patches/fix-junit-provider-selection.patch | 2 +- debian/patches/maven-compatibility.patch | 2 +- debian/patches/surefire-execution-parameters-compatibility.patch | 6 +++--- 6 files changed, 16 insertions(+), 8 deletions(-) diff --git a/debian/changelog b/debian/changelog index 091191b..c59c3f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +surefire (2.20-1) UNRELEASED; urgency=medium + + * Team upload. + * New upstream release + - Refreshed the patches + + -- Emmanuel Bourg <[email protected]> Thu, 14 Sep 2017 12:43:01 +0200 + surefire (2.19.1-2) unstable; urgency=medium * Team upload. diff --git a/debian/patches/bypass-testng-version-check.patch b/debian/patches/bypass-testng-version-check.patch index 54337da..b7d282a 100644 --- a/debian/patches/bypass-testng-version-check.patch +++ b/debian/patches/bypass-testng-version-check.patch @@ -5,7 +5,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java -@@ -1173,7 +1173,7 @@ +@@ -1237,7 +1237,7 @@ return "org.apache.maven.surefire.testng.conf.TestNG60Configurator"; } @@ -14,7 +14,7 @@ Forwarded: not-needed } catch ( InvalidVersionSpecificationException invsex ) { -@@ -1780,13 +1780,6 @@ +@@ -1842,13 +1842,6 @@ if ( artifact != null ) { diff --git a/debian/patches/doxia-compatibility.patch b/debian/patches/doxia-compatibility.patch index 34cb42a..893a2ec 100644 --- a/debian/patches/doxia-compatibility.patch +++ b/debian/patches/doxia-compatibility.patch @@ -11,4 +11,4 @@ Forwarded: no +import org.apache.maven.doxia.sink.impl.SinkEventAttributeSet; import org.apache.maven.doxia.sink.SinkEventAttributes; import org.apache.maven.doxia.util.DoxiaUtils; - import org.apache.maven.reporting.MavenReportException; + import org.apache.maven.plugin.surefire.log.api.ConsoleLogger; diff --git a/debian/patches/fix-junit-provider-selection.patch b/debian/patches/fix-junit-provider-selection.patch index 445be38..019d4a3 100644 --- a/debian/patches/fix-junit-provider-selection.patch +++ b/debian/patches/fix-junit-provider-selection.patch @@ -9,7 +9,7 @@ Forwarded: not-needed --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java -@@ -1386,12 +1386,14 @@ +@@ -1450,12 +1450,14 @@ private boolean isJunit47Compatible( Artifact artifact ) { diff --git a/debian/patches/maven-compatibility.patch b/debian/patches/maven-compatibility.patch index acb5a00..06346f5 100644 --- a/debian/patches/maven-compatibility.patch +++ b/debian/patches/maven-compatibility.patch @@ -3,7 +3,7 @@ Author: Emmanuel Bourg <[email protected]> Forwarded: not-needed --- a/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java +++ b/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/SurefireHelper.java -@@ -164,7 +164,7 @@ +@@ -170,7 +170,7 @@ { try { diff --git a/debian/patches/surefire-execution-parameters-compatibility.patch b/debian/patches/surefire-execution-parameters-compatibility.patch index 45a89e1..81be283 100644 --- a/debian/patches/surefire-execution-parameters-compatibility.patch +++ b/debian/patches/surefire-execution-parameters-compatibility.patch @@ -6,7 +6,7 @@ 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 -@@ -437,6 +437,11 @@ +@@ -448,6 +448,11 @@ return test; } @@ -18,7 +18,7 @@ Forwarded: not-needed public boolean isUseSystemClassLoader() { return useSystemClassLoader; -@@ -467,6 +472,11 @@ +@@ -478,6 +483,11 @@ this.failIfNoSpecifiedTests = failIfNoSpecifiedTests; } @@ -30,7 +30,7 @@ Forwarded: not-needed public int getSkipAfterFailureCount() { return skipAfterFailureCount; -@@ -598,13 +608,13 @@ +@@ -619,13 +629,13 @@ return excludesFile; } -- 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
