[geronimo-interceptor-3.0-spec] 07/09: 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 geronimo-interceptor-3.0-spec.

commit 532d406ab3f3b028c9b2c134ff256a221d2e7fa3
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Mar 23 00:39:07 2018 +0100

    Build with Maven instead of Ant
---
 debian/build.xml                                  | 41 -----------------------
 debian/changelog                                  |  1 +
 debian/control                                    |  3 +-
 debian/libgeronimo-interceptor-3.0-spec-java.poms |  2 +-
 debian/rules                                      | 16 +--------
 5 files changed, 4 insertions(+), 59 deletions(-)

diff --git a/debian/build.xml b/debian/build.xml
deleted file mode 100644
index 4a6642a..0000000
--- a/debian/build.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="pkg-java" default="package" basedir="..">
-
-    <property name="build.sourceDirectory" value="src/main/java"/>
-    <property name="build.resourcesDirectory" value="src/main/resources"/>
-    <property name="build.directory" value="build"/>
-    <property name="build.outputDirectory" value="${build.directory}/classes"/>
-
-    <target name="init">
-        <available property="available.resources" file="${build.resourcesDirectory}"/>
-    </target>
-
-    <target name="clean">
-        <delete dir="${build.directory}"/>
-    </target>
-
-    <target name="process-resources" depends="init" if="available.resources">
-        <mkdir dir="${build.outputDirectory}"/>
-        <copy todir="${build.outputDirectory}">
-            <fileset dir="${build.resourcesDirectory}"/>
-        </copy>
-    </target>
-
-    <target name="compile" depends="process-resources">
-        <mkdir dir="${build.outputDirectory}"/>
-        <javac
-            destdir="${build.outputDirectory}"
-            nowarn="true"
-            source="${sourceVersion}" target="${targetVersion}"
-            debug="on">
-            <src path="${build.sourceDirectory}"/>
-        </javac>
-    </target>
-
-    <target name="package" depends="compile">
-        <jar jarfile="${build.directory}/${artifactId}-${artifactVersion}.jar"
-            basedir="${build.outputDirectory}"/>
-    </target>
-
-</project>
diff --git a/debian/changelog b/debian/changelog
index 37e9c53..a986442 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 geronimo-interceptor-3.0-spec (1.0.1-4) UNRELEASED; urgency=medium
 
+  * Build with Maven instead of Ant
   * Build with the DH sequencer instead of CDBS
   * Standards-Version updated to 4.1.3
   * Switch to debhelper level 11
diff --git a/debian/control b/debian/control
index 9ba357c..faeedb8 100644
--- a/debian/control
+++ b/debian/control
@@ -8,10 +8,9 @@ Uploaders:
  Kyo Lee <kyo.lee at eucalyptus.com>,
  Thierry Carrez <thierry.carrez at ubuntu.com>
 Build-Depends:
- ant,
  debhelper (>= 11),
  default-jdk,
- maven-repo-helper
+ maven-debian-helper
 Standards-Version: 4.1.3
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/geronimo-interceptor-3.0-spec.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/geronimo-interceptor-3.0-spec.git
diff --git a/debian/libgeronimo-interceptor-3.0-spec-java.poms b/debian/libgeronimo-interceptor-3.0-spec-java.poms
index 32f7205..6786939 100644
--- a/debian/libgeronimo-interceptor-3.0-spec-java.poms
+++ b/debian/libgeronimo-interceptor-3.0-spec-java.poms
@@ -1 +1 @@
-pom.xml --no-parent --java-lib --usj-name=geronimo-interceptor-3.0-spec --artifact=build/geronimo-interceptor-3.0-spec-*.jar
+pom.xml --no-parent --java-lib --usj-name=geronimo-interceptor-3.0-spec
diff --git a/debian/rules b/debian/rules
index 5333e1c..fe25d29 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,23 +4,9 @@ include /usr/share/dpkg/pkg-info.mk
 
 SVN                  := tags/geronimo-interceptor_3.0_spec-$(DEB_VERSION_UPSTREAM)
 ASFREPO              := http://svn.apache.org/repos/asf/geronimo/specs/$(SVN)
-REQUIRED_JVM_VERSION := 1.5
-
-JAVA_HOME            := /usr/lib/jvm/default-java
-DEB_ANT_BUILDFILE    := debian/build.xml
-DEB_ANT_ARGS         := -DartifactVersion=$(DEB_VERSION_UPSTREAM) \
-                        -DartifactId=$(DEB_SOURCE) \
-                        -DsourceVersion=$(REQUIRED_JVM_VERSION) \
-                        -DtargetVersion=$(REQUIRED_JVM_VERSION)
 
 %:
-	dh $@ --buildsystem=ant --with maven-repo-helper
-
-override_dh_auto_build:
-	dh_auto_build -- -f debian/build.xml $(DEB_ANT_ARGS)
-
-override_dh_auto_clean:
-	dh_auto_clean -- -f debian/build.xml
+	dh $@
 
 get-orig-source:
 	echo "Getting version $(DEB_VERSION_UPSTREAM) from $(SVN)"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/geronimo-interceptor-3.0-spec.git