[pkg-java] r17449 - in trunk/surefire/debian: . patches
Emmanuel Bourg
ebourg-guest at alioth.debian.org
Thu Nov 7 15:03:34 UTC 2013
Author: ebourg-guest
Date: 2013-11-07 15:03:33 +0000 (Thu, 07 Nov 2013)
New Revision: 17449
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.12)
Modified: trunk/surefire/debian/build.properties
===================================================================
--- trunk/surefire/debian/build.properties 2013-11-07 11:22:54 UTC (rev 17448)
+++ trunk/surefire/debian/build.properties 2013-11-07 15:03:33 UTC (rev 17449)
@@ -14,6 +14,7 @@
/usr/share/java/maven-artifact.jar:\
/usr/share/java/maven-artifact-manager.jar:\
/usr/share/java/maven-core.jar:\
+ /usr/share/java/maven-plugin-descriptor.jar:\
/usr/share/java/maven-project.jar:\
/usr/share/java/maven-reporting-api.jar:\
/usr/share/java/maven-reporting-impl.jar:\
@@ -21,9 +22,9 @@
/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-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
build.javaVersion=1.5
-
Modified: trunk/surefire/debian/build.xml
===================================================================
--- trunk/surefire/debian/build.xml 2013-11-07 11:22:54 UTC (rev 17448)
+++ trunk/surefire/debian/build.xml 2013-11-07 15:03:33 UTC (rev 17449)
@@ -68,6 +68,7 @@
<cleanmodule dir=""/>
<cleanmodule dir="surefire-api"/>
<cleanmodule dir="surefire-booter"/>
+ <cleanmodule dir="surefire-grouper"/>
<cleanmodule dir="surefire-providers/common-junit3"/>
<cleanmodule dir="surefire-providers/common-junit4"/>
<cleanmodule dir="surefire-providers/common-junit48"/>
@@ -82,9 +83,16 @@
</target>
<target name="package">
+ <!-- Generate the sources for surefire-grouper with JavaCC -->
+ <mkdir dir="surefire-grouper/target/generated-sources"/>
+ <javacc target="surefire-grouper/src/main/javacc/category-expression.jj"
+ outputdirectory="surefire-grouper/target/generated-sources"
+ javacchome="/usr/share/java"/>
+
<packagemodule dir=""/>
<package-shaded-module dir="surefire-api"/>
<package-shaded-module dir="surefire-booter"/>
+ <package-shaded-module dir="surefire-grouper"/>
<packagemodule dir="surefire-providers"/>
<packagemodule dir="surefire-providers/common-junit3"/>
<packagemodule dir="surefire-providers/common-junit4"/>
@@ -100,6 +108,7 @@
<restore-pom dir=""/>
<restore-pom dir="surefire-api"/>
<restore-pom dir="surefire-booter"/>
+ <restore-pom dir="surefire-grouper"/>
<restore-pom dir="surefire-providers"/>
<restore-pom dir="surefire-providers/common-junit3"/>
<restore-pom dir="surefire-providers/common-junit4"/>
@@ -118,6 +127,7 @@
<javadoc destdir="${javadoc.dir}">
<packageset dir="surefire-api/src/main/java/"/>
<packageset dir="surefire-booter/src/main/java/"/>
+ <packageset dir="surefire-grouper/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/"/>
Modified: trunk/surefire/debian/changelog
===================================================================
--- trunk/surefire/debian/changelog 2013-11-07 11:22:54 UTC (rev 17448)
+++ trunk/surefire/debian/changelog 2013-11-07 15:03:33 UTC (rev 17449)
@@ -1,9 +1,9 @@
-surefire (2.11-1) UNRELEASED; urgency=low
+surefire (2.12-1) UNRELEASED; urgency=low
* Team upload.
* New upstream release
- Refreshed the patches
- - Build the new common-junit48 module
+ - Build the new common-junit48 and surefire-grouper modules
* 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-07 11:22:54 UTC (rev 17448)
+++ trunk/surefire/debian/control 2013-11-07 15:03:33 UTC (rev 17449)
@@ -6,6 +6,7 @@
Build-Depends: cdbs, debhelper (>= 9), default-jdk
Build-Depends-Indep: ant,
ant-optional,
+ javacc,
junit,
junit4,
libjmock-java,
Modified: trunk/surefire/debian/libsurefire-java.poms
===================================================================
--- trunk/surefire/debian/libsurefire-java.poms 2013-11-07 11:22:54 UTC (rev 17448)
+++ trunk/surefire/debian/libsurefire-java.poms 2013-11-07 15:03:33 UTC (rev 17449)
@@ -1,6 +1,7 @@
pom.xml --no-parent
surefire-api/pom.xml
surefire-booter/pom.xml
+surefire-grouper/pom.xml
surefire-providers/pom.xml
surefire-providers/common-junit3/pom.xml
surefire-providers/common-junit4/pom.xml
Modified: trunk/surefire/debian/patches/bypass-testng-version-check.patch
===================================================================
--- trunk/surefire/debian/patches/bypass-testng-version-check.patch 2013-11-07 11:22:54 UTC (rev 17448)
+++ trunk/surefire/debian/patches/bypass-testng-version-check.patch 2013-11-07 15:03:33 UTC (rev 17449)
@@ -5,9 +5,9 @@
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
-@@ -580,16 +580,6 @@
+@@ -618,16 +618,6 @@
// TODO: this is pretty manual, but I'd rather not require the plugin > dependencies section right now
- Artifact artifact = (Artifact) getProjectArtifactMap().get( getTestNGArtifactName() );
+ Artifact artifact = getProjectArtifactMap().get( getTestNGArtifactName() );
- if ( artifact != null )
- {
@@ -24,7 +24,7 @@
}
--- 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
-@@ -143,7 +143,7 @@
+@@ -198,7 +198,7 @@
return new TestNGMapConfigurator();
}
Modified: trunk/surefire/debian/patches/fix-junit-provider-selection.patch
===================================================================
--- trunk/surefire/debian/patches/fix-junit-provider-selection.patch 2013-11-07 11:22:54 UTC (rev 17448)
+++ trunk/surefire/debian/patches/fix-junit-provider-selection.patch 2013-11-07 15:03:33 UTC (rev 17449)
@@ -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
-@@ -324,12 +324,14 @@
+@@ -326,12 +326,14 @@
private boolean isJunit47Compatible( Artifact artifact )
{
Modified: trunk/surefire/debian/patches/pom.patch
===================================================================
--- trunk/surefire/debian/patches/pom.patch 2013-11-07 11:22:54 UTC (rev 17448)
+++ trunk/surefire/debian/patches/pom.patch 2013-11-07 15:03:33 UTC (rev 17449)
@@ -5,29 +5,28 @@
--- a/pom.xml
+++ b/pom.xml
-@@ -20,12 +20,6 @@
+@@ -20,13 +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>
- <parent>
- <artifactId>maven-parent</artifactId>
- <groupId>org.apache.maven</groupId>
-- <version>20</version>
+- <version>21</version>
- <relativePath>../pom/maven/pom.xml</relativePath>
- </parent>
-
+-
<groupId>org.apache.maven.surefire</groupId>
<artifactId>surefire</artifactId>
-@@ -226,7 +220,7 @@
+ <version>2.12</version>
+@@ -232,14 +225,15 @@
</dependency>
</dependencies>
- <build>
+<!-- <build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
-@@ -241,8 +235,9 @@
+ <pluginManagement>
+ <plugins>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>${shadedVersion}</version>
@@ -38,7 +37,7 @@
<useSystemClassLoader>false</useSystemClassLoader>
</configuration>
</plugin>
-@@ -268,7 +263,7 @@
+@@ -261,7 +255,7 @@
</plugin>
</plugins>
</pluginManagement>
@@ -46,4 +45,4 @@
+ </build>-->
<profiles>
- <!-- use preinstalled JDK 1.3 to build and test -->
+ <profile>
Modified: trunk/surefire/debian/rules
===================================================================
--- trunk/surefire/debian/rules 2013-11-07 11:22:54 UTC (rev 17448)
+++ trunk/surefire/debian/rules 2013-11-07 15:03:33 UTC (rev 17449)
@@ -19,6 +19,7 @@
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-grouper/pom.xml surefire-grouper/target/surefire-grouper-$(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