[plexus-utils2] 03/04: Build with maven-debian-helper instead of maven-ant-helper
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Nov 19 13:51:37 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository plexus-utils2.
commit c31ac5f7bd8522b09287a09941be50d52009f2b8
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Nov 19 14:23:16 2015 +0100
Build with maven-debian-helper instead of maven-ant-helper
---
debian/README.source | 2 +-
debian/build-classpath | 1 -
debian/build.properties | 4 ----
debian/changelog | 1 +
debian/control | 8 +++-----
debian/libplexus-utils2-java.poms | 15 ++++++++++-----
debian/maven.cleanIgnoreRules | 17 -----------------
debian/maven.ignoreRules | 1 +
debian/maven.publishedRules | 19 -------------------
debian/maven.rules | 1 +
debian/patches/01-add-junit-dependency.patch | 18 ++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 7 +------
13 files changed, 37 insertions(+), 58 deletions(-)
diff --git a/debian/README.source b/debian/README.source
index 4c35325..d324db0 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,5 +1,5 @@
Information about plexus-utils2
-------------------------------
+-------------------------------
This package was debianized using the mh_make command
from the maven-debian-helper package.
diff --git a/debian/build-classpath b/debian/build-classpath
deleted file mode 100644
index 5bfa9ce..0000000
--- a/debian/build-classpath
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/java/ant-nodeps.jar
diff --git a/debian/build.properties b/debian/build.properties
deleted file mode 100644
index 0b96d97..0000000
--- a/debian/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-build.directory=target
-javadoc.dir=target/apidocs
-javadoc.generate=true
-classpath.compile = /usr/share/java/maven-plugin-testing-harness.jar
diff --git a/debian/changelog b/debian/changelog
index 178c64d..6f31ea7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ plexus-utils2 (3.0.22-1) UNRELEASED; urgency=medium
* Team upload.
* New upstream release
- New build dependency on libmaven-plugin-testing-java
+ * Build with maven-debian-helper instead of maven-ant-helper
* Replaced the obsolete codehaus URLs
* Exclude the JIRA issues exported as JSON files from the upstream tarball
diff --git a/debian/control b/debian/control
index 2746f46..24531ee 100644
--- a/debian/control
+++ b/debian/control
@@ -4,12 +4,10 @@ Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Ludovic Claude <ludovic.claude at laposte.net>,
Damien Raude-Morvan <drazzib at debian.org>
-Build-Depends: ant-optional,
- debhelper (>= 9),
+Build-Depends: debhelper (>= 9),
default-jdk,
- maven-ant-helper (>> 6.7),
- maven-repo-helper (>= 1.5~)
-Build-Depends-Indep: default-jdk-doc, junit (>= 3.8.2), libmaven-plugin-testing-java
+ maven-debian-helper
+Build-Depends-Indep: default-jdk-doc, junit (>= 3.8.2), libmaven-javadoc-plugin-java, libmaven-plugin-testing-java
Standards-Version: 3.9.6
Vcs-Git: git://anonscm.debian.org/pkg-java/plexus-utils2.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/plexus-utils2.git
diff --git a/debian/libplexus-utils2-java.poms b/debian/libplexus-utils2-java.poms
index ca9031f..9485098 100644
--- a/debian/libplexus-utils2-java.poms
+++ b/debian/libplexus-utils2-java.poms
@@ -2,7 +2,9 @@
# Format of this file is:
# <path to pom file> [option]*
# where option can be:
-# --ignore: ignore this POM or
+# --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
@@ -11,13 +13,16 @@
# --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
+# 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
+# --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 --artifact=target/plexus-utils-*.jar --java-lib --usj-name=plexus-utils2 --no-parent
-target/plexus-utils.javadoc.pom --has-package-version --artifact=target/plexus-utils.javadoc.jar --classifier=javadoc --ignore-pom --package=libplexus-utils2-java-doc
+pom.xml --no-parent --has-package-version --java-lib --usj-name=plexus-utils2
diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules
deleted file mode 100644
index b47b61d..0000000
--- a/debian/maven.cleanIgnoreRules
+++ /dev/null
@@ -1,17 +0,0 @@
-# Maven clean ignore rules - ignore some Maven dependencies and plugins
-# during the clean phase of a Maven build
-# Format of this file is:
-# [group] [artifact] [type] [version] [classifier] [scope]
-# where each element can be either
-# - the exact string, for example org.apache for the group, or 3.1
-# for the version. In this case, the element is simply matched
-# and left as it is
-# - * (the star character, alone). In this case, anything will
-# match and be left as it is. For example, using * on the
-# position of the artifact field will match any artifact id
-# All elements much match before a rule can be applied
-# Example rule: match jar with groupid= junit, artifactid= junit
-# and version starting with 3., this dependency is then removed
-# from the POM before mvn clean is called
-# junit junit jar s/3\\..*/3.x/
-
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
index 434c573..7fdcd91 100644
--- a/debian/maven.ignoreRules
+++ b/debian/maven.ignoreRules
@@ -14,4 +14,5 @@
# from the POM
# junit junit jar s/3\\..*/3.x/
+org.apache.maven.plugins maven-enforcer-plugin * * * *
org.apache.maven.plugins maven-release-plugin * * * *
diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules
deleted file mode 100644
index 822f087..0000000
--- a/debian/maven.publishedRules
+++ /dev/null
@@ -1,19 +0,0 @@
-# Maven published rules - additional rules to publish, to help
-# the packaging work of Debian maintainers using mh_make
-# Format of this file is:
-# [group] [artifact] [type] [version] [classifier] [scope]
-# where each element can be either
-# - the exact string, for example org.apache for the group, or 3.1
-# for the version. In this case, the element is simply matched
-# and left as it is
-# - * (the star character, alone). In this case, anything will
-# match and be left as it is. For example, using * on the
-# position of the artifact field will match any artifact id
-# - a regular expression of the form s/match/replace/
-# in this case, elements that match are transformed using
-# the regex rule.
-# All elements much match before a rule can be applied
-# Example rule: match jar with groupid= junit, artifactid= junit
-# and version starting with 3., replacing the version with 3.x
-# junit junit jar s/3\\..*/3.x/
-
diff --git a/debian/maven.rules b/debian/maven.rules
index 5e18461..5293bef 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -19,3 +19,4 @@
junit junit jar s/3\..*/3.x/ * *
org.codehaus.plexus plexus-utils jar s/.*/2.x/ * *
org.codehaus.plexus plexus pom s/.*/2.x/ * *
+s/org.apache.maven.shared/org.apache.maven.plugin-testing/ maven-plugin-testing-harness * s/.*/debian/ * *
diff --git a/debian/patches/01-add-junit-dependency.patch b/debian/patches/01-add-junit-dependency.patch
new file mode 100644
index 0000000..b647561
--- /dev/null
+++ b/debian/patches/01-add-junit-dependency.patch
@@ -0,0 +1,18 @@
+Description: Add the missing tests dependencies specified in the parent pom
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/pom.xml
++++ b/pom.xml
+@@ -52,6 +52,12 @@
+ <version>1.1</version>
+ <scope>test</scope>
+ </dependency>
++ <dependency>
++ <groupId>junit</groupId>
++ <artifactId>junit</artifactId>
++ <version>3.8.2</version>
++ <scope>test</scope>
++ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..bf071b2
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-add-junit-dependency.patch
diff --git a/debian/rules b/debian/rules
index 97c8c1b..c09e3ef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,9 @@
#!/usr/bin/make -f
-DEB_SOURCE_PACKAGE := $(shell dpkg-parsechangelog | grep '^Source:' | cut -f 2 -d ' ')
-DEB_UPSTREAM_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ' | cut -d: -f2- | sed 's/-[^-]*$$//')
-
export JAVA_HOME=/usr/lib/jvm/default-java
-export CLASSPATH=$(shell for jar in `cat debian/build-classpath`; do if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; done)
-export ANT_ARGS=-Dbasedir=$(realpath .) -Dpackage=$(DEB_SOURCE_PACKAGE) -f /usr/share/maven-ant-helper/maven-build.xml
%:
- dh $@ --buildsystem=ant --with maven_repo_helper
+ dh $@ --buildsystem=maven
get-orig-source:
uscan --download-version $(DEB_UPSTREAM_VERSION) --force-download --rename
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-utils2.git
More information about the pkg-java-commits
mailing list