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

Miguel Landaeta nomadium-guest at alioth.debian.org
Mon Oct 10 22:34:18 UTC 2011 

Author: nomadium-guest
Date: 2011-10-10 22:34:18 +0000 (Mon, 10 Oct 2011)
New Revision: 15175

Modified:
   trunk/surefire/debian/build.properties
   trunk/surefire/debian/build.xml
   trunk/surefire/debian/changelog
   trunk/surefire/debian/control
   trunk/surefire/debian/libsurefire-java.poms
   trunk/surefire/debian/patches/pom.patch
   trunk/surefire/debian/patches/series
   trunk/surefire/debian/rules
Log:
* Team upload.
* New upstream release.
* Refresh and remove unneccesary patches.
* Add Build-Depends on libmaven-common-artifact-filters-java.
* Drop outdated Maven artifact surefire-junit.
* Provide new Maven artifacts: surefire-junit3, maven-surefire-common,
  common-junit3, common-junit4, surefire-junit47 and surefire-testng-utils.
* Fix clean target to allow "two in a row" builds.


Modified: trunk/surefire/debian/build.properties
===================================================================
--- trunk/surefire/debian/build.properties	2011-10-10 22:10:53 UTC (rev 15174)
+++ trunk/surefire/debian/build.properties	2011-10-10 22:34:18 UTC (rev 15175)
@@ -18,6 +18,11 @@
             /usr/share/java/maven-reporting-api.jar:\
             /usr/share/java/maven-reporting-impl.jar:\
             /usr/share/java/maven-toolchain.jar:\
+            /usr/share/java/maven-common-artifact-filters.jar:\
             ${basedir}/surefire-api/target/surefire-api-${version}.jar:\
-            ${basedir}/surefire-booter/target/surefire-booter-${version}.jar
+            ${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
+build.javaVersion=1.5
 

Modified: trunk/surefire/debian/build.xml
===================================================================
--- trunk/surefire/debian/build.xml	2011-10-10 22:10:53 UTC (rev 15174)
+++ trunk/surefire/debian/build.xml	2011-10-10 22:34:18 UTC (rev 15175)
@@ -68,9 +68,14 @@
         <cleanmodule dir=""/>
         <cleanmodule dir="surefire-api"/>
         <cleanmodule dir="surefire-booter"/>
-        <cleanmodule dir="surefire-providers/surefire-junit"/>
+        <cleanmodule dir="surefire-providers/common-junit3"/>
+        <cleanmodule dir="surefire-providers/common-junit4"/>
+        <cleanmodule dir="surefire-providers/surefire-junit3"/>
         <cleanmodule dir="surefire-providers/surefire-junit4"/>
+        <cleanmodule dir="surefire-providers/surefire-junit47"/>
         <cleanmodule dir="surefire-providers/surefire-testng"/>
+        <cleanmodule dir="surefire-providers/surefire-testng-utils"/>
+        <cleanmodule dir="maven-surefire-common"/>
         <cleanmodule dir="maven-surefire-plugin"/>
         <cleanmodule dir="maven-surefire-report-plugin"/>
     </target>
@@ -89,18 +94,28 @@
         <copy file="debian/.mh/pom.xml"
            tofile="debian/.mh/maven-repo/org/apache/maven/surefire/surefire-booter/debian/surefire-booter-debian.pom" />
         <packagemodule dir="surefire-providers"/>
-        <packagemodule dir="surefire-providers/surefire-junit"/>
+        <packagemodule dir="surefire-providers/common-junit3"/>
+        <packagemodule dir="surefire-providers/common-junit4"/>
+        <packagemodule dir="surefire-providers/surefire-junit3"/>
         <packagemodule dir="surefire-providers/surefire-junit4"/>
+        <packagemodule dir="surefire-providers/surefire-junit47"/>
         <packagemodule dir="surefire-providers/surefire-testng"/>
+        <packagemodule dir="surefire-providers/surefire-testng-utils"/>
+        <package-plugin-module dir="maven-surefire-common"/>
         <package-plugin-module dir="maven-surefire-plugin"/>
         <package-plugin-module dir="maven-surefire-report-plugin"/>
         <restore-pom dir=""/>
         <restore-pom dir="surefire-api"/>
         <restore-pom dir="surefire-booter"/>
         <restore-pom dir="surefire-providers"/>
-        <restore-pom dir="surefire-providers/surefire-junit"/>
+        <restore-pom dir="surefire-providers/common-junit3"/>
+        <restore-pom dir="surefire-providers/common-junit4"/>
+        <restore-pom dir="surefire-providers/surefire-junit3"/>
         <restore-pom dir="surefire-providers/surefire-junit4"/>
+        <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="maven-surefire-common"/>
         <restore-pom dir="maven-surefire-plugin"/>
         <restore-pom dir="maven-surefire-report-plugin"/>
     </target>
@@ -109,7 +124,7 @@
         <javadoc destdir="${javadoc.dir}">
             <packageset dir="surefire-api/src/main/java/"/>
             <packageset dir="surefire-booter/src/main/java/"/>
-            <packageset dir="surefire-providers/surefire-junit/src/main/java/"/>
+            <packageset dir="surefire-providers/surefire-junit3/src/main/java/"/>
             <packageset dir="surefire-providers/surefire-junit4/src/main/java/"/>
             <packageset dir="surefire-providers/surefire-testng/src/main/java/"/>
             <packageset dir="maven-surefire-plugin/src/main/java/"/>

Modified: trunk/surefire/debian/changelog
===================================================================
--- trunk/surefire/debian/changelog	2011-10-10 22:10:53 UTC (rev 15174)
+++ trunk/surefire/debian/changelog	2011-10-10 22:34:18 UTC (rev 15175)
@@ -1,3 +1,16 @@
+surefire (2.10-1) UNRELEASED; urgency=low
+
+  * Team upload.
+  * New upstream release.
+  * Refresh and remove unneccesary patches.
+  * Add Build-Depends on libmaven-common-artifact-filters-java.
+  * Drop outdated Maven artifact surefire-junit.
+  * Provide new Maven artifacts: surefire-junit3, maven-surefire-common,
+    common-junit3, common-junit4, surefire-junit47 and surefire-testng-utils.
+  * Fix clean target to allow "two in a row" builds.
+
+ -- Miguel Landaeta <miguel at miguel.cc>  Mon, 10 Oct 2011 18:00:08 -0430
+
 surefire (2.4.3-5) unstable; urgency=low
 
   * Team upload.

Modified: trunk/surefire/debian/control
===================================================================
--- trunk/surefire/debian/control	2011-10-10 22:10:53 UTC (rev 15174)
+++ trunk/surefire/debian/control	2011-10-10 22:34:18 UTC (rev 15175)
@@ -8,7 +8,7 @@
  libmaven-clean-plugin-java, libmaven-compiler-plugin-java, libmaven-install-plugin-java, 
  libmaven-jar-plugin-java, libmaven-resources-plugin-java, libmaven-shade-plugin-java,
  libmaven-plugin-tools-java, libplexus-velocity-java, velocity,
- junit, junit4, testng, libjmock-java
+ junit, junit4, testng, libjmock-java, libmaven-common-artifact-filters-java
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/surefire
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/surefire/

Modified: trunk/surefire/debian/libsurefire-java.poms
===================================================================
--- trunk/surefire/debian/libsurefire-java.poms	2011-10-10 22:10:53 UTC (rev 15174)
+++ trunk/surefire/debian/libsurefire-java.poms	2011-10-10 22:34:18 UTC (rev 15175)
@@ -2,9 +2,14 @@
 surefire-api/pom.xml
 surefire-booter/pom.xml
 surefire-providers/pom.xml
-surefire-providers/surefire-junit/pom.xml
+surefire-providers/common-junit3/pom.xml
+surefire-providers/common-junit4/pom.xml
+surefire-providers/surefire-junit3/pom.xml
 surefire-providers/surefire-junit4/pom.xml
+surefire-providers/surefire-junit47/pom.xml
 surefire-providers/surefire-testng/pom.xml
+surefire-providers/surefire-testng-utils/pom.xml
+maven-surefire-common/pom.xml
 maven-surefire-plugin/pom.xml
 maven-surefire-report-plugin/pom.xml
 

Modified: trunk/surefire/debian/patches/pom.patch
===================================================================
--- trunk/surefire/debian/patches/pom.patch	2011-10-10 22:10:53 UTC (rev 15174)
+++ trunk/surefire/debian/patches/pom.patch	2011-10-10 22:34:18 UTC (rev 15175)
@@ -1,33 +1,65 @@
---- a/pom.xml
-+++ b/pom.xml
-@@ -19,12 +19,6 @@
+Description: Disable Maven artifacts not available in Debian
+Author: Miguel Landaeta <miguel at miguel.cc>
+Forwarded: no
+Last-Update: 2011-10-10
+
+--- surefire-2.10.orig/pom.xml
++++ surefire-2.10/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>
  
- <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/maven-v4_0_0.xsd">
-   <modelVersion>4.0.0</modelVersion>
 -  <parent>
 -    <artifactId>maven-parent</artifactId>
 -    <groupId>org.apache.maven</groupId>
--    <version>7</version>
+-    <version>20</version>
 -    <relativePath>../pom/maven/pom.xml</relativePath>
 -  </parent>
+ 
    <groupId>org.apache.maven.surefire</groupId>
    <artifactId>surefire</artifactId>
-   <packaging>pom</packaging>
-@@ -122,7 +116,7 @@
-       <scope>test</scope>
+@@ -226,7 +220,7 @@
      </dependency>
    </dependencies>
+ 
 -  <build>
 +<!--  <build>
      <plugins>
        <plugin>
-         <artifactId>maven-site-plugin</artifactId>
-@@ -154,7 +148,7 @@
+         <artifactId>maven-compiler-plugin</artifactId>
+@@ -241,8 +235,9 @@
+         <plugin>
+           <artifactId>maven-surefire-plugin</artifactId>
+           <version>${shadedVersion}</version>
+-          <configuration>
++          <configuration>-->
+             <!-- NOTE: Be sure to isolate the Surefire version under test from the version running the tests! -->
++            <!--
+             <useSystemClassLoader>false</useSystemClassLoader>
+           </configuration>
          </plugin>
+@@ -267,7 +262,7 @@
+         </plugin>
        </plugins>
      </pluginManagement>
 -  </build>
-+  </build> -->
-   <modules>
-     <module>surefire-api</module>
-     <module>surefire-booter</module>
++  </build>-->
+ 
+   <profiles>
+     <!-- use preinstalled JDK 1.3 to build and test -->
+--- surefire-2.10.orig/maven-surefire-plugin/pom.xml
++++ surefire-2.10/maven-surefire-plugin/pom.xml
+@@ -140,10 +140,13 @@
+       <groupId>org.apache.maven.surefire</groupId>
+       <artifactId>surefire-booter</artifactId>
+     </dependency>
++    <!-- surefire 2.4.3 is too outdated to provide this artifact,
++         so the package can't Build-Depends on itself yet
+     <dependency>
+       <groupId>org.apache.maven.surefire</groupId>
+       <artifactId>maven-surefire-common</artifactId>
+     </dependency>
++    -->
+     <dependency>
+       <groupId>org.codehaus.plexus</groupId>
+       <artifactId>plexus-utils</artifactId>

Modified: trunk/surefire/debian/patches/series
===================================================================
--- trunk/surefire/debian/patches/series	2011-10-10 22:10:53 UTC (rev 15174)
+++ trunk/surefire/debian/patches/series	2011-10-10 22:34:18 UTC (rev 15175)
@@ -1,2 +1 @@
 pom.patch
-doxia_1.1.patch

Modified: trunk/surefire/debian/rules
===================================================================
--- trunk/surefire/debian/rules	2011-10-10 22:10:53 UTC (rev 15174)
+++ trunk/surefire/debian/rules	2011-10-10 22:34:18 UTC (rev 15175)
@@ -19,12 +19,18 @@
 	mh_installpoms -plib$(PACKAGE)-java
 	mh_installjar -plib$(PACKAGE)-java -l surefire-api/pom.xml surefire-api/target/surefire-api-$(VERSION).jar
 	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/surefire-junit/pom.xml surefire-providers/surefire-junit/target/surefire-junit-$(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/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
 	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 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
 
 clean::
 	-rm -rf debian/tmp surefire-providers/target
 	mh_clean
+	-find . -type f -name pom.xml.save -delete

More information about the pkg-java-commits mailing list