[libspring-java] 07/18: Patched Spring MVC to use the older Rome API in Debian

[Emmanuel Bourg]

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

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

commit 0f967689edff95818e7d7efa169224176a427737
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri May 27 00:04:12 2016 +0200

    Patched Spring MVC to use the older Rome API in Debian
---
 debian/changelog                             |  1 +
 debian/maven.rules                           |  1 +
 debian/patches/0038-rome-compatibility.patch | 81 ++++++++++++++++++++++++++++
 debian/patches/series                        |  1 +
 4 files changed, 84 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index fa7b777..67bfb89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ libspring-java (4.1.9-1) UNRELEASED; urgency=medium
     - Updated the Maven poms
     - New binary package for the spring-messaging module
     - Switch Spring MVC to Tiles 3 only and drop Tiles 2 support
+    - Patched Spring MVC to use the older Rome API in Debian
 
  -- Emmanuel Bourg <ebourg at apache.org>  Sun, 03 Apr 2016 01:12:35 +0200
 
diff --git a/debian/maven.rules b/debian/maven.rules
index 068dad8..9496c66 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -33,3 +33,4 @@ s/velocity/org.apache.velocity/ velocity * s/.*/debian/ * *
 
 s/org.apache.taglibs/taglibs/ s/taglibs-standard-jstlel/standard/ * s/.*/debian/ * *
 org.apache.jdo parent-pom * * * *
+s/com.rometools/rome/ rome * s/.*/debian/ * *
diff --git a/debian/patches/0038-rome-compatibility.patch b/debian/patches/0038-rome-compatibility.patch
new file mode 100644
index 0000000..8023180
--- /dev/null
+++ b/debian/patches/0038-rome-compatibility.patch
@@ -0,0 +1,81 @@
+Description: Use the older ROME API available in Debian
+Author: Emmanuel Bourg <ebourg at apache.org>
+Forwarded: not-needed
+--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractAtomFeedView.java
++++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractAtomFeedView.java
+@@ -21,8 +21,8 @@
+ import javax.servlet.http.HttpServletRequest;
+ import javax.servlet.http.HttpServletResponse;
+ 
+-import com.rometools.rome.feed.atom.Entry;
+-import com.rometools.rome.feed.atom.Feed;
++import com.sun.syndication.feed.atom.Entry;
++import com.sun.syndication.feed.atom.Feed;
+ 
+ /**
+  * Abstract superclass for Atom Feed views, using the
+--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractFeedView.java
++++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractFeedView.java
+@@ -22,8 +22,8 @@
+ import javax.servlet.http.HttpServletRequest;
+ import javax.servlet.http.HttpServletResponse;
+ 
+-import com.rometools.rome.feed.WireFeed;
+-import com.rometools.rome.io.WireFeedOutput;
++import com.sun.syndication.feed.WireFeed;
++import com.sun.syndication.io.WireFeedOutput;
+ 
+ import org.springframework.util.StringUtils;
+ import org.springframework.web.servlet.view.AbstractView;
+--- a/spring-web/src/main/java/org/springframework/http/converter/feed/AbstractWireFeedHttpMessageConverter.java
++++ b/spring-web/src/main/java/org/springframework/http/converter/feed/AbstractWireFeedHttpMessageConverter.java
+@@ -23,10 +23,10 @@
+ import java.io.Writer;
+ import java.nio.charset.Charset;
+ 
+-import com.rometools.rome.feed.WireFeed;
+-import com.rometools.rome.io.FeedException;
+-import com.rometools.rome.io.WireFeedInput;
+-import com.rometools.rome.io.WireFeedOutput;
++import com.sun.syndication.feed.WireFeed;
++import com.sun.syndication.io.FeedException;
++import com.sun.syndication.io.WireFeedInput;
++import com.sun.syndication.io.WireFeedOutput;
+ 
+ import org.springframework.http.HttpInputMessage;
+ import org.springframework.http.HttpOutputMessage;
+--- a/spring-web/src/main/java/org/springframework/http/converter/feed/AtomFeedHttpMessageConverter.java
++++ b/spring-web/src/main/java/org/springframework/http/converter/feed/AtomFeedHttpMessageConverter.java
+@@ -16,7 +16,7 @@
+ 
+ package org.springframework.http.converter.feed;
+ 
+-import com.rometools.rome.feed.atom.Feed;
++import com.sun.syndication.feed.atom.Feed;
+ 
+ import org.springframework.http.MediaType;
+ 
+--- a/spring-web/src/main/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverter.java
++++ b/spring-web/src/main/java/org/springframework/http/converter/feed/RssChannelHttpMessageConverter.java
+@@ -16,7 +16,7 @@
+ 
+ package org.springframework.http.converter.feed;
+ 
+-import com.rometools.rome.feed.rss.Channel;
++import com.sun.syndication.feed.rss.Channel;
+ 
+ import org.springframework.http.MediaType;
+ 
+--- a/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractRssFeedView.java
++++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/view/feed/AbstractRssFeedView.java
+@@ -21,8 +21,8 @@
+ import javax.servlet.http.HttpServletRequest;
+ import javax.servlet.http.HttpServletResponse;
+ 
+-import com.rometools.rome.feed.rss.Channel;
+-import com.rometools.rome.feed.rss.Item;
++import com.sun.syndication.feed.rss.Channel;
++import com.sun.syndication.feed.rss.Item;
+ 
+ /**
+  * Abstract superclass for RSS Feed views, using the
diff --git a/debian/patches/series b/debian/patches/series
index dd8d317..c80252f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 0035-ignore-asciidoctor-plugin.patch
 0036-ignore-compilation-warnings.patch
 0037-ignore-sonar-plugin.patch
+0038-rome-compatibility.patch

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