[maven-dependency-analyzer] 04/05: Build with maven-debian-helper instead of maven-ant-helper and enabled the unit tests
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Wed Jun 24 12:36:12 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository maven-dependency-analyzer.
commit 10c05ada34fd5a215d8260b689193e65e8ed7da8
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Wed Jun 24 11:46:49 2015 +0200
Build with maven-debian-helper instead of maven-ant-helper and enabled the unit tests
---
debian/build.properties | 4 ----
debian/changelog | 7 ++++++-
debian/control | 14 ++++++-------
debian/libmaven-dependency-analyzer-java.poms | 30 +++++++++++++++++++++++++--
debian/maven-settings.xml | 9 --------
debian/maven.properties | 1 +
debian/rules | 25 +++-------------------
7 files changed, 45 insertions(+), 45 deletions(-)
diff --git a/debian/build.properties b/debian/build.properties
deleted file mode 100644
index 43828cd..0000000
--- a/debian/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-javadoc.dir=target/api
-build.directory=target
-maven.test.skip=true
-maven.generate.target=org.codehaus.plexus:plexus-component-metadata:${plexus-component-metadata.version}:generate-metadata
diff --git a/debian/changelog b/debian/changelog
index d3f4303..7cf97ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,11 @@
-maven-dependency-analyzer (1.2-3) UNRELEASED; urgency=medium
+maven-dependency-analyzer (1.4-1) UNRELEASED; urgency=medium
* Team upload.
+ * New upstream release.
+ * Build with maven-debian-helper instead of maven-ant-helper
+ * Enabled the unit tests
+ * Added new build dependencies on libplexus-containers1.5-java, libjmock-java
+ and libmaven-plugin-testing-java
* Moved the package to Git
* Standards-Version updated to 3.9.6 (no changes)
* Use XZ compression for the upstream tarball
diff --git a/debian/control b/debian/control
index c6c21d6..1a2c829 100644
--- a/debian/control
+++ b/debian/control
@@ -3,16 +3,18 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Ludovic Claude <ludovic.claude at laposte.net>
-Build-Depends: ant, cdbs, debhelper (>= 9), default-jdk, libjaxp1.3-java
+Build-Depends: cdbs, debhelper (>= 9), default-jdk, libjaxp1.3-java
Build-Depends-Indep: ant-optional,
junit,
libasm3-java,
+ libjmock-java,
+ libmaven-plugin-testing-java,
libmaven-plugin-tools-java,
libmaven2-core-java,
libplexus-component-metadata-java (>= 1.0~beta3.0.7),
+ libplexus-containers1.5-java,
libplexus-utils-java,
- maven-ant-helper (>> 4),
- maven-repo-helper
+ maven-debian-helper
Standards-Version: 3.9.6
Vcs-Git: git://anonscm.debian.org/pkg-java/maven-dependency-analyzer.git
Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/maven-dependency-analyzer.git
@@ -20,10 +22,8 @@ Homepage: http://maven.apache.org/shared/maven-dependency-analyzer/
Package: libmaven-dependency-analyzer-java
Architecture: all
-Depends: libasm3-java,
- libmaven2-core-java,
- libplexus-utils-java,
- ${misc:Depends}
+Depends: ${misc:Depends}, ${maven:Depends}
+Suggests: ${maven:OptionalDepends}
Description: Maven Dependency Analyzer
Maven is a software project management and comprehension tool. Based on the
concept of a project object model (POM), Maven can manage a project's build,
diff --git a/debian/libmaven-dependency-analyzer-java.poms b/debian/libmaven-dependency-analyzer-java.poms
index e3a3ef0..64b1188 100644
--- a/debian/libmaven-dependency-analyzer-java.poms
+++ b/debian/libmaven-dependency-analyzer-java.poms
@@ -1,2 +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 --java-lib
diff --git a/debian/maven-settings.xml b/debian/maven-settings.xml
deleted file mode 100644
index 01f8769..0000000
--- a/debian/maven-settings.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<!--
- This is a minimal settings.xml that switches maven to offline mode
- and uses the Debian repo as the local repo.
--->
-
-<settings>
- <localRepository>/usr/share/maven-repo</localRepository>
- <offline>true</offline>
-</settings>
diff --git a/debian/maven.properties b/debian/maven.properties
new file mode 100644
index 0000000..81cec92
--- /dev/null
+++ b/debian/maven.properties
@@ -0,0 +1 @@
+maven.test.failure.ignore=true
diff --git a/debian/rules b/debian/rules
index 2d3a464..261ec16 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,28 +1,9 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/class/maven.mk
-PACKAGE := $(DEB_SOURCE_PACKAGE)
-VERSION := $(DEB_UPSTREAM_VERSION)
-# Need to specify the exact version of the Plexus plugin (from plexus-component-metadata package) used here
-PLEXUS_PLUGIN_VERSION:= 1.0-beta-3.0.7
-JAVA_HOME := /usr/lib/jvm/default-java
-DEB_JARS := ant-nodeps maven-core maven-model maven-plugin-api maven-plugin-descriptor maven-plugin-registry \
- maven-project maven-artifact maven-artifact-manager plexus-utils asm3
-DEB_ANT_BUILD_TARGET := package #javadoc
-DEB_ANT_BUILDFILE := /usr/share/maven-ant-helper/maven-build.xml
-DEB_ANT_ARGS := -Dbasedir=$(realpath .) -Dpackage=$(PACKAGE) -Dversion=$(VERSION) -Dplexus-component-metadata.version=$(PLEXUS_PLUGIN_VERSION)
-API_DOCS := target/api
+JAVA_HOME := /usr/lib/jvm/default-java
get-orig-source:
- uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
-
-binary-post-install/lib$(PACKAGE)-java::
- mh_installpoms -plib$(PACKAGE)-java
- mh_installjar -plib$(PACKAGE)-java -l pom.xml target/$(PACKAGE)-$(VERSION).jar
-
-clean::
- -rm -rf debian/tmp
- mh_clean
- mh_unpatchpoms -plib$(PACKAGE)-java
+ uscan --download-current-version --force-download --rename
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven-dependency-analyzer.git
More information about the pkg-java-commits
mailing list