This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository plexus-cdc.
commit bcd5ece73398177aa2527421549ccb55195acf36 Author: Emmanuel Bourg <[email protected]> Date: Wed Aug 30 11:14:49 2017 +0200 Build with maven-debian-helper instead of maven-ant-helper --- debian/build.properties | 3 --- debian/changelog | 1 + debian/control | 15 +++------------ debian/maven.properties | 1 + .../plexus-container-default-dependency.patch | 17 +++++++++++++++++ debian/patches/series | 1 + debian/rules | 20 ++------------------ 7 files changed, 25 insertions(+), 33 deletions(-) diff --git a/debian/build.properties b/debian/build.properties deleted file mode 100644 index 231acb2..0000000 --- a/debian/build.properties +++ /dev/null @@ -1,3 +0,0 @@ -javadoc.dir=target/api -build.directory=target -maven.test.skip=true diff --git a/debian/changelog b/debian/changelog index 0c87c6d..6e1c272 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ plexus-cdc (1.0~alpha14-7) UNRELEASED; urgency=medium * Team upload. + * Build with maven-debian-helper instead of maven-ant-helper * Moved the package to Git * Standards-Version updated to 4.1.0 * Switch to debhelper level 10 diff --git a/debian/control b/debian/control index 24d28a3..cb63714 100644 --- a/debian/control +++ b/debian/control @@ -6,9 +6,6 @@ Uploaders: Torsten Werner <[email protected]>, Damien Raude-Morvan <[email protected]> Build-Depends: - ant, - ant-optional, - cdbs, debhelper (>= 10), default-jdk, libjdom1-java, @@ -16,8 +13,7 @@ Build-Depends: libplexus-utils-java, libqdox-java (>= 1.11), libslf4j-java, - maven-ant-helper (>> 4), - maven-repo-helper + maven-debian-helper (>= 2.2) Standards-Version: 4.1.0 Vcs-Git: https://anonscm.debian.org/git/pkg-java/plexus-cdc.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/plexus-cdc.git @@ -25,13 +21,8 @@ Homepage: http://plexus.codehaus.org/guides/quick-start/component-descriptor-cre Package: libplexus-cdc-java Architecture: all -Depends: - libjdom1-java, - libplexus-containers-java, - libplexus-utils-java, - libqdox-java (>= 1.11), - libslf4j-java, - ${misc:Depends} +Depends: ${misc:Depends}, ${maven:Depends} +Suggests: ${maven:OptionalDepends} Description: Plexus Component Descriptor Creator The Plexus project provides a full software stack for creating and executing software projects. Based on the Plexus container, the applications diff --git a/debian/maven.properties b/debian/maven.properties new file mode 100644 index 0000000..d2f1b82 --- /dev/null +++ b/debian/maven.properties @@ -0,0 +1 @@ +maven.test.skip=true diff --git a/debian/patches/plexus-container-default-dependency.patch b/debian/patches/plexus-container-default-dependency.patch new file mode 100644 index 0000000..b9845b2 --- /dev/null +++ b/debian/patches/plexus-container-default-dependency.patch @@ -0,0 +1,17 @@ +Description: Adds the dependency on plexus-container-default that should be inherited fromt the parent pom +Author: Emmanuel Bourg <[email protected]> +Forwarded: not-needed +--- a/pom.xml ++++ b/pom.xml +@@ -18,6 +18,11 @@ + + <dependencies> + <dependency> ++ <groupId>org.codehaus.plexus</groupId> ++ <artifactId>plexus-container-default</artifactId> ++ <version>1.0-alpha-43</version> ++ </dependency> ++ <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + <version>1.4.3</version> diff --git a/debian/patches/series b/debian/patches/series index 00c9287..119caa5 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ +plexus-container-default-dependency.patch qdox1_9.patch diff --git a/debian/rules b/debian/rules index 88283cb..bbdbfb3 100755 --- a/debian/rules +++ b/debian/rules @@ -1,23 +1,7 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/debhelper.mk -include /usr/share/cdbs/1/class/ant.mk - -PACKAGE := $(DEB_SOURCE_PACKAGE) -VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -s "s/~alpha/-alpha-/") -JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := ant-nodeps slf4j-api qdox jdom1 plexus-container-default plexus-utils -DEB_ANT_BUILD_TARGET := package #javadoc -DEB_ANT_BUILDFILE := /usr/share/maven-ant-helper/maven-build.xml -DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -API_DOCS := target/api - -binary-post-install/lib$(PACKAGE)-java:: - mh_installpoms -plib$(PACKAGE)-java - mh_installjar -plib$(PACKAGE)-java -l pom.xml target/$(PACKAGE)-$(VERSION).jar - -clean:: - mh_clean +%: + dh $@ get-orig-source: sh -e debian/orig-tar.sh -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-cdc.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
