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 88d5c0dbb1cd742383cc1a49c835b3705967e250 Author: Torsten Werner <[email protected]> Date: Tue Aug 23 11:41:00 2011 +0000 * Use Maven to build package but disable tests because they FTBFS. * Add documentation package. --- debian/README.source | 9 +++++ debian/TODO | 1 + debian/build.properties | 4 -- debian/changelog | 4 +- debian/control | 43 ++++++++++++++++++---- debian/copyright | 20 ++++------ debian/libmaven-jar-plugin-java-doc.doc-base.api | 10 +++++ debian/libmaven-jar-plugin-java-doc.install | 2 + debian/libmaven-jar-plugin-java.poms | 27 +++++++++++++- debian/maven-settings.xml | 9 ----- debian/maven.cleanIgnoreRules | 17 +++++++++ debian/maven.ignoreRules | 18 +++++++++ debian/maven.properties | 4 ++ debian/maven.publishedRules | 19 ++++++++++ debian/maven.rules | 26 ++++++++++--- debian/orig-tar.sh | 14 +++---- .../0001-remove-version-of-some-plugins.patch | 29 +++++++++++++++ debian/patches/series | 1 + debian/rules | 21 ++--------- debian/watch | 5 ++- 20 files changed, 215 insertions(+), 68 deletions(-) diff --git a/debian/README.source b/debian/README.source new file mode 100644 index 0000000..1054d60 --- /dev/null +++ b/debian/README.source @@ -0,0 +1,9 @@ +Information about maven-jar-plugin +------------------------------ + +This package was debianized using the mh_make command +from the maven-debian-helper package. + +The build system uses Maven but prevents it from downloading +anything from the Internet, making the build compliant with +the Debian policy. diff --git a/debian/TODO b/debian/TODO new file mode 100644 index 0000000..982ffcd --- /dev/null +++ b/debian/TODO @@ -0,0 +1 @@ +- fix test code diff --git a/debian/build.properties b/debian/build.properties deleted file mode 100644 index 087f536..0000000 --- a/debian/build.properties +++ /dev/null @@ -1,4 +0,0 @@ -javadoc.dir=target/api -build.directory=target -maven.test.skip=true -maven.generate.target=plugin:descriptor diff --git a/debian/changelog b/debian/changelog index 23d9366..c837131 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,10 @@ maven-jar-plugin (2.2-5) unstable; urgency=low * Switch to source format 3.0. * Switch to debhelper level 7. * Update Standards-Version: 3.9.1. + * Use Maven to build package but disable tests because they FTBFS. + * Add documentation package. - -- Torsten Werner <[email protected]> Tue, 23 Aug 2011 11:39:30 +0200 + -- Torsten Werner <[email protected]> Tue, 23 Aug 2011 12:58:27 +0200 maven-jar-plugin (2.2-4) unstable; urgency=low diff --git a/debian/control b/debian/control index 085fe63..74e1fb2 100644 --- a/debian/control +++ b/debian/control @@ -3,11 +3,11 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Torsten Werner <[email protected]> -Build-Depends: default-jdk, debhelper (>= 7), cdbs -Build-Depends-Indep: maven-repo-helper, maven-ant-helper (>> 4), ant, ant-optional, - junit, libmaven-plugin-tools-java, libplexus-velocity-java, velocity, - libmaven2-core-java, libmaven-archiver-java, - libplexus-archiver-java, libplexus-io-java, libplexus-utils-java, libcommons-lang-java +Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4) +Build-Depends-Indep: libmaven-enforcer-plugin-java, libmaven-javadoc-plugin-java, libcommons-lang-java, + libmaven-archiver-java, libmaven2-core-java, libplexus-archiver-java, libplexus-io-java, + libplexus-utils-java, libmaven-plugin-testing-java, default-jdk-doc, libmaven2-core-java-doc, + libplexus-utils-java-doc, libmaven-install-plugin-java, libmaven-invoker-plugin-java Standards-Version: 3.9.1 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/ @@ -15,9 +15,10 @@ Homepage: http://maven.apache.org/plugins/maven-jar-plugin/ Package: libmaven-jar-plugin-java Architecture: all -Depends: ${misc:Depends}, libmaven2-core-java, libmaven-archiver-java, - libplexus-archiver-java, libplexus-io-java, libplexus-utils-java, libcommons-lang-java -Description: Maven Jar plugin +Depends: ${misc:Depends}, ${maven:Depends} +Recommends: ${maven:OptionalDepends} +Suggests: libmaven-jar-plugin-java-doc +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, reporting and documentation from a central piece of information. @@ -34,3 +35,29 @@ Description: Maven Jar plugin * Allowing transparent migration to new features . This plugin provides the capability to build and sign jars. + +Package: libmaven-jar-plugin-java-doc +Architecture: all +Section: doc +Depends: ${misc:Depends}, ${maven:DocDepends} +Recommends: ${maven:DocOptionalDepends} +Suggests: libmaven-jar-plugin-java +Description: Documentation 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, + reporting and documentation from a central piece of information. + . + Maven's primary goal is to allow a developer to comprehend the complete + state of a development effort in the shortest period of time. In order to + attain this goal there are several areas of concern that Maven attempts + to deal with: + . + * Making the build process easy + * Providing a uniform build system + * Providing quality project information + * Providing guidelines for best practices development + * Allowing transparent migration to new features + . + This plugin provides the capability to build and sign jars. + . + This package contains the API documentation of libmaven-jar-plugin-java. diff --git a/debian/copyright b/debian/copyright index f3b1562..61d55c2 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,22 +1,16 @@ -Format-Specification: http://dep.debian.net/deps/dep5/ -Name: Maven Jar Plugin -Maintainer: Apache Maven team -Source: http://maven.apache.org/ +Format: http://dep.debian.net/deps/dep5/ +Upstream-Name: Maven Jar Plugin +Upstream-Contact: Jerome Lacoste <[email protected]> +Source: http://maven.apache.org/plugins/maven-jar-plugin/ Files: * Copyright: 2001-2009, The Apache Software Foundation. License: Apache-2.0 Files: debian/* -Copyright: 2008, Torsten Werner <[email protected]>. -License: GPL-3+ - +Copyright: 2008-2011, Torsten Werner <[email protected]>. License: Apache-2.0 - On Debian GNU/Linux system you can find the complete text of the - Apache 2.0 license in '/usr/share/common-licenses/Apache-2.0'. -License: GPL-3 +License: Apache-2.0 On Debian GNU/Linux system you can find the complete text of the - GNU General Public License version 3 license in - '/usr/share/common-licenses/GPL-3'. - + Apache-2.0 license in '/usr/share/common-licenses/Apache-2.0'. diff --git a/debian/libmaven-jar-plugin-java-doc.doc-base.api b/debian/libmaven-jar-plugin-java-doc.doc-base.api new file mode 100644 index 0000000..6313791 --- /dev/null +++ b/debian/libmaven-jar-plugin-java-doc.doc-base.api @@ -0,0 +1,10 @@ +Document: libmaven-jar-plugin-java +Title: API Javadoc for Maven Jar Plugin +Author: Maven Jar Plugin developers +Abstract: This is the API Javadoc provided for the + libmaven-jar-plugin-java library. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libmaven-jar-plugin-java/api/index.html +Files: /usr/share/doc/libmaven-jar-plugin-java/api/* diff --git a/debian/libmaven-jar-plugin-java-doc.install b/debian/libmaven-jar-plugin-java-doc.install new file mode 100644 index 0000000..fabd2a1 --- /dev/null +++ b/debian/libmaven-jar-plugin-java-doc.install @@ -0,0 +1,2 @@ +target/apidocs/* usr/share/doc/libmaven-jar-plugin-java/api + diff --git a/debian/libmaven-jar-plugin-java.poms b/debian/libmaven-jar-plugin-java.poms index 43e746b..31a0ccf 100644 --- a/debian/libmaven-jar-plugin-java.poms +++ b/debian/libmaven-jar-plugin-java.poms @@ -1 +1,26 @@ -pom.xml --no-parent +# List of POM files for the package +# Format of this file is: +# <path to pom file> [option]* +# where option can be: +# --ignore: ignore this POM or +# --no-parent: remove the <parent> tag from the POM +# --package=<package>: an alternative package to use when installing this POM +# and its artifact +# --has-package-version: to indicate that the original version of the POM is the same as the upstream part +# of the version for the package. +# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM +# during a clean operation with mh_cleanpom or mh_installpom +# --artifact=<path>: path to the build artifact associated with this POM, +# it will be installed when using the command mh_install +# --java-lib: install the jar into /usr/share/java to comply with Debian +# packaging guidelines +# --usj-name=<name>: name to use when installing the library in /usr/share/java +# --usj-version=<version>: version to use when installing the library in /usr/share/java +# --no-usj-versionless: don't install the versionless link in /usr/share/java +# --dest-jar=<path>: the destination for the real jar +# it will be installed with mh_install. +# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default. +# --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created +# temporarily for certain artifacts such as Javadoc jars. +# +pom.xml --no-parent --has-package-version diff --git a/debian/maven-settings.xml b/debian/maven-settings.xml deleted file mode 100644 index 01f8769..0000000 --- a/debian/maven-settings.xml +++ /dev/null @@ -1,9 +0,0 @@ -<!-- - 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> diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules new file mode 100644 index 0000000..b47b61d --- /dev/null +++ b/debian/maven.cleanIgnoreRules @@ -0,0 +1,17 @@ +# Maven clean ignore rules - ignore some Maven dependencies and plugins +# during the clean phase of a Maven build +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., this dependency is then removed +# from the POM before mvn clean is called +# junit junit jar s/3\\..*/3.x/ + diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..2571a60 --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1,18 @@ +# Maven ignore rules - ignore some Maven dependencies and plugins +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., this dependency is then removed +# from the POM +# junit junit jar s/3\\..*/3.x/ + +org.apache.maven.plugins maven-jxr-plugin * * * * +org.apache.maven.plugins maven-source-plugin * * * * diff --git a/debian/maven.properties b/debian/maven.properties new file mode 100644 index 0000000..11f9276 --- /dev/null +++ b/debian/maven.properties @@ -0,0 +1,4 @@ +# Include here properties to pass to Maven during the build. +# For example: +maven.test.skip=true + diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules new file mode 100644 index 0000000..822f087 --- /dev/null +++ b/debian/maven.publishedRules @@ -0,0 +1,19 @@ +# Maven published rules - additional rules to publish, to help +# the packaging work of Debian maintainers using mh_make +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# - a regular expression of the form s/match/replace/ +# in this case, elements that match are transformed using +# the regex rule. +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., replacing the version with 3.x +# junit junit jar s/3\\..*/3.x/ + diff --git a/debian/maven.rules b/debian/maven.rules index b240c44..4be060f 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1,5 +1,21 @@ -# keep the version for all Maven plugins as versionless plugins don't work -* * maven-plugin * -org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ -s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-harness -junit junit jar s/3\..*/3.x/ +# Maven rules - transform Maven dependencies and plugins +# Format of this file is: +# [group] [artifact] [type] [version] [classifier] [scope] +# where each element can be either +# - the exact string, for example org.apache for the group, or 3.1 +# for the version. In this case, the element is simply matched +# and left as it is +# - * (the star character, alone). In this case, anything will +# match and be left as it is. For example, using * on the +# position of the artifact field will match any artifact id +# - a regular expression of the form s/match/replace/ +# in this case, elements that match are transformed using +# the regex rule. +# All elements much match before a rule can be applied +# Example rule: match jar with groupid= junit, artifactid= junit +# and version starting with 3., replacing the version with 3.x +# junit junit jar s/3\\..*/3.x/ + +s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing * s/.*/debian/ * * +s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-harness * s/.*/debian/ * * +s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-test-tools * s/.*/debian/ * * diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh index 5b54c62..2bd6489 100755 --- a/debian/orig-tar.sh +++ b/debian/orig-tar.sh @@ -1,16 +1,16 @@ #!/bin/sh -e -TAR=../maven-jar-plugin_$2.orig.tar.gz -DIR=maven-jar-plugin-$2 -TAG=maven-jar-plugin-$2 +VERSION=$2 +TAR=../maven-jar-plugin_$VERSION.orig.tar.gz +DIR=maven-jar-plugin-$VERSION +TAG=$(echo "maven-jar-plugin-$VERSION" | sed -re's/~(alpha|beta)/-\1-/') -svn export http://svn.apache.org/repos/asf/maven/plugins/tags/$TAG $DIR -tar -c -z -f $TAR $DIR +svn export http://svn.apache.org/repos/asf/maven/plugins/tags/${TAG}/ $DIR +GZIP=--best tar -c -z -f $TAR --exclude '*.jar' --exclude '*.class' $DIR rm -rf $DIR ../$TAG # move to directory 'tarballs' if [ -r .svn/deb-layout ]; then . .svn/deb-layout - mv $TAR $origDir - echo "moved $TAR to $origDir" + mv $TAR $origDir && echo "moved $TAR to $origDir" fi diff --git a/debian/patches/0001-remove-version-of-some-plugins.patch b/debian/patches/0001-remove-version-of-some-plugins.patch new file mode 100644 index 0000000..4b83dae --- /dev/null +++ b/debian/patches/0001-remove-version-of-some-plugins.patch @@ -0,0 +1,29 @@ +From: Torsten Werner <[email protected]> +Date: Tue, 23 Aug 2011 13:11:15 +0200 +Subject: [PATCH] remove version of some plugins + +--- + pom.xml | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) + +diff --git a/pom.xml b/pom.xml +index 8858059..c35581f 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -182,7 +182,6 @@ under the License. + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-install-plugin</artifactId> +- <version>2.2</version> + <executions> + <execution> + <id>integration-test</id> +@@ -207,7 +206,6 @@ under the License. + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-invoker-plugin</artifactId> +- <version>1.1</version> + <configuration> + <projectsDirectory>src/it</projectsDirectory> + <pomIncludes> +-- diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..b5dfd4a --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-remove-version-of-some-plugins.patch diff --git a/debian/rules b/debian/rules index 299ff61..b76c54a 100755 --- a/debian/rules +++ b/debian/rules @@ -1,24 +1,9 @@ #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk +include /usr/share/cdbs/1/class/maven.mk -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 maven-artifact maven-artifact-manager \ - maven-archiver plexus-archiver plexus-io plexus-utils commons-lang plexus-container-default-alpha -DEB_ANT_BUILD_TARGET := package #javadoc -DEB_ANT_BUILDFILE := /usr/share/maven-ant-helper/maven-build.xml -DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -API_DOCS := target/api +JAVA_HOME := /usr/lib/jvm/default-java get-orig-source: - -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 pom.xml target/$(PACKAGE)-$(VERSION).jar - -clean:: - -rm -rf debian/tmp + uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename diff --git a/debian/watch b/debian/watch index 6238865..fbf3c76 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,4 @@ version=3 -http://svn.apache.org/repos/asf/maven/plugins/tags/ \ - maven-jar-plugin-(.*)/ debian debian/orig-tar.sh +opts="uversionmangle=s/-(alpha|beta)-/~$1/" \ + http://svn.apache.org/repos/asf/maven/plugins/tags/ \ + maven-jar-plugin-(\d.*)/ debian debian/orig-tar.sh -- 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
