[maven] 01/24: Build with the DH sequencer instead of CDBS
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue May 23 21:54:57 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch maven-3.5
in repository maven.
commit c18847641f32ef57395900766f4c6da860075099
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Mon May 15 15:50:38 2017 +0200
Build with the DH sequencer instead of CDBS
---
debian/changelog | 7 ++++
debian/clean | 2 ++
debian/control | 2 +-
debian/libmaven3-core-java.poms | 24 +++++++-------
debian/maven.buildRules | 1 +
debian/maven.rules | 5 ++-
debian/rules | 73 +++++++++++++----------------------------
7 files changed, 50 insertions(+), 64 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c359457..e56dde2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+maven (3.3.9-5) UNRELEASED; urgency=medium
+
+ * Team upload.
+ * Build with the DH sequencer instead of CDBS
+
+ -- Emmanuel Bourg <ebourg at apache.org> Mon, 15 May 2017 11:13:10 +0200
+
maven (3.3.9-4) unstable; urgency=medium
* Team upload.
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..c290af8
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,2 @@
+maven-ant-tasks-2.1.1.jar
+dependencies.xml
diff --git a/debian/control b/debian/control
index f9e72c6..37f6d5d 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,7 @@ Build-Depends-Indep: ant-optional,
libxmlunit-java,
maven-ant-helper,
maven-repo-helper
-Build-Depends: ant, cdbs, debhelper (>= 9), default-jdk
+Build-Depends: ant, debhelper (>= 9), default-jdk
Standards-Version: 3.9.8
Vcs-Git: https://anonscm.debian.org/git/pkg-java/maven.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/maven.git
diff --git a/debian/libmaven3-core-java.poms b/debian/libmaven3-core-java.poms
index 047fce8..dfd84df 100644
--- a/debian/libmaven3-core-java.poms
+++ b/debian/libmaven3-core-java.poms
@@ -1,15 +1,15 @@
pom.xml
apache-maven/pom.xml --ignore
-maven-aether-provider/pom.xml --has-package-version
-maven-artifact/pom.xml --has-package-version
-maven-builder-support/pom.xml --has-package-version
-maven-compat/pom.xml --has-package-version
-maven-core/pom.xml --has-package-version
-maven-embedder/pom.xml --has-package-version
-maven-model/pom.xml --has-package-version
-maven-model-builder/pom.xml --has-package-version
-maven-plugin-api/pom.xml --has-package-version
-maven-repository-metadata/pom.xml --has-package-version
-maven-settings/pom.xml --has-package-version
-maven-settings-builder/pom.xml --has-package-version
+maven-aether-provider/pom.xml --has-package-version --java-lib --usj-name=maven3-aether-provider --artifact=maven-aether-provider/target/maven-aether-provider-*.jar
+maven-artifact/pom.xml --has-package-version --java-lib --usj-name=maven3-artifact --artifact=maven-artifact/target/maven-artifact-*.jar
+maven-builder-support/pom.xml --has-package-version --java-lib --usj-name=maven3-builder-support --artifact=maven-builder-support/target/maven-builder-support-*.jar
+maven-compat/pom.xml --has-package-version --java-lib --usj-name=maven3-compat --artifact=maven-compat/target/maven-compat-*.jar
+maven-core/pom.xml --has-package-version --java-lib --usj-name=maven3-core --artifact=maven-core/target/maven-core-*.jar
+maven-embedder/pom.xml --has-package-version --java-lib --usj-name=maven3-embedder --artifact=maven-embedder/target/maven-embedder-*.jar
+maven-model/pom.xml --has-package-version --java-lib --usj-name=maven3-model --artifact=maven-model/target/maven-model-*.jar
+maven-model-builder/pom.xml --has-package-version --java-lib --usj-name=maven3-model-builder --artifact=maven-model-builder/target/maven-model-builder-*.jar
+maven-plugin-api/pom.xml --has-package-version --java-lib --usj-name=maven3-plugin-api --artifact=maven-plugin-api/target/maven-plugin-api-*.jar
+maven-repository-metadata/pom.xml --has-package-version --java-lib --usj-name=maven3-repository-metadata --artifact=maven-repository-metadata/target/maven-repository-metadata-*.jar
+maven-settings/pom.xml --has-package-version --java-lib --usj-name=maven3-settings --artifact=maven-settings/target/maven-settings-*.jar
+maven-settings-builder/pom.xml --has-package-version --java-lib --usj-name=maven3-settings-builder --artifact=maven-settings-builder/target/maven-settings-builder-*.jar
diff --git a/debian/maven.buildRules b/debian/maven.buildRules
index d85c360..1d581ab 100644
--- a/debian/maven.buildRules
+++ b/debian/maven.buildRules
@@ -13,6 +13,7 @@ org.apache.maven.wagon * jar s/.*/2.x/ * *
org.codehaus.plexus plexus-classworlds * s/.*/2.x/ * *
org.codehaus.plexus plexus-utils * s/.*/2.x/ * *
+org.codehaus.plexus plexus-container-default * s/.*/1.5.5/ * *
org.codehaus.plexus plexus-component-metadata * s/.*/1.5.5/ * *
org.codehaus.plexus plexus-component-annotations * s/.*/1.5.5/ * *
diff --git a/debian/maven.rules b/debian/maven.rules
index 750633a..c01b5d4 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -4,6 +4,9 @@
junit junit jar s/4\..*/4.x/ * *
s/easymock/org.easymock/ easymock * s/.*/debian/ * *
+org.eclipse.sisu org.eclipse.sisu.plexus * s/.*/debian/ * *
+s/org.eclipse.sisu/org.sonatype.plugins/ sisu-maven-plugin * s/.*/1.1/ * *
+
org.apache.commons commons-lang3 * s/3\..*/3.x/ * *
org.apache.maven.wagon * jar s/.*/2.x/ * *
@@ -14,7 +17,7 @@ org.codehaus.plexus plexus-container-default * s/.*/1.5.5/ * *
org.codehaus.plexus plexus-component-metadata * s/.*/1.5.5/ * *
org.codehaus.plexus plexus-component-annotations * s/.*/1.5.5/ * *
-org.apache.maven.plugins maven-clean-plugin * s/.*/2.3/ * *
+org.apache.maven.plugins maven-clean-plugin * s/.*/2.5/ * *
org.apache.maven.plugins maven-resources-plugin * s/.*/2.3/ * *
org.apache.maven.plugins maven-surefire-plugin * s/.*/2.17/ * *
org.apache.maven.plugins maven-jar-plugin * s/.*/2.4/ * *
diff --git a/debian/rules b/debian/rules
index b591e86..dd6c458 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,66 +1,39 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+PACKAGE := maven
+VERSION := $(shell dpkg-parsechangelog --show-field Version | sed 's/-[^-]*$$//')
-PACKAGE := $(DEB_SOURCE_PACKAGE)
-VERSION := $(DEB_UPSTREAM_VERSION)
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := ant-trax
-DEB_ANT_CLEAN_TARGET := clean-bootstrap
-DEB_ANT_BUILD_TARGET := maven-compile
-DEB_ANT_ARGS := -Dpackage=$(PACKAGE) -Dversion=$(VERSION) \
- -Dmaven.home=/usr/share/maven2/ \
- -Dmaven.repo.local=$(realpath $(DEB_BUILDDIR))/debian/tmp/maven-repo \
- -Dmaven.test.skip=true
-API_DOCS := build/doc/api
-BASE_MODULES := apache-maven maven-artifact-manager maven-artifact maven-builder-support \
- maven-core maven-error-diagnostics maven-model maven-monitor \
- maven-plugin-api maven-plugin-descriptor maven-plugin-parameter-documenter \
- maven-plugin-registry maven-profile maven-project maven-repository-metadata \
- maven-settings maven-toolchain
+%:
+ dh $@ --buildsystem=ant --with maven-repo-helper
-get-orig-source:
- -uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+override_dh_auto_build:
+ install -d debian/tmp/maven-repo
+ cp -rL /usr/share/maven-repo/* debian/tmp/maven-repo/
+ -ln -s /usr/share/java/maven-ant-tasks.jar maven-ant-tasks-2.1.1.jar
-configure/$(PACKAGE)::
mh_unpatchpoms -plibmaven3-core-java
mh_patchpoms -plibmaven3-core-java --rules=debian/maven.buildRules
-makebuilddir/$(PACKAGE)::
- install -d $(DEB_BUILDDIR)/debian/tmp/maven-repo
- cp -rL /usr/share/maven-repo/* $(DEB_BUILDDIR)/debian/tmp/maven-repo/
- -rm $(DEB_BUILDDIR)/maven-ant-tasks-2.1.1.jar
- -ln -s /usr/share/java/maven-ant-tasks.jar $(DEB_BUILDDIR)/maven-ant-tasks-2.1.1.jar
+ dh_auto_build -- -Dpackage=$(PACKAGE) -Dversion=$(VERSION) \
+ -Dmaven.home=/usr/share/maven2/ \
+ -Dmaven.repo.local=debian/tmp/maven-repo \
+ -Dmaven.test.skip=true \
+ maven-compile
-install/libmaven3-core-java::
+override_mh_install:
mh_unpatchpoms -plibmaven3-core-java
-
- mh_installpoms -plibmaven3-core-java
- mh_installjar -plibmaven3-core-java -l --usj-name=maven3-aether-provider maven-aether-provider/pom.xml maven-aether-provider/target/maven-aether-provider-$(VERSION).jar
- mh_installjar -plibmaven3-core-java -l --usj-name=maven3-artifact maven-artifact/pom.xml maven-artifact/target/maven-artifact-$(VERSION).jar
- mh_installjar -plibmaven3-core-java -l --usj-name=maven3-builder-support maven-builder-support/pom.xml maven-builder-support/target/maven-builder-support-$(VERSION).jar
- mh_installjar -plibmaven3-core-java -l --usj-name=maven3-compat maven-compat/pom.xml maven-compat/target/maven-compat-$(VERSION).jar
- mh_installjar -plibmaven3-core-java -l --usj-name=maven3-core maven-core/pom.xml maven-core/target/maven-core-$(VERSION).jar
- mh_installjar -plibmaven3-core-java -l --usj-name=maven3-embedder maven-embedder/pom.xml maven-embedder/target/maven-embedder-$(VERSION).jar
- mh_installjar -plibmaven3-core-java -l --usj-name=maven3-model maven-model/pom.xml maven-model/target/maven-model-$(VERSION).jar
- mh_installjar -plibmaven3-core-java -l --usj-name=maven3-model-builder maven-model-builder/pom.xml maven-model-builder/target/maven-model-builder-$(VERSION).jar
- mh_installjar -plibmaven3-core-java -l --usj-name=maven3-plugin-api maven-plugin-api/pom.xml maven-plugin-api/target/maven-plugin-api-$(VERSION).jar
- mh_installjar -plibmaven3-core-java -l --usj-name=maven3-repository-metadata maven-repository-metadata/pom.xml maven-repository-metadata/target/maven-repository-metadata-$(VERSION).jar
- mh_installjar -plibmaven3-core-java -l --usj-name=maven3-settings maven-settings/pom.xml maven-settings/target/maven-settings-$(VERSION).jar
- mh_installjar -plibmaven3-core-java -l --usj-name=maven3-settings-builder maven-settings-builder/pom.xml maven-settings-builder/target/maven-settings-builder-$(VERSION).jar
+ mh_install
+
+override_dh_install:
+ dh_install
-binary-post-install/$(PACKAGE)::
# compress manpages
- find $(DEB_BUILDDIR)/debian/$(PACKAGE)/usr/share/maven/man -type f | xargs gzip -9v -n
+ find debian/$(PACKAGE)/usr/share/maven/man -type f | xargs gzip -9v -n
-clean::
- mh_clean
+override_dh_auto_clean:
+ dh_auto_build -- clean-bootstrap
mh_unpatchpoms -plibmaven3-core-java
- -rm -rf debian/tmp/mvn-repo
- -rm $(DEB_BUILDDIR)/maven-ant-tasks-2.1.1.jar
-find . -name target -type d | xargs rm -rf
- -rm -f dependencies.xml
-# No documentation released yet.
-#binary-post-install/$(PACKAGE)-doc::
+get-orig-source:
+ -uscan --download-current-version --force-download --rename
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven.git
More information about the pkg-java-commits
mailing list