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

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-11-08 17:56:11 +0000 (Fri, 08 Nov 2013)
New Revision: 17457

Modified:
   trunk/surefire/debian/build.xml
   trunk/surefire/debian/changelog
   trunk/surefire/debian/libsurefire-java.poms
   trunk/surefire/debian/patches/bypass-testng-version-check.patch
   trunk/surefire/debian/patches/fix-junit-provider-selection.patch
   trunk/surefire/debian/patches/pom.patch
   trunk/surefire/debian/rules
Log:
New upstream release (2.14.1)



Modified: trunk/surefire/debian/build.xml
===================================================================
--- trunk/surefire/debian/build.xml	2013-11-08 16:25:58 UTC (rev 17456)
+++ trunk/surefire/debian/build.xml	2013-11-08 17:56:11 UTC (rev 17457)
@@ -79,6 +79,7 @@
         <cleanmodule dir="surefire-providers/surefire-junit47"/>
         <cleanmodule dir="surefire-providers/surefire-testng"/>
         <cleanmodule dir="surefire-providers/surefire-testng-utils"/>
+        <cleanmodule dir="surefire-report-parser"/>
         <cleanmodule dir="maven-surefire-common"/>
         <cleanmodule dir="maven-surefire-plugin"/>
         <cleanmodule dir="maven-surefire-report-plugin"/>
@@ -105,6 +106,7 @@
         <packagemodule dir="surefire-providers/surefire-junit47"/>
         <packagemodule dir="surefire-providers/surefire-testng"/>
         <packagemodule dir="surefire-providers/surefire-testng-utils"/>
+        <packagemodule dir="surefire-report-parser"/>
         <package-plugin-module dir="maven-surefire-common"/>
         <package-plugin-module dir="maven-surefire-plugin"/>
         <package-plugin-module dir="maven-surefire-report-plugin"/>
@@ -122,6 +124,7 @@
         <restore-pom dir="surefire-providers/surefire-junit47"/>
         <restore-pom dir="surefire-providers/surefire-testng"/>
         <restore-pom dir="surefire-providers/surefire-testng-utils"/>
+        <restore-pom dir="surefire-report-parser"/>
         <restore-pom dir="maven-surefire-common"/>
         <restore-pom dir="maven-surefire-plugin"/>
         <restore-pom dir="maven-surefire-report-plugin"/>

Modified: trunk/surefire/debian/changelog
===================================================================
--- trunk/surefire/debian/changelog	2013-11-08 16:25:58 UTC (rev 17456)
+++ trunk/surefire/debian/changelog	2013-11-08 17:56:11 UTC (rev 17457)
@@ -1,9 +1,10 @@
-surefire (2.13-1) UNRELEASED; urgency=low
+surefire (2.14.1-1) UNRELEASED; urgency=low
 
   * Team upload.
   * New upstream release
     - Refreshed the patches
-    - Build the new modules: common-junit48, common-java5 and surefire-grouper
+    - 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
   * debian/orig-tar.sh:
     - Use XZ compression for the upstream tarball

Modified: trunk/surefire/debian/libsurefire-java.poms
===================================================================
--- trunk/surefire/debian/libsurefire-java.poms	2013-11-08 16:25:58 UTC (rev 17456)
+++ trunk/surefire/debian/libsurefire-java.poms	2013-11-08 17:56:11 UTC (rev 17457)
@@ -12,6 +12,7 @@
 surefire-providers/surefire-junit47/pom.xml
 surefire-providers/surefire-testng/pom.xml
 surefire-providers/surefire-testng-utils/pom.xml
+surefire-report-parser/pom.xml
 maven-surefire-common/pom.xml
 maven-surefire-plugin/pom.xml
 maven-surefire-report-plugin/pom.xml

Modified: trunk/surefire/debian/patches/bypass-testng-version-check.patch
===================================================================
--- trunk/surefire/debian/patches/bypass-testng-version-check.patch	2013-11-08 16:25:58 UTC (rev 17456)
+++ trunk/surefire/debian/patches/bypass-testng-version-check.patch	2013-11-08 17:56:11 UTC (rev 17457)
@@ -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
-@@ -1314,16 +1314,6 @@
+@@ -1320,16 +1320,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 16:25:58 UTC (rev 17456)
+++ trunk/surefire/debian/patches/fix-junit-provider-selection.patch	2013-11-08 17:56:11 UTC (rev 17457)
@@ -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
-@@ -933,12 +933,14 @@
+@@ -948,12 +948,14 @@
  
      private boolean isJunit47Compatible( Artifact artifact )
      {
@@ -25,4 +25,4 @@
 +                 ( artifact != null && "4.x".equals( artifact.getVersion() ) ) );
      }
  
-     boolean isForkModeNever()
+     static boolean isForkModeNever( String forkMode )

Modified: trunk/surefire/debian/patches/pom.patch
===================================================================
--- trunk/surefire/debian/patches/pom.patch	2013-11-08 16:25:58 UTC (rev 17456)
+++ trunk/surefire/debian/patches/pom.patch	2013-11-08 17:56:11 UTC (rev 17457)
@@ -18,8 +18,8 @@
 -
    <groupId>org.apache.maven.surefire</groupId>
    <artifactId>surefire</artifactId>
-   <version>2.13</version>
-@@ -264,7 +257,7 @@
+   <version>2.14.1</version>
+@@ -275,7 +268,7 @@
      </dependency>
    </dependencies>
  
@@ -28,7 +28,7 @@
      <pluginManagement>
        <plugins>
          <plugin>
-@@ -275,8 +268,9 @@
+@@ -286,8 +279,9 @@
          <plugin>
            <artifactId>maven-surefire-plugin</artifactId>
            <version>${shadedVersion}</version>
@@ -39,7 +39,7 @@
              <useSystemClassLoader>false</useSystemClassLoader>
            </configuration>
          </plugin>
-@@ -337,7 +331,7 @@
+@@ -352,7 +346,7 @@
          </plugin>
        </plugins>
      </pluginManagement>

Modified: trunk/surefire/debian/rules
===================================================================
--- trunk/surefire/debian/rules	2013-11-08 16:25:58 UTC (rev 17456)
+++ trunk/surefire/debian/rules	2013-11-08 17:56:11 UTC (rev 17457)
@@ -29,6 +29,7 @@
 	mh_installjar -plib$(PACKAGE)-java -l surefire-providers/surefire-junit47/pom.xml surefire-providers/surefire-junit47/target/surefire-junit47-$(VERSION).jar
 	mh_installjar -plib$(PACKAGE)-java -l surefire-providers/surefire-testng/pom.xml surefire-providers/surefire-testng/target/surefire-testng-$(VERSION).jar
 	mh_installjar -plib$(PACKAGE)-java -l surefire-providers/surefire-testng-utils/pom.xml surefire-providers/surefire-testng-utils/target/surefire-testng-utils-$(VERSION).jar
+	mh_installjar -plib$(PACKAGE)-java -l surefire-report-parser/pom.xml surefire-report-parser/target/surefire-report-parser-$(VERSION).jar
 	mh_installjar -plib$(PACKAGE)-java -l maven-surefire-common/pom.xml maven-surefire-common/target/maven-surefire-common-$(VERSION).jar
 	mh_installjar -plib$(PACKAGE)-java -l maven-surefire-plugin/pom.xml maven-surefire-plugin/target/maven-surefire-plugin-$(VERSION).jar
 	mh_installjar -plib$(PACKAGE)-java -l maven-surefire-report-plugin/pom.xml maven-surefire-report-plugin/target/maven-surefire-report-plugin-$(VERSION).jar