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 26c4edc56a5cd3e80558bd61e7db6fc1513fdcd4 Author: Ludovic Claude <[email protected]> Date: Wed Jul 8 23:57:02 2009 +0000 * New upstream version, add myself to Uploaders * Use Ant and cdbs-ant as the build system as Maven2 uses this plugin to build itself now. * Remove the dependency on default-jre | java2-runtime as this is a library. * Use default-jdk as Build-Depends instead of open-jdk-6 * Add the Maven POM to the package, * 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 --- debian/build.properties | 5 +- debian/build.xml | 35 -------------- debian/changelog | 17 +++++++ debian/control | 15 +++--- debian/copyright | 2 +- debian/libmaven-clean-plugin-java.poms | 1 + debian/maven.rules | 3 ++ debian/patches/pom.diff | 86 ---------------------------------- debian/patches/series | 1 - debian/rules | 27 +++++------ 10 files changed, 46 insertions(+), 146 deletions(-) diff --git a/debian/build.properties b/debian/build.properties index 56739cc..087f536 100644 --- a/debian/build.properties +++ b/debian/build.properties @@ -1,3 +1,4 @@ -javadoc.dir=build/api +javadoc.dir=target/api build.directory=target -build.outputDirectory=target/classes +maven.test.skip=true +maven.generate.target=plugin:descriptor diff --git a/debian/build.xml b/debian/build.xml deleted file mode 100644 index e2e24fe..0000000 --- a/debian/build.xml +++ /dev/null @@ -1,35 +0,0 @@ -<?xml version="1.0"?> - -<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"/> - - <target name="clean"> - <ant target="clean" antfile="${maven.build.xml}" dir="."/> - </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> - -</project> diff --git a/debian/changelog b/debian/changelog index 214a314..20137e9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,20 @@ +maven-clean-plugin (2.3-1) unstable; urgency=low + + * New upstream version, add myself to Uploaders + * Use Ant and cdbs-ant as the build system as Maven2 uses + this plugin to build itself now. + * Remove the dependency on default-jre | java2-runtime as this is + a library. + * Use default-jdk as Build-Depends instead of open-jdk-6 + * Add the Maven POM to the package, + * 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 + + -- Ludovic Claude <[email protected]> Sun, 03 May 2009 00:27:41 +0100 + maven-clean-plugin (2.2-2) unstable; urgency=low * Switch to openjdk. diff --git a/debian/control b/debian/control index bf49ea7..8087a7c 100644 --- a/debian/control +++ b/debian/control @@ -1,20 +1,21 @@ Source: maven-clean-plugin -Section: devel +Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Torsten Werner <[email protected]> -Build-Depends: openjdk-6-jdk, ant, debhelper (>= 5), cdbs, quilt, maven-ant-helper, - libmaven-plugin-tools-java, libmaven-file-management-java, libplexus-containers-java, +Uploaders: Torsten Werner <[email protected]>, Ludovic Claude <[email protected]> +Build-Depends: debhelper (>= 5), cdbs, default-jdk +Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional, + junit, libmaven-plugin-tools-java, libplexus-velocity-java, velocity, + libmaven-file-management-java, libplexus-containers-java, libplexus-interpolation-java -Standards-Version: 3.8.0 +Standards-Version: 3.8.1 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/maven-clean-plugin Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/maven-clean-plugin/ Homepage: http://maven.apache.org/plugins/maven-clean-plugin/ Package: libmaven-clean-plugin-java Architecture: all -Section: devel -Depends: ${misc:Depends}, default-jre | java2-runtime, libmaven-file-management-java +Depends: ${misc:Depends}, libmaven-file-management-java Description: Maven clean 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/copyright b/debian/copyright index 7de9d8c..8d8a653 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,7 +3,7 @@ This package was debianized by Torsten Werner <[email protected]>. 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>. diff --git a/debian/libmaven-clean-plugin-java.poms b/debian/libmaven-clean-plugin-java.poms new file mode 100644 index 0000000..43e746b --- /dev/null +++ b/debian/libmaven-clean-plugin-java.poms @@ -0,0 +1 @@ +pom.xml --no-parent diff --git a/debian/maven.rules b/debian/maven.rules new file mode 100644 index 0000000..fc4f30e --- /dev/null +++ b/debian/maven.rules @@ -0,0 +1,3 @@ +# keep the version for all Maven plugins as versionless plugins don't work +* * maven-plugin * +junit junit jar s/3\..*/3.x/ diff --git a/debian/patches/pom.diff b/debian/patches/pom.diff deleted file mode 100644 index dd8b04c..0000000 --- a/debian/patches/pom.diff +++ /dev/null @@ -1,86 +0,0 @@ -Currently we need to patch most of the dependencies in the POM. - -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:31:45.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> -@@ -56,15 +60,27 @@ - <artifactId>maven-plugin-api</artifactId> - <version>2.0</version> - </dependency> -+ --> -+ <dependency> -+ <groupId>org.apache.maven.shared</groupId> -+ <artifactId>maven-shared-io</artifactId> -+ <version>1.1</version> -+ <scope>system</scope> -+ <systemPath>/usr/share/java/maven-shared-io.jar</systemPath> -+ </dependency> - <dependency> - <groupId>org.apache.maven.shared</groupId> - <artifactId>file-management</artifactId> - <version>1.2</version> -+ <scope>system</scope> -+ <systemPath>/usr/share/java/file-management.jar</systemPath> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-utils</artifactId> -- <version>1.1</version> -+ <version>1.4.8</version> -+ <scope>system</scope> -+ <systemPath>/usr/share/java/plexus-utils.jar</systemPath> - </dependency> - - <!-- Test --> -@@ -83,7 +99,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 +118,7 @@ - <artifactId>maven-source-plugin</artifactId> - <version>2.0.4</version> - </plugin> -+ --> - </plugins> - </build> - diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 7740e23..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -pom.diff diff --git a/debian/rules b/debian/rules index 723882c..3b8d326 100755 --- a/debian/rules +++ b/debian/rules @@ -2,23 +2,22 @@ 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/java-6-openjdk -DEB_JARS := maven2 file-management plexus-utils plexus-container-default-1.0 +PACKAGE := $(DEB_SOURCE_PACKAGE) +VERSION := $(DEB_UPSTREAM_VERSION) +JAVA_HOME := /usr/lib/jvm/default-java +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 := -Dversion=$(VERSION) -API_DOCS := build/api +DEB_ANT_BUILDFILE := /usr/share/maven-ant-helper/maven-build.xml +DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dversion=$(VERSION) +API_DOCS := target/api get-orig-source: - uscan --force-download - -REPO := /usr/share/maven-repo -PLUGINS := $(REPO)/org/apache/maven/plugins + -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename binary-post-install/lib$(PACKAGE)-java:: - dh_install target/*.jar $(PLUGINS)/$(PACKAGE)/$(VERSION)/ - install -m644 pom.xml $(DEB_DESTDIR)$(PLUGINS)/$(PACKAGE)/$(VERSION)/$(PACKAGE)-$(VERSION).pom + mh_installpoms -plib$(PACKAGE)-java + mh_installjar -plib$(PACKAGE)-java -l pom.xml target/$(PACKAGE)-$(VERSION).jar + +clean:: + -rm -rf debian/tmp -- 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
