This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven-clean-plugin.
commit 0ee8bfe6eedbbbd2b3ac9378a84b221026c372a0 Author: Torsten Werner <[email protected]> Date: Sun Dec 7 00:15:13 2008 +0000 package builds locally --- debian/build.xml | 43 +++++++++++++++++++------------- debian/changelog | 2 +- debian/control | 2 +- debian/maven-settings.xml | 4 +++ debian/patches/pom.diff | 63 +++++++++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 3 ++- 7 files changed, 98 insertions(+), 20 deletions(-) diff --git a/debian/build.xml b/debian/build.xml index d5fe243..49d31c0 100644 --- a/debian/build.xml +++ b/debian/build.xml @@ -2,25 +2,34 @@ <project name="pkg-java" default="package" basedir=".."> - <property file="debian/build.properties"/> - <property name="maven.test.skip" value="true"/> - <property name="maven.build.xml" value="/usr/share/maven-ant-helper/maven-build.xml"/> - <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/> + <property file="debian/build.properties"/> + <property name="maven.test.skip" value="true"/> + <property name="maven.build.xml" value="/usr/share/maven-ant-helper/maven-build.xml"/> + <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/> - <target name="clean"> - <ant target="clean" antfile="${maven.build.xml}" dir="."/> - </target> + <target name="clean"> + <ant target="clean" antfile="${maven.build.xml}" dir="."/> + </target> - <target name="package"> - <ant target="package" antfile="${maven.build.xml}" dir="."> - <property name="artifactId" value="maven-clean-plugin"/> - </ant> - </target> + <target name="package"> + <java classname="org.codehaus.classworlds.Launcher" + classpath="/usr/share/maven2/boot/classworlds.jar" + failonerror="true" fork="true"> + <sysproperty key="classworlds.conf" value="/etc/maven2/m2.conf"/> + <sysproperty key="maven.home" value="/usr/share/maven2"/> + <arg value="-Dmaven.test.skip"/> + <arg value="-s${basedir}/debian/maven-settings.xml"/> + <arg value="plugin:descriptor"/> + </java> + <ant target="package" antfile="${maven.build.xml}" dir="."> + <property name="artifactId" value="maven-clean-plugin"/> + </ant> + </target> - <target name="javadoc"> - <javadoc destdir="${javadoc.dir}"> - <packageset dir="src/main/java/"/> - </javadoc> - </target> + <target name="javadoc"> + <javadoc destdir="${javadoc.dir}"> + <packageset dir="src/main/java/"/> + </javadoc> + </target> </project> diff --git a/debian/changelog b/debian/changelog index e6b538f..6534414 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ maven-clean-plugin (2.2-1) unstable; urgency=low UNRELEASED - * Initial release. (Closes: #xxxxxx) + * Initial release. (Closes: #508020) -- Torsten Werner <[email protected]> Thu, 04 Dec 2008 19:29:26 +0100 diff --git a/debian/control b/debian/control index 27c1c70..661a806 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Section: devel Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Torsten Werner <[email protected]> -Build-Depends: default-jdk, ant, debhelper (>= 5), cdbs, maven-ant-helper, +Build-Depends: default-jdk, ant, debhelper (>= 5), cdbs, quilt, maven-ant-helper, libmaven-file-management-java Standards-Version: 3.8.0 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-clean-plugin diff --git a/debian/maven-settings.xml b/debian/maven-settings.xml new file mode 100644 index 0000000..89219ea --- /dev/null +++ b/debian/maven-settings.xml @@ -0,0 +1,4 @@ +<settings> + <localRepository>/usr/share/maven-repo</localRepository> + <offline>true</offline> +</settings> diff --git a/debian/patches/pom.diff b/debian/patches/pom.diff new file mode 100644 index 0000000..170bc8e --- /dev/null +++ b/debian/patches/pom.diff @@ -0,0 +1,63 @@ +Index: maven-clean-plugin-2.2/pom.xml +=================================================================== +--- maven-clean-plugin-2.2.orig/pom.xml 2007-11-30 00:33:21.000000000 +0100 ++++ maven-clean-plugin-2.2/pom.xml 2008-12-07 01:12:27.000000000 +0100 +@@ -21,13 +21,16 @@ + <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> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-plugins</artifactId> + <version>10</version> + </parent> ++ --> + + <artifactId>maven-clean-plugin</artifactId> ++ <groupId>org.apache.maven.plugins</groupId> + <version>2.2</version> + <packaging>maven-plugin</packaging> + <name>Maven Clean Plugin</name> +@@ -46,6 +49,7 @@ + </issueManagement> + + <dependencies> ++ <!-- + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> +@@ -66,6 +70,7 @@ + <artifactId>plexus-utils</artifactId> + <version>1.1</version> + </dependency> ++ --> + + <!-- Test --> + <dependency> +@@ -83,7 +88,17 @@ + </contributors> + + <build> ++ <pluginManagement> ++ <plugins> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-plugin-plugin</artifactId> ++ <version>2.4.3</version> ++ </plugin> ++ </plugins> ++ </pluginManagement> + <plugins> ++ <!-- + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.3</version> +@@ -92,6 +107,7 @@ + <artifactId>maven-source-plugin</artifactId> + <version>2.0.4</version> + </plugin> ++ --> + </plugins> + </build> + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..7740e23 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +pom.diff diff --git a/debian/rules b/debian/rules index ec3751a..da85cb2 100755 --- a/debian/rules +++ b/debian/rules @@ -2,11 +2,12 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/ant.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk PACKAGE := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ') VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | sed 's/Version: \(.*\)-.*/\1/') JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := maven2 maven-file-management plexus-utils +DEB_JARS := maven2 file-management plexus-utils DEB_ANT_BUILD_TARGET := package #javadoc DEB_ANT_BUILDFILE := debian/build.xml DEB_ANT_ARGS := -Dversion=$(VERSION) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-clean-plugin.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
