[surefire] 02/07: 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 b0d309c31b756d0480559242ba4b7bae925d3a5b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Sep 20 16:46:58 2017 +0200

    Refreshed the patches
---
 debian/changelog                                   | 8 ++++++++
 debian/patches/bypass-testng-version-check.patch   | 4 ++--
 debian/patches/fix-junit-provider-selection.patch  | 2 +-
 debian/patches/jsr305-dependency.patch             | 6 +++---
 debian/patches/maven-compatibility.patch           | 2 +-
 debian/patches/maven-shared-utils-dependency.patch | 6 +++---
 6 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 428f91a..1290e8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+surefire (2.20.1-1) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * New upstream release
+    - Refreshed the patches
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 20 Sep 2017 16:46:39 +0200
+
 surefire (2.20-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/patches/bypass-testng-version-check.patch b/debian/patches/bypass-testng-version-check.patch
index b7d282a..a309e37 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
-@@ -1237,7 +1237,7 @@
+@@ -1284,7 +1284,7 @@
                  return "org.apache.maven.surefire.testng.conf.TestNG60Configurator";
              }
  
@@ -14,7 +14,7 @@ Forwarded: not-needed
          }
          catch ( InvalidVersionSpecificationException invsex )
          {
-@@ -1842,13 +1842,6 @@
+@@ -1890,13 +1890,6 @@
  
          if ( artifact != null )
          {
diff --git a/debian/patches/fix-junit-provider-selection.patch b/debian/patches/fix-junit-provider-selection.patch
index 019d4a3..78ef73d 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
-@@ -1450,12 +1450,14 @@
+@@ -1497,12 +1497,14 @@
  
      private boolean isJunit47Compatible( Artifact artifact )
      {
diff --git a/debian/patches/jsr305-dependency.patch b/debian/patches/jsr305-dependency.patch
index 528cd82..14a0ae1 100644
--- a/debian/patches/jsr305-dependency.patch
+++ b/debian/patches/jsr305-dependency.patch
@@ -3,9 +3,9 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/surefire-api/pom.xml
 +++ b/surefire-api/pom.xml
-@@ -40,6 +40,12 @@
-       <groupId>org.apache.maven.shared</groupId>
-       <artifactId>maven-shared-utils</artifactId>
+@@ -45,6 +45,12 @@
+       <artifactId>jsr305</artifactId>
+       <scope>provided</scope>
      </dependency>
 +    <dependency>
 +      <groupId>com.google.code.findbugs</groupId>
diff --git a/debian/patches/maven-compatibility.patch b/debian/patches/maven-compatibility.patch
index 06346f5..1d19ae5 100644
--- a/debian/patches/maven-compatibility.patch
+++ b/debian/patches/maven-compatibility.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 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
-@@ -170,7 +170,7 @@
+@@ -206,7 +206,7 @@
      {
          try
          {
diff --git a/debian/patches/maven-shared-utils-dependency.patch b/debian/patches/maven-shared-utils-dependency.patch
index 7a0ba11..197df63 100644
--- a/debian/patches/maven-shared-utils-dependency.patch
+++ b/debian/patches/maven-shared-utils-dependency.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg at apache.org>
 Forwarded: not-needed
 --- a/maven-surefire-common/pom.xml
 +++ b/maven-surefire-common/pom.xml
-@@ -140,25 +140,6 @@
+@@ -139,25 +139,6 @@
          </executions>
        </plugin>
        <plugin>
@@ -28,10 +28,10 @@ Forwarded: not-needed
 -      <plugin>
          <artifactId>maven-surefire-plugin</artifactId>
          <configuration>
-           <redirectTestOutputToFile>true</redirectTestOutputToFile>
+           <jvm>${jdk.home}/bin/java</jvm>
 --- a/maven-surefire-report-plugin/pom.xml
 +++ b/maven-surefire-report-plugin/pom.xml
-@@ -153,24 +153,6 @@
+@@ -148,24 +148,6 @@
          </executions>
        </plugin>
        <plugin>

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