[libcommons-jxpath-java] 03/05: Build with maven-debian-helper instead of Ant

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Fri Jun 3 16:36:34 UTC 2016 

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

ebourg-guest pushed a commit to branch master
in repository libcommons-jxpath-java.

commit 3f61d2dec397798dca7842ddc84d07f14754c79c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Jun 3 18:01:14 2016 +0200

    Build with maven-debian-helper instead of Ant
---
 debian/ant.properties                      |  9 ---------
 debian/changelog                           |  1 +
 debian/commons-jxpath.bnd                  |  6 ------
 debian/control                             | 13 ++++++-------
 debian/libcommons-jxpath-java-doc.doc-base |  4 ++--
 debian/libcommons-jxpath-java-doc.docs     |  2 --
 debian/libcommons-jxpath-java-doc.install  |  1 +
 debian/libcommons-jxpath-java.poms         |  2 +-
 debian/maven.ignoreRules                   | 11 ++++++++++-
 debian/maven.properties                    |  5 +++++
 debian/maven.rules                         |  6 +++++-
 debian/rules                               | 25 ++-----------------------
 12 files changed, 33 insertions(+), 52 deletions(-)

diff --git a/debian/ant.properties b/debian/ant.properties
deleted file mode 100644
index bbdf602..0000000
--- a/debian/ant.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-build.sysclasspath=only
-final.name=commons-jxpath-1.3
-junit.jar = /usr/share/java/junit.jar
-jaxp.jaxp.jar = /usr/share/java/jaxp.jaxp.jar
-jaxp.xslt.jar = /usr/share/java/jaxp.xslt.jar
-servlet.jar = /usr/share/java/servlet-3.1.jar
-commons-beanutils.jar = /usr/share/java/commons-beanutils.jar
-commons-collections.jar = /usr/share/java/commons-collections.jar
-commons-logging.jar = /usr/share/java/commons-logging.jar
diff --git a/debian/changelog b/debian/changelog
index c819c5a..52a2433 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libcommons-jxpath-java (1.3-9) UNRELEASED; urgency=medium
 
   * Team upload.
   * Transition to the Servlet API 3.1
+  * Build with maven-debian-helper instead of Ant
   * Standards-Version updated to 3.9.8 (no changes)
 
  -- Emmanuel Bourg <ebourg at apache.org>  Fri, 03 Jun 2016 18:23:17 +0200
diff --git a/debian/commons-jxpath.bnd b/debian/commons-jxpath.bnd
deleted file mode 100644
index 271f498..0000000
--- a/debian/commons-jxpath.bnd
+++ /dev/null
@@ -1,6 +0,0 @@
-Bundle-Name: Java XPath interpreter
-Bundle-SymbolicName: org.apache.commons.jxpath
-Bundle-Version: 1.2.0
-Bundle-Vendor: Debian.org
-Import-Package: !javax.servlet.jsp, !org.apache.commons.beanutils, !org.jdom*, *
-Export-Package: *
diff --git a/debian/control b/debian/control
index 964b589..c3c4a7e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,18 +4,17 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Emmanuel Bourg <ebourg at apache.org>,
  Jakub Adam <jakub.adam at ktknet.cz>
-Build-Depends: ant,
-               cdbs (>= 0.4.8),
-               debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
                default-jdk,
                junit,
                libcommons-beanutils-java,
                libcommons-collections3-java,
                libcommons-logging-java,
                libjdom1-java,
+               libmaven-bundle-plugin-java,
+               libmaven-javadoc-plugin-java,
                libservlet3.1-java,
-               maven-repo-helper,
-               bnd (>= 2.1.0)
+               maven-debian-helper
 Standards-Version: 3.9.8
 Vcs-Git: git://anonscm.debian.org/pkg-java/libcommons-jxpath-java.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libcommons-jxpath-java.git
@@ -23,8 +22,8 @@ Homepage: http://commons.apache.org/jxpath
 
 Package: libcommons-jxpath-java
 Architecture: all
-Depends: ${misc:Depends}
-Suggests: libcommons-jxpath-java-doc
+Depends: ${misc:Depends}, ${maven:Depends}
+Suggests: libcommons-jxpath-java-doc, ${maven:OptionalDepends}
 Description: Apache Commons JXPath - XPath expressions applied to Java objects
  This library provides the Java developer the ability to manipulate
  javabeans with the XPath syntax. It also supports Java collections,
diff --git a/debian/libcommons-jxpath-java-doc.doc-base b/debian/libcommons-jxpath-java-doc.doc-base
index 9d78a4c..435e803 100644
--- a/debian/libcommons-jxpath-java-doc.doc-base
+++ b/debian/libcommons-jxpath-java-doc.doc-base
@@ -6,5 +6,5 @@ Abstract: Javadocs programmer API of libcommons-jxpath-java,
 Section: Programming
 
 Format: HTML
-Index: /usr/share/doc/libcommons-jxpath-java-doc/api/index.html
-Files: /usr/share/doc/libcommons-jxpath-java-doc/api/*.html
+Index: /usr/share/doc/libcommons-jxpath-java/api/index.html
+Files: /usr/share/doc/libcommons-jxpath-java/api/*.html
diff --git a/debian/libcommons-jxpath-java-doc.docs b/debian/libcommons-jxpath-java-doc.docs
deleted file mode 100644
index 0f45efd..0000000
--- a/debian/libcommons-jxpath-java-doc.docs
+++ /dev/null
@@ -1,2 +0,0 @@
-PROPOSAL.html
-dist/docs/api
diff --git a/debian/libcommons-jxpath-java-doc.install b/debian/libcommons-jxpath-java-doc.install
new file mode 100644
index 0000000..98d4814
--- /dev/null
+++ b/debian/libcommons-jxpath-java-doc.install
@@ -0,0 +1 @@
+target/apidocs/* /usr/share/doc/libcommons-jxpath-java/api
diff --git a/debian/libcommons-jxpath-java.poms b/debian/libcommons-jxpath-java.poms
index f661294..0417132 100644
--- a/debian/libcommons-jxpath-java.poms
+++ b/debian/libcommons-jxpath-java.poms
@@ -25,4 +25,4 @@
 #   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
 #     Empty by default. [mh_install]
 #
-pom.xml --no-parent --has-package-version --java-lib --artifact=target/commons-jxpath-*.jar
+pom.xml --has-package-version
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index b14c62c..062df2e 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -1,2 +1,11 @@
-xml-apis xml-apis * * * *
+
+com.mockrunner mockrunner-jdk1.3-j2ee1.3 * * * *
+org.apache.maven.plugins maven-assembly-plugin * * * *
+org.apache.maven.plugins maven-checkstyle-plugin * * * *
+org.apache.maven.plugins maven-pmd-plugin * * * *
+org.apache.maven.plugins maven-surefire-plugin * * * *
+org.codehaus.mojo findbugs-maven-plugin * * * *
+org.codehaus.mojo rat-maven-plugin * * * *
+org.codehaus.mojo taglist-maven-plugin * * * *
 xerces xercesImpl * * * *
+xml-apis xml-apis * * * *
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/maven.rules b/debian/maven.rules
index b553637..9eb807a 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -1,5 +1,9 @@
 
+commons-beanutils commons-beanutils jar s/.*/debian/ * *
 commons-jxpath commons-jxpath jar s/.*/debian/ * *
-commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * *
 s/javax.servlet/javax.servlet.jsp/ s/jsp-api/javax.servlet.jsp-api/ jar s/.*/2.3/ * *
 javax.servlet s/servlet-api/javax.servlet-api/ jar s/.*/3.1/ * *
+s/jdom/org.jdom/ jdom jar s/1\..*/debian/ * *
+junit junit jar s/3\..*/3.x/ * *
+org.apache.commons commons-parent pom s/.*/debian/ * *
+commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * *
diff --git a/debian/rules b/debian/rules
index 8155200..ec38b7c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,25 +1,4 @@
 #!/usr/bin/make -f
-# debian/rules for libcommons-jxpath-java (uses CDBS)
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-JAVA_HOME	     := /usr/lib/jvm/default-java
-ANT_HOME             := /usr/share/ant
-DEB_JARS             := junit jdom1 servlet-api-3.1 jsp-api-2.3 commons-beanutils common-collections3 commons-logging
-DEB_ANT_BUILD_TARGET := jar javadoc
-DEB_ANT_CLEAN_TARGET := clean
-
-binary-install/libcommons-jxpath-java::
-	mh_install -plibcommons-jxpath-java
-
-JAR=debian/libcommons-jxpath-java/usr/share/java/commons-jxpath-*.jar
-common-binary-post-install-indep::
-	bnd wrap --properties debian/commons-jxpath.bnd --output $(JAR).tmp $(JAR)
-	mv $(JAR).tmp $(JAR)
-
-clean::
-	mh_clean
+%:
+	dh $@ --buildsystem=maven

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

More information about the pkg-java-commits mailing list