[mvel] 12/13: Ignore any javadoc errors with Java 9.
Markus Koschany
apo at moszumanska.debian.org
Sat Dec 2 09:06:50 UTC 2017
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository mvel.
commit 97f284a842f3bc644f41ae98de4fb892a249a0b0
Author: Markus Koschany <apo at debian.org>
Date: Sat Dec 2 09:55:05 2017 +0100
Ignore any javadoc errors with Java 9.
Closes: #875775
Thanks: Chris West for the report.
---
debian/changelog | 2 ++
debian/patches/java9.patch | 30 ++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 33 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 27c6152..e6f9c0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ mvel (2.4.0-1) unstable; urgency=medium
* Remove --has-package-version flag.
* d/copyright: Use https for Format field.
* Refresh use_system_asm.diff.
+ * Add java9.patch and work around the FTBFS with Java 9 by ignoring doclint
+ errors. Thanks to Chris West for the report. (Closes: #875775)
-- Markus Koschany <apo at debian.org> Sat, 02 Dec 2017 00:03:58 +0100
diff --git a/debian/patches/java9.patch b/debian/patches/java9.patch
new file mode 100644
index 0000000..c88a53b
--- /dev/null
+++ b/debian/patches/java9.patch
@@ -0,0 +1,30 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sat, 2 Dec 2017 09:54:39 +0100
+Subject: java9
+
+Work around FTBFS with Java 9 by ignoring the doclint errors.
+
+Bug-Debian: https://bugs.debian.org/875775
+Forwarded: no
+---
+ pom.xml | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/pom.xml b/pom.xml
+index dbed0b0..fdb10b9 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -80,6 +80,13 @@
+ </extensions>
+
+ <plugins>
++ <plugin>
++ <groupId>org.apache.maven.plugins</groupId>
++ <artifactId>maven-javadoc-plugin</artifactId>
++ <configuration>
++ <failOnError>false</failOnError>
++ </configuration>
++ </plugin>
+ <plugin>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0</version>
diff --git a/debian/patches/series b/debian/patches/series
index dc44fc9..5677edf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
use_system_asm.diff
+java9.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/mvel.git
More information about the pkg-java-commits
mailing list