[pkg-java] r17459 - in trunk/surefire/debian: . patches

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-11-08 21:36:50 +0000 (Fri, 08 Nov 2013)
New Revision: 17459

Modified:
   trunk/surefire/debian/changelog
   trunk/surefire/debian/patches/bypass-testng-version-check.patch
   trunk/surefire/debian/patches/fix-junit-provider-selection.patch
   trunk/surefire/debian/patches/pom.patch
Log:
New upstream release (2.16)



Modified: trunk/surefire/debian/changelog
===================================================================
--- trunk/surefire/debian/changelog	2013-11-08 18:36:17 UTC (rev 17458)
+++ trunk/surefire/debian/changelog	2013-11-08 21:36:50 UTC (rev 17459)
@@ -1,4 +1,4 @@
-surefire (2.15-1) UNRELEASED; urgency=low
+surefire (2.16-1) UNRELEASED; urgency=low
 
   * Team upload.
   * New upstream release

Modified: trunk/surefire/debian/patches/bypass-testng-version-check.patch
===================================================================
--- trunk/surefire/debian/patches/bypass-testng-version-check.patch	2013-11-08 18:36:17 UTC (rev 17458)
+++ trunk/surefire/debian/patches/bypass-testng-version-check.patch	2013-11-08 21:36:50 UTC (rev 17459)
@@ -5,7 +5,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
-@@ -1011,7 +1011,7 @@
+@@ -1086,7 +1086,7 @@
                  return "org.apache.maven.surefire.testng.conf.TestNG652Configurator";
              }
  
@@ -14,7 +14,7 @@
          }
          catch ( InvalidVersionSpecificationException invsex )
          {
-@@ -1440,16 +1440,6 @@
+@@ -1663,16 +1663,6 @@
      {
          Artifact artifact = getProjectArtifactMap().get( getTestNGArtifactName() );
  

Modified: trunk/surefire/debian/patches/fix-junit-provider-selection.patch
===================================================================
--- trunk/surefire/debian/patches/fix-junit-provider-selection.patch	2013-11-08 18:36:17 UTC (rev 17458)
+++ trunk/surefire/debian/patches/fix-junit-provider-selection.patch	2013-11-08 21:36:50 UTC (rev 17459)
@@ -9,7 +9,7 @@
 
 --- 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
-@@ -1065,12 +1065,14 @@
+@@ -1288,12 +1288,14 @@
  
      private boolean isJunit47Compatible( Artifact artifact )
      {

Modified: trunk/surefire/debian/patches/pom.patch
===================================================================
--- trunk/surefire/debian/patches/pom.patch	2013-11-08 18:36:17 UTC (rev 17458)
+++ trunk/surefire/debian/patches/pom.patch	2013-11-08 21:36:50 UTC (rev 17459)
@@ -18,8 +18,8 @@
 -
    <groupId>org.apache.maven.surefire</groupId>
    <artifactId>surefire</artifactId>
-   <version>2.15</version>
-@@ -281,7 +274,7 @@
+   <version>2.16</version>
+@@ -283,7 +276,7 @@
      </dependency>
    </dependencies>
  
@@ -28,7 +28,7 @@
      <pluginManagement>
        <plugins>
          <plugin>
-@@ -292,8 +285,9 @@
+@@ -294,8 +287,9 @@
          <plugin>
            <artifactId>maven-surefire-plugin</artifactId>
            <version>${shadedVersion}</version>
@@ -39,7 +39,7 @@
              <useSystemClassLoader>false</useSystemClassLoader>
            </configuration>
          </plugin>
-@@ -365,7 +359,7 @@
+@@ -367,7 +361,7 @@
          </plugin>
        </plugins>
      </pluginManagement>