[libcommons-compress-java] 01/08: Build with maven-debian-helper instead of ant

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Wed Apr 20 14:49:36 UTC 2016


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

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

commit 221c689eaf65a43df6ed46b129683f3791d2bb9b
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Apr 20 15:33:26 2016 +0200

    Build with maven-debian-helper instead of ant
---
 debian/MANIFEST.MF                   | 46 --------------------------
 debian/ant.properties                |  9 ------
 debian/build.xml                     | 62 ------------------------------------
 debian/changelog                     |  6 ++++
 debian/control                       | 14 ++++----
 debian/libcommons-compress-java.poms | 29 ++++++++++++++++-
 debian/maven.ignoreRules             |  3 ++
 debian/maven.properties              |  5 +++
 debian/maven.rules                   |  1 +
 debian/rules                         | 21 +++---------
 10 files changed, 54 insertions(+), 142 deletions(-)

diff --git a/debian/MANIFEST.MF b/debian/MANIFEST.MF
deleted file mode 100644
index 5e86b3a..0000000
--- a/debian/MANIFEST.MF
+++ /dev/null
@@ -1,46 +0,0 @@
-Manifest-Version: 1.0
-Export-Package: org.apache.commons.compress;version="1.10",org.apache.
- commons.compress.archivers;version="1.10",org.apache.commons.compress
- .archivers.ar;version="1.10",org.apache.commons.compress.archivers.ar
- j;version="1.10",org.apache.commons.compress.archivers.cpio;version="
- 1.10",org.apache.commons.compress.archivers.dump;version="1.10",org.a
- pache.commons.compress.archivers.jar;version="1.10",org.apache.common
- s.compress.archivers.sevenz;version="1.10",org.apache.commons.compres
- s.archivers.tar;version="1.10",org.apache.commons.compress.archivers.
- zip;version="1.10",org.apache.commons.compress.changes;version="1.10"
- ,org.apache.commons.compress.compressors;version="1.10",org.apache.co
- mmons.compress.compressors.bzip2;version="1.10",org.apache.commons.co
- mpress.compressors.deflate;version="1.10",org.apache.commons.compress
- .compressors.gzip;version="1.10",org.apache.commons.compress.compress
- ors.lzma;version="1.10",org.apache.commons.compress.compressors.lzw;v
- ersion="1.10",org.apache.commons.compress.compressors.pack200;version
- ="1.10",org.apache.commons.compress.compressors.snappy;version="1.10"
- ,org.apache.commons.compress.compressors.xz;version="1.10",org.apache
- .commons.compress.compressors.z;version="1.10",org.apache.commons.com
- press.parallel;version="1.10",org.apache.commons.compress.utils;versi
- on="1.10"
-Implementation-Title: Apache Commons Compress
-Implementation-Vendor: The Apache Software Foundation
-Implementation-Vendor-Id: org.apache
-Specification-Title: Apache Commons Compress
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Bundle-SymbolicName: org.apache.commons.compress
-Extension-Name: org.apache.commons.compress
-Implementation-Version: 1.10
-Specification-Vendor: The Apache Software Foundation
-Bundle-Name: Apache Commons Compress
-Bundle-Vendor: The Apache Software Foundation
-Bundle-Version: 1.10.0
-Bundle-ManifestVersion: 2
-Bundle-Description: Apache Commons Compress software defines an API fo
- r working withcompression and archive formats.  These include: bzip2,
-  gzip, pack200,lzma, xz, Snappy, traditional Unix Compress, DEFLATE a
- nd ar, cpio,jar, tar, zip, dump, 7z, arj.
-Bundle-DocURL: http://commons.apache.org/compress/
-Import-Package: org.tukaani.xz;resolution:=optional
-Include-Resource: META-INF/LICENSE.txt=LICENSE.txt,META-INF/NOTICE.txt
- =NOTICE.txt
-Specification-Version: 1.10
-Implementation-Build: tags/COMPRESS-1.10-RC3 at r1696055; 2015-08-15 17:3
- 6:59+0200
-Main-Class: org.apache.commons.compress.archivers.Lister
diff --git a/debian/ant.properties b/debian/ant.properties
deleted file mode 100644
index 1921c50..0000000
--- a/debian/ant.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-project.name=commons-compress
-class.dir=build
-source.dir=src/main/java
-jar=commons-compress.jar
-test.dir=target
-test.class.dir=${test.dir}/test-classes
-test.source.dir=src/test/java
-test.res.dir=src/test/resources
-test.results.dir=${test.dir}/test-reports
diff --git a/debian/build.xml b/debian/build.xml
deleted file mode 100644
index b6f7d4f..0000000
--- a/debian/build.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project default="package" name="${project.name}" basedir="..">
-
-  <target name="clean">
-    <delete dir="${class.dir}" quiet="true"/>
-    <delete dir="${test.dir}" quiet="true"/>
-  </target>
-
-  <target name="compile" description="o Compile the source files">
-    <mkdir dir="${class.dir}"/>
-    <javac srcdir="${source.dir}" destdir="${class.dir}"
-      debug="true" source="1.5" target="1.5"/>
-  </target>
-
-  <target name="test-compile" description="o Compile the test source files" depends="compile">
-    <mkdir dir="${test.class.dir}"/>
-    <javac srcdir="${test.source.dir}" destdir="${test.class.dir}"
-      debug="true" source="1.5" target="1.5" encoding="ISO-8859-1">
-      <classpath>
-         <pathelement location="${class.dir}"/>
-         <pathelement path="${java.class.path}"/>
-      </classpath>
-    </javac>
-    <copy todir="${test.class.dir}">
-      <fileset dir="${test.res.dir}">
-         <exclude name="**/*.java"/>
-      </fileset>
-    </copy>
-  </target>
-
-  <target name="test" depends="test-compile">
-     <mkdir dir="${test.results.dir}"/>
-     <junit printsummary="yes" haltonfailure="yes">
-       <classpath>
-         <pathelement location="${class.dir}"/>
-         <pathelement location="${test.class.dir}"/>
-         <pathelement path="${java.class.path}"/>
-       </classpath>
-       <formatter type="plain" usefile="false"/>
-       <batchtest todir="${test.results.dir}">
-         <fileset dir="${test.source.dir}">
-            <include name="**/*TestCase.java"/>
-            <include name="**/*Test.java"/>
-            <exclude name="**/*$*"/>
-            <exclude name="**/Abstract*"/>
-         </fileset>
-       </batchtest>
-     </junit>
-  </target>
-
-  <target name="jar" description="o Create the jar" depends="compile">
-    <jar jarfile="${jar}" manifest="debian/MANIFEST.MF">
-      <fileset dir="${class.dir}">
-          <include name="**"/>
-      </fileset>
-    </jar>
-  </target>
-
-  <target name="package" depends="test,jar"/>
-
-</project>
diff --git a/debian/changelog b/debian/changelog
index e6f0068..fadb237 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libcommons-compress-java (1.10-3) UNRELEASED; urgency=medium
+
+  * Build with maven-debian-helper instead of ant.
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Wed, 20 Apr 2016 14:52:48 +0200
+
 libcommons-compress-java (1.10-2) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 231c0e1..3e850a4 100644
--- a/debian/control
+++ b/debian/control
@@ -4,15 +4,13 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Torsten Werner <twerner at debian.org>, Jakub Adam <jakub.adam at ktknet.cz>,
  Emmanuel Bourg <ebourg at apache.org>
-Build-Depends: ant,
-               ant-optional,
-               cdbs,
-               debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
                default-jdk,
                junit4,
-               maven-repo-helper,
                javahelper,
-               libxz-java (>= 1.5)
+               libmaven-bundle-plugin-java,
+               libxz-java (>= 1.5),
+               maven-debian-helper
 Standards-Version: 3.9.7
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/libcommons-compress-java.git
 Vcs-Git: git://anonscm.debian.org/pkg-java/libcommons-compress-java.git
@@ -20,8 +18,8 @@ Homepage: http://commons.apache.org/compress/
 
 Package: libcommons-compress-java
 Architecture: all
-Depends: ${misc:Depends}
-Suggests: libxz-java (>= 1.5)
+Depends: ${misc:Depends}, ${maven:Depends}
+Suggests: ${maven:OptionalDepends}
 Description: Java API for working with compression and archive formats
  Apache Commons Compress defines a Java API for working with
  compression and archive formats. These include: bzip2, gzip, pack200,
diff --git a/debian/libcommons-compress-java.poms b/debian/libcommons-compress-java.poms
index 43e746b..5ad70f2 100644
--- a/debian/libcommons-compress-java.poms
+++ b/debian/libcommons-compress-java.poms
@@ -1 +1,28 @@
-pom.xml --no-parent
+# 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
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..34733b6
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1,3 @@
+
+org.apache.maven.plugins maven-javadoc-plugin * * * *
+org.apache.maven.plugins maven-scm-publish-plugin * * * *
diff --git a/debian/maven.properties b/debian/maven.properties
new file mode 100644
index 0000000..c67a92a
--- /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
+
+project.build.sourceEncoding=UTF-8
diff --git a/debian/maven.rules b/debian/maven.rules
new file mode 100644
index 0000000..d6696a1
--- /dev/null
+++ b/debian/maven.rules
@@ -0,0 +1 @@
+junit junit * s/.*/4.x/ * *
diff --git a/debian/rules b/debian/rules
index 7d85167..97ed3f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,21 +1,10 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/class/javahelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+%:
+	dh $@ --buildsystem=maven --with javahelper
 
-JAVA_HOME         := /usr/lib/jvm/default-java
-DEB_ANT_BUILDFILE := debian/build.xml
-DEB_JARS          := ant-junit4 ant-junit junit4 xz
-PACKAGE           := commons-compress
-
-install/lib$(PACKAGE)-java::
-	mh_installpoms -plib$(PACKAGE)-java
-	mh_installjar -plib$(PACKAGE)-java -l pom.xml $(PACKAGE).jar
-	dh_installchangelogs  -plib$(PACKAGE)-java RELEASE-NOTES.txt
-
-clean::
-	mh_clean
-	-rm -rf commons-compress.jar
+override_dh_installchangelogs:
+	dh_installchangelogs -- RELEASE-NOTES.txt
 
 get-orig-source:
-	uscan --force-download --download-version $(DEB_UPSTREAM_VERSION) --rename
+	uscan --force-download --download-current-version --rename

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



More information about the pkg-java-commits mailing list