[pegdown] 05/06: Build with Maven instead of Ant

[Emmanuel Bourg]

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

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

commit a744e10224f8ddb34ede2b379966831c5c778848
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Jul 20 16:31:51 2016 +0200

    Build with Maven instead of Ant
---
 debian/build.xml            | 18 ------------------
 debian/changelog            |  1 +
 debian/control              |  5 +++--
 debian/libpegdown-java.poms |  2 +-
 debian/maven.ignoreRules    |  2 ++
 debian/maven.properties     |  5 +++++
 debian/rules                | 12 ++++++------
 7 files changed, 18 insertions(+), 27 deletions(-)

diff --git a/debian/build.xml b/debian/build.xml
deleted file mode 100644
index 11453bb..0000000
--- a/debian/build.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<project default="build" basedir="..">
-  <property name="ant.build.javac.source" value="1.6"/>
-  <property name="ant.build.javac.target" value="1.6"/>
-
-  <target name="build">
-    <mkdir dir="target/classes"/>
-    <javac srcdir="src/main/java" destdir="target/classes" debug="yes" includeantruntime="false">
-      <classpath>
-        <pathelement path="/usr/share/java/parboiled-core.jar"/>
-        <pathelement path="/usr/share/java/parboiled-java.jar"/>
-      </classpath>
-    </javac>
-    <jar jarfile="target/pegdown.jar">
-      <fileset dir="target/classes"/>
-    </jar>
-  </target>
-
-</project>
diff --git a/debian/changelog b/debian/changelog
index 181ca6e..5dda620 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ pegdown (1.6.0-1) UNRELEASED; urgency=medium
 
   * New upstream release
     - Refreshed debian/pom.xml
+  * Build with Maven instead of Ant
   * Standards-Version updated to 3.9.8
   * Use secure Vcs-* URLs
 
diff --git a/debian/control b/debian/control
index 58b5b1f..c7bf9df 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: java
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: debhelper (>= 9), default-jdk, ant, maven-repo-helper, libparboiled-java
+Build-Depends: debhelper (>= 9), default-jdk, maven-debian-helper, libparboiled-java
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/pegdown.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/pegdown.git
@@ -11,7 +11,8 @@ Homepage: http://pegdown.org
 
 Package: libpegdown-java
 Architecture: all
-Depends: ${misc:Depends}, libparboiled-java
+Depends: ${misc:Depends}, ${maven:Depends}
+Suggests: ${maven:OptionalDepends}
 Description: Lightweight Markdown processing library
  Pegdown is nearly 100% compatible with the original Markdown specification
  and fully passes the original Markdown test suite. On top of the standard
diff --git a/debian/libpegdown-java.poms b/debian/libpegdown-java.poms
index c6cb054..1d885c3 100644
--- a/debian/libpegdown-java.poms
+++ b/debian/libpegdown-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]
 #
-debian/pom.xml --has-package-version --java-lib --artifact=target/pegdown.jar
+pom.xml --has-package-version --java-lib
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..eb0c758
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1,2 @@
+net.sf.jtidy jtidy * * * *
+org.specs2 specs2-core_2.11 * * * *
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 de23393..d4959ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,17 @@
 #!/usr/bin/make -f
 
-export JAVA_HOME=/usr/lib/jvm/default-java
 VERSION = $(shell dpkg-parsechangelog | sed -rne 's/^Version: ([0-9.]+)[-+].*$$/\1/p')
 
 %:
-	dh $@ --buildsystem=ant --with maven-repo-helper
+	dh $@ --buildsystem=maven
 
-override_dh_auto_build:
-	dh_auto_build -- -f debian/build.xml
+override_dh_auto_configure:
+	cp debian/pom.xml .
+	dh_auto_configure
 
 override_dh_auto_clean:
-	mh_clean
-	rm -Rf target
+	dh_auto_clean
+	rm -f pom.xml
 
 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/pegdown.git