[pkg-java] r17456 - in trunk/surefire/debian: . patches
Emmanuel Bourg
ebourg-guest at alioth.debian.org
Fri Nov 8 16:25:59 UTC 2013
Author: ebourg-guest
Date: 2013-11-08 16:25:58 +0000 (Fri, 08 Nov 2013)
New Revision: 17456
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/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.13)
Modified: trunk/surefire/debian/build.properties
===================================================================
--- trunk/surefire/debian/build.properties 2013-11-08 15:48:25 UTC (rev 17455)
+++ trunk/surefire/debian/build.properties 2013-11-08 16:25:58 UTC (rev 17456)
@@ -20,12 +20,14 @@
/usr/share/java/maven-project.jar:\
/usr/share/java/maven-reporting-api.jar:\
/usr/share/java/maven-reporting-impl.jar:\
+ /usr/share/java/maven-shared-utils.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-grouper/target/surefire-grouper-${version}.jar:\
${basedir}/maven-surefire-common/target/maven-surefire-common-${version}.jar:\
+ ${basedir}/surefire-providers/common-java5/target/common-java5-${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-junit48/target/common-junit48-${version}.jar
Modified: trunk/surefire/debian/build.xml
===================================================================
--- trunk/surefire/debian/build.xml 2013-11-08 15:48:25 UTC (rev 17455)
+++ trunk/surefire/debian/build.xml 2013-11-08 16:25:58 UTC (rev 17456)
@@ -70,6 +70,7 @@
<cleanmodule dir="surefire-api"/>
<cleanmodule dir="surefire-booter"/>
<cleanmodule dir="surefire-grouper"/>
+ <cleanmodule dir="surefire-providers/common-java5"/>
<cleanmodule dir="surefire-providers/common-junit3"/>
<cleanmodule dir="surefire-providers/common-junit4"/>
<cleanmodule dir="surefire-providers/common-junit48"/>
@@ -95,6 +96,7 @@
<package-shaded-module dir="surefire-booter"/>
<package-shaded-module dir="surefire-grouper"/>
<packagemodule dir="surefire-providers"/>
+ <packagemodule dir="surefire-providers/common-java5"/>
<packagemodule dir="surefire-providers/common-junit3"/>
<packagemodule dir="surefire-providers/common-junit4"/>
<packagemodule dir="surefire-providers/common-junit48"/>
@@ -111,6 +113,7 @@
<restore-pom dir="surefire-booter"/>
<restore-pom dir="surefire-grouper"/>
<restore-pom dir="surefire-providers"/>
+ <restore-pom dir="surefire-providers/common-java5"/>
<restore-pom dir="surefire-providers/common-junit3"/>
<restore-pom dir="surefire-providers/common-junit4"/>
<restore-pom dir="surefire-providers/common-junit48"/>
Modified: trunk/surefire/debian/changelog
===================================================================
--- trunk/surefire/debian/changelog 2013-11-08 15:48:25 UTC (rev 17455)
+++ trunk/surefire/debian/changelog 2013-11-08 16:25:58 UTC (rev 17456)
@@ -1,10 +1,10 @@
-surefire (2.12.4-1) UNRELEASED; urgency=low
+surefire (2.13-1) UNRELEASED; urgency=low
* Team upload.
* New upstream release
- Refreshed the patches
- - Build the new common-junit48 and surefire-grouper modules
- - New dependency on libcommons-lang3-java
+ - Build the new modules: common-junit48, common-java5 and surefire-grouper
+ - New dependency on libcommons-lang3-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 15:48:25 UTC (rev 17455)
+++ trunk/surefire/debian/control 2013-11-08 16:25:58 UTC (rev 17456)
@@ -19,6 +19,7 @@
libmaven-plugin-tools-java (>= 3.2),
libmaven-resources-plugin-java,
libmaven-shade-plugin-java,
+ libmaven-shared-utils-java,
libplexus-velocity-java,
maven-ant-helper (>= 7.9),
maven-repo-helper,
@@ -31,7 +32,7 @@
Package: libsurefire-java
Architecture: all
-Depends: libcommons-lang3-java, libmaven-common-artifact-filters-java, ${misc:Depends}
+Depends: 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/libsurefire-java.poms
===================================================================
--- trunk/surefire/debian/libsurefire-java.poms 2013-11-08 15:48:25 UTC (rev 17455)
+++ trunk/surefire/debian/libsurefire-java.poms 2013-11-08 16:25:58 UTC (rev 17456)
@@ -3,6 +3,7 @@
surefire-booter/pom.xml
surefire-grouper/pom.xml
surefire-providers/pom.xml
+surefire-providers/common-java5/pom.xml
surefire-providers/common-junit3/pom.xml
surefire-providers/common-junit4/pom.xml
surefire-providers/common-junit48/pom.xml
Modified: trunk/surefire/debian/patches/bypass-testng-version-check.patch
===================================================================
--- trunk/surefire/debian/patches/bypass-testng-version-check.patch 2013-11-08 15:48:25 UTC (rev 17455)
+++ trunk/surefire/debian/patches/bypass-testng-version-check.patch 2013-11-08 16:25:58 UTC (rev 17456)
@@ -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
-@@ -1184,16 +1184,6 @@
+@@ -1314,16 +1314,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 15:48:25 UTC (rev 17455)
+++ trunk/surefire/debian/patches/fix-junit-provider-selection.patch 2013-11-08 16:25:58 UTC (rev 17456)
@@ -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
-@@ -867,12 +867,14 @@
+@@ -933,12 +933,14 @@
private boolean isJunit47Compatible( Artifact artifact )
{
Modified: trunk/surefire/debian/patches/pom.patch
===================================================================
--- trunk/surefire/debian/patches/pom.patch 2013-11-08 15:48:25 UTC (rev 17455)
+++ trunk/surefire/debian/patches/pom.patch 2013-11-08 16:25:58 UTC (rev 17456)
@@ -18,8 +18,8 @@
-
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire</artifactId>
- <version>2.12.4</version>
-@@ -240,7 +233,7 @@
+ <version>2.13</version>
+@@ -264,7 +257,7 @@
</dependency>
</dependencies>
@@ -28,7 +28,7 @@
<pluginManagement>
<plugins>
<plugin>
-@@ -251,8 +244,9 @@
+@@ -275,8 +268,9 @@
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${shadedVersion}</version>
@@ -39,12 +39,12 @@
<useSystemClassLoader>false</useSystemClassLoader>
</configuration>
</plugin>
-@@ -294,7 +288,7 @@
- </configuration> </plugin>
+@@ -337,7 +331,7 @@
+ </plugin>
</plugins>
</pluginManagement>
- </build>
+ </build>-->
- <profiles>
- <profile>
+ <reporting>
+ <plugins>
Modified: trunk/surefire/debian/rules
===================================================================
--- trunk/surefire/debian/rules 2013-11-08 15:48:25 UTC (rev 17455)
+++ trunk/surefire/debian/rules 2013-11-08 16:25:58 UTC (rev 17456)
@@ -20,6 +20,7 @@
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-grouper/pom.xml surefire-grouper/target/surefire-grouper-$(VERSION).jar
+ mh_installjar -plib$(PACKAGE)-java -l surefire-providers/common-java5/pom.xml surefire-providers/common-java5/target/common-java5-$(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
More information about the pkg-java-commits
mailing list