Source: surefire
Version: 2.10-1
Severity: wishlist
Tags: patch
Attached, please find a patch which adjusts surefire's build process so it no
longer needs to Build-Depend on itself.
--
Daniel Schepler
diff -urN surefire-2.10.old/debian/build.xml surefire-2.10/debian/build.xml
--- surefire-2.10.old/debian/build.xml 2011-10-10 15:34:18.000000000 -0700
+++ surefire-2.10/debian/build.xml 2012-01-07 12:31:22.000000000 -0800
@@ -19,7 +19,7 @@
<macrodef name="packagemodule">
<attribute name="dir"/>
<sequential>
- <ant target="package" antfile="${maven.build}" dir="@{dir}">
+ <ant target="package-and-local-install" antfile="${maven.build}" dir="@{dir}">
<property name="debian.dir" location="debian" />
<property name="project.dir" value="@{dir}" />
<property name="keep-cleaned-pom" value="true" />
@@ -31,7 +31,7 @@
<macrodef name="package-plugin-module">
<attribute name="dir"/>
<sequential>
- <ant target="package" antfile="${maven.build}" dir="@{dir}">
+ <ant target="package-and-local-install" antfile="${maven.build}" dir="@{dir}">
<property name="debian.dir" location="debian" />
<property name="project.dir" value="@{dir}" />
<property name="maven.generate.target" value="plugin:descriptor" />
@@ -44,7 +44,7 @@
<macrodef name="package-shaded-module">
<attribute name="dir"/>
<sequential>
- <ant target="package" antfile="${maven.build}" dir="@{dir}">
+ <ant target="package-and-local-install" antfile="${maven.build}" dir="@{dir}">
<property name="debian.dir" location="debian" />
<property name="project.dir" value="@{dir}" />
<property name="maven.package.target" value="install" />
@@ -83,16 +83,7 @@
<target name="package">
<packagemodule dir=""/>
<package-shaded-module dir="surefire-api"/>
- <mkdir dir="debian/.mh/maven-repo/org/apache/maven/surefire/surefire-api/debian" />
- <copy file="surefire-api/target/surefire-api-${version}.jar"
- tofile="debian/.mh/maven-repo/org/apache/maven/surefire/surefire-api/debian/surefire-api-debian.jar" />
- <copy file="debian/.mh/pom.xml"
- tofile="debian/.mh/maven-repo/org/apache/maven/surefire/surefire-api/debian/surefire-api-debian.pom" />
<package-shaded-module dir="surefire-booter"/>
- <copy file="surefire-booter/target/surefire-booter-${version}.jar"
- tofile="debian/.mh/maven-repo/org/apache/maven/surefire/surefire-booter/debian/surefire-booter-debian.jar" />
- <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/common-junit3"/>
<packagemodule dir="surefire-providers/common-junit4"/>
diff -urN surefire-2.10.old/debian/control surefire-2.10/debian/control
--- surefire-2.10.old/debian/control 2011-10-11 10:01:42.000000000 -0700
+++ surefire-2.10/debian/control 2012-01-07 12:31:45.000000000 -0800
@@ -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, libsurefire-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
