This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven-stapler-plugin.
commit 073ab072020a1acb33460feb70ce68cb6ce7945b Author: Emmanuel Bourg <[email protected]> Date: Fri Aug 8 23:50:18 2014 +0200 Fixed a Javadoc error breaking the build with Java 8u20 --- debian/changelog | 1 + debian/rules | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 44a1ef3..d92135e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ maven-stapler-plugin (1.17-1) UNRELEASED; urgency=medium * Team upload. * New upstream release + * Fixed a Javadoc error breaking the build with Java 8u20 * Removed java7-compat.patch (fixed upstream) * Ignore the Maven dependency on animal-sniffer-maven-plugin * Removed the unused rules from debian/maven.rules diff --git a/debian/rules b/debian/rules index b76c54a..9b2fc79 100755 --- a/debian/rules +++ b/debian/rules @@ -5,5 +5,11 @@ include /usr/share/cdbs/1/class/maven.mk JAVA_HOME := /usr/lib/jvm/default-java +# Hack to work around a Javadoc error with Java 8u20 +JAVA_VERSION = $(shell $(JAVA_HOME)/bin/java -version 2>&1 | sed 's/.*version "\(.*\)\.\(.*\)\..*"/\1\2/; 1q') +ifeq ($(shell [ $(JAVA_VERSION) -ge 18 ] && echo true),true) +DEB_MAVEN_ARGS = '-DadditionalJOption=-cp .' +endif + 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/maven-stapler-plugin.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
