This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven-jar-plugin.
commit 2953af3c631b2ac6c5af5c9ccd6f5ead35fbd193 Author: Torsten Werner <[email protected]> Date: Tue Dec 9 22:10:29 2008 +0000 package builds now --- debian/build.xml | 1 + debian/control | 9 +++- debian/patches/pom.diff | 109 ++++++++++++++++++++++++++++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 5 ++- 5 files changed, 121 insertions(+), 4 deletions(-) diff --git a/debian/build.xml b/debian/build.xml index d8049c9..b6fef4f 100644 --- a/debian/build.xml +++ b/debian/build.xml @@ -18,6 +18,7 @@ <arg value="-Dmaven.test.skip"/> <arg value="-s${basedir}/debian/maven-settings.xml"/> <arg value="plugin:descriptor"/> + <arg value="-e"/> </java> <ant target="package" antfile="${maven.build.xml}" dir="."> <property name="artifactId" value="maven-jar-plugin"/> diff --git a/debian/control b/debian/control index 9d29e0b..1dc28e5 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,10 @@ 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-archiver-java, libplexus-archiver-java, libplexus-utils-java, + libcommons-lang-java, libplexus-containers-java, libmaven-plugin-tools-java, + libplexus-interpolation-java Standards-Version: 3.8.0 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-jar-plugin Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-jar-plugin/ @@ -12,7 +15,9 @@ Homepage: http://maven.apache.org/plugins/maven-jar-plugin/ Package: libmaven-jar-plugin-java Architecture: all Section: devel -Depends: ${misc:Depends}, default-jre | java2-runtime, libmaven-plugin-tools-java +Depends: ${misc:Depends}, default-jre | java2-runtime, maven2, libmaven-archiver-java, + libplexus-archiver-java, libplexus-utils-java, libcommons-lang-java, + libplexus-containers-java Description: Maven Jar plugin 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, diff --git a/debian/patches/pom.diff b/debian/patches/pom.diff new file mode 100644 index 0000000..859db6f --- /dev/null +++ b/debian/patches/pom.diff @@ -0,0 +1,109 @@ +Index: maven-jar-plugin-2.2/pom.xml +=================================================================== +--- maven-jar-plugin-2.2.orig/pom.xml 2008-12-09 22:47:31.000000000 +0100 ++++ maven-jar-plugin-2.2/pom.xml 2008-12-09 22:19:48.000000000 +0100 +@@ -18,11 +18,14 @@ + under the License. + --> + <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";> ++ <!-- + <parent> + <artifactId>maven-plugins</artifactId> + <groupId>org.apache.maven.plugins</groupId> + <version>10</version> + </parent> ++ --> ++ <groupId>org.apache.maven.plugins</groupId> + <modelVersion>4.0.0</modelVersion> + <artifactId>maven-jar-plugin</artifactId> + <packaging>maven-plugin</packaging> +@@ -59,18 +62,23 @@ + <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</groupId> + <artifactId>maven-project</artifactId> + <version>2.0.7</version> + </dependency> ++ --> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-archiver</artifactId> + <version>2.3</version> + </dependency> ++ <!-- + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-archiver</artifactId> +@@ -101,15 +109,20 @@ + </exclusion> + </exclusions> + </dependency> ++ --> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.1</version> ++ <scope>system</scope> ++ <systemPath>/usr/share/java/commons-lang.jar</systemPath> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-utils</artifactId> + <version>1.4.9</version> ++ <scope>system</scope> ++ <systemPath>/usr/share/java/plexus-utils.jar</systemPath> + </dependency> + <dependency> + <groupId>org.apache.maven.shared</groupId> +@@ -120,7 +133,22 @@ + </dependencies> + + <build> ++ <pluginManagement> ++ <plugins> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-plugin-plugin</artifactId> ++ <version>2.4.3</version> ++ </plugin> ++ <plugin> ++ <groupId>org.apache.maven.plugins</groupId> ++ <artifactId>maven-resources-plugin</artifactId> ++ <version>2.3</version> ++ </plugin> ++ </plugins> ++ </pluginManagement> + <plugins> ++ <!-- + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> +@@ -153,9 +181,11 @@ + </configuration> + </execution> + </executions> +- </plugin> ++ </plugin> ++ --> + + <!-- Testing the result of the it pom.xml --> ++ <!-- + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> +@@ -166,6 +196,7 @@ + </excludes> + </configuration> + </plugin> ++ --> + </plugins> + </build> + <profiles> 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 36f0ba5..198d456 100755 --- a/debian/rules +++ b/debian/rules @@ -6,8 +6,9 @@ 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 := +JAVA_HOME := /usr/lib/jvm/java-6-openjdk +DEB_JARS := maven2 maven-archiver plexus-archiver plexus-utils \ + commons-lang plexus-container-default-1.0 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-jar-plugin.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
