You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2019/07/04 15:42:49 UTC
[activemq] branch master updated: AMQ-7216 - Update Rome dependency
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq.git
The following commit(s) were added to refs/heads/master by this push:
new f7e2d43 AMQ-7216 - Update Rome dependency
new eb885cb Merge pull request #361 from coheigea/AMQ-7216
f7e2d43 is described below
commit f7e2d438318037fcbf0e529e0f5f830541df0d08
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri May 24 11:47:09 2019 +0100
AMQ-7216 - Update Rome dependency
---
activemq-karaf/pom.xml | 1 -
activemq-osgi/pom.xml | 1 +
activemq-web/pom.xml | 8 ++------
.../apache/activemq/web/view/RssMessageRenderer.java | 17 ++++++++---------
assembly/src/main/descriptors/common-bin.xml | 5 +++--
pom.xml | 10 ++--------
6 files changed, 16 insertions(+), 26 deletions(-)
diff --git a/activemq-karaf/pom.xml b/activemq-karaf/pom.xml
index 3859da9..79fd653 100644
--- a/activemq-karaf/pom.xml
+++ b/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>
diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index 9a406f0..35ffcb1 100644
--- a/activemq-osgi/pom.xml
+++ b/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,
diff --git a/activemq-web/pom.xml b/activemq-web/pom.xml
index 30ea042..5380de8 100644
--- a/activemq-web/pom.xml
+++ b/activemq-web/pom.xml
@@ -90,16 +90,12 @@
<!-- 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>
</dependency>
@@ -182,4 +178,4 @@
</build>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
diff --git a/activemq-web/src/main/java/org/apache/activemq/web/view/RssMessageRenderer.java b/activemq-web/src/main/java/org/apache/activemq/web/view/RssMessageRenderer.java
index d677e93..21b7a2e 100644
--- a/activemq-web/src/main/java/org/apache/activemq/web/view/RssMessageRenderer.java
+++ b/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);
diff --git a/assembly/src/main/descriptors/common-bin.xml b/assembly/src/main/descriptors/common-bin.xml
index 8c707c8..d9bf1de 100644
--- a/assembly/src/main/descriptors/common-bin.xml
+++ b/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>
diff --git a/pom.xml b/pom.xml
index 54c4a9c..3749cb0 100644
--- a/pom.xml
+++ b/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,16 +1081,11 @@
<!-- 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>
<version>${mqtt-client-version}</version>