SAK-42401 Update Rome 1.12.1 (sakaiproject#7289)

aagrandaz · Aug 27, 2019 · acd67b1 · acd67b1
1 parent c1c110b
commit acd67b1
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 25 deletions.
diff --git a/podcasts/podcasts-impl/pom.xml b/podcasts/podcasts-impl/pom.xml
@@ -46,14 +46,14 @@
     </dependency>
 <!--		Needed to construct the actual feed -->
     <dependency>
-      <groupId>rome</groupId>
+      <groupId>com.rometools</groupId>
       <artifactId>rome</artifactId>
-      <version>1.0-sakai</version>
+      <version>1.12.1</version>
     </dependency>
     <dependency>
-      <groupId>rome</groupId>
-      <artifactId>modules</artifactId>
-      <version>0.3.2</version>
+      <groupId>com.rometools</groupId>
+      <artifactId>rome-modules</artifactId>
+      <version>1.12.1</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/...s/podcasts-impl/src/java/org/sakaiproject/component/app/podcasts/BasicPodfeedService.java b/...s/podcasts-impl/src/java/org/sakaiproject/component/app/podcasts/BasicPodfeedService.java
@@ -54,17 +54,18 @@
 import org.sakaiproject.site.api.SiteService;
 import org.sakaiproject.util.ResourceLoader;
 
-import com.sun.syndication.feed.WireFeed;
-import com.sun.syndication.feed.module.DCModuleImpl;
-import com.sun.syndication.feed.module.itunes.EntryInformation;
-import com.sun.syndication.feed.module.itunes.EntryInformationImpl;
-import com.sun.syndication.feed.rss.Channel;
-import com.sun.syndication.feed.rss.Description;
-import com.sun.syndication.feed.rss.Enclosure;
-import com.sun.syndication.feed.rss.Guid;
-import com.sun.syndication.feed.rss.Item;
-import com.sun.syndication.io.FeedException;
-import com.sun.syndication.io.WireFeedOutput;
+import com.rometools.modules.itunes.EntryInformation;
+import com.rometools.modules.itunes.EntryInformationImpl;
+import com.rometools.rome.feed.WireFeed;
+import com.rometools.rome.feed.module.DCModuleImpl;
+import com.rometools.rome.feed.rss.Channel;
+import com.rometools.rome.feed.rss.Description;
+import com.rometools.rome.feed.rss.Enclosure;
+import com.rometools.rome.feed.rss.Guid;
+import com.rometools.rome.feed.rss.Item;
+import com.rometools.rome.io.FeedException;
+import com.rometools.rome.io.WireFeedOutput;
+
 
 @Slf4j
 public class BasicPodfeedService implements PodfeedService {

diff --git a/simple-rss-portlet/pom.xml b/simple-rss-portlet/pom.xml
@@ -78,9 +78,9 @@
 		</dependency>
 
 		<dependency>
-			<groupId>rome</groupId>
+			<groupId>com.rometools</groupId>
 			<artifactId>rome</artifactId>
-			<version>1.0</version>
+			<version>1.12.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.jdom</groupId>

diff --git a/simple-rss-portlet/src/main/java/au/edu/anu/portal/portlets/rss/FeedParser.java b/simple-rss-portlet/src/main/java/au/edu/anu/portal/portlets/rss/FeedParser.java
@@ -27,15 +27,16 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 
+import com.rometools.rome.feed.synd.SyndEnclosure;
+import com.rometools.rome.feed.synd.SyndEntry;
+import com.rometools.rome.feed.synd.SyndFeed;
+import com.rometools.rome.io.FeedException;
+import com.rometools.rome.io.SyndFeedInput;
+import com.rometools.rome.io.XmlReader;
+
 import au.edu.anu.portal.portlets.rss.model.Attachment;
 import au.edu.anu.portal.portlets.rss.utils.Messages;
 
-import com.sun.syndication.feed.synd.SyndEnclosure;
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.io.FeedException;
-import com.sun.syndication.io.SyndFeedInput;
-import com.sun.syndication.io.XmlReader;
 
 /**
  * This class parses a feed via ROME

diff --git a/simple-rss-portlet/src/main/java/au/edu/anu/portal/portlets/rss/SimpleRSSPortlet.java b/simple-rss-portlet/src/main/java/au/edu/anu/portal/portlets/rss/SimpleRSSPortlet.java
@@ -34,7 +34,7 @@
 import javax.portlet.RenderResponse;
 import javax.portlet.ValidatorException;
 
-import com.sun.syndication.feed.synd.SyndFeed;
+import com.rometools.rome.feed.synd.SyndFeed;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.text.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;