[surefire] 08/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 58ec13529d45073058cac0dea84e1eca475ff443
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jul 20 10:19:48 2017 +0200

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

diff --git a/debian/changelog b/debian/changelog
index f7e4492..5d4c684 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-surefire (2.18-1) UNRELEASED; urgency=medium
+surefire (2.18.1-1) UNRELEASED; urgency=medium
 
   * Team upload.
   * New upstream release
diff --git a/debian/patches/bypass-testng-version-check.patch b/debian/patches/bypass-testng-version-check.patch
index a182020..db23ba8 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
-@@ -1146,7 +1146,7 @@
+@@ -1117,7 +1117,7 @@
                  return "org.apache.maven.surefire.testng.conf.TestNG652Configurator";
              }
  
@@ -14,7 +14,7 @@ Forwarded: not-needed
          }
          catch ( InvalidVersionSpecificationException invsex )
          {
-@@ -1745,16 +1745,6 @@
+@@ -1716,16 +1716,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 38baeb8..143caba 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
-@@ -1359,12 +1359,14 @@
+@@ -1330,12 +1330,14 @@
  
      private boolean isJunit47Compatible( Artifact artifact )
      {

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