[surefire] 02/16: Refreshed the patches

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository surefire.

commit 056d90ebbd9c42cc8c9e31f6e5cfaa3dbbf454d0
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jul 20 10:05:35 2017 +0200

    Refreshed the patches
---
 debian/changelog                                  | 8 ++++++++
 debian/patches/bypass-testng-version-check.patch  | 4 ++--
 debian/patches/fix-junit-provider-selection.patch | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 12a9fe3..1efb289 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+surefire (2.18-1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 20 Jul 2017 10:05:17 +0200
+
 surefire (2.17-6) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/bypass-testng-version-check.patch b/debian/patches/bypass-testng-version-check.patch
index 3bcb8c4..a182020 100644
--- a/debian/patches/bypass-testng-version-check.patch
+++ b/debian/patches/bypass-testng-version-check.patch
@@ -5,7 +5,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 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
-@@ -1095,7 +1095,7 @@
+@@ -1146,7 +1146,7 @@
                  return "org.apache.maven.surefire.testng.conf.TestNG652Configurator";
              }
  
@@ -14,7 +14,7 @@ Forwarded: not-needed
          }
          catch ( InvalidVersionSpecificationException invsex )
          {
-@@ -1681,16 +1681,6 @@
+@@ -1745,16 +1745,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 7ebe523..38baeb8 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
-@@ -1299,12 +1299,14 @@
+@@ -1359,12 +1359,14 @@
  
      private boolean isJunit47Compatible( Artifact artifact )
      {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/surefire.git