[plexus-classworlds] 05/10: Build with maven-debian-helper instead of maven-ant-helper
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Sep 21 15:37:40 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository plexus-classworlds.
commit 94187df2fdc480db002b87c917fcd4cfa1b44817
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Sep 21 15:26:09 2017 +0200
Build with maven-debian-helper instead of maven-ant-helper
---
debian/build-classpath | 1 -
debian/build.properties | 4 ----
debian/changelog | 1 +
debian/control | 13 +++++++------
debian/libplexus-classworlds2-java.poms | 4 +---
debian/maven.ignoreRules | 6 ++++--
debian/maven.properties | 5 +++++
debian/rules | 16 ++--------------
8 files changed, 20 insertions(+), 30 deletions(-)
diff --git a/debian/build-classpath b/debian/build-classpath
deleted file mode 100644
index 5bfa9ce..0000000
--- a/debian/build-classpath
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/java/ant-nodeps.jar
diff --git a/debian/build.properties b/debian/build.properties
deleted file mode 100644
index cc21fff..0000000
--- a/debian/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-build.directory=target
-javadoc.dir=target/apidocs
-javadoc.generate=true
-maven.test.skip=true
diff --git a/debian/changelog b/debian/changelog
index b4fdc88..de1d161 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
plexus-classworlds2 (2.5.2-2) UNRELEASED; urgency=medium
* Team upload.
+ * Build with maven-debian-helper instead of maven-ant-helper
* Standards-Version updated to 4.1.0
* Switch to debhelper level 10
* Use secure Vcs-* URLs
diff --git a/debian/control b/debian/control
index 71c29a9..d4d8f13 100644
--- a/debian/control
+++ b/debian/control
@@ -10,8 +10,9 @@ Build-Depends:
debhelper (>= 10),
default-jdk,
default-jdk-doc,
- maven-ant-helper (>> 6.7),
- maven-repo-helper (>= 1.5~)
+ libmaven-bundle-plugin-java,
+ libmaven-javadoc-plugin-java,
+ maven-debian-helper (>= 2.2)
Standards-Version: 4.1.0
Vcs-Git: https://anonscm.debian.org/git/pkg-java/plexus-classworlds2.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/plexus-classworlds2.git
@@ -19,8 +20,8 @@ Homepage: http://plexus.codehaus.org/plexus-classworlds
Package: libplexus-classworlds2-java
Architecture: all
-Depends: ${misc:Depends}
-Suggests: libplexus-classworlds2-java-doc
+Depends: ${misc:Depends}, ${maven:Depends}
+Suggests: ${maven:OptionalDepends}, libplexus-classworlds2-java-doc
Description: Class loading utilities for the Plexus framework
The Plexus project provides a full software stack for creating and executing
software projects. Based on the Plexus container, the applications can
@@ -43,8 +44,8 @@ Description: Class loading utilities for the Plexus framework
Package: libplexus-classworlds2-java-doc
Architecture: all
Section: doc
-Depends: default-jdk-doc, ${misc:Depends}
-Suggests: libplexus-classworlds2-java
+Depends: ${maven:DocDepends}, ${misc:Depends}
+Suggests: ${maven:DocOptionalDepends}, libplexus-classworlds2-java
Description: Class loading utilities for the Plexus framework - documentation
The Plexus project provides a full software stack for creating and executing
software projects. Based on the Plexus container, the applications can
diff --git a/debian/libplexus-classworlds2-java.poms b/debian/libplexus-classworlds2-java.poms
index 23fb6a9..01138a4 100644
--- a/debian/libplexus-classworlds2-java.poms
+++ b/debian/libplexus-classworlds2-java.poms
@@ -23,6 +23,4 @@
# --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 --has-package-version --artifact=target/plexus-classworlds-*.jar --java-lib --usj-name=plexus-classworlds2 --no-parent
-target/plexus-classworlds.javadoc.pom --has-package-version --package=plexus-classworlds2-doc --artifact=target/plexus-classworlds.javadoc.jar --classifier=javadoc --ignore-pom
-
+pom.xml --has-package-version --java-lib --usj-name=plexus-classworlds2 --no-parent
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 990cc4c..dfdeabe 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -14,5 +14,7 @@
# from the POM
# junit junit jar s/3\\..*/3.x/
-junit junit * * * *
-org.apache.maven.plugins maven-surefire-plugin * * * *
+org.apache.maven.plugins maven-dependency-plugin * * * *
+org.apache.maven.plugins maven-enforcer-plugin * * * *
+org.apache.maven.plugins maven-release-plugin * * * *
+org.apache.maven.plugins maven-scm-publish-plugin * * * *
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 c61b3d4..5a6351f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,7 @@
#!/usr/bin/make -f
-DEB_SOURCE_PACKAGE := $(shell dpkg-parsechangelog | grep '^Source:' | cut -f 2 -d ' ')
-DEB_UPSTREAM_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ' | cut -d: -f2- | sed 's/-[^-]*$$//')
-
-export JAVA_HOME=/usr/lib/jvm/default-java
-export CLASSPATH=$(shell for jar in `cat debian/build-classpath`; do if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; done)
-export ANT_ARGS=-Dbasedir=$(realpath .) -Dpackage=$(DEB_SOURCE_PACKAGE) -f /usr/share/maven-ant-helper/maven-build.xml
-
%:
- dh $@ --buildsystem=ant --with maven_repo_helper
-
-override_dh_auto_clean:
- mh_clean
- mh_unpatchpoms -plibplexus-classworlds2-java
- rm -Rf target debian/plexus-classworlds2-doc
+ dh $@
get-orig-source:
- uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
+ uscan --download-current-version --force-download --rename
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-classworlds.git
More information about the pkg-java-commits
mailing list