[rome] 06/07: Fixed the build failure with Java 9 (Closes: #873308)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository rome.

commit fbd30c96cef34067678509da806e755b3d7dd7a4
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Mar 12 12:23:26 2018 +0100

    Fixed the build failure with Java 9 (Closes: #873308)
---
 debian/changelog                            |  1 +
 debian/patches/01-java9-compatibility.patch | 44 +++++++++++++++++++++++++++++
 debian/patches/series                       |  1 +
 3 files changed, 46 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e96d069..023b141 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ rome (1.0-7) UNRELEASED; urgency=medium
   * Update copyright info.
 
   [ Emmanuel Bourg ]
+  * Fixed the build failure with Java 9 (Closes: #873308)
   * Fixed the watch file
   * Standards-Version updated to 4.1.3
   * Switch to debhelper level 11
diff --git a/debian/patches/01-java9-compatibility.patch b/debian/patches/01-java9-compatibility.patch
new file mode 100644
index 0000000..e3c40d7
--- /dev/null
+++ b/debian/patches/01-java9-compatibility.patch
@@ -0,0 +1,44 @@
+Description: Fixes the build failure with Java 9
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+Bug-Debian: https://bugs.debian.org/873308
+--- a/com/sun/syndication/feed/synd/SyndEntryImpl.java
++++ b/com/sun/syndication/feed/synd/SyndEntryImpl.java
+@@ -386,7 +386,7 @@
+      * @param uri the URI of the ModuleImpl.
+      * @return The module with the given URI, <b>null</b> if none.
+      */
+-    public Module getModule(String uri) {
++    public com.sun.syndication.feed.module.Module getModule(String uri) {
+         return ModuleUtils.getModule(getModules(),uri);
+     }
+ 
+@@ -418,7 +418,7 @@
+         basePropInterfaceMap.put("description",SyndContent.class);
+         basePropInterfaceMap.put("contents",SyndContent.class);
+         basePropInterfaceMap.put("enclosures",SyndEnclosure.class);
+-        basePropInterfaceMap.put("modules",Module.class);
++        basePropInterfaceMap.put("modules",com.sun.syndication.feed.module.Module.class);
+ 
+         Map basePropClassImplMap = new HashMap();
+         basePropClassImplMap.put(SyndContent.class,SyndContentImpl.class);
+--- a/com/sun/syndication/feed/synd/SyndFeedImpl.java
++++ b/com/sun/syndication/feed/synd/SyndFeedImpl.java
+@@ -640,7 +640,7 @@
+      * @param uri the URI of the ModuleImpl.
+      * @return The module with the given URI, <b>null</b> if none.
+      */
+-    public Module getModule(String uri) {
++    public com.sun.syndication.feed.module.Module getModule(String uri) {
+         return ModuleUtils.getModule(getModules(),uri);
+     }
+ 
+@@ -676,7 +676,7 @@
+         basePropInterfaceMap.put("description",String.class);
+         basePropInterfaceMap.put("image",SyndImage.class);
+         basePropInterfaceMap.put("entries",SyndEntry.class);
+-        basePropInterfaceMap.put("modules",Module.class);
++        basePropInterfaceMap.put("modules",com.sun.syndication.feed.module.Module.class);
+ 
+         Map basePropClassImplMap = new HashMap();
+         basePropClassImplMap.put(SyndEntry.class,SyndEntryImpl.class);
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..12bc5e0
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01-java9-compatibility.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/rome.git