Merge pull request #361 from coheigea/AMQ-7216

[AMQ-7216] Update Rome dependency

activemq-karaf/pom.xml

@@ -33,7 +33,6 @@
   <properties>
     <xpp3-bundle-version>1.1.4c_5</xpp3-bundle-version>
     <jodatime-bundle-version>2.9</jodatime-bundle-version>
-    <jdom-bundle-version>1.1_4</jdom-bundle-version>
     <dom4j-bundle-version>1.6.1_2</dom4j-bundle-version>
     <xstream-bundle-version>1.4.8_1</xstream-bundle-version>
     <servicemix.specs.version>2.4.0</servicemix.specs.version>

activemq-osgi/pom.xml

@@ -35,6 +35,7 @@
       !org.apache.commons.daemon,
       !org.apache.maven*,
       !com.google.thirdparty.publicsuffix,
+      !com.rometools*,
       sun.misc*;resolution:=optional,
       sun.nio*;resolution:=optional,
       javax.jmdns*;resolution:=optional,

activemq-web/pom.xml

@@ -90,15 +90,11 @@
 
     <!-- Rome RSS Reader -->
     <dependency>
-      <groupId>rome</groupId>
+      <groupId>com.rometools</groupId>
       <artifactId>rome</artifactId>
     </dependency>
 
     <!-- XML -->
-    <dependency>
-      <groupId>jdom</groupId>
-      <artifactId>jdom</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.xbean</groupId>
       <artifactId>xbean-spring</artifactId>
@@ -182,4 +178,4 @@
       </build>
     </profile>
   </profiles>
-</project>
+</project>

activemq-web/src/main/java/org/apache/activemq/web/view/RssMessageRenderer.java

@@ -29,14 +29,14 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.sun.syndication.feed.synd.SyndContent;
-import com.sun.syndication.feed.synd.SyndContentImpl;
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndEntryImpl;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.feed.synd.SyndFeedImpl;
-import com.sun.syndication.io.FeedException;
-import com.sun.syndication.io.SyndFeedOutput;
+import com.rometools.rome.feed.synd.SyndContent;
+import com.rometools.rome.feed.synd.SyndContentImpl;
+import com.rometools.rome.feed.synd.SyndEntry;
+import com.rometools.rome.feed.synd.SyndEntryImpl;
+import com.rometools.rome.feed.synd.SyndFeed;
+import com.rometools.rome.feed.synd.SyndFeedImpl;
+import com.rometools.rome.io.FeedException;
+import com.rometools.rome.io.SyndFeedOutput;
 
 /**
  * This renderer uses XStream to render messages on a queue as full XML elements
@@ -53,7 +53,6 @@ public class RssMessageRenderer extends SimpleMessageRenderer {
 
     public void renderMessage(PrintWriter writer, HttpServletRequest request, HttpServletResponse response, QueueBrowser browser, Message message) throws JMSException {
         SyndFeed feed = getFeed(browser, request);
-
         List<SyndEntry> entries = feed.getEntries();
         SyndEntry entry = createEntry(browser, message, request);
         SyndContent description = createEntryContent(browser, message, request);

assembly/src/main/descriptors/common-bin.xml

@@ -283,8 +283,9 @@
         <include>org.eclipse.jetty.orbit:org.eclipse.jdt.core</include>
 
         <!-- Atom/RSS support -->
-        <include>rome:rome</include>
-        <include>jdom:jdom</include>
+        <include>com.rometools:rome</include>
+        <include>com.rometools:rome-utils</include>
+        <include>org.jdom:jdom2</include>
 
         <!-- REST API -->
         <include>org.jolokia:jolokia-core</include>

pom.xml

@@ -75,7 +75,6 @@
     <jackson-version>2.9.8</jackson-version>
     <jasypt-version>1.9.2</jasypt-version>
     <jaxb-bundle-version>2.2.11_1</jaxb-bundle-version>
-    <jdom-version>1.0</jdom-version>
     <jetty9-version>9.2.26.v20180806</jetty9-version>
     <jetty-version>${jetty9-version}</jetty-version>
     <jmdns-version>3.4.1</jmdns-version>
@@ -110,7 +109,7 @@
     <qpid-jms-proton-version>0.33.1</qpid-jms-proton-version>
     <netty-all-version>4.1.36.Final</netty-all-version>
     <regexp-version>1.3</regexp-version>
-    <rome-version>1.0</rome-version>
+    <rome-version>1.12.0</rome-version>
     <saxon-version>9.5.1-5</saxon-version>
     <saxon-bundle-version>9.5.1-5_1</saxon-bundle-version>
     <scala-plugin-version>3.1.0</scala-plugin-version>
@@ -1082,15 +1081,10 @@
 
       <!-- ACTIVEMQ-WEB Specific Dependencies -->
       <dependency>
-        <groupId>rome</groupId>
+        <groupId>com.rometools</groupId>
         <artifactId>rome</artifactId>
         <version>${rome-version}</version>
       </dependency>
-      <dependency>
-        <groupId>jdom</groupId>
-        <artifactId>jdom</artifactId>
-        <version>${jdom-version}</version>
-      </dependency>
       <dependency>
         <groupId>org.fusesource.mqtt-client</groupId>
         <artifactId>mqtt-client</artifactId>