This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository surefire.
commit 168c67ffa8835911469def5463c5a1a711b6c131 Author: Emmanuel Bourg <[email protected]> Date: Wed Jun 10 17:46:20 2015 +0200 Refreshed the patches --- debian/changelog | 2 +- debian/patches/bypass-testng-version-check.patch | 4 ++-- debian/patches/fix-junit-provider-selection.patch | 2 +- debian/patches/pom.patch | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 733d2ac..07778ac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -surefire (2.16-1) UNRELEASED; urgency=low +surefire (2.17-1) UNRELEASED; urgency=low * Team upload. * New upstream release diff --git a/debian/patches/bypass-testng-version-check.patch b/debian/patches/bypass-testng-version-check.patch index dbb383f..3bcb8c4 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 -@@ -1086,7 +1086,7 @@ +@@ -1095,7 +1095,7 @@ return "org.apache.maven.surefire.testng.conf.TestNG652Configurator"; } @@ -14,7 +14,7 @@ Forwarded: not-needed } catch ( InvalidVersionSpecificationException invsex ) { -@@ -1663,16 +1663,6 @@ +@@ -1681,16 +1681,6 @@ { Artifact artifact = getProjectArtifactMap().get( getTestNGArtifactName() ); diff --git a/debian/patches/fix-junit-provider-selection.patch b/debian/patches/fix-junit-provider-selection.patch index 78749ad..7ebe523 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 -@@ -1288,12 +1288,14 @@ +@@ -1299,12 +1299,14 @@ private boolean isJunit47Compatible( Artifact artifact ) { diff --git a/debian/patches/pom.patch b/debian/patches/pom.patch index a41347a..c4daea0 100644 --- a/debian/patches/pom.patch +++ b/debian/patches/pom.patch @@ -12,14 +12,14 @@ Last-Update: 2011-10-10 - <parent> - <artifactId>maven-parent</artifactId> - <groupId>org.apache.maven</groupId> -- <version>22</version> +- <version>23</version> - <relativePath>../pom/maven/pom.xml</relativePath> - </parent> - <groupId>org.apache.maven.surefire</groupId> <artifactId>surefire</artifactId> - <version>2.16</version> -@@ -283,7 +276,7 @@ + <version>2.17</version> +@@ -279,7 +272,7 @@ </dependency> </dependencies> @@ -28,7 +28,7 @@ Last-Update: 2011-10-10 <pluginManagement> <plugins> <plugin> -@@ -294,8 +287,9 @@ +@@ -290,8 +283,9 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <version>${shadedVersion}</version> @@ -39,7 +39,7 @@ Last-Update: 2011-10-10 <useSystemClassLoader>false</useSystemClassLoader> </configuration> </plugin> -@@ -367,7 +361,7 @@ +@@ -351,7 +345,7 @@ </plugin> </plugins> </pluginManagement> -- 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
