diff --git a/podcasts/podcasts-impl/pom.xml b/podcasts/podcasts-impl/pom.xml index c213ba50a6cf..e882f4834a10 100644 --- a/podcasts/podcasts-impl/pom.xml +++ b/podcasts/podcasts-impl/pom.xml @@ -46,14 +46,14 @@ - rome + com.rometools rome - 1.0-sakai + 1.12.1 - rome - modules - 0.3.2 + com.rometools + rome-modules + 1.12.1 diff --git a/podcasts/podcasts-impl/src/java/org/sakaiproject/component/app/podcasts/BasicPodfeedService.java b/podcasts/podcasts-impl/src/java/org/sakaiproject/component/app/podcasts/BasicPodfeedService.java index bedd1d9e57eb..4a8d99e5e990 100644 --- a/podcasts/podcasts-impl/src/java/org/sakaiproject/component/app/podcasts/BasicPodfeedService.java +++ b/podcasts/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 index 22efe5486091..a2c0f3edd4a1 100644 --- a/simple-rss-portlet/pom.xml +++ b/simple-rss-portlet/pom.xml @@ -78,9 +78,9 @@ - rome + com.rometools rome - 1.0 + 1.12.1 org.jdom 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 index 4d359dc9d641..231ea3513ec1 100644 --- 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 index efa80c334ba8..f0f0ce0a39b7 100644 --- 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;