[libspin-java] 04/05: Build with maven-debian-helper instead of maven-ant-helper

Thu Jul 7 15:04:11 UTC 2016

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

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

commit 20337e438d022f42011ea167ebf8e0085448136e
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jul 7 16:59:14 2016 +0200

    Build with maven-debian-helper instead of maven-ant-helper
---
 debian/build.properties         |  4 ----
 debian/build.xml                | 32 --------------------------------
 debian/changelog                |  2 ++
 debian/control                  |  5 +++--
 debian/libspin-java-doc.docs    |  1 -
 debian/libspin-java-doc.install |  1 +
 debian/libspin-java.install     |  1 -
 debian/libspin-java.links       |  1 -
 debian/libspin-java.poms        | 28 ++++++++++++++++++++++++++++
 debian/maven.ignoreRules        |  6 ++++++
 debian/maven.rules              |  2 ++
 debian/rules                    | 12 +++---------
 12 files changed, 45 insertions(+), 50 deletions(-)

diff --git a/debian/build.properties b/debian/build.properties
deleted file mode 100644
index a9b10ce..0000000
--- a/debian/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-javadoc.dir=build/api
-classpath.compile = \
-                    /usr/share/java/cglib-nodep.jar:\
-                    /usr/share/java/maven-ant-helper.jar
diff --git a/debian/build.xml b/debian/build.xml
deleted file mode 100644
index d774729..0000000
--- a/debian/build.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="pkg-java" default="package" basedir="..">
-
-    <property file="debian/build.properties"/>
-    <property name="maven.test.skip" value="true"/>
-    <property name="maven.build.xml" value="/usr/share/maven-ant-helper/maven-build.xml"/>
-    <property file="/usr/share/maven-ant-helper/maven-defaults.properties"/>
-    <property name="pom.file" value="NONE" />
-    <property name="keep-cleaned-pom" value="true" />
-
-    <target name="clean">
-        <ant target="clean" antfile="${maven.build.xml}" dir="."/>
-    </target>
-
-    <target name="package">
-        <ant target="package" antfile="${maven.build.xml}" dir=".">
-            <property name="artifactId" value="spin"/>
-            <property name="version" value="1.5"/>
-            <property name="basedir" value="."/>
-        </ant>
-    </target>
-
-    <target name="javadoc">
-        <javadoc destdir="${javadoc.dir}">
-            <fileset dir="./src/main/java/">
-                <exclude name="**/proxy/CGLibProxyFactory.java"/>
-            </fileset>
-        </javadoc>
-    </target>
-
-</project>
diff --git a/debian/changelog b/debian/changelog
index 4afc757..eb9fb2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ libspin-java (1.5+dfsg-8) UNRELEASED; urgency=medium
 
   * Team upload.
   * Depend on libcglib-nodep-java instead of libcglib3-java
+  * Build with maven-debian-helper instead of maven-ant-helper
+  * Enabled the unit tests
   * Standards-Version updated to 3.9.8
   * Use a secure Vcs-Git URL
 
diff --git a/debian/control b/debian/control
index e4525e4..c1ad171 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: tony mancill <tmancill at debian.org>
  , gregor herrmann <gregoa at debian.org>
-Build-Depends: debhelper (>= 9), ant, maven-ant-helper
+Build-Depends: debhelper (>= 9), maven-debian-helper, libmaven-javadoc-plugin-java, xvfb, xauth
 Build-Depends-Indep: default-jdk, junit, libcglib-nodep-java
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-java/libspin-java.git
@@ -13,7 +13,8 @@ Homepage: http://spin.sourceforge.net
 
 Package: libspin-java
 Architecture: all
-Depends: ${misc:Depends}
+Depends: ${misc:Depends}, ${maven:Depends},
+Suggests: ${maven:OptionalDepends}
 Description: transparent threading solution for non-freezing Swing applications
  Swing is the standard component architecture for developing Java desktop
  applications. Its exhaustive collection of widgets is the foundation for
diff --git a/debian/libspin-java-doc.docs b/debian/libspin-java-doc.docs
deleted file mode 100644
index e5e6d3a..0000000
--- a/debian/libspin-java-doc.docs
+++ /dev/null
@@ -1 +0,0 @@
-build/api
diff --git a/debian/libspin-java-doc.install b/debian/libspin-java-doc.install
new file mode 100644
index 0000000..f2f0ca5
--- /dev/null
+++ b/debian/libspin-java-doc.install
@@ -0,0 +1 @@
+target/site/apidocs/* /usr/share/doc/libspin-java/api/
diff --git a/debian/libspin-java.install b/debian/libspin-java.install
deleted file mode 100644
index e1421f9..0000000
--- a/debian/libspin-java.install
+++ /dev/null
@@ -1 +0,0 @@
-build/spin-1.5.jar usr/share/java
diff --git a/debian/libspin-java.links b/debian/libspin-java.links
deleted file mode 100644
index 1f596b7..0000000
--- a/debian/libspin-java.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java/spin-1.5.jar usr/share/java/spin.jar
diff --git a/debian/libspin-java.poms b/debian/libspin-java.poms
new file mode 100644
index 0000000..1d885c3
--- /dev/null
+++ b/debian/libspin-java.poms
@@ -0,0 +1,28 @@
+# 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 --has-package-version --java-lib
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..408b423
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1,6 @@
+
+org.apache.maven.plugins maven-assembly-plugin * * * *
+org.apache.maven.plugins maven-deploy-plugin * * * *
+org.apache.maven.plugins maven-project-info-reports-plugin * * * *
+org.apache.maven.plugins maven-release-plugin * * * *
+org.apache.maven.plugins maven-site-plugin * * * *
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..9d87a49
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1,2 @@
+
+junit junit jar s/3\..*/3.x/ * *
diff --git a/debian/rules b/debian/rules
index 7919e11..900a792 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,13 +1,7 @@
 #!/usr/bin/make -f
 
-export JAVA_HOME=/usr/lib/jvm/default-java
-ANT=ant -buildfile $(CURDIR)/debian/build.xml
-
 %:
-	dh $@
-
-override_dh_auto_build:
-	$(ANT) package javadoc
+	dh $@ --buildsystem=maven
 
-override_dh_auto_clean:
-	$(ANT) clean
+override_dh_auto_test:
+	xvfb-run dh_auto_test

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

