This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven-resources-plugin.
commit 71e42fdcd7fc5085be2ffbb6cfb683b15d4c3b24 Author: Torsten Werner <[email protected]> Date: Mon Dec 8 11:06:30 2008 +0000 package builds now --- debian/build.xml | 2 +- debian/control | 4 ++- debian/patches/pom.diff | 88 +++++++++++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 5 ++- 5 files changed, 95 insertions(+), 5 deletions(-) diff --git a/debian/build.xml b/debian/build.xml index 7a27095..d636120 100644 --- a/debian/build.xml +++ b/debian/build.xml @@ -20,7 +20,7 @@ <arg value="plugin:descriptor"/> </java> <ant target="package" antfile="${maven.build.xml}" dir="."> - <property name="artifactId" value="maven-compiler-plugin"/> + <property name="artifactId" value="maven-resources-plugin"/> </ant> </target> diff --git a/debian/control b/debian/control index cdcc328..7398973 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,9 @@ Section: devel Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Torsten Werner <[email protected]> -Build-Depends: default-jdk, ant, debhelper (>= 5), cdbs, quilt, maven-ant-helper +Build-Depends: openjdk-6-jdk, ant, debhelper (>= 5), cdbs, quilt, maven-ant-helper, + maven2, libmaven-filtering-java, libplexus-interpolation-java, + libmaven-plugin-tools-java Standards-Version: 3.8.0 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-resources-plugin Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-resources-plugin/ diff --git a/debian/patches/pom.diff b/debian/patches/pom.diff new file mode 100644 index 0000000..db92730 --- /dev/null +++ b/debian/patches/pom.diff @@ -0,0 +1,88 @@ +Index: maven-resources-plugin-2.3/pom.xml +=================================================================== +--- maven-resources-plugin-2.3.orig/pom.xml 2008-12-08 00:28:06.000000000 +0100 ++++ maven-resources-plugin-2.3/pom.xml 2008-12-07 23:40:20.000000000 +0100 +@@ -22,13 +22,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> + <artifactId>maven-plugins</artifactId> + <groupId>org.apache.maven.plugins</groupId> + <version>12</version> + </parent> ++ --> + + <artifactId>maven-resources-plugin</artifactId> ++ <groupId>org.apache.maven.plugins</groupId> + <version>2.3</version> + <packaging>maven-plugin</packaging> + +@@ -58,20 +61,35 @@ + </issueManagement> + + <dependencies> ++ <!-- + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + <version>2.0.6</version> + </dependency> ++ --> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</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</groupId> ++ <artifactId>maven-core</artifactId> ++ <version>2.0.9</version> ++ <scope>system</scope> ++ <systemPath>/usr/share/java/maven2.jar</systemPath> ++ </dependency> ++ --> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> +- <version>1.5.6</version> ++ <version>1.4.8</version> ++ <scope>system</scope> ++ <systemPath>/usr/share/java/plexus-utils.jar</systemPath> + </dependency> + + <dependency> +@@ -80,14 +98,28 @@ + <version>1.0-beta-2</version> + </dependency> + ++ <!-- + <dependency> + <groupId>org.apache.maven.shared</groupId> + <artifactId>maven-plugin-testing-harness</artifactId> + <version>1.0-beta-1</version> + <scope>test</scope> + </dependency> ++ --> + </dependencies> + ++ <build> ++ <pluginManagement> ++ <plugins> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-plugin-plugin</artifactId> ++ <version>2.4.3</version> ++ </plugin> ++ </plugins> ++ </pluginManagement> ++ </build> ++ + <profiles> + <profile> + <id>run-its</id> 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 11511be..544565d 100755 --- a/debian/rules +++ b/debian/rules @@ -6,9 +6,8 @@ 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 plexus-compiler-api plexus-compiler-manager \ - plexus-utils +JAVA_HOME := /usr/lib/jvm/java-6-openjdk +DEB_JARS := maven2 maven-filtering 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-resources-plugin.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
