[libjackson-json-java] 03/07: Fix FTBFS with Java 9.
Markus Koschany
apo at moszumanska.debian.org
Fri Mar 30 17:33:37 BST 2018
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository libjackson-json-java.
commit 58c3f70a6ea3be9f51666575ffebeb57919b4b60
Author: Markus Koschany <apo at debian.org>
Date: Fri Mar 30 18:16:07 2018 +0200
Fix FTBFS with Java 9.
Closes: #893239
---
debian/patches/java9.patch | 28 ++++++++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 29 insertions(+)
diff --git a/debian/patches/java9.patch b/debian/patches/java9.patch
new file mode 100644
index 0000000..8404004
--- /dev/null
+++ b/debian/patches/java9.patch
@@ -0,0 +1,28 @@
+From: Markus Koschany <apo at debian.org>
+Date: Fri, 30 Mar 2018 18:15:54 +0200
+Subject: java9
+
+Don't use wildcards to avoid an ambigious reference to java.lang.Module.
+
+Bug-Debian: https://bugs.debian.org/893239
+Forwarded: no
+---
+ src/mapper/java/org/codehaus/jackson/map/module/SimpleModule.java | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/mapper/java/org/codehaus/jackson/map/module/SimpleModule.java b/src/mapper/java/org/codehaus/jackson/map/module/SimpleModule.java
+index c36d0a8..39936c2 100644
+--- a/src/mapper/java/org/codehaus/jackson/map/module/SimpleModule.java
++++ b/src/mapper/java/org/codehaus/jackson/map/module/SimpleModule.java
+@@ -4,7 +4,10 @@ import java.util.HashMap;
+ import java.util.Map;
+
+ import org.codehaus.jackson.Version;
+-import org.codehaus.jackson.map.*;
++import org.codehaus.jackson.map.Module;
++import org.codehaus.jackson.map.JsonDeserializer;
++import org.codehaus.jackson.map.JsonSerializer;
++import org.codehaus.jackson.map.KeyDeserializer;
+ import org.codehaus.jackson.map.deser.ValueInstantiator;
+
+ /**
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4d2c86f
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+java9.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjackson-json-java.git
More information about the pkg-java-commits
mailing list