[libws-commons-util-java] 28/30: Build with Maven instead of Ant

Fri Apr 20 16:55:21 BST 2018

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

ebourg-guest pushed a commit to branch master
in repository libws-commons-util-java.

commit 55954ef1a81aee6c50ad961f87de34036606553e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Apr 20 17:44:43 2018 +0200

    Build with Maven instead of Ant
---
 debian/build.xml                        | 37 ---------------------------------
 debian/changelog                        |  1 +
 debian/control                          |  5 +++--
 debian/dirs                             |  1 -
 debian/libws-commons-util-java.manifest |  8 +++++++
 debian/libws-commons-util-java.poms     |  2 +-
 debian/osgi-MANIFEST.MF                 |  9 --------
 debian/rules                            | 20 ++----------------
 8 files changed, 15 insertions(+), 68 deletions(-)

diff --git a/debian/build.xml b/debian/build.xml
deleted file mode 100644
index d25928b..0000000
--- a/debian/build.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="ws-commons-util" default="dist" basedir="..">
-
-	<!-- Component parameters -->
-	<property name="distfilename" value="ws-commons-util" />
-
-	<!-- Directory setup -->
-	<property name="srcdir" value="src" />
-	<property name="builddir" value="build" />
-	<property name="build_classdir" value="${builddir}/classes" />
-	<property name="version" value="1.0.1" />
-	<property name="dist" value="${distfilename}-${version}.jar" />
-
-	<!-- Excevution tags -->
-	<property name="debug" value="off" />
-	<property name="verbose" value="no" />
-
-	<!-- Distribution structure -->
-	<property name="dist_javadocs" value="${builddir}/${javadocsdir}" />
-
-	<target name="compile">
-		<mkdir dir="${build_classdir}" />
-		<javac srcdir="${srcdir}/main/java" destdir="${build_classdir}"
-            debug="true" source="1.4" target="1.4" />
-	</target>
-
-	<target name="dist" depends="compile">
-		<jar jarfile="${dist}" basedir="${build_classdir}" />
-	</target>
-
-	<target name="clean">
-		<delete dir="${builddir}" />
-		<delete file="${dist}" />
-	</target>
-
-</project>
diff --git a/debian/changelog b/debian/changelog
index 64e8851..0c5bad0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libws-commons-util-java (1.0.1-10) UNRELEASED; urgency=medium
 
   * Team upload.
   * Removed Niels Thykier from the uploaders (Closes: #770582)
+  * Build with Maven instead of Ant
   * Moved the package to Git
   * Standards-Version updated to 4.1.4
   * Switch to debhelper level 11
diff --git a/debian/control b/debian/control
index a5fb4b7..6e28df6 100644
--- a/debian/control
+++ b/debian/control
@@ -5,10 +5,11 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Jakub Adam <jakub.adam at ktknet.cz>
 Build-Depends:
  ant,
- cdbs,
  debhelper (>= 11),
  default-jdk,
- maven-repo-helper
+ javahelper,
+ junit,
+ maven-debian-helper
 Standards-Version: 4.1.4
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/libws-commons-util-java.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libws-commons-util-java.git
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 13c9f03..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java
diff --git a/debian/libws-commons-util-java.manifest b/debian/libws-commons-util-java.manifest
new file mode 100644
index 0000000..3bb00d5
--- /dev/null
+++ b/debian/libws-commons-util-java.manifest
@@ -0,0 +1,8 @@
+usr/share/java/ws-commons-util.jar:
+ Bundle-Localization: plugin
+ Bundle-Name: WS Commons Util Plug-in
+ Bundle-SymbolicName: org.apache.ws.commons.util
+ Export-Package: org.apache.ws.commons.serialize;version="1.0.1",org.apache.ws.commons.util;version="1.0.1"
+ Bundle-Version: 1.0.1
+ Bundle-ManifestVersion: 2
+ Import-Package: javax.xml,javax.xml.namespace,org.w3c.dom,org.xml.sax,org.xml.sax.ext,org.xml.sax.helpers
diff --git a/debian/libws-commons-util-java.poms b/debian/libws-commons-util-java.poms
index 0417132..29ecd5e 100644
--- a/debian/libws-commons-util-java.poms
+++ b/debian/libws-commons-util-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 --has-package-version
+pom.xml --has-package-version --java-lib --has-package-version
diff --git a/debian/osgi-MANIFEST.MF b/debian/osgi-MANIFEST.MF
deleted file mode 100644
index c9a89c8..0000000
--- a/debian/osgi-MANIFEST.MF
+++ /dev/null
@@ -1,9 +0,0 @@
-Bundle-Localization: plugin
-Bundle-Name: WS Commons Util Plug-in
-Bundle-SymbolicName: org.apache.ws.commons.util
-Export-Package: org.apache.ws.commons.serialize;version="1.0.1",org.ap
- ache.ws.commons.util;version="1.0.1"
-Bundle-Version: 1.0.1
-Bundle-ManifestVersion: 2
-Import-Package: javax.xml,javax.xml.namespace,org.w3c.dom,org.xml.sax,
- org.xml.sax.ext,org.xml.sax.helpers
diff --git a/debian/rules b/debian/rules
index feefa85..df489df 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,20 +1,4 @@
 #!/usr/bin/make -f
-# debian/rules file for libws-commons-util-java (uses cdbs)
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-DEB_UPSTREAM_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ' | cut -f1 -d-)
-
-install/libws-commons-util-java::
-	jar umf debian/osgi-MANIFEST.MF  ws-commons-util-$(DEB_UPSTREAM_VERSION).jar
-	mh_installpoms -plibws-commons-util-java
-	mh_installjar -plibws-commons-util-java -l pom.xml ws-commons-util-$(DEB_UPSTREAM_VERSION).jar
-
-clean::
-	-mh_clean
-
-JAVA_HOME := /usr/lib/jvm/default-java
-BUILD_FILE := debian/build.xml
-DEB_ANT_INVOKE := ant -f $(BUILD_FILE)
-DEB_ANT_BUILD_TARGET := dist
+%:
+	dh $@ --with javahelper

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

