This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven-filtering.
commit 5820d6d47f28eee110d59261aee1a6082b7bc26c Author: Emmanuel Bourg <[email protected]> Date: Mon Jul 17 16:47:52 2017 +0200 Build with maven-debian-helper instead of maven-ant-helper --- debian/build.properties | 3 --- debian/changelog | 1 + debian/components.xml | 33 --------------------------------- debian/control | 18 ++++++------------ debian/libmaven-filtering-java.poms | 2 +- debian/maven.ignoreRules | 1 + debian/maven.properties | 5 +++++ debian/rules | 33 +++------------------------------ 8 files changed, 17 insertions(+), 79 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 8ad11a7..c894c38 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ maven-filtering (1.1-2) 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.0.0 * Switch to debhelper level 10 diff --git a/debian/components.xml b/debian/components.xml deleted file mode 100644 index 858eea2..0000000 --- a/debian/components.xml +++ /dev/null @@ -1,33 +0,0 @@ -<component-set> - <components> - <component> - <role>org.apache.maven.shared.filtering.MavenResourcesFiltering</role> - <role-hint>default</role-hint> - <implementation>org.apache.maven.shared.filtering.DefaultMavenResourcesFiltering</implementation> - <description></description> - <requirements> - <requirement> - <role>org.sonatype.plexus.build.incremental.BuildContext</role> - <field-name>buildContext</field-name> - </requirement> - <requirement> - <role>org.apache.maven.shared.filtering.MavenFileFilter</role> - <role-hint>default</role-hint> - <field-name>mavenFileFilter</field-name> - </requirement> - </requirements> - </component> - <component> - <role>org.apache.maven.shared.filtering.MavenFileFilter</role> - <role-hint>default</role-hint> - <implementation>org.apache.maven.shared.filtering.DefaultMavenFileFilter</implementation> - <description></description> - <requirements> - <requirement> - <role>org.sonatype.plexus.build.incremental.BuildContext</role> - <field-name>buildContext</field-name> - </requirement> - </requirements> - </component> - </components> -</component-set> diff --git a/debian/control b/debian/control index 9237cda..ade2fd2 100644 --- a/debian/control +++ b/debian/control @@ -4,17 +4,15 @@ Priority: optional Maintainer: Debian Java Maintainers <[email protected]> Uploaders: Torsten Werner <[email protected]>, Damien Raude-Morvan <[email protected]> -Build-Depends: cdbs, debhelper (>= 10), default-jdk -Build-Depends-Indep: ant, - ant-optional, - junit, +Build-Depends: debhelper (>= 10), default-jdk +Build-Depends-Indep: junit, libmaven2-core-java, libplexus-build-api-java, libplexus-container-default-java, libplexus-interpolation-java (>= 1.12), + libplexus-maven-plugin-java, libplexus-utils-java (>= 1.5.15), - maven-ant-helper (>> 4), - maven-repo-helper + maven-debian-helper (>= 2.2~) Standards-Version: 4.0.0 Vcs-Git: https://anonscm.debian.org/git/pkg-java/maven-filtering.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/maven-filtering.git @@ -22,12 +20,8 @@ Homepage: http://maven.apache.org/shared/maven-filtering/ Package: libmaven-filtering-java Architecture: all -Depends: libmaven2-core-java, - libplexus-build-api-java, - libplexus-container-default-java, - libplexus-interpolation-java (>= 1.12), - libplexus-utils-java (>= 1.5.15), - ${misc:Depends} +Depends: ${misc:Depends}, ${maven:Depends} +Suggests: ${maven:OptionalDepends} Description: Maven Filtering 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-filtering-java.poms b/debian/libmaven-filtering-java.poms index 43e746b..87f2cc6 100644 --- a/debian/libmaven-filtering-java.poms +++ b/debian/libmaven-filtering-java.poms @@ -1 +1 @@ -pom.xml --no-parent +pom.xml --no-parent --has-package-version diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..0cdbfcd --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1 @@ +org.sonatype.plexus plexus-build-api jar * tests * diff --git a/debian/maven.properties b/debian/maven.properties new file mode 100644 index 0000000..e593715 --- /dev/null +++ b/debian/maven.properties @@ -0,0 +1,5 @@ +# Include here properties to pass to Maven during the build. +# For example: +# maven.test.skip=true + +maven.test.skip=true diff --git a/debian/rules b/debian/rules index 52d0f70..0b3433a 100755 --- a/debian/rules +++ b/debian/rules @@ -1,34 +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/~/-/") -JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := ant-nodeps maven-core maven-project maven-model maven-settings \ - plexus-build-api plexus-container-default-alpha plexus-interpolation plexus-utils junit -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 +%: + dh $@ get-orig-source: - -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename - -makebuilddir/lib$(PACKAGE)-java:: - install -d target/classes/META-INF/plexus/ - install -m644 debian/components.xml target/classes/META-INF/plexus/ - -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 - mh_unpatchpoms -plib$(PACKAGE)-java - -# Extract generated plexus components.xml files from a standard Maven build -copy-plexus-components: target/classes/META-INF/plexus/components.xml - cp target/classes/META-INF/plexus/components.xml debian/components.xml - + -uscan --download-current --force-download --rename -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-filtering.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
