This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository nailgun.
commit 6ddc95352ff3d2e473b2be6409de036a3b9f68b8 Author: Emmanuel Bourg <[email protected]> Date: Fri Nov 13 08:59:48 2015 +0100 Build with maven-debian-helper to fix the build failure caused by the maven plugins upgrades. --- debian/ant.properties | 6 --- debian/changelog | 8 ++++ debian/control | 7 +-- debian/maven.ignoreRules | 4 ++ debian/nailgun.poms | 31 +++++++++++- debian/patches/adjust_maven_plugins_versions.patch | 56 ---------------------- debian/patches/remove_parent_from_main_pom.patch | 20 -------- debian/patches/series | 2 - debian/rules | 24 ++++------ 9 files changed, 52 insertions(+), 106 deletions(-) diff --git a/debian/ant.properties b/debian/ant.properties deleted file mode 100644 index c13a929..0000000 --- a/debian/ant.properties +++ /dev/null @@ -1,6 +0,0 @@ -# Ensure that source and target are 1.6 -# For backwards compat on Java 7 -# see https://lists.debian.org/debian-java/2012/12/msg00026.html -# -ant.build.javac.source=1.6 -ant.build.javac.target=1.6 diff --git a/debian/changelog b/debian/changelog index 34139bd..aca702a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +nailgun (0.9.1-3) UNRELEASED; urgency=medium + + * Team upload. + * Build with maven-debian-helper to fix the build failure caused + by the maven plugins upgrades. + + -- Emmanuel Bourg <[email protected]> Fri, 13 Nov 2015 08:33:21 +0100 + nailgun (0.9.1-2) unstable; urgency=medium * Team upload. diff --git a/debian/control b/debian/control index bb00cd7..b26e172 100644 --- a/debian/control +++ b/debian/control @@ -7,12 +7,7 @@ Uploaders: Hideki Yamane <[email protected]>, Build-Depends: debhelper (>= 9), default-jdk, - maven-debian-helper (>= 1.5), - maven-repo-helper, - default-jdk-doc, - libmaven-javadoc-plugin-java, - libmaven-source-plugin-java, - libmaven-install-plugin-java + maven-debian-helper (>= 1.5) Standards-Version: 3.9.6 Homepage: http://martiansoftware.com/nailgun/ Vcs-Git: git://anonscm.debian.org/pkg-java/nailgun.git diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..db039f7 --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1,4 @@ + +org.apache.maven.plugins maven-javadoc-plugin * * * * +org.apache.maven.plugins maven-release-plugin * * * * +org.apache.maven.plugins maven-source-plugin * * * * diff --git a/debian/nailgun.poms b/debian/nailgun.poms index f658e8d..2def87a 100644 --- a/debian/nailgun.poms +++ b/debian/nailgun.poms @@ -1 +1,30 @@ -./nailgun-server/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 +nailgun-server/pom.xml --has-package-version --java-lib +nailgun-examples/pom.xml --ignore diff --git a/debian/patches/adjust_maven_plugins_versions.patch b/debian/patches/adjust_maven_plugins_versions.patch deleted file mode 100644 index 9689057..0000000 --- a/debian/patches/adjust_maven_plugins_versions.patch +++ /dev/null @@ -1,56 +0,0 @@ -Description: Adjust maven plugins versions to what is available in Debian -Author: Miguel Landaeta <[email protected]> -Forwarded: no -Last-Update: 2015-02-12 - ---- nailgun-0.9.1.orig/pom.xml -+++ nailgun-0.9.1/pom.xml -@@ -55,7 +55,7 @@ - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> -- <version>3.0</version> -+ <version>2.5.1</version> - <configuration> - <source>1.4</source> - <target>1.4</target> -@@ -77,7 +77,7 @@ - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> -- <version>2.9</version> -+ <version>2.9.1</version> - <executions> - <execution> - <id>attach-javadocs</id> -@@ -87,6 +87,7 @@ - </execution> - </executions> - </plugin> -+ <!-- - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> -@@ -95,6 +96,7 @@ - <arguments>-Dgpg.passphrase=${gpg.passphrase}</arguments> - </configuration> - </plugin> -+ --> - </plugins> - </build> - -@@ -111,6 +113,7 @@ - </repository> - </distributionManagement> - -+ <!-- - <profiles> - <profile> - <id>release-sign-artifacts</id> -@@ -143,5 +146,6 @@ - </build> - </profile> - </profiles> -+ --> - - </project> diff --git a/debian/patches/remove_parent_from_main_pom.patch b/debian/patches/remove_parent_from_main_pom.patch deleted file mode 100644 index 910eb86..0000000 --- a/debian/patches/remove_parent_from_main_pom.patch +++ /dev/null @@ -1,20 +0,0 @@ -Description: Remove reference to parent artifact -Author: Miguel Landaeta <[email protected]> -Forwarded: no -Last-Update: 2015-02-12 - ---- nailgun-0.9.1.orig/pom.xml -+++ nailgun-0.9.1/pom.xml -@@ -2,12 +2,6 @@ - <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> - <modelVersion>4.0.0</modelVersion> - -- <parent> -- <groupId>org.sonatype.oss</groupId> -- <artifactId>oss-parent</artifactId> -- <version>7</version> -- </parent> -- - <groupId>com.martiansoftware</groupId> - <artifactId>nailgun-all</artifactId> - <version>0.9.1</version> diff --git a/debian/patches/series b/debian/patches/series index 91c3d1e..afe6f5c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,5 +1,3 @@ name_define_as_ng-nailgun_ng.c.patch Makefile_enable_hardening.patch disable_install_target.patch -remove_parent_from_main_pom.patch -adjust_maven_plugins_versions.patch diff --git a/debian/rules b/debian/rules index 74700c3..27abe7f 100755 --- a/debian/rules +++ b/debian/rules @@ -1,29 +1,23 @@ #!/usr/bin/make -f -#export DH_VERBOSE=1 + include /usr/share/dpkg/default.mk +export JAVA_HOME := /usr/lib/jvm/default-java + export DEB_BUILD_MAINT_OPTIONS := hardening=+all -export ANT="ant -propertyfile $(CURDIR)/debian/ant.properties" %: - dh $@ + dh $@ --buildsystem=maven override_dh_auto_build: - dh_auto_build + make + dh_auto_build cp $(CURDIR)/ng $(CURDIR)/ng-nailgun - mvn-debian clean install -o - -override_dh_auto_install: - dh_auto_install - mh_installjar -pnailgun --java-lib ./nailgun-server/pom.xml \ - ./nailgun-server/target/nailgun-server-$(DEB_VERSION_UPSTREAM).jar - mh_installpoms -pnailgun override_dh_auto_clean: - -dh_auto_clean - -rm $(CURDIR)/ng-nailgun - mh_clean - -find $(CURDIR) -type d -name target -exec rm -rf {} \; 2>/dev/null + dh_auto_clean + make clean + rm -f $(CURDIR)/ng-nailgun get-orig-source: uscan --force-download --rename -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/nailgun.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
