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

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-11-08 18:36:17 +0000 (Fri, 08 Nov 2013)
New Revision: 17458

Modified:
   trunk/surefire/debian/build.properties
   trunk/surefire/debian/changelog
   trunk/surefire/debian/control
   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.15)



Modified: trunk/surefire/debian/build.properties
===================================================================
--- trunk/surefire/debian/build.properties	2013-11-08 17:56:11 UTC (rev 17457)
+++ trunk/surefire/debian/build.properties	2013-11-08 18:36:17 UTC (rev 17458)
@@ -2,9 +2,11 @@
 build.directory=target
 maven.test.skip=true
 classpath.compile = \
+            /usr/share/java/commons-io.jar:\
             /usr/share/java/commons-lang.jar:\
             /usr/share/java/commons-lang3.jar:\
             /usr/share/java/plexus-utils.jar:\
+            /usr/share/java/jsr305.jar:\
             /usr/share/java/junit.jar:\
             /usr/share/java/junit4.jar:\
             /usr/share/java/testng.jar:\

Modified: trunk/surefire/debian/changelog
===================================================================
--- trunk/surefire/debian/changelog	2013-11-08 17:56:11 UTC (rev 17457)
+++ trunk/surefire/debian/changelog	2013-11-08 18:36:17 UTC (rev 17458)
@@ -1,11 +1,12 @@
-surefire (2.14.1-1) UNRELEASED; urgency=low
+surefire (2.15-1) UNRELEASED; urgency=low
 
   * Team upload.
   * New upstream release
     - Refreshed the patches
     - Build the new modules: common-junit48, common-java5, surefire-grouper
       and surefire-report-parser
-    - New dependency on libcommons-lang3-java and libmaven-shared-utils-java
+    - New dependency on libcommons-io-java, libcommons-lang3-java,
+      libjsr305-java and libmaven-shared-utils-java
   * debian/orig-tar.sh:
     - Use XZ compression for the upstream tarball
     - Reworked to pull the sources from the Apache Git repository

Modified: trunk/surefire/debian/control
===================================================================
--- trunk/surefire/debian/control	2013-11-08 17:56:11 UTC (rev 17457)
+++ trunk/surefire/debian/control	2013-11-08 18:36:17 UTC (rev 17458)
@@ -9,8 +9,10 @@
                      javacc,
                      junit,
                      junit4,
+                     libcommons-io-java,
                      libcommons-lang3-java,
                      libjmock-java,
+                     libjsr305-java,
                      libmaven-clean-plugin-java,
                      libmaven-common-artifact-filters-java,
                      libmaven-compiler-plugin-java,
@@ -32,7 +34,7 @@
 
 Package: libsurefire-java
 Architecture: all
-Depends: libcommons-lang3-java, libmaven-common-artifact-filters-java, libmaven-shared-utils-java, ${misc:Depends}
+Depends: libcommons-io-java, libcommons-lang3-java, libmaven-common-artifact-filters-java, libmaven-shared-utils-java, ${misc:Depends}
 Recommends: junit | junit4 | testng | libjmock-java
 Description: Surefire test framework for Java
  Maven is a software project management and comprehension tool. Based on the

Modified: trunk/surefire/debian/patches/bypass-testng-version-check.patch
===================================================================
--- trunk/surefire/debian/patches/bypass-testng-version-check.patch	2013-11-08 17:56:11 UTC (rev 17457)
+++ trunk/surefire/debian/patches/bypass-testng-version-check.patch	2013-11-08 18:36:17 UTC (rev 17458)
@@ -5,7 +5,16 @@
 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
-@@ -1320,16 +1320,6 @@
+@@ -1011,7 +1011,7 @@
+                 return "org.apache.maven.surefire.testng.conf.TestNG652Configurator";
+             }
+ 
+-            throw new MojoExecutionException( "Unknown TestNG version " + version );
++            return "org.apache.maven.surefire.testng.conf.TestNG652Configurator";
+         }
+         catch ( InvalidVersionSpecificationException invsex )
+         {
+@@ -1440,16 +1440,6 @@
      {
          Artifact artifact = getProjectArtifactMap().get( getTestNGArtifactName() );
  
@@ -22,14 +31,3 @@
          return artifact;
  
      }
---- a/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
-+++ b/surefire-providers/surefire-testng/src/main/java/org/apache/maven/surefire/testng/TestNGExecutor.java
-@@ -204,7 +204,7 @@
-                 return new TestNG652Configurator();
-             }
- 
--            throw new TestSetFailedException( "Unknown TestNG version " + version );
-+            return new TestNGMapConfigurator();
-         }
-         catch ( InvalidVersionSpecificationException invsex )
-         {

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

Modified: trunk/surefire/debian/patches/pom.patch
===================================================================
--- trunk/surefire/debian/patches/pom.patch	2013-11-08 17:56:11 UTC (rev 17457)
+++ trunk/surefire/debian/patches/pom.patch	2013-11-08 18:36:17 UTC (rev 17458)
@@ -18,8 +18,8 @@
 -
    <groupId>org.apache.maven.surefire</groupId>
    <artifactId>surefire</artifactId>
-   <version>2.14.1</version>
-@@ -275,7 +268,7 @@
+   <version>2.15</version>
+@@ -281,7 +274,7 @@
      </dependency>
    </dependencies>
  
@@ -28,7 +28,7 @@
      <pluginManagement>
        <plugins>
          <plugin>
-@@ -286,8 +279,9 @@
+@@ -292,8 +285,9 @@
          <plugin>
            <artifactId>maven-surefire-plugin</artifactId>
            <version>${shadedVersion}</version>
@@ -39,7 +39,7 @@
              <useSystemClassLoader>false</useSystemClassLoader>
            </configuration>
          </plugin>
-@@ -352,7 +346,7 @@
+@@ -365,7 +359,7 @@
          </plugin>
        </plugins>
      </pluginManagement>