[geronimo-validation-1.0-spec] 05/07: Build with maven-debian-helper instead of javahelper
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Thu Sep 28 20:32:54 UTC 2017
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository geronimo-validation-1.0-spec.
commit 97703ab4967302b38ed69d79d6297366444c639b
Author: Emmanuel Bourg <ebourg at apache.org>
Date: Thu Sep 28 22:21:04 2017 +0200
Build with maven-debian-helper instead of javahelper
---
debian/changelog | 1 +
debian/control | 13 +++++-----
...ibgeronimo-validation-1.0-spec-java-doc.install | 1 +
...ibgeronimo-validation-1.0-spec-java-doc.javadoc | 1 -
debian/libgeronimo-validation-1.0-spec-java.poms | 28 ++++++++++++++++++++++
debian/maven.ignoreRules | 1 +
debian/patches/01-maven-bundle-extension.patch | 14 +++++++++++
debian/patches/series | 1 +
debian/rules | 13 +---------
9 files changed, 54 insertions(+), 19 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0374c2b..0dc450a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ geronimo-validation-1.0-spec (1.1-3) UNRELEASED; urgency=medium
* Update copyright info to format 1.0.
[ Emmanuel Bourg ]
+ * Build with maven-debian-helper instead of javahelper
* Standards-Version updated to 4.1.0
* Added the Homepage field
* Use XZ compression for the upstream tarball
diff --git a/debian/control b/debian/control
index 8c951e6..c1764d6 100644
--- a/debian/control
+++ b/debian/control
@@ -5,9 +5,10 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
Build-Depends:
debhelper (>= 10~),
default-jdk,
- javahelper,
libgeronimo-osgi-support-java,
- maven-repo-helper
+ libmaven-bundle-plugin-java,
+ libmaven-javadoc-plugin-java,
+ maven-debian-helper (>= 2.2)
Standards-Version: 4.1.0
Vcs-Git: https://anonscm.debian.org/git/pkg-java/geronimo-validation-1.0-spec.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/geronimo-validation-1.0-spec.git
@@ -15,8 +16,8 @@ Homepage: http://geronimo.apache.org
Package: libgeronimo-validation-1.0-spec-java
Architecture: all
-Depends: libgeronimo-osgi-support-java, ${misc:Depends}
-Suggests: libgeronimo-validation-1.0-spec-java-doc (= ${binary:Version})
+Depends: ${maven:Depends}, ${misc:Depends}
+Suggests: ${maven:OptionalDepends}, libgeronimo-validation-1.0-spec-java-doc (= ${binary:Version})
Description: Geronimo JSR-303 Bean Validation Spec API
Apache Geronimo implementation of the JSR-303 Bean Validation Spec API.
.
@@ -35,8 +36,8 @@ Description: Geronimo JSR-303 Bean Validation Spec API
Package: libgeronimo-validation-1.0-spec-java-doc
Architecture: all
Section: doc
-Depends: ${misc:Depends}
-Suggests: libgeronimo-validation-1.0-spec-java (= ${binary:Version})
+Depends: ${maven:DocDepends}, ${misc:Depends}
+Suggests: ${maven:DocOptionalDepends}, libgeronimo-validation-1.0-spec-java (= ${binary:Version})
Description: Documentation for libgeronimo-validation-1.0-spec-java
Documentation for the Apache Geronimo implementation of the JSR-303 Bean
Validation Spec API.
diff --git a/debian/libgeronimo-validation-1.0-spec-java-doc.install b/debian/libgeronimo-validation-1.0-spec-java-doc.install
new file mode 100644
index 0000000..7bb0508
--- /dev/null
+++ b/debian/libgeronimo-validation-1.0-spec-java-doc.install
@@ -0,0 +1 @@
+target/apidocs/* /usr/share/doc/libgeronimo-validation-1.0-spec-java/api/
diff --git a/debian/libgeronimo-validation-1.0-spec-java-doc.javadoc b/debian/libgeronimo-validation-1.0-spec-java-doc.javadoc
deleted file mode 100644
index ae2d3b2..0000000
--- a/debian/libgeronimo-validation-1.0-spec-java-doc.javadoc
+++ /dev/null
@@ -1 +0,0 @@
-internal /usr/share/doc/libgeronimo-validation-1.0-spec-java/api
diff --git a/debian/libgeronimo-validation-1.0-spec-java.poms b/debian/libgeronimo-validation-1.0-spec-java.poms
new file mode 100644
index 0000000..55f6b66
--- /dev/null
+++ b/debian/libgeronimo-validation-1.0-spec-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 --no-parent --java-lib --usj-name=geronimo-validation-1.0-spec
diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules
new file mode 100644
index 0000000..a08d9b3
--- /dev/null
+++ b/debian/maven.ignoreRules
@@ -0,0 +1 @@
+org.apache.maven.plugins maven-eclipse-plugin
diff --git a/debian/patches/01-maven-bundle-extension.patch b/debian/patches/01-maven-bundle-extension.patch
new file mode 100644
index 0000000..49fce29
--- /dev/null
+++ b/debian/patches/01-maven-bundle-extension.patch
@@ -0,0 +1,14 @@
+Description: Mark the maven-bundle-plugin as an extension to handle the 'bundle' packaging
+ (this parameter is defined in a parent pom not available in Debian)
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/pom.xml
++++ b/pom.xml
+@@ -80,6 +80,7 @@
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
++ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-SymbolicName>${groupId}.${artifactId};singleton=true</Bundle-SymbolicName>
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..bfe1816
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-maven-bundle-extension.patch
diff --git a/debian/rules b/debian/rules
index 8e942e7..08e4d9f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,7 @@
#!/usr/bin/make -f
-export JAVA_HOME=/usr/lib/jvm/default-java
-export CLASSPATH=/usr/share/java/geronimo-osgi-locator.jar
-
%:
- dh $@ --with javahelper
-
-override_jh_build:
- jh_build geronimo-validation.jar src/main
-
-override_dh_auto_install:
- mh_installpom -plibgeronimo-validation-1.0-spec-java pom.xml --no-parent
- mh_installjar -plibgeronimo-validation-1.0-spec-java pom.xml \
- geronimo-validation.jar /usr/share/java/geronimo-validation.jar
+ dh $@
get-orig-source:
cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/geronimo-validation-1.0-spec.git
More information about the pkg-java-commits
mailing list