[plexus-io] 02/10: Build with maven-debian-helper instead of maven-ant-helper

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository plexus-io.

commit 88465a30757af2f488b93385fc5bbb95ba1e26fd
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue Jul 18 12:44:39 2017 +0200

    Build with maven-debian-helper instead of maven-ant-helper
---
 debian/build.properties       |  2 --
 debian/changelog              |  1 +
 debian/control                | 10 ++++------
 debian/libplexus-io-java.poms |  2 +-
 debian/maven.ignoreRules      |  4 ++++
 debian/maven.rules            |  2 +-
 debian/rules                  | 22 +++-------------------
 7 files changed, 14 insertions(+), 29 deletions(-)

diff --git a/debian/build.properties b/debian/build.properties
deleted file mode 100644
index e2ae10b..0000000
--- a/debian/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-javadoc.dir=build/api
-maven.test.skip=true
diff --git a/debian/changelog b/debian/changelog
index e8b4e94..79f1943 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 plexus-io (2.7.1-2) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Build with maven-debian-helper instead of maven-ant-helper
   * Standards-Version updated to 4.0.0
 
  -- Emmanuel Bourg <ebourg at apache.org>  Tue, 18 Jul 2017 11:27:54 +0200
diff --git a/debian/control b/debian/control
index 9e54458..f30f399 100644
--- a/debian/control
+++ b/debian/control
@@ -6,11 +6,8 @@ Uploaders: Torsten Werner <twerner at debian.org>,
  Ludovic Claude <ludovic.claude at laposte.net>,
  Damien Raude-Morvan <drazzib at debian.org>,
  tony mancill <tmancill at debian.org>
-Build-Depends: debhelper (>= 10), cdbs (>= 0.4.5.3), default-jdk
-Build-Depends-Indep: maven-repo-helper (>> 0.5),
- maven-ant-helper (>> 4),
- ant,
- ant-optional,
+Build-Depends: debhelper (>= 10), default-jdk
+Build-Depends-Indep: maven-debian-helper (>= 2.2),
  libplexus-utils2-java, libplexus-containers-java, libplexus-cli-java,
  libcommons-io-java,
  libjsr305-java
@@ -21,7 +18,8 @@ Homepage: https://github.com/codehaus-plexus/plexus-io
 
 Package: libplexus-io-java
 Architecture: all
-Depends: ${misc:Depends}, libplexus-utils-java, libplexus-containers-java
+Depends: ${misc:Depends}, ${maven:Depends}
+Suggests: ${maven:OptionalDepends}
 Description: Plexus IO Components
  Plexus IO is a set of plexus components, which are designed for use in I/O
  operations. These I/O operations are doing nothing spectacular. For example,
diff --git a/debian/libplexus-io-java.poms b/debian/libplexus-io-java.poms
index 43e746b..87f2cc6 100644
--- a/debian/libplexus-io-java.poms
+++ b/debian/libplexus-io-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..046d380
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1,4 @@
+
+org.apache.maven.plugins maven-enforcer-plugin * * * *
+org.apache.maven.plugins maven-scm-publish-plugin * * * *
+org.codehaus.mojo animal-sniffer-maven-plugin * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
index 42017bb..2bd7da5 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,2 +1,2 @@
 org.codehaus.plexus plexus-container-default jar s/.*/1.0-alpha/
-
+org.codehaus.plexus plexus-utils * s/.*/2.x/ * *
diff --git a/debian/rules b/debian/rules
index 0174d67..2457530 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 plexus-utils2 plexus-container-default plexus-cli jsr305 commons-io
-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             := build/api
+%:
+	dh $@
 
 get-orig-source:
-	uscan --download-version $(VERSION) --force-download
-
-binary-post-install/lib$(PACKAGE)-java::
-	mh_installpoms -plib$(PACKAGE)-java
-	mh_installjar -plib$(PACKAGE)-java -l pom.xml build/$(PACKAGE)-$(VERSION).jar
-
-clean::
-	mh_clean
+	uscan --download-current-version --force-download

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-io.git