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

Emmanuel Bourg ebourg-guest at alioth.debian.org
Thu Nov 7 11:22:54 UTC 2013 

Author: ebourg-guest
Date: 2013-11-07 11:22:54 +0000 (Thu, 07 Nov 2013)
New Revision: 17448

Modified:
   trunk/surefire/debian/build.properties
   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.11)
Refreshed the patches
Build the new common-junit48 module
debian/rules: Unpatch the poms in the clean target


Modified: trunk/surefire/debian/build.properties
===================================================================
--- trunk/surefire/debian/build.properties	2013-11-07 09:52:57 UTC (rev 17447)
+++ trunk/surefire/debian/build.properties	2013-11-07 11:22:54 UTC (rev 17448)
@@ -23,6 +23,7 @@
             ${basedir}/surefire-booter/target/surefire-booter-${version}.jar:\
             ${basedir}/maven-surefire-common/target/maven-surefire-common-${version}.jar:\
             ${basedir}/surefire-providers/common-junit3/target/common-junit3-${version}.jar:\
-            ${basedir}/surefire-providers/common-junit4/target/common-junit4-${version}.jar
+            ${basedir}/surefire-providers/common-junit4/target/common-junit4-${version}.jar:\
+            ${basedir}/surefire-providers/common-junit48/target/common-junit48-${version}.jar
 build.javaVersion=1.5
 

Modified: trunk/surefire/debian/build.xml
===================================================================
--- trunk/surefire/debian/build.xml	2013-11-07 09:52:57 UTC (rev 17447)
+++ trunk/surefire/debian/build.xml	2013-11-07 11:22:54 UTC (rev 17448)
@@ -70,6 +70,7 @@
         <cleanmodule dir="surefire-booter"/>
         <cleanmodule dir="surefire-providers/common-junit3"/>
         <cleanmodule dir="surefire-providers/common-junit4"/>
+        <cleanmodule dir="surefire-providers/common-junit48"/>
         <cleanmodule dir="surefire-providers/surefire-junit3"/>
         <cleanmodule dir="surefire-providers/surefire-junit4"/>
         <cleanmodule dir="surefire-providers/surefire-junit47"/>
@@ -87,6 +88,7 @@
         <packagemodule dir="surefire-providers"/>
         <packagemodule dir="surefire-providers/common-junit3"/>
         <packagemodule dir="surefire-providers/common-junit4"/>
+        <packagemodule dir="surefire-providers/common-junit48"/>
         <packagemodule dir="surefire-providers/surefire-junit3"/>
         <packagemodule dir="surefire-providers/surefire-junit4"/>
         <packagemodule dir="surefire-providers/surefire-junit47"/>
@@ -101,6 +103,7 @@
         <restore-pom dir="surefire-providers"/>
         <restore-pom dir="surefire-providers/common-junit3"/>
         <restore-pom dir="surefire-providers/common-junit4"/>
+        <restore-pom dir="surefire-providers/common-junit48"/>
         <restore-pom dir="surefire-providers/surefire-junit3"/>
         <restore-pom dir="surefire-providers/surefire-junit4"/>
         <restore-pom dir="surefire-providers/surefire-junit47"/>

Modified: trunk/surefire/debian/changelog
===================================================================
--- trunk/surefire/debian/changelog	2013-11-07 09:52:57 UTC (rev 17447)
+++ trunk/surefire/debian/changelog	2013-11-07 11:22:54 UTC (rev 17448)
@@ -1,12 +1,16 @@
-surefire (2.10-6) UNRELEASED; urgency=low
+surefire (2.11-1) UNRELEASED; urgency=low
 
   * Team upload.
+  * New upstream release
+    - Refreshed the patches
+    - Build the new common-junit48 module
   * debian/orig-tar.sh:
     - Use XZ compression for the upstream tarball
     - Reworked to pull the sources from the Apache Git repository
   * debian/watch: Updated to watch the tags on the Github mirror
   * debian/control: Updated Standards-Version to 3.9.5 (no changes)
   * Switch to debhelper level 9
+  * debian/rules: Unpatch the poms in the clean target
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 30 Oct 2013 12:47:54 +0100
 

Modified: trunk/surefire/debian/libsurefire-java.poms
===================================================================
--- trunk/surefire/debian/libsurefire-java.poms	2013-11-07 09:52:57 UTC (rev 17447)
+++ trunk/surefire/debian/libsurefire-java.poms	2013-11-07 11:22:54 UTC (rev 17448)
@@ -4,6 +4,7 @@
 surefire-providers/pom.xml
 surefire-providers/common-junit3/pom.xml
 surefire-providers/common-junit4/pom.xml
+surefire-providers/common-junit48/pom.xml
 surefire-providers/surefire-junit3/pom.xml
 surefire-providers/surefire-junit4/pom.xml
 surefire-providers/surefire-junit47/pom.xml
@@ -12,4 +13,3 @@
 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-07 09:52:57 UTC (rev 17447)
+++ trunk/surefire/debian/patches/bypass-testng-version-check.patch	2013-11-07 11:22:54 UTC (rev 17448)
@@ -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
-@@ -531,16 +531,6 @@
+@@ -580,16 +580,6 @@
          // TODO: this is pretty manual, but I'd rather not require the plugin > dependencies section right now
          Artifact artifact = (Artifact) getProjectArtifactMap().get( getTestNGArtifactName() );
  
@@ -15,8 +15,8 @@
 -            if ( !range.containsVersion( new DefaultArtifactVersion( artifact.getVersion() ) ) )
 -            {
 -                throw new MojoFailureException(
--                    "TestNG support requires version 4.7 or above. You have declared version " +
--                        artifact.getVersion() );
+-                    "TestNG support requires version 4.7 or above. You have declared version "
+-                        + artifact.getVersion() );
 -            }
 -        }
          return artifact;

Modified: trunk/surefire/debian/patches/fix-junit-provider-selection.patch
===================================================================
--- trunk/surefire/debian/patches/fix-junit-provider-selection.patch	2013-11-07 09:52:57 UTC (rev 17447)
+++ trunk/surefire/debian/patches/fix-junit-provider-selection.patch	2013-11-07 11:22:54 UTC (rev 17448)
@@ -7,11 +7,9 @@
 Author: James Page <james.page at ubuntu.com>
 Forwarded: not-needed
 
-Index: surefire/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java
-===================================================================
---- surefire.orig/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java	2012-03-19 15:06:03.310108598 +0000
-+++ surefire/maven-surefire-common/src/main/java/org/apache/maven/plugin/surefire/AbstractSurefireMojo.java	2012-03-26 09:34:20.549223250 +0100
-@@ -311,12 +311,14 @@
+--- 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
+@@ -324,12 +324,14 @@
  
      private boolean isJunit47Compatible( Artifact artifact )
      {

Modified: trunk/surefire/debian/patches/pom.patch
===================================================================
--- trunk/surefire/debian/patches/pom.patch	2013-11-07 09:52:57 UTC (rev 17447)
+++ trunk/surefire/debian/patches/pom.patch	2013-11-07 11:22:54 UTC (rev 17448)
@@ -3,8 +3,8 @@
 Forwarded: no
 Last-Update: 2011-10-10
 
---- surefire-2.10.orig/pom.xml
-+++ surefire-2.10/pom.xml
+--- a/pom.xml
++++ b/pom.xml
 @@ -20,12 +20,6 @@
  <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
    <modelVersion>4.0.0</modelVersion>
@@ -38,7 +38,7 @@
              <useSystemClassLoader>false</useSystemClassLoader>
            </configuration>
          </plugin>
-@@ -267,7 +262,7 @@
+@@ -268,7 +263,7 @@
          </plugin>
        </plugins>
      </pluginManagement>

Modified: trunk/surefire/debian/rules
===================================================================
--- trunk/surefire/debian/rules	2013-11-07 09:52:57 UTC (rev 17447)
+++ trunk/surefire/debian/rules	2013-11-07 11:22:54 UTC (rev 17448)
@@ -21,6 +21,7 @@
 	mh_installjar -plib$(PACKAGE)-java -l surefire-booter/pom.xml surefire-booter/target/surefire-booter-$(VERSION).jar
 	mh_installjar -plib$(PACKAGE)-java -l surefire-providers/common-junit3/pom.xml surefire-providers/common-junit3/target/common-junit3-$(VERSION).jar
 	mh_installjar -plib$(PACKAGE)-java -l surefire-providers/common-junit4/pom.xml surefire-providers/common-junit4/target/common-junit4-$(VERSION).jar
+	mh_installjar -plib$(PACKAGE)-java -l surefire-providers/common-junit48/pom.xml surefire-providers/common-junit48/target/common-junit48-$(VERSION).jar
 	mh_installjar -plib$(PACKAGE)-java -l surefire-providers/surefire-junit3/pom.xml surefire-providers/surefire-junit3/target/surefire-junit3-$(VERSION).jar
 	mh_installjar -plib$(PACKAGE)-java -l surefire-providers/surefire-junit4/pom.xml surefire-providers/surefire-junit4/target/surefire-junit4-$(VERSION).jar
 	mh_installjar -plib$(PACKAGE)-java -l surefire-providers/surefire-junit47/pom.xml surefire-providers/surefire-junit47/target/surefire-junit47-$(VERSION).jar
@@ -33,4 +34,4 @@
 clean::
 	-rm -rf debian/tmp surefire-providers/target
 	mh_clean
-	-find . -type f -name pom.xml.save -delete
+	mh_unpatchpoms -plib$(PACKAGE)-java

More information about the pkg-java-commits mailing list