Author: ludovicc-guest
Date: 2009-07-14 23:58:34 +0000 (Tue, 14 Jul 2009)
New Revision: 9346
Added:
trunk/surefire/debian/build.properties
trunk/surefire/debian/build.xml
trunk/surefire/debian/libsurefire-java.poms
trunk/surefire/debian/maven-settings.xml
trunk/surefire/debian/maven.rules
trunk/surefire/debian/patches/doxia_1.1.patch
trunk/surefire/debian/patches/pom.patch
Removed:
trunk/surefire/debian/patches/pom.diff
Modified:
trunk/surefire/debian/changelog
trunk/surefire/debian/control
trunk/surefire/debian/copyright
trunk/surefire/debian/orig-tar.sh
trunk/surefire/debian/patches/series
trunk/surefire/debian/rules
Log:
* Change section to java, bump up Standards-Version to 3.8.1
* Bump up debhelper to 6
* Migrate the build from cdbs-maven to cdbs-ant as Maven uses
this plugin for its build.
* Add a Build-Depends-Indep dependency on maven-repo-helper
* Use mh_installpom and mh_installjar to install the POM and the jar to the
Maven repository
* Remove the patch for the POM as it's no longer needed, as well as
the dependency on Quilt
* Remove Depends on Java runtimes as it is a library
Added: trunk/surefire/debian/build.properties
===================================================================
--- trunk/surefire/debian/build.properties (rev 0)
+++ trunk/surefire/debian/build.properties 2009-07-14 23:58:34 UTC (rev
9346)
@@ -0,0 +1,23 @@
+javadoc.dir=target/api
+build.directory=target
+maven.test.skip=true
+classpath.compile = \
+ /usr/share/java/commons-lang.jar:\
+ /usr/share/java/plexus-utils.jar:\
+ /usr/share/java/junit.jar:\
+ /usr/share/java/junit4.jar:\
+ /usr/share/java/testng.jar:\
+ /usr/share/java/doxia-core.jar:\
+ /usr/share/java/doxia-logging-api.jar:\
+ /usr/share/java/doxia-sink-api.jar:\
+ /usr/share/java/doxia-site-renderer.jar:\
+ /usr/share/java/maven-artifact.jar:\
+ /usr/share/java/maven-artifact-manager.jar:\
+ /usr/share/java/maven-core.jar:\
+ /usr/share/java/maven-project.jar:\
+ /usr/share/java/maven-reporting-api.jar:\
+ /usr/share/java/maven-reporting-impl.jar:\
+ /usr/share/java/maven-toolchain.jar:\
+ ${basedir}/surefire-api/target/surefire-api-${version}.jar:\
+ ${basedir}/surefire-booter/target/surefire-booter-${version}.jar
+
Added: trunk/surefire/debian/build.xml
===================================================================
--- trunk/surefire/debian/build.xml (rev 0)
+++ trunk/surefire/debian/build.xml 2009-07-14 23:58:34 UTC (rev 9346)
@@ -0,0 +1,120 @@
+<?xml version="1.0"?>
+
+<project name="pkg-java" default="package" basedir="..">
+
+ <property file="debian/build.properties"/>
+ <property name="maven.build"
value="/usr/share/maven-ant-helper/maven-build.xml"/>
+ <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
+
+ <macrodef name="cleanmodule">
+ <attribute name="dir"/>
+ <sequential>
+ <ant target="clean" antfile="${maven.build}" dir="@{dir}">
+ <property name="debian.dir" location="debian" />
+ <property name="project.dir" value="@{dir}" />
+ </ant>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="packagemodule">
+ <attribute name="dir"/>
+ <sequential>
+ <ant target="package" antfile="${maven.build}" dir="@{dir}">
+ <property name="debian.dir" location="debian" />
+ <property name="project.dir" value="@{dir}" />
+ <property name="keep-cleaned-pom" value="true" />
+ <property name="use-local-repo" value="true" />
+ </ant>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="package-plugin-module">
+ <attribute name="dir"/>
+ <sequential>
+ <ant target="package" 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" />
+ <property name="keep-cleaned-pom" value="true" />
+ <property name="use-local-repo" value="true" />
+ </ant>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="package-shaded-module">
+ <attribute name="dir"/>
+ <sequential>
+ <ant target="package" antfile="${maven.build}" dir="@{dir}">
+ <property name="debian.dir" location="debian" />
+ <property name="project.dir" value="@{dir}" />
+ <property name="maven.package.target" value="install" />
+ <property name="keep-cleaned-pom" value="true" />
+ <property name="use-local-repo" value="true" />
+ </ant>
+ </sequential>
+ </macrodef>
+
+ <macrodef name="restore-pom">
+ <attribute name="dir"/>
+ <sequential>
+ <ant target="restore-pom" antfile="${maven.build}" dir="@{dir}">
+ <property name="debian.dir" location="debian" />
+ <property name="project.dir" value="@{dir}" />
+ </ant>
+ </sequential>
+ </macrodef>
+
+ <target name="clean">
+ <cleanmodule dir=""/>
+ <cleanmodule dir="surefire-api"/>
+ <cleanmodule dir="surefire-booter"/>
+ <cleanmodule dir="surefire-providers/surefire-junit"/>
+ <cleanmodule dir="surefire-providers/surefire-junit4"/>
+ <cleanmodule dir="surefire-providers/surefire-testng"/>
+ <cleanmodule dir="maven-surefire-plugin"/>
+ <cleanmodule dir="maven-surefire-report-plugin"/>
+ </target>
+
+ <target name="package">
+ <packagemodule dir=""/>
+ <package-shaded-module dir="surefire-api"/>
+ <mkdir
dir="debian/tmp/maven-repo/org/apache/maven/surefire/surefire-api/debian" />
+ <copy file="surefire-api/target/surefire-api-${version}.jar"
+
tofile="debian/tmp/maven-repo/org/apache/maven/surefire/surefire-api/debian/surefire-api-debian.jar"
/>
+ <copy file="debian/tmp/pom.xml"
+
tofile="debian/tmp/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/tmp/maven-repo/org/apache/maven/surefire/surefire-booter/debian/surefire-booter-debian.jar"
/>
+ <copy file="debian/tmp/pom.xml"
+
tofile="debian/tmp/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/surefire-junit4"/>
+ <packagemodule dir="surefire-providers/surefire-testng"/>
+ <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/surefire-junit4"/>
+ <restore-pom dir="surefire-providers/surefire-testng"/>
+ <restore-pom dir="maven-surefire-plugin"/>
+ <restore-pom dir="maven-surefire-report-plugin"/>
+ </target>
+
+ <target name="javadoc">
+ <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-junit4/src/main/java/"/>
+ <packageset
dir="surefire-providers/surefire-testng/src/main/java/"/>
+ <packageset dir="maven-surefire-plugin/src/main/java/"/>
+ <packageset dir="maven-surefire-report-plugin/src/main/java/"/>
+ </javadoc>
+ </target>
+
+</project>
Modified: trunk/surefire/debian/changelog
===================================================================
--- trunk/surefire/debian/changelog 2009-07-14 22:49:22 UTC (rev 9345)
+++ trunk/surefire/debian/changelog 2009-07-14 23:58:34 UTC (rev 9346)
@@ -1,3 +1,18 @@
+surefire (2.4.3-2) experimental; urgency=low
+
+ * Change section to java, bump up Standards-Version to 3.8.1
+ * Bump up debhelper to 6
+ * Migrate the build from cdbs-maven to cdbs-ant as Maven uses
+ this plugin for its build.
+ * Add a Build-Depends-Indep dependency on maven-repo-helper
+ * Use mh_installpom and mh_installjar to install the POM and the jar to the
+ Maven repository
+ * Remove the patch for the POM as it's no longer needed, as well as
+ the dependency on Quilt
+ * Remove Depends on Java runtimes as it is a library
+
+ -- Ludovic Claude <[email protected]> Tue, 26 May 2009 21:03:39
+0100
+
surefire (2.4.3-1) unstable; urgency=low
* Initial release. (Closes: #508829)
Modified: trunk/surefire/debian/control
===================================================================
--- trunk/surefire/debian/control 2009-07-14 22:49:22 UTC (rev 9345)
+++ trunk/surefire/debian/control 2009-07-14 23:58:34 UTC (rev 9346)
@@ -1,19 +1,22 @@
Source: surefire
-Section: libs
+Section: java
Priority: optional
Maintainer: Debian Java Maintainers
<[email protected]>
Uploaders: Torsten Werner <[email protected]>
-Build-Depends: debhelper (>= 5), cdbs, openjdk-6-jdk, quilt,
maven-debian-helper,
- libsurefire-java
-Standards-Version: 3.8.0
+Build-Depends: debhelper (>= 5), cdbs, openjdk-6-jdk, quilt
+Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant,
ant-optional,
+ 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
+Standards-Version: 3.8.1
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/surefire
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/surefire/
Homepage: http://maven.apache.org/surefire/
Package: libsurefire-java
Architecture: all
-Depends: ${misc:Depends}, default-jre | java2-runtime, junit, junit4,
- libjmock-java
+Depends: ${misc:Depends}, junit, junit4, testng, libjmock-java
Description: Surefire test framework for Java
Maven is a software project management and comprehension tool. Based on the
concept of a project object model (POM), Maven can manage a project's build,
Modified: trunk/surefire/debian/copyright
===================================================================
--- trunk/surefire/debian/copyright 2009-07-14 22:49:22 UTC (rev 9345)
+++ trunk/surefire/debian/copyright 2009-07-14 23:58:34 UTC (rev 9346)
@@ -3,7 +3,7 @@
The Debian packaging is Copyright (c) 2008 Torsten Werner and is
licensed under the GNU General Public License version 3. On Debian
systems, the complete text of the GNU General Public License can be
-found in '/usr/share/common-licenses/GPL'.
+found in '/usr/share/common-licenses/GPL-3'.
The package was downloaded from <http://maven.apache.org/surefire/>.
Added: trunk/surefire/debian/libsurefire-java.poms
===================================================================
--- trunk/surefire/debian/libsurefire-java.poms (rev 0)
+++ trunk/surefire/debian/libsurefire-java.poms 2009-07-14 23:58:34 UTC (rev
9346)
@@ -0,0 +1,10 @@
+pom.xml --no-parent
+surefire-api/pom.xml
+surefire-booter/pom.xml
+surefire-providers/pom.xml
+surefire-providers/surefire-junit/pom.xml
+surefire-providers/surefire-junit4/pom.xml
+surefire-providers/surefire-testng/pom.xml
+maven-surefire-plugin/pom.xml
+maven-surefire-report-plugin/pom.xml
+
Added: trunk/surefire/debian/maven-settings.xml
===================================================================
--- trunk/surefire/debian/maven-settings.xml (rev 0)
+++ trunk/surefire/debian/maven-settings.xml 2009-07-14 23:58:34 UTC (rev
9346)
@@ -0,0 +1,9 @@
+<!--
+ This is a minimal settings.xml that switches maven to offline mode
+ and uses the Debian repo as the local repo.
+-->
+
+<settings>
+ <localRepository>/usr/share/maven-repo</localRepository>
+ <offline>true</offline>
+</settings>
Added: trunk/surefire/debian/maven.rules
===================================================================
--- trunk/surefire/debian/maven.rules (rev 0)
+++ trunk/surefire/debian/maven.rules 2009-07-14 23:58:34 UTC (rev 9346)
@@ -0,0 +1,8 @@
+# keep the version for all Maven plugins as versionless plugins don't work
+* * maven-plugin *
+junit junit jar s/3\..*/3.x/
+junit junit jar s/4\..*/4.x/
+jmock jmock jar s/1\..*/1.x/
+# fix the version of maven-shade-plugin
+org.apache.maven.plugins maven-shade-plugin maven-plugin s/.*/1.2.1
+
Property changes on: trunk/surefire/debian/orig-tar.sh
___________________________________________________________________
Modified: svn:executable
-
+ *
Added: trunk/surefire/debian/patches/doxia_1.1.patch
===================================================================
--- trunk/surefire/debian/patches/doxia_1.1.patch
(rev 0)
+++ trunk/surefire/debian/patches/doxia_1.1.patch 2009-07-14 23:58:34 UTC
(rev 9346)
@@ -0,0 +1,45 @@
+---
a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java
++++
b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportMojo.java
+@@ -30,7 +30,7 @@
+ import org.apache.maven.project.MavenProject;
+ import org.apache.maven.reporting.AbstractMavenReport;
+ import org.apache.maven.reporting.MavenReportException;
+-import org.codehaus.doxia.site.renderer.SiteRenderer;
++import org.apache.maven.doxia.siterenderer.Renderer;
+ import org.codehaus.plexus.util.PathTool;
+ import org.codehaus.plexus.util.StringUtils;
+
+@@ -56,10 +56,10 @@
+ /**
+ * Doxia Site Renderer
+ *
+- * @parameter
expression="${component.org.codehaus.doxia.site.renderer.SiteRenderer}"
++ * @parameter
expression="${component.org.apache.maven.doxia.siterenderer.Renderer}"
+ * @required @readonly
+ */
+- private SiteRenderer siteRenderer;
++ private Renderer siteRenderer;
+
+ /**
+ * Maven Project
+@@ -230,7 +230,7 @@
+ return getBundle( locale ).getString( "report.surefire.description" );
+ }
+
+- protected SiteRenderer getSiteRenderer()
++ protected Renderer getSiteRenderer()
+ {
+ return siteRenderer;
+ }
+---
a/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
++++
b/maven-surefire-report-plugin/src/main/java/org/apache/maven/plugins/surefire/report/SurefireReportGenerator.java
+@@ -20,8 +20,7 @@
+ */
+
+ import org.apache.maven.reporting.MavenReportException;
+-import org.codehaus.doxia.sink.Sink;
+-
++import org.apache.maven.doxia.sink.Sink;
+ import java.io.File;
+ import java.text.NumberFormat;
+ import java.util.Iterator;
Deleted: trunk/surefire/debian/patches/pom.diff
===================================================================
--- trunk/surefire/debian/patches/pom.diff 2009-07-14 22:49:22 UTC (rev
9345)
+++ trunk/surefire/debian/patches/pom.diff 2009-07-14 23:58:34 UTC (rev
9346)
@@ -1,255 +0,0 @@
-Index: surefire-2.4.3/maven-surefire-plugin/pom.xml
-===================================================================
---- surefire-2.4.3.orig/maven-surefire-plugin/pom.xml 2008-12-17
15:47:26.000000000 +0100
-+++ surefire-2.4.3/maven-surefire-plugin/pom.xml 2008-12-17
15:47:30.000000000 +0100
-@@ -92,12 +92,15 @@
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-plugin-api</artifactId>
-- <version>2.0.6</version>
-+ <version>2.0.9</version>
-+ <scope>system</scope>
-+ <systemPath>/usr/share/java/maven2.jar</systemPath>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-booter</artifactId>
- </dependency>
-+ <!--
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
-@@ -122,16 +125,19 @@
- <artifactId>maven-toolchain</artifactId>
- <version>1.0</version>
- </dependency>
-+ -->
- </dependencies>
-
- <build>
- <plugins>
-+ <!--
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <configuration>
-
<stagingSiteURL>scp://people.apache.org/www/maven.apache.org/plugins/${project.artifactId}-${project.version}</stagingSiteURL>
- </configuration>
- </plugin>
-+ -->
- </plugins>
- </build>
-
-Index: surefire-2.4.3/pom.xml
-===================================================================
---- surefire-2.4.3.orig/pom.xml 2008-12-17 15:47:26.000000000 +0100
-+++ surefire-2.4.3/pom.xml 2008-12-17 16:01:46.000000000 +0100
-@@ -19,12 +19,14 @@
-
- <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>
- <relativePath>../pom/maven/pom.xml</relativePath>
- </parent>
-+ -->
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire</artifactId>
- <packaging>pom</packaging>
-@@ -101,11 +103,13 @@
- <artifactId>surefire-booter</artifactId>
- <version>2.4.3</version>
- </dependency>
-+ <!--
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- <version>1.5.1</version>
- </dependency>
-+ -->
- </dependencies>
- </dependencyManagement>
- <dependencies>
-@@ -113,21 +117,25 @@
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
-- <scope>test</scope>
-+ <scope>system</scope>
-+ <systemPath>/usr/share/java/junit.jar</systemPath>
- </dependency>
- <dependency>
- <groupId>jmock</groupId>
- <artifactId>jmock</artifactId>
- <version>1.0.1</version>
-- <scope>test</scope>
-+ <scope>system</scope>
-+ <systemPath>/usr/share/java/jmock.jar</systemPath>
- </dependency>
- </dependencies>
- <build>
- <plugins>
-+ <!--
- <plugin>
- <artifactId>maven-site-plugin</artifactId>
- <version>2.0-beta-5</version>
- </plugin>
-+ -->
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
-@@ -135,17 +143,19 @@
- <target>1.3</target>
- </configuration>
- </plugin>
-+ <!--
- <plugin>
- <artifactId>maven-source-plugin</artifactId>
- <version>2.0.4</version>
- </plugin>
-+ -->
- </plugins>
- <pluginManagement>
- <plugins>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
-- <version>2.3.1</version>
-- </plugin>
-+ <version>2.4.3</version>
-+ </plugin>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <configuration>
-@@ -160,8 +170,8 @@
- <module>surefire-booter</module>
- <module>surefire-providers</module>
- <module>maven-surefire-plugin</module>
-- <module>maven-surefire-report-plugin</module>
-- <module>surefire-integration-tests</module>
-+ <!--<module>maven-surefire-report-plugin</module>-->
-+ <!--<module>surefire-integration-tests</module>-->
- </modules>
-
- <profiles>
-Index: surefire-2.4.3/surefire-api/pom.xml
-===================================================================
---- surefire-2.4.3.orig/surefire-api/pom.xml 2008-12-17 15:47:26.000000000
+0100
-+++ surefire-2.4.3/surefire-api/pom.xml 2008-12-17 15:47:30.000000000
+0100
-@@ -28,6 +28,7 @@
- <name>SureFire API</name>
- <build>
- <plugins>
-+ <!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
-@@ -59,17 +60,29 @@
- </execution>
- </executions>
- </plugin>
-+ -->
- </plugins>
- </build>
- <dependencies>
-+ <!--
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </dependency>
-+ -->
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
-- <version>2.1</version>
-+ <version>2.4</version>
-+ <scope>system</scope>
-+ <systemPath>/usr/share/java/commons-lang.jar</systemPath>
-+ </dependency>
-+ <dependency>
-+ <groupId>org.codehaus.plexus</groupId>
-+ <artifactId>plexus-container-default</artifactId>
-+ <version>1.0-beta-2</version>
-+ <scope>system</scope>
-+
<systemPath>/usr/share/java/plexus-container-default-1.0.jar</systemPath>
- </dependency>
- </dependencies>
- </project>
-Index: surefire-2.4.3/surefire-booter/pom.xml
-===================================================================
---- surefire-2.4.3.orig/surefire-booter/pom.xml 2008-12-17
15:47:26.000000000 +0100
-+++ surefire-2.4.3/surefire-booter/pom.xml 2008-12-17 15:47:30.000000000
+0100
-@@ -9,6 +9,7 @@
- <name>SureFire Booter</name>
- <build>
- <plugins>
-+ <!--
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
-@@ -35,6 +36,7 @@
- </execution>
- </executions>
- </plugin>
-+ -->
- </plugins>
- </build>
- <dependencies>
-@@ -42,9 +44,11 @@
- <groupId>org.apache.maven.surefire</groupId>
- <artifactId>surefire-api</artifactId>
- </dependency>
-+ <!--
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-utils</artifactId>
- </dependency>
-+ -->
- </dependencies>
--</project>
-\ No newline at end of file
-+</project>
-Index: surefire-2.4.3/surefire-providers/pom.xml
-===================================================================
---- surefire-2.4.3.orig/surefire-providers/pom.xml 2008-12-17
15:47:26.000000000 +0100
-+++ surefire-2.4.3/surefire-providers/pom.xml 2008-12-17 15:47:30.000000000
+0100
-@@ -31,7 +31,7 @@
- <modules>
- <module>surefire-junit</module>
- <module>surefire-junit4</module>
-- <module>surefire-testng</module>
-+ <!--<module>surefire-testng</module>-->
- </modules>
- <dependencies>
- <dependency>
-Index: surefire-2.4.3/surefire-providers/surefire-junit/pom.xml
-===================================================================
---- surefire-2.4.3.orig/surefire-providers/surefire-junit/pom.xml
2008-12-17 15:47:26.000000000 +0100
-+++ surefire-2.4.3/surefire-providers/surefire-junit/pom.xml 2008-12-17
15:47:30.000000000 +0100
-@@ -30,7 +30,9 @@
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
-- <version>3.8.1</version>
-+ <version>3.8.2</version>
-+ <scope>system</scope>
-+ <systemPath>/usr/share/java/junit.jar</systemPath>
- </dependency>
- </dependencies>
- </project>
-Index: surefire-2.4.3/surefire-providers/surefire-junit4/pom.xml
-===================================================================
---- surefire-2.4.3.orig/surefire-providers/surefire-junit4/pom.xml
2008-12-17 15:47:26.000000000 +0100
-+++ surefire-2.4.3/surefire-providers/surefire-junit4/pom.xml 2008-12-17
15:47:30.000000000 +0100
-@@ -30,7 +30,9 @@
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
-- <version>4.0</version>
-+ <version>4.3.1</version>
-+ <scope>system</scope>
-+ <systemPath>/usr/share/java/junit4.jar</systemPath>
- </dependency>
- </dependencies>
- <build>
Added: trunk/surefire/debian/patches/pom.patch
===================================================================
--- trunk/surefire/debian/patches/pom.patch (rev 0)
+++ trunk/surefire/debian/patches/pom.patch 2009-07-14 23:58:34 UTC (rev
9346)
@@ -0,0 +1,33 @@
+--- a/pom.xml
++++ b/pom.xml
+@@ -19,12 +19,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/maven-v4_0_0.xsd";>
+ <modelVersion>4.0.0</modelVersion>
+- <parent>
+- <artifactId>maven-parent</artifactId>
+- <groupId>org.apache.maven</groupId>
+- <version>7</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>
+ </dependency>
+ </dependencies>
+- <build>
++<!-- <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+@@ -154,7 +148,7 @@
+ </plugin>
+ </plugins>
+ </pluginManagement>
+- </build>
++ </build> -->
+ <modules>
+ <module>surefire-api</module>
+ <module>surefire-booter</module>
Modified: trunk/surefire/debian/patches/series
===================================================================
--- trunk/surefire/debian/patches/series 2009-07-14 22:49:22 UTC (rev
9345)
+++ trunk/surefire/debian/patches/series 2009-07-14 23:58:34 UTC (rev
9346)
@@ -1 +1,2 @@
-pom.diff
+pom.patch
+doxia_1.1.patch
Modified: trunk/surefire/debian/rules
===================================================================
--- trunk/surefire/debian/rules 2009-07-14 22:49:22 UTC (rev 9345)
+++ trunk/surefire/debian/rules 2009-07-14 23:58:34 UTC (rev 9346)
@@ -1,10 +1,30 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/maven.mk
+include /usr/share/cdbs/1/class/ant.mk
include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-JAVA_HOME := /usr/lib/jvm/java-6-openjdk
+PACKAGE := $(DEB_SOURCE_PACKAGE)
+VERSION := $(DEB_UPSTREAM_VERSION)
+JAVA_HOME := /usr/lib/jvm/java-6-openjdk
+DEB_JARS := ant-nodeps maven-core maven-model maven-plugin-api
maven-project file-management plexus-utils plexus-container-default-alpha
+DEB_ANT_BUILD_TARGET := package #javadoc
+DEB_ANT_BUILDFILE := debian/build.xml
+DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -Dversion=$(VERSION)
+API_DOCS := target/api
get-orig-source:
- uscan --force-download --rename
+ -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download
--rename
+
+binary-post-install/lib$(PACKAGE)-java::
+ 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/surefire-junit4/pom.xml
surefire-providers/surefire-junit4/target/surefire-junit4-$(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 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
Property changes on: trunk/surefire/debian/rules
___________________________________________________________________
Modified: svn:executable
-
+ *
_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
