[jboss-xnio] 01/04: Add java9.patch and fix FTBFS with Java 9.
Markus Koschany
apo at moszumanska.debian.org
Sun Mar 25 17:24:53 BST 2018
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository jboss-xnio.
commit 6322f4b9f51fdd6cb42124b5aa39dfe211c7fe4f
Author: Markus Koschany <apo at debian.org>
Date: Mon Mar 19 11:10:01 2018 +0100
Add java9.patch and fix FTBFS with Java 9.
Closes: #893359
---
debian/patches/java9.patch | 23 +++++++++++++++++++++++
debian/patches/maven-bundle-plugin-rules.patch | 12 ++++++++++--
debian/patches/series | 1 +
3 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/debian/patches/java9.patch b/debian/patches/java9.patch
new file mode 100644
index 0000000..470146f
--- /dev/null
+++ b/debian/patches/java9.patch
@@ -0,0 +1,23 @@
+From: Markus Koschany <apo at debian.org>
+Date: Mon, 19 Mar 2018 11:09:53 +0100
+Subject: java9
+
+---
+ api/pom.xml | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/api/pom.xml b/api/pom.xml
+index 43377f1..8a3d730 100644
+--- a/api/pom.xml
++++ b/api/pom.xml
+@@ -181,6 +181,10 @@
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <configuration>
+ <additionalparam>-Xdoclint:none</additionalparam>
++ <additionalparam>-Xdoclint:none</additionalparam>
++ <compilerArgs>
++ <arg>--add-modules</arg><arg>java.xml.ws.annotation</arg>
++ </compilerArgs>
+ <doctitle><![CDATA[XNIO API ]]>${project.version}</doctitle>
+ <header><![CDATA[XNIO API ]]>${project.version}</header>
+ <footer><![CDATA[XNIO API ]]>${project.version}</footer>
diff --git a/debian/patches/maven-bundle-plugin-rules.patch b/debian/patches/maven-bundle-plugin-rules.patch
index e6c1edd..2fa7c0f 100644
--- a/debian/patches/maven-bundle-plugin-rules.patch
+++ b/debian/patches/maven-bundle-plugin-rules.patch
@@ -1,6 +1,14 @@
-Description: Fix the rules in Maven Bundle Plugin
-Author: Kai-Chung Yan (殷啟聰) <seamlikok at gmail.com>
+From: =?utf-8?b?IkthaS1DaHVuZyBZYW4gKOaut+WVn+iBsCki?= <seamlikok at gmail.com>
+Date: Mon, 19 Mar 2018 11:08:23 +0100
+Subject: Fix the rules in Maven Bundle Plugin
+
Bug: https://issues.jboss.org/browse/XNIO-321
+---
+ api/pom.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/api/pom.xml b/api/pom.xml
+index 05e49c6..43377f1 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -207,7 +207,7 @@
diff --git a/debian/patches/series b/debian/patches/series
index 97ce5e6..84684d5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
maven-bundle-plugin-rules.patch
+java9.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jboss-xnio.git
More information about the pkg-java-commits
mailing list