[jackrabbit] 03/10: Use Maven as build system

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository jackrabbit.

commit e058037c184c909ce92d89fb563e58632c2edf18
Author: Markus Koschany <apo at gambaru.de>
Date:   Sun Jun 21 18:45:56 2015 +0200

    Use Maven as build system
---
 debian/build.properties |  2 --
 debian/build.xml        | 43 -------------------------------------------
 debian/changelog        |  2 ++
 debian/control          |  4 +---
 debian/rules            |  2 +-
 5 files changed, 4 insertions(+), 49 deletions(-)

diff --git a/debian/build.properties b/debian/build.properties
deleted file mode 100644
index 4e12bf5..0000000
--- a/debian/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-build.directory=target
-maven.test.skip=true
diff --git a/debian/build.xml b/debian/build.xml
deleted file mode 100644
index c99a2aa..0000000
--- a/debian/build.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="pkg-java" default="build-all" basedir="..">
-
-    <property file="debian/build.properties"/>
-    <property name="maven.build" value="/usr/share/maven-ant-helper/maven-build.xml"/>
-    <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
-
-    <macrodef name="clean-module">
-        <attribute name="dir"/>
-        <sequential>
-          <ant target="clean" antfile="${maven.build}" dir="@{dir}">
-            <property name="debian.dir" location="debian" />
-            <property name="project.dir" value="@{dir}" />
-          </ant>
-        </sequential>
-    </macrodef>
-    
-    <macrodef name="package-module">
-        <attribute name="dir"/>
-        <sequential>
-        <ant target="package" antfile="${maven.build}" dir="@{dir}">
-          <property name="debian.dir" location="debian" />
-          <property name="project.dir" value="@{dir}" />
-        </ant>
-        </sequential>
-    </macrodef>
-
-    <target name="clean">
-        <clean-module dir=""/>
-        <clean-module dir="jackrabbit-parent"/>
-        <clean-module dir="jackrabbit-webdav"/>
-    </target>
-
-    <target name="package">
-        <package-module dir=""/>
-        <package-module dir="jackrabbit-parent"/>
-        <package-module dir="jackrabbit-webdav"/>
-    </target>
-
-    <target name="build-all" depends="package" />
-
-</project>
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index a0019fc..5311831 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -26,6 +26,8 @@ jackrabbit (2.10.1-1) unstable; urgency=high
     and comma-separated-files-in-dep5-copyright.
   * Drop build-classpath and fix Lintian warning about missing classpath for
     dependencies.
+  * Use maven-debian-helper and Maven as build system. Drop all ant
+    build-dependencies.
 
  -- Markus Koschany <apo at gambaru.de>  Sun, 21 Jun 2015 18:35:47 +0200
 
diff --git a/debian/control b/debian/control
index 297417e..acf8dd1 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,6 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders:
  Damien Raude-Morvan <drazzib at debian.org>
 Build-Depends:
- ant-optional,
  bnd,
  debhelper (>= 9),
  default-jdk,
@@ -13,8 +12,7 @@ Build-Depends:
  libcommons-httpclient-java,
  libservlet2.5-java,
  libslf4j-java,
- maven-ant-helper,
- maven-repo-helper (>= 1.5~)
+ maven-debian-helper
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-java/jackrabbit.git
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/jackrabbit.git
diff --git a/debian/rules b/debian/rules
index 5fb87cd..c6badc1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ export CLASSPATH=/usr/share/java/slf4j-api.jar:/usr/share/java/servlet-api-2.5.j
 export ANT_ARGS=-Dbasedir=$(realpath .) -Dpackage=$(DEB_SOURCE_PACKAGE) -f debian/build.xml
 
 %:
-	dh $@ --buildsystem=ant --with maven_repo_helper
+	dh $@ --buildsystem=maven
 
 get-orig-source:
 	uscan --download-current-version --force-download --repack --compression xz

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