[libxstream-java] 04/05: Build with maven-debian-helper
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Tue Mar 29 09:24:44 UTC 2016
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository libxstream-java.
commit 374b3da6bb97793591207ee6de4bc8fefcfe30fc
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Tue Mar 29 11:17:08 2016 +0200
Build with maven-debian-helper
---
debian/build.properties | 7 -------
debian/build.xml | 47 ---------------------------------------------
debian/changelog | 1 +
debian/control | 23 ++++++----------------
debian/libxstream-java.poms | 35 ++++++++++++++++++++++++++++++---
debian/maven.ignoreRules | 3 ++-
debian/maven.properties | 5 +++++
debian/maven.rules | 12 ++----------
debian/rules | 28 +++------------------------
9 files changed, 51 insertions(+), 110 deletions(-)
diff --git a/debian/build.properties b/debian/build.properties
deleted file mode 100644
index 3a35132..0000000
--- a/debian/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-ant.build.javac.source=1.5
-ant.build.javac.target=1.5
-
-javadoc.dir=target/api
-build.sourceDirectory=src/java
-classpath.compile=\
- ${basedir}/xstream/build/xstream-${version}.jar
\ No newline at end of file
diff --git a/debian/build.xml b/debian/build.xml
deleted file mode 100644
index 643efd9..0000000
--- a/debian/build.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="xstream" default="package" 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="cleanmodule">
- <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="packagemodule">
- <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">
- <delete dir="build"/>
- <cleanmodule dir="xstream/"/>
- <cleanmodule dir="xstream-benchmark/"/>
- </target>
-
- <target name="package">
- <packagemodule dir="xstream/"/>
- <packagemodule dir="xstream-benchmark/"/>
- </target>
-
- <target name="javadoc">
- <javadoc destdir="${javadoc.dir}">
- <packageset dir="xstream/src/java/"/>
- <packageset dir="xstream-benchmark/src/java/"/>
- </javadoc>
- </target>
-
-</project>
diff --git a/debian/changelog b/debian/changelog
index 8e10ebd..13c662f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
libxstream-java (1.4.8-2) UNRELEASED; urgency=medium
+ * Build with maven-debian-helper
* Standards-Version updated to 3.9.7 (no changes)
* Use secure Vcs-* fields
* Updated the old references to codehaus.org
diff --git a/debian/control b/debian/control
index acf3f95..c20efec 100644
--- a/debian/control
+++ b/debian/control
@@ -6,11 +6,11 @@ Uploaders: Torsten Werner <twerner at debian.org>,
Varun Hiremath <varun at debian.org>,
Damien Raude-Morvan <drazzib at debian.org>,
Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: ant,
- cdbs,
+Build-Depends: maven-debian-helper,
debhelper (>= 9),
default-jdk,
javahelper,
+ libbuild-helper-maven-plugin-java,
libcglib3-java,
libdom4j-java,
libjdom1-java,
@@ -18,13 +18,12 @@ Build-Depends: ant,
libjettison-java,
libjoda-time-java,
libkxml2-java,
+ libmaven-bundle-plugin-java,
libstax-java,
libstax2-api-java,
libwoodstox-java,
libxom-java,
- libxpp3-java,
- maven-ant-helper,
- maven-repo-helper
+ libxpp3-java
Standards-Version: 3.9.7
Vcs-Git: https://anonscm.debian.org/git/pkg-java/libxstream-java.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/libxstream-java.git
@@ -32,18 +31,8 @@ Homepage: http://x-stream.github.io
Package: libxstream-java
Architecture: all
-Depends: libxpp3-java, ${misc:Depends}
-Suggests: libcglib3-java,
- libdom4j-java,
- libjdom1-java,
- libjdom2-java,
- libjettison-java,
- libjoda-time-java,
- libkxml2-java,
- libstax-java,
- libstax2-api-java,
- libwoodstox-java,
- libxom-java
+Depends: ${misc:Depends}, ${maven:Depends}
+Suggests: ${maven:OptionalDepends}
Description: Java library to serialize objects to XML and back again
The features of the XStream library are:
.
diff --git a/debian/libxstream-java.poms b/debian/libxstream-java.poms
index dd4559c..f0012a4 100644
--- a/debian/libxstream-java.poms
+++ b/debian/libxstream-java.poms
@@ -1,3 +1,32 @@
-pom.xml --no-parent
-xstream/pom.xml --java-lib
-xstream-benchmark/pom.xml --java-lib
+# 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 --no-parent --has-package-version
+xstream/pom.xml --has-package-version --java-lib
+xstream-benchmark/pom.xml --has-package-version --java-lib
+xstream-hibernate/pom.xml --ignore
+xstream-distribution/pom.xml --ignore
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 2e57185..7c2ce02 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -19,7 +19,9 @@ commons-cli commons-cli * * * *
commons-io commons-io * * * *
commons-lang commons-lang * * * *
jmock jmock * * * *
+junit junit * * * *
org.apache.maven.plugins maven-assembly-plugin * * * *
+org.apache.maven.plugins maven-dependency-plugin * * * *
org.apache.maven.plugins maven-eclipse-plugin * * * *
org.apache.maven.plugins maven-enforcer-plugin * * * *
org.apache.maven.plugins maven-javadoc-plugin * * * *
@@ -30,7 +32,6 @@ org.apache.maven.plugins maven-surefire-report-plugin * * * *
org.apache.maven.wagon wagon-webdav * * * *
org.codehaus.mojo cobertura-maven-plugin * * * *
org.codehaus.mojo jxr-maven-plugin * * * *
-org.codehaus.woodstox wstx-asl * * * *
org.json json * * * *
oro oro * * * *
xmlpull xmlpull * * * *
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/maven.rules b/debian/maven.rules
index 28dfb84..c468ef6 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -16,18 +16,10 @@
# and version starting with 3., replacing the version with 3.x
# junit junit jar s/3\..*/3.x/
-com.thoughtworks.xstream xstream-benchmark jar s/.*/debian/ * *
-com.thoughtworks.xstream xstream-distribution pom s/.*/debian/ * *
-com.thoughtworks.xstream xstream-hibernate jar s/.*/debian/ * *
-com.thoughtworks.xstream xstream-parent pom s/.*/debian/ * *
-com.thoughtworks.xstream xstream jar s/.*/debian/ * *
s/jdom/org.jdom/ jdom jar s/1\..*/debian/ * *
org.jdom jdom2 jar s/.*/debian/ * *
s/net.sf.kxml/kxml2/ kxml2-min jar s/.*/debian/ * *
s/net.sf.kxml/kxml2/ kxml2 jar s/.*/debian/ * *
-joda-time joda-time jar s/.*/debian/ * *
-junit junit jar s/3\..*/3.x/ * *
org.codehaus.jettison jettison s/bundle/jar/ s/.*/debian/ * *
-s/hsqldb/org.hsqldb/ hsqldb * s/.*/debian/ * *
-s/jboss/javassist/ javassist * s/.*/debian/ * *
-cglib cglib * s/.*/3.x/ * *
+cglib cglib* * s/.*/3.x/ * *
+org.codehaus.woodstox s/wstx-asl/woodstox-core-lgpl/ * s/.*/debian/ * *
diff --git a/debian/rules b/debian/rules
index 02b1d80..26e21f7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,29 +1,7 @@
#!/usr/bin/make -f
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-
-PACKAGE := $(DEB_SOURCE_PACKAGE)
-VERSION := $(DEB_UPSTREAM_VERSION)
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := ant-nodeps xom joda-time jettison cglib3 dom4j xpp3 jdom1 jdom2 stax woodstox-core-lgpl kxml2 stax2-api
-DEB_ANT_BUILD_TARGET := package javadoc
-DEB_ANT_BUILDFILE := debian/build.xml
-DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=xstream -Dversion=$(VERSION)
-
-pre-build::
- -rm xstream/src/java/com/thoughtworks/xstream/converters/reflection/HarmonyReflectionProvider.java
-
-binary-post-install/$(PACKAGE)::
- mh_installpoms -p$(PACKAGE)
- mh_installjar -p$(PACKAGE) -l xstream/pom.xml xstream/build/xstream-$(VERSION).jar
- mh_installjar -p$(PACKAGE) -l xstream-benchmark/pom.xml xstream-benchmark/build/xstream-benchmark-$(VERSION).jar
- jh_manifest
-
-clean::
- mh_clean
- rm -Rf target
- mh_unpatchpoms -p$(PACKAGE)
+%:
+ dh $@ --buildsystem=maven --with javahelper
get-orig-source:
- uscan --force-download --rename
+ uscan --download-current-version --force-download --rename --repack --compression xz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libxstream-java.git
More information about the pkg-java-commits
mailing list