[jruby-joni] 03/05: Build with Maven instead of Ant and enabled the unit tests

Mon Oct 3 20:41:23 UTC 2016

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

ebourg-guest pushed a commit to branch debian/sid
in repository jruby-joni.

commit b4e2063c17b51b706dcb6790853a55fbdfd5e9f8
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Oct 3 22:32:55 2016 +0200

    Build with Maven instead of Ant and enabled the unit tests
---
 debian/ant.properties          |  6 ------
 debian/changelog               |  1 +
 debian/control                 |  7 ++++---
 debian/libjruby-joni-java.poms | 29 ++++++++++++++++++++++++++++-
 debian/maven.ignoreRules       |  4 ++++
 debian/rules                   | 15 +--------------
 6 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/debian/ant.properties b/debian/ant.properties
deleted file mode 100644
index c13a929..0000000
--- a/debian/ant.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-# Ensure that source and target are 1.6
-# For backwards compat on Java 7
-# see https://lists.debian.org/debian-java/2012/12/msg00026.html
-#
-ant.build.javac.source=1.6
-ant.build.javac.target=1.6
diff --git a/debian/changelog b/debian/changelog
index fa9bc61..69a7615 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 jruby-joni (2.1.11-2) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Build with Maven instead of Ant and enabled the unit tests
   * Depend on libasm-java (>= 5.0) instead of libasm4-java
   * Switch to debhelper level 9
 
diff --git a/debian/control b/debian/control
index c2d72da..be74ab5 100644
--- a/debian/control
+++ b/debian/control
@@ -5,8 +5,8 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Hideki Yamane <henrich at debian.org>,
  Torsten Werner <twerner at debian.org>
 Build-Depends: debhelper (>= 9), default-jdk
-Build-Depends-Indep: ant, libjcodings-java (>= 1.0.13), libasm-java (>= 5.0),
- maven-debian-helper
+Build-Depends-Indep: libjcodings-java (>= 1.0.13), libasm-java (>= 5.0),
+ maven-debian-helper (>= 2.0), junit
 Standards-Version: 3.9.8
 Homepage: https://github.com/jruby/joni/
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/jruby-joni/
@@ -14,7 +14,8 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jruby-joni.git
 
 Package: libjruby-joni-java
 Architecture: all
-Depends: ${misc:Depends}, libjcodings-java (>= 1.0.13), libasm-java (>= 5.0),
+Depends: ${misc:Depends}, ${maven:Depends}
+Suggests: ${maven:OptionalDepends}
 Description: Java port of Oniguruma regexp library 
  Oniguruma is a regular expressions library.  The characteristics of this
  library is that different character encoding for every regular expression
diff --git a/debian/libjruby-joni-java.poms b/debian/libjruby-joni-java.poms
index 43e746b..b68401f 100644
--- a/debian/libjruby-joni-java.poms
+++ b/debian/libjruby-joni-java.poms
@@ -1 +1,28 @@
-pom.xml --no-parent
+# List of POM files for the package
+# Format of this file is:
+# <path to pom file> [option]*
+# where option can be:
+#   --ignore: ignore this POM and its artifact if any
+#   --ignore-pom: don't install the POM. To use on POM files that are created
+#     temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms]
+#   --no-parent: remove the <parent> tag from the POM
+#   --package=<package>: an alternative package to use when installing this POM
+#      and its artifact
+#   --has-package-version: to indicate that the original version of the POM is the same as the upstream part
+#      of the version for the package.
+#   --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM
+#      during a clean operation with mh_cleanpom or mh_installpom
+#   --artifact=<path>: path to the build artifact associated with this POM,
+#      it will be installed when using the command mh_install. [mh_install]
+#   --java-lib: install the jar into /usr/share/java to comply with Debian
+#      packaging guidelines
+#   --usj-name=<name>: name to use when installing the library in /usr/share/java
+#   --usj-version=<version>: version to use when installing the library in /usr/share/java
+#   --no-usj-versionless: don't install the versionless link in /usr/share/java
+#   --dest-jar=<path>: the destination for the real jar.
+#     It will be installed with mh_install. [mh_install]
+#   --classifier=<classifier>: Optional, the classifier for the jar. Empty by default.
+#   --site-xml=<location>: Optional, the location for site.xml if it needs to be installed.
+#     Empty by default. [mh_install]
+#
+pom.xml --no-parent --java-lib
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..01f7a6e
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1,4 @@
+
+org.apache.maven.plugins maven-javadoc-plugin * * * *
+org.apache.maven.plugins maven-source-plugin * * * *
+org.apache.maven.wagon wagon-webdav * * * *
diff --git a/debian/rules b/debian/rules
index d61fb48..f4e2070 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,20 +1,7 @@
 #!/usr/bin/make -f
-#export DH_VERBOSE=1
 
 %:
-	dh $@
-
-override_dh_auto_build:
-	ant -propertyfile $(CURDIR)/debian/ant.properties
-
-override_dh_auto_install:
-	dh_auto_install
-	mh_installpoms -plibjruby-joni-java
-	mh_installjar -plibjruby-joni-java pom.xml target/joni*.jar --java-lib
-
-override_dh_auto_clean:
-	dh_auto_clean
-	mh_clean
+	dh $@ --buildsystem=maven
 
 get-orig-source:
 	uscan --force-download --rename

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

