Commit a927145a authored by Emmanuel Bourg's avatar Emmanuel Bourg

Depend on librome-java (>= 1.6)

parent 930badd2
libspring-java (4.3.21-3) UNRELEASED; urgency=medium
* Team upload.
* Depend on librome-java (>= 1.6)
-- Emmanuel Bourg <ebourg@apache.org> Tue, 22 Jan 2019 19:39:02 +0100
libspring-java (4.3.21-2) unstable; urgency=medium
* Team upload.
......
......@@ -74,7 +74,7 @@ Build-Depends-Indep: bsh,
libprotobuf-java-format-java (>= 1.3),
libquartz2-java,
libreactor-core-java (>= 2.0.8),
librome-java,
librome-java (>= 1.6),
libservlet3.1-java,
libtaglibs-standard-jstlel-java,
libtiles-java (>= 3.0),
......
......@@ -32,5 +32,4 @@ s/velocity/org.apache.velocity/ velocity * s/.*/debian/ * *
org.apache.jdo parent-pom * * * *
org.yaml snakeyaml * s/.*/1.x/ * *
net.sf.ehcache s/ehcache/ehcache-core/ * s/.*/debian/ * *
s/com.rometools/rome/ rome * s/.*/debian/ * *
org.quartz-scheduler quartz * s/.*/2.x/ * *
Description: Use the older ROME API available in Debian
Author: Emmanuel Bourg <ebourg@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;
import org.springframework.http.MediaType;
......@@ -6,7 +6,6 @@
0035-ignore-asciidoctor-plugin.patch
0036-ignore-compilation-warnings.patch
0037-ignore-sonar-plugin.patch
0038-rome-compatibility.patch
0039-openjpa-compatibility.patch
0040-ignore-json-assert.patch
0041-servlet-api-compatibility.patch
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment