[surefire] 10/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 a317fc88956c77ec58a8ed0d38cd0e21b817d790
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jul 20 10:25:33 2017 +0200

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

diff --git a/debian/changelog b/debian/changelog
index 5d4c684..9270643 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-surefire (2.18.1-1) UNRELEASED; urgency=medium
+surefire (2.19-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 db23ba8..892a663 100644
--- a/debian/patches/bypass-testng-version-check.patch
+++ b/debian/patches/bypass-testng-version-check.patch
@@ -5,8 +5,8 @@ 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
-@@ -1117,7 +1117,7 @@
-                 return "org.apache.maven.surefire.testng.conf.TestNG652Configurator";
+@@ -1139,7 +1139,7 @@
+                 return "org.apache.maven.surefire.testng.conf.TestNG60Configurator";
              }
  
 -            throw new MojoExecutionException( "Unknown TestNG version " + version );
@@ -14,12 +14,10 @@ Forwarded: not-needed
          }
          catch ( InvalidVersionSpecificationException invsex )
          {
-@@ -1716,16 +1716,6 @@
-     {
-         Artifact artifact = getProjectArtifactMap().get( getTestNGArtifactName() );
+@@ -1756,13 +1756,6 @@
  
--        if ( artifact != null )
--        {
+         if ( artifact != null )
+         {
 -            VersionRange range = createVersionRange();
 -            if ( !range.containsVersion( new DefaultArtifactVersion( artifact.getVersion() ) ) )
 -            {
@@ -27,7 +25,6 @@ Forwarded: not-needed
 -                    "TestNG support requires version 4.7 or above. You have declared version "
 -                        + artifact.getVersion() );
 -            }
--        }
-         return artifact;
- 
-     }
+         }
+         else if ( projectArtifactName.equals( getTestNGArtifactName() ) )
+         {
diff --git a/debian/patches/fix-junit-provider-selection.patch b/debian/patches/fix-junit-provider-selection.patch
index 143caba..4fb8705 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
-@@ -1330,12 +1330,14 @@
+@@ -1352,12 +1352,14 @@
  
      private boolean isJunit47Compatible( Artifact artifact )
      {

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