This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven-invoker.
commit 145fa3834c2130f43ba27ef8c10f28c8e716253c Author: Emmanuel Bourg <[email protected]> Date: Mon Jan 18 23:12:12 2016 +0100 Build with maven-debian-helper --- debian/build.properties | 4 ---- debian/changelog | 1 + debian/control | 13 +++++-------- debian/libmaven-invoker-java.poms | 29 ++++++++++++++++++++++++++++- debian/maven-settings.xml | 9 --------- debian/maven.rules | 5 ++++- debian/rules | 26 ++++---------------------- 7 files changed, 42 insertions(+), 45 deletions(-) diff --git a/debian/build.properties b/debian/build.properties deleted file mode 100644 index 43828cd..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=org.codehaus.plexus:plexus-component-metadata:${plexus-component-metadata.version}:generate-metadata diff --git a/debian/changelog b/debian/changelog index 99d0910..b06b7ad 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ maven-invoker (2.2-1) UNRELEASED; urgency=medium * Team upload. * New upstream release + * Build with maven-debian-helper * Removed the build dependency on libplexus-component-metadata-java * Standards-Version updated to 3.9.6 (no changes) * Moved the package to Git diff --git a/debian/control b/debian/control index ae27276..bfe143b 100644 --- a/debian/control +++ b/debian/control @@ -3,15 +3,11 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Ludovic Claude <[email protected]> -Build-Depends: cdbs, debhelper (>= 9), default-jdk -Build-Depends-Indep: ant, - ant-optional, - junit, +Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper +Build-Depends-Indep: junit, libmaven-plugin-tools-java, libplexus-containers1.5-java, - libplexus-utils-java, - maven-ant-helper (>> 4), - maven-repo-helper + libplexus-utils-java Standards-Version: 3.9.6 Vcs-Git: git://anonscm.debian.org/pkg-java/maven-invoker.git Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/maven-invoker.git @@ -19,7 +15,8 @@ Homepage: http://maven.apache.org/shared/maven-invoker/ Package: libmaven-invoker-java Architecture: all -Depends: libplexus-utils-java, libplexus-containers1.5-java, ${misc:Depends} +Depends: ${misc:Depends}, ${maven:Depends} +Suggests: ${maven:OptionalDepends} Description: Maven Invoker 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/libmaven-invoker-java.poms b/debian/libmaven-invoker-java.poms index 43e746b..64b1188 100644 --- a/debian/libmaven-invoker-java.poms +++ b/debian/libmaven-invoker-java.poms @@ -1 +1,28 @@ -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 and its artifact if any +# --ignore-pom: don't install the POM. To use on POM files that are created +# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms] +# --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. [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. [mh_install] +# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default. +# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed. +# Empty by default. [mh_install] +# +pom.xml --no-parent --has-package-version --java-lib 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.rules b/debian/maven.rules index 8486979..37eb25c 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1,2 +1,5 @@ -junit junit jar s/3\..*/3.x/ +junit junit jar s/4\..*/4.x/ * * +org.codehaus.plexus plexus-component-annotations jar s/.*/1.5.5/ * * +org.codehaus.plexus plexus-component-metadata maven-plugin s/.*/1.5.5/ * * +org.codehaus.plexus plexus-utils jar s/.*/2.x/ * * diff --git a/debian/rules b/debian/rules index ea1d730..7fe7cd1 100755 --- a/debian/rules +++ b/debian/rules @@ -1,27 +1,9 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk +export JAVA_HOME = /usr/lib/jvm/default-java -PACKAGE := $(DEB_SOURCE_PACKAGE) -VERSION := $(DEB_UPSTREAM_VERSION) -JAVA_HOME := /usr/lib/jvm/default-java -# Need to specify the exact version of the Plexus plugin (from plexus-component-metadata package) used here -PLEXUS_PLUGIN_VERSION:= 1.5.5 -DEB_JARS := ant-nodeps plexus-utils junit plexus-component-annotations-1.5 -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) -Dplexus-component-metadata.version=$(PLEXUS_PLUGIN_VERSION) -API_DOCS := target/api +%: + dh $@ --buildsystem=maven 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 - mh_clean - mh_unpatchpoms -plib$(PACKAGE)-java + uscan --download-curent-version --force-download --rename -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-invoker.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
