You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by co...@apache.org on 2019/06/07 09:25:54 UTC
[camel] branch camel-2.x updated (76dbb1b -> 41e0d78)
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a change to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 76dbb1b Camel-google-sheets: Fixed test options naming
new 49d8f11 Updating Rome dependency
new 41e0d78 Fixing up camel-jxpath in Karaf
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
components/camel-rss/pom.xml | 2 +-
.../camel/component/rss/AggregateRssFeedStrategy.java | 19 ++++++++++---------
.../apache/camel/component/rss/RssDateComparator.java | 6 +++---
.../org/apache/camel/component/rss/RssEndpoint.java | 14 ++++++++------
.../camel/component/rss/RssEntryPollingConsumer.java | 3 ++-
.../java/org/apache/camel/component/rss/RssUtils.java | 7 ++++---
.../apache/camel/component/rss/UpdatedDateFilter.java | 3 ++-
.../org/apache/camel/dataformat/rss/RssConverter.java | 15 ++++++++-------
.../apache/camel/dataformat/rss/RssDataFormat.java | 3 ++-
.../apache/camel/component/rss/JettyTestServer.java | 3 ++-
.../rss/RssEntryPollingConsumerWithFilterTest.java | 7 ++++---
.../apache/camel/component/rss/RssEntrySortTest.java | 7 ++++---
.../org/apache/camel/component/rss/RssFilterTest.java | 9 +++++----
.../camel/component/rss/RssPollingConsumerTest.java | 3 ++-
.../camel/component/rss/UpdatedDateFilterTest.java | 7 ++++---
.../apache/camel/dataformat/rss/RssConverterTest.java | 3 ++-
.../camel/dataformat/rss/RssDataFormatTest.java | 7 ++++---
parent/pom.xml | 10 ++--------
.../karaf/features/src/main/resources/features.xml | 10 +++-------
.../camel-spring-boot-dependencies/pom.xml | 5 -----
20 files changed, 72 insertions(+), 71 deletions(-)
Re: [camel] branch camel-2.x updated (76dbb1b -> 41e0d78)
Posted by Andrea Cosentino <an...@gmail.com>.
Please fix the codestyle.
Il giorno ven 7 giu 2019 alle ore 11:25 <co...@apache.org> ha scritto:
> This is an automated email from the ASF dual-hosted git repository.
>
> coheigea pushed a change to branch camel-2.x
> in repository https://gitbox.apache.org/repos/asf/camel.git.
>
>
> from 76dbb1b Camel-google-sheets: Fixed test options naming
> new 49d8f11 Updating Rome dependency
> new 41e0d78 Fixing up camel-jxpath in Karaf
>
> The 2 revisions listed above as "new" are entirely new to this
> repository and will be described in separate emails. The revisions
> listed as "add" were already present in the repository and have only
> been added to this reference.
>
>
> Summary of changes:
> components/camel-rss/pom.xml | 2 +-
> .../camel/component/rss/AggregateRssFeedStrategy.java | 19
> ++++++++++---------
> .../apache/camel/component/rss/RssDateComparator.java | 6 +++---
> .../org/apache/camel/component/rss/RssEndpoint.java | 14 ++++++++------
> .../camel/component/rss/RssEntryPollingConsumer.java | 3 ++-
> .../java/org/apache/camel/component/rss/RssUtils.java | 7 ++++---
> .../apache/camel/component/rss/UpdatedDateFilter.java | 3 ++-
> .../org/apache/camel/dataformat/rss/RssConverter.java | 15 ++++++++-------
> .../apache/camel/dataformat/rss/RssDataFormat.java | 3 ++-
> .../apache/camel/component/rss/JettyTestServer.java | 3 ++-
> .../rss/RssEntryPollingConsumerWithFilterTest.java | 7 ++++---
> .../apache/camel/component/rss/RssEntrySortTest.java | 7 ++++---
> .../org/apache/camel/component/rss/RssFilterTest.java | 9 +++++----
> .../camel/component/rss/RssPollingConsumerTest.java | 3 ++-
> .../camel/component/rss/UpdatedDateFilterTest.java | 7 ++++---
> .../apache/camel/dataformat/rss/RssConverterTest.java | 3 ++-
> .../camel/dataformat/rss/RssDataFormatTest.java | 7 ++++---
> parent/pom.xml | 10 ++--------
> .../karaf/features/src/main/resources/features.xml | 10 +++-------
> .../camel-spring-boot-dependencies/pom.xml | 5 -----
> 20 files changed, 72 insertions(+), 71 deletions(-)
>
>
[camel] 02/02: Fixing up camel-jxpath in Karaf
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 41e0d78cfab152da47a57a0d2173fc0f261e0772
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Fri Jun 7 10:25:34 2019 +0100
Fixing up camel-jxpath in Karaf
---
parent/pom.xml | 3 ++-
platforms/karaf/features/src/main/resources/features.xml | 8 ++------
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/parent/pom.xml b/parent/pom.xml
index 27394d9..ea5ae9a 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -376,7 +376,8 @@
<jclouds-google-guava-version-range>[18.0,19.0)</jclouds-google-guava-version-range>
<jcommander-version>1.72</jcommander-version>
<jcr-version>2.0</jcr-version>
- <jdom-bundle-version>2.0.6_1</jdom-bundle-version>
+ <jdom-bundle-version>1.1_4</jdom-bundle-version>
+ <jdom2-bundle-version>2.0.6_1</jdom2-bundle-version>
<jedis-client-version>2.9.0</jedis-client-version>
<jedis-client-bundle-version>2.9.0_1</jedis-client-bundle-version>
<jersey-version>2.11</jersey-version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index 4a4bb5b..d329917 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -314,8 +314,6 @@
<feature version='${project.version}'>camel-core</feature>
<feature>transaction</feature>
<bundle dependency='true'>mvn:net.sf.ehcache/ehcache/${ehcache-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
- <bundle>mvn:org.apache.camel/camel-cache/${project.version}</bundle>
</feature>
<feature name='camel-caffeine' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version="${project.version}">camel-core</feature>
@@ -951,8 +949,6 @@
<bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
<bundle dependency='true'>mvn:commons-configuration/commons-configuration/${commons-configuration-version}</bundle>
<bundle dependency='true'>mvn:commons-digester/commons-digester/${commons-digester-version}</bundle>
- <bundle dependency='true'>mvn:commons-jxpath/commons-jxpath/${commons-jxpath-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
<bundle dependency='true'>mvn:commons-lang/commons-lang/${commons-lang-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.ant/${ant-bundle-version}</bundle>
<bundle dependency='true'>mvn:commons-configuration/commons-configuration/${commons-configuration-version}</bundle>
@@ -1292,7 +1288,6 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.bcel/${bcel-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.xpp3/${xpp3-bundle-version}</bundle>
<bundle dependency='true'>mvn:joda-time/joda-time/${jodatime2-bundle-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/${dom4j-bundle-version}</bundle>
</feature>
<feature name='camel-jing' version='${project.version}' resolver='(obr)' start-level='50'>
@@ -1399,6 +1394,7 @@
<bundle dependency='true'>mvn:commons-collections/commons-collections/${commons-collections-version}</bundle>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
<bundle dependency='true'>mvn:commons-jxpath/commons-jxpath/${commons-jxpath-version}</bundle>
+ <bundle dependency='true'>mvn:commons-jxpath/commons-jxpath/${commons-jxpath-version}</bundle>
<bundle>mvn:org.apache.camel/camel-jxpath/${project.version}</bundle>
</feature>
<feature name='camel-kafka' version='${project.version}' resolver='(obr)' start-level='50'>
@@ -2002,7 +1998,7 @@
</feature>
<feature name='camel-rss' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-atom</feature>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
+ <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom2-bundle-version}</bundle>
<bundle dependency="true">mvn:com.rometools/rome/${rome-version}</bundle>
<bundle>mvn:org.apache.camel/camel-rss/${project.version}</bundle>
</feature>
[camel] 01/02: Updating Rome dependency
Posted by co...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
coheigea pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 49d8f11f09ef07acc670bb4bb83732c78ec2d3fd
Author: Colm O hEigeartaigh <co...@apache.org>
AuthorDate: Thu Jun 6 12:49:10 2019 +0100
Updating Rome dependency
---
components/camel-rss/pom.xml | 2 +-
.../camel/component/rss/AggregateRssFeedStrategy.java | 19 ++++++++++---------
.../apache/camel/component/rss/RssDateComparator.java | 6 +++---
.../org/apache/camel/component/rss/RssEndpoint.java | 14 ++++++++------
.../camel/component/rss/RssEntryPollingConsumer.java | 3 ++-
.../java/org/apache/camel/component/rss/RssUtils.java | 7 ++++---
.../apache/camel/component/rss/UpdatedDateFilter.java | 3 ++-
.../org/apache/camel/dataformat/rss/RssConverter.java | 15 ++++++++-------
.../apache/camel/dataformat/rss/RssDataFormat.java | 3 ++-
.../apache/camel/component/rss/JettyTestServer.java | 3 ++-
.../rss/RssEntryPollingConsumerWithFilterTest.java | 7 ++++---
.../apache/camel/component/rss/RssEntrySortTest.java | 7 ++++---
.../org/apache/camel/component/rss/RssFilterTest.java | 9 +++++----
.../camel/component/rss/RssPollingConsumerTest.java | 3 ++-
.../camel/component/rss/UpdatedDateFilterTest.java | 7 ++++---
.../apache/camel/dataformat/rss/RssConverterTest.java | 3 ++-
.../camel/dataformat/rss/RssDataFormatTest.java | 7 ++++---
parent/pom.xml | 11 ++---------
.../karaf/features/src/main/resources/features.xml | 2 +-
.../camel-spring-boot-dependencies/pom.xml | 5 -----
20 files changed, 70 insertions(+), 66 deletions(-)
diff --git a/components/camel-rss/pom.xml b/components/camel-rss/pom.xml
index 21b4886..711f3f3 100644
--- a/components/camel-rss/pom.xml
+++ b/components/camel-rss/pom.xml
@@ -55,7 +55,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>rome</groupId>
+ <groupId>com.rometools</groupId>
<artifactId>rome</artifactId>
<version>${rome-version}</version>
</dependency>
diff --git a/components/camel-rss/src/main/java/org/apache/camel/component/rss/AggregateRssFeedStrategy.java b/components/camel-rss/src/main/java/org/apache/camel/component/rss/AggregateRssFeedStrategy.java
index b0afb74..693d01f 100644
--- a/components/camel-rss/src/main/java/org/apache/camel/component/rss/AggregateRssFeedStrategy.java
+++ b/components/camel-rss/src/main/java/org/apache/camel/component/rss/AggregateRssFeedStrategy.java
@@ -19,30 +19,31 @@ package org.apache.camel.component.rss;
import java.util.ArrayList;
import java.util.List;
-import com.sun.syndication.feed.synd.SyndEntryImpl;
-import com.sun.syndication.feed.synd.SyndFeed;
import org.apache.camel.Exchange;
import org.apache.camel.processor.aggregate.AggregationStrategy;
import org.apache.camel.util.CastUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.rometools.rome.feed.synd.SyndEntry;
+import com.rometools.rome.feed.synd.SyndFeed;
+
public class AggregateRssFeedStrategy implements AggregationStrategy {
- protected final Logger log = LoggerFactory.getLogger(AggregateRssFeedStrategy.class);
-
+ protected final Logger log = LoggerFactory.getLogger(AggregateRssFeedStrategy.class);
+
public Exchange aggregate(Exchange oldExchange, Exchange newExchange) {
if (oldExchange == null) {
return newExchange;
}
SyndFeed oldFeed = oldExchange.getIn().getBody(SyndFeed.class);
SyndFeed newFeed = newExchange.getIn().getBody(SyndFeed.class);
- if (oldFeed != null && newFeed != null) {
- List<SyndEntryImpl> oldEntries = CastUtils.cast(oldFeed.getEntries());
- List<SyndEntryImpl> newEntries = CastUtils.cast(newFeed.getEntries());
- List<SyndEntryImpl> mergedList = new ArrayList<>(oldEntries.size() + newEntries.size());
+ if (oldFeed != null && newFeed != null) {
+ List<SyndEntry> oldEntries = CastUtils.cast(oldFeed.getEntries());
+ List<SyndEntry> newEntries = CastUtils.cast(newFeed.getEntries());
+ List<SyndEntry> mergedList = new ArrayList<>(oldEntries.size() + newEntries.size());
mergedList.addAll(oldEntries);
mergedList.addAll(newEntries);
- oldFeed.setEntries(mergedList);
+ oldFeed.setEntries(mergedList);
} else {
log.debug("Could not merge exchanges. One body was null.");
}
diff --git a/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssDateComparator.java b/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssDateComparator.java
index 48e887e..876b3c8 100644
--- a/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssDateComparator.java
+++ b/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssDateComparator.java
@@ -19,7 +19,7 @@ package org.apache.camel.component.rss;
import java.util.Comparator;
import java.util.Date;
-import com.sun.syndication.feed.synd.SyndEntry;
+import com.rometools.rome.feed.synd.SyndEntry;
public class RssDateComparator implements Comparator<SyndEntry> {
@@ -37,7 +37,7 @@ public class RssDateComparator implements Comparator<SyndEntry> {
Date date = entry.getUpdatedDate();
if (date == null) {
date = entry.getPublishedDate();
- }
+ }
return date;
- }
+ }
}
diff --git a/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssEndpoint.java b/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssEndpoint.java
index 3d159b1..d90127c 100644
--- a/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssEndpoint.java
+++ b/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssEndpoint.java
@@ -19,7 +19,6 @@ package org.apache.camel.component.rss;
import java.util.Arrays;
import java.util.Date;
-import com.sun.syndication.feed.synd.SyndFeed;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.Producer;
@@ -30,6 +29,9 @@ import org.apache.camel.spi.UriEndpoint;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.rometools.rome.feed.synd.SyndEntry;
+import com.rometools.rome.feed.synd.SyndFeed;
+
/**
* The rss component is used for consuming RSS feeds.
*/
@@ -44,7 +46,7 @@ public class RssEndpoint extends FeedEndpoint {
public RssEndpoint(String endpointUri, FeedComponent component, String feedUri) {
super(endpointUri, component, feedUri);
}
-
+
@Override
public Producer createProducer() throws Exception {
throw new UnsupportedOperationException("RssProducer is not implemented");
@@ -63,11 +65,11 @@ public class RssEndpoint extends FeedEndpoint {
SyndFeed newFeed;
try {
newFeed = (SyndFeed)((SyndFeed) feed).clone();
- newFeed.setEntries(Arrays.asList(entry));
+ newFeed.setEntries(Arrays.asList((SyndEntry)entry));
} catch (CloneNotSupportedException e) {
LOG.debug("Could not create a new feed. This exception will be ignored.", e);
newFeed = null;
- }
+ }
exchange.getIn().setBody(newFeed);
return exchange;
}
@@ -78,8 +80,8 @@ public class RssEndpoint extends FeedEndpoint {
RssEntryPollingConsumer answer = new RssEntryPollingConsumer(this, processor, filter, lastUpdate, throttleEntries);
configureConsumer(answer);
return answer;
- }
-
+ }
+
@Override
protected FeedPollingConsumer createPollingConsumer(FeedEndpoint feedEndpoint, Processor processor) throws Exception {
RssPollingConsumer answer = new RssPollingConsumer(this, processor);
diff --git a/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssEntryPollingConsumer.java b/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssEntryPollingConsumer.java
index 4136e01..38eae76 100644
--- a/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssEntryPollingConsumer.java
+++ b/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssEntryPollingConsumer.java
@@ -19,12 +19,13 @@ package org.apache.camel.component.rss;
import java.util.Collections;
import java.util.Date;
-import com.sun.syndication.feed.synd.SyndFeed;
import org.apache.camel.Processor;
import org.apache.camel.component.feed.EntryFilter;
import org.apache.camel.component.feed.FeedEntryPollingConsumer;
import org.apache.camel.util.ObjectHelper;
+import com.rometools.rome.feed.synd.SyndFeed;
+
/**
* Consumer to poll RSS feeds and return each entry from the feed step by step.
*/
diff --git a/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssUtils.java b/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssUtils.java
index 8744565..70764fc 100644
--- a/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssUtils.java
+++ b/components/camel-rss/src/main/java/org/apache/camel/component/rss/RssUtils.java
@@ -20,11 +20,12 @@ import java.io.InputStream;
import java.net.HttpURLConnection;
import java.net.URL;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.io.SyndFeedInput;
-import com.sun.syndication.io.XmlReader;
import org.apache.commons.codec.binary.Base64;
+import com.rometools.rome.feed.synd.SyndFeed;
+import com.rometools.rome.io.SyndFeedInput;
+import com.rometools.rome.io.XmlReader;
+
public final class RssUtils {
private RssUtils() {
diff --git a/components/camel-rss/src/main/java/org/apache/camel/component/rss/UpdatedDateFilter.java b/components/camel-rss/src/main/java/org/apache/camel/component/rss/UpdatedDateFilter.java
index 95079ca..06bd4fa 100644
--- a/components/camel-rss/src/main/java/org/apache/camel/component/rss/UpdatedDateFilter.java
+++ b/components/camel-rss/src/main/java/org/apache/camel/component/rss/UpdatedDateFilter.java
@@ -19,13 +19,14 @@ package org.apache.camel.component.rss;
import java.util.Date;
import java.util.Map;
-import com.sun.syndication.feed.synd.SyndEntry;
import org.apache.camel.component.feed.EntryFilter;
import org.apache.camel.component.feed.FeedEndpoint;
import org.apache.camel.util.LRUCacheFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.rometools.rome.feed.synd.SyndEntry;
+
/**
* Filters out all entries which occur before the last time of the entry we saw
* (assuming entries arrive sorted in order).
diff --git a/components/camel-rss/src/main/java/org/apache/camel/dataformat/rss/RssConverter.java b/components/camel-rss/src/main/java/org/apache/camel/dataformat/rss/RssConverter.java
index 7fada8d..9c9934e 100644
--- a/components/camel-rss/src/main/java/org/apache/camel/dataformat/rss/RssConverter.java
+++ b/components/camel-rss/src/main/java/org/apache/camel/dataformat/rss/RssConverter.java
@@ -18,23 +18,24 @@ package org.apache.camel.dataformat.rss;
import java.io.StringReader;
-import com.sun.syndication.feed.synd.SyndFeed;
-import com.sun.syndication.io.FeedException;
-import com.sun.syndication.io.SyndFeedInput;
-import com.sun.syndication.io.SyndFeedOutput;
+import com.rometools.rome.feed.synd.SyndFeed;
+import com.rometools.rome.io.FeedException;
+import com.rometools.rome.io.SyndFeedInput;
+import com.rometools.rome.io.SyndFeedOutput;
+
import org.apache.camel.Converter;
@Converter
public final class RssConverter {
private RssConverter() {
}
-
+
@Converter
public static String feedToXml(SyndFeed feed) throws FeedException {
SyndFeedOutput out = new SyndFeedOutput();
return out.outputString(feed);
- }
-
+ }
+
@Converter
public static SyndFeed xmlToFeed(String xml) throws FeedException {
SyndFeedInput input = new SyndFeedInput();
diff --git a/components/camel-rss/src/main/java/org/apache/camel/dataformat/rss/RssDataFormat.java b/components/camel-rss/src/main/java/org/apache/camel/dataformat/rss/RssDataFormat.java
index 8808d38..d6da760 100644
--- a/components/camel-rss/src/main/java/org/apache/camel/dataformat/rss/RssDataFormat.java
+++ b/components/camel-rss/src/main/java/org/apache/camel/dataformat/rss/RssDataFormat.java
@@ -19,13 +19,14 @@ package org.apache.camel.dataformat.rss;
import java.io.InputStream;
import java.io.OutputStream;
-import com.sun.syndication.feed.synd.SyndFeed;
import org.apache.camel.Exchange;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.spi.DataFormatName;
import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.ExchangeHelper;
+import com.rometools.rome.feed.synd.SyndFeed;
+
/**
* RSS DataFormat
* <p/>
diff --git a/components/camel-rss/src/test/java/org/apache/camel/component/rss/JettyTestServer.java b/components/camel-rss/src/test/java/org/apache/camel/component/rss/JettyTestServer.java
index d43ba20..67239d1 100644
--- a/components/camel-rss/src/test/java/org/apache/camel/component/rss/JettyTestServer.java
+++ b/components/camel-rss/src/test/java/org/apache/camel/component/rss/JettyTestServer.java
@@ -18,6 +18,7 @@ package org.apache.camel.component.rss;
import java.io.File;
import java.io.IOException;
+import java.nio.charset.StandardCharsets;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
@@ -123,7 +124,7 @@ public final class JettyTestServer {
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
- resp.getWriter().write(FileUtils.readFileToString(new File("src/test/data/rss20.xml")));
+ resp.getWriter().write(FileUtils.readFileToString(new File("src/test/data/rss20.xml"), StandardCharsets.UTF_8));
}
}
diff --git a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithFilterTest.java b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithFilterTest.java
index cdcd075..15c4617 100644
--- a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithFilterTest.java
+++ b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithFilterTest.java
@@ -22,8 +22,6 @@ import java.util.TimeZone;
import javax.naming.Context;
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -31,6 +29,9 @@ import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.camel.util.jndi.JndiContext;
import org.junit.Test;
+import com.rometools.rome.feed.synd.SyndEntry;
+import com.rometools.rome.feed.synd.SyndFeed;
+
public class RssEntryPollingConsumerWithFilterTest extends CamelTestSupport {
@Test
@@ -73,7 +74,7 @@ public class RssEntryPollingConsumerWithFilterTest extends CamelTestSupport {
public boolean isAfterDate(Exchange ex) {
SyndFeed feed = ex.getIn().getBody(SyndFeed.class);
assertTrue(feed.getEntries().size() == 1);
- SyndEntry entry = (SyndEntry) feed.getEntries().get(0);
+ SyndEntry entry = feed.getEntries().get(0);
return entry.getPublishedDate().after(time);
}
}
diff --git a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortTest.java b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortTest.java
index cc707c6..a37f00e 100644
--- a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortTest.java
+++ b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortTest.java
@@ -20,8 +20,6 @@ import java.util.Date;
import javax.naming.Context;
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
import org.apache.camel.Body;
import org.apache.camel.builder.ExpressionBuilder;
import org.apache.camel.builder.RouteBuilder;
@@ -30,6 +28,9 @@ import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.camel.util.jndi.JndiContext;
import org.junit.Test;
+import com.rometools.rome.feed.synd.SyndEntry;
+import com.rometools.rome.feed.synd.SyndFeed;
+
public class RssEntrySortTest extends CamelTestSupport {
@Test
@@ -69,7 +70,7 @@ public class RssEntrySortTest extends CamelTestSupport {
public static class MyBean {
public Date getPubDate(@Body Object body) {
SyndFeed feed = (SyndFeed) body;
- SyndEntry syndEntry = (SyndEntry) feed.getEntries().get(0);
+ SyndEntry syndEntry = feed.getEntries().get(0);
Date date = syndEntry.getUpdatedDate();
if (date == null) {
date = syndEntry.getPublishedDate();
diff --git a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssFilterTest.java b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssFilterTest.java
index 242737a..1b214b9 100644
--- a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssFilterTest.java
+++ b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssFilterTest.java
@@ -18,8 +18,6 @@ package org.apache.camel.component.rss;
import javax.naming.Context;
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndFeed;
import org.apache.camel.Body;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -27,6 +25,9 @@ import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.camel.util.jndi.JndiContext;
import org.junit.Test;
+import com.rometools.rome.feed.synd.SyndEntry;
+import com.rometools.rome.feed.synd.SyndFeed;
+
public class RssFilterTest extends CamelTestSupport {
@Test
@@ -60,9 +61,9 @@ public class RssFilterTest extends CamelTestSupport {
// START SNIPPET: ex2
public static class FilterBean {
public boolean titleContainsCamel(@Body SyndFeed feed) {
- SyndEntry firstEntry = (SyndEntry) feed.getEntries().get(0);
+ SyndEntry firstEntry = feed.getEntries().get(0);
return firstEntry.getTitle().contains("Camel");
}
}
- // END SNIPPET: ex2
+ // END SNIPPET: ex2
}
diff --git a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerTest.java b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerTest.java
index 415af8c..a68163d 100644
--- a/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerTest.java
+++ b/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.rss;
-import com.sun.syndication.feed.synd.SyndFeed;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.builder.RouteBuilder;
@@ -24,6 +23,8 @@ import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
+import com.rometools.rome.feed.synd.SyndFeed;
+
public class RssPollingConsumerTest extends CamelTestSupport {
@Test
diff --git a/components/camel-rss/src/test/java/org/apache/camel/component/rss/UpdatedDateFilterTest.java b/components/camel-rss/src/test/java/org/apache/camel/component/rss/UpdatedDateFilterTest.java
index 653e174..c063007 100644
--- a/components/camel-rss/src/test/java/org/apache/camel/component/rss/UpdatedDateFilterTest.java
+++ b/components/camel-rss/src/test/java/org/apache/camel/component/rss/UpdatedDateFilterTest.java
@@ -18,12 +18,13 @@ package org.apache.camel.component.rss;
import java.util.Date;
-import com.sun.syndication.feed.synd.SyndEntry;
-import com.sun.syndication.feed.synd.SyndEntryImpl;
-import com.sun.syndication.feed.synd.SyndFeedImpl;
import org.junit.Before;
import org.junit.Test;
+import com.rometools.rome.feed.synd.SyndEntry;
+import com.rometools.rome.feed.synd.SyndEntryImpl;
+import com.rometools.rome.feed.synd.SyndFeedImpl;
+
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
diff --git a/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssConverterTest.java b/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssConverterTest.java
index 7a85a56..47d15e1 100644
--- a/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssConverterTest.java
+++ b/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssConverterTest.java
@@ -16,9 +16,10 @@
*/
package org.apache.camel.dataformat.rss;
-import com.sun.syndication.feed.synd.SyndFeed;
import org.apache.camel.builder.RouteBuilder;
+import com.rometools.rome.feed.synd.SyndFeed;
+
public class RssConverterTest extends RssDataFormatTest {
protected RouteBuilder createRouteBuilder() throws Exception {
diff --git a/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssDataFormatTest.java b/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssDataFormatTest.java
index 96eb987..5f396b6 100644
--- a/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssDataFormatTest.java
+++ b/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssDataFormatTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.dataformat.rss;
-import com.sun.syndication.feed.synd.SyndFeed;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.component.rss.RssUtils;
@@ -24,6 +23,8 @@ import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Before;
import org.junit.Test;
+import com.rometools.rome.feed.synd.SyndFeed;
+
public class RssDataFormatTest extends CamelTestSupport {
private String feedXml;
private SyndFeed feed;
@@ -43,8 +44,8 @@ public class RssDataFormatTest extends CamelTestSupport {
mock.message(0).body().isInstanceOf(SyndFeed.class);
mock.message(0).body(SyndFeed.class).equals(feed);
mock.assertIsSatisfied();
- }
-
+ }
+
@Override
@Before
public void setUp() throws Exception {
diff --git a/parent/pom.xml b/parent/pom.xml
index bd2138c..27394d9 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -376,8 +376,7 @@
<jclouds-google-guava-version-range>[18.0,19.0)</jclouds-google-guava-version-range>
<jcommander-version>1.72</jcommander-version>
<jcr-version>2.0</jcr-version>
- <jdom-bundle-version>1.1_4</jdom-bundle-version>
- <jdom-version>1.1.3</jdom-version>
+ <jdom-bundle-version>2.0.6_1</jdom-bundle-version>
<jedis-client-version>2.9.0</jedis-client-version>
<jedis-client-bundle-version>2.9.0_1</jedis-client-bundle-version>
<jersey-version>2.11</jersey-version>
@@ -604,8 +603,7 @@
<rhino-js-version>1.7R2</rhino-js-version>
<ribbon-version>2.3.0</ribbon-version>
<roaster-version>2.20.1.Final</roaster-version>
- <rome-bundle-version>1.0_3</rome-bundle-version>
- <rome-version>1.0</rome-version>
+ <rome-version>1.12.0</rome-version>
<rxjava-version>1.3.8</rxjava-version>
<rxjava2-version>2.2.3</rxjava2-version>
<saaj-impl-version>1.3.2_2</saaj-impl-version>
@@ -4827,11 +4825,6 @@
<version>${rhino-js-version}</version>
</dependency>
<dependency>
- <groupId>org.jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>${jdom-version}</version>
- </dependency>
- <dependency>
<groupId>commons-dbcp</groupId>
<artifactId>commons-dbcp</artifactId>
<version>${commons-dbcp-version}</version>
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index b9ea6ba..4a4bb5b 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -2003,7 +2003,7 @@
<feature name='camel-rss' version='${project.version}' resolver='(obr)' start-level='50'>
<feature version='${project.version}'>camel-atom</feature>
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.jdom/${jdom-bundle-version}</bundle>
- <bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.rome/${rome-bundle-version}</bundle>
+ <bundle dependency="true">mvn:com.rometools/rome/${rome-version}</bundle>
<bundle>mvn:org.apache.camel/camel-rss/${project.version}</bundle>
</feature>
<feature name='camel-rx' version='${project.version}' start-level='50'>
diff --git a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
index 055a4c2..4f3e133 100644
--- a/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
+++ b/platforms/spring-boot/spring-boot-dm/camel-spring-boot-dependencies/pom.xml
@@ -3531,11 +3531,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>org.jdom</groupId>
- <artifactId>jdom</artifactId>
- <version>1.1.3</version>
- </dependency>
- <dependency>
<groupId>org.jruby</groupId>
<artifactId>jruby</artifactId>
<version>1.7.18</version>
Re: [camel] branch camel-2.x updated (76dbb1b -> 41e0d78)
Posted by Andrea Cosentino <an...@gmail.com>.
You need to run the profile sourcecheck
mvn clean install -Psourcecheck
https://github.com/apache/camel/blob/master/CONTRIBUTING.md#running-checkstyle
Thanks!
Il giorno ven 7 giu 2019 alle ore 11:35 Colm O hEigeartaigh <
coheigea@apache.org> ha scritto:
> Hi Andrea,
>
> How can I know if I broke the CS? mvn clean install doesn't show any
> errors.
>
> Colm.
>
> On Fri, Jun 7, 2019 at 10:33 AM Andrea Cosentino <an...@gmail.com>
> wrote:
>
> > This was already pushed on master, but I had to fix the CS this morning
> >
> > Il giorno ven 7 giu 2019 alle ore 11:31 Claus Ibsen <
> claus.ibsen@gmail.com
> > >
> > ha scritto:
> >
> > > Hi
> > >
> > > Also please work on master first, so we ensure changes that goes into
> > > 2.x are also made into master.
> > >
> > > On Fri, Jun 7, 2019 at 11:25 AM <co...@apache.org> wrote:
> > > >
> > > > This is an automated email from the ASF dual-hosted git repository.
> > > >
> > > > coheigea pushed a change to branch camel-2.x
> > > > in repository https://gitbox.apache.org/repos/asf/camel.git.
> > > >
> > > >
> > > > from 76dbb1b Camel-google-sheets: Fixed test options naming
> > > > new 49d8f11 Updating Rome dependency
> > > > new 41e0d78 Fixing up camel-jxpath in Karaf
> > > >
> > > > The 2 revisions listed above as "new" are entirely new to this
> > > > repository and will be described in separate emails. The revisions
> > > > listed as "add" were already present in the repository and have only
> > > > been added to this reference.
> > > >
> > > >
> > > > Summary of changes:
> > > > components/camel-rss/pom.xml | 2 +-
> > > > .../camel/component/rss/AggregateRssFeedStrategy.java | 19
> > > ++++++++++---------
> > > > .../apache/camel/component/rss/RssDateComparator.java | 6 +++---
> > > > .../org/apache/camel/component/rss/RssEndpoint.java | 14
> > > ++++++++------
> > > > .../camel/component/rss/RssEntryPollingConsumer.java | 3 ++-
> > > > .../java/org/apache/camel/component/rss/RssUtils.java | 7 ++++---
> > > > .../apache/camel/component/rss/UpdatedDateFilter.java | 3 ++-
> > > > .../org/apache/camel/dataformat/rss/RssConverter.java | 15
> > > ++++++++-------
> > > > .../apache/camel/dataformat/rss/RssDataFormat.java | 3 ++-
> > > > .../apache/camel/component/rss/JettyTestServer.java | 3 ++-
> > > > .../rss/RssEntryPollingConsumerWithFilterTest.java | 7 ++++---
> > > > .../apache/camel/component/rss/RssEntrySortTest.java | 7 ++++---
> > > > .../org/apache/camel/component/rss/RssFilterTest.java | 9 +++++----
> > > > .../camel/component/rss/RssPollingConsumerTest.java | 3 ++-
> > > > .../camel/component/rss/UpdatedDateFilterTest.java | 7 ++++---
> > > > .../apache/camel/dataformat/rss/RssConverterTest.java | 3 ++-
> > > > .../camel/dataformat/rss/RssDataFormatTest.java | 7 ++++---
> > > > parent/pom.xml | 10
> ++--------
> > > > .../karaf/features/src/main/resources/features.xml | 10
> +++-------
> > > > .../camel-spring-boot-dependencies/pom.xml | 5 -----
> > > > 20 files changed, 72 insertions(+), 71 deletions(-)
> > > >
> > >
> > >
> > > --
> > > Claus Ibsen
> > > -----------------
> > > http://davsclaus.com @davsclaus
> > > Camel in Action 2: https://www.manning.com/ibsen2
> > >
> >
>
>
> --
> Colm O hEigeartaigh
>
> Talend Community Coder
> http://coders.talend.com
>
Re: [camel] branch camel-2.x updated (76dbb1b -> 41e0d78)
Posted by Colm O hEigeartaigh <co...@apache.org>.
Hi Andrea,
How can I know if I broke the CS? mvn clean install doesn't show any errors.
Colm.
On Fri, Jun 7, 2019 at 10:33 AM Andrea Cosentino <an...@gmail.com> wrote:
> This was already pushed on master, but I had to fix the CS this morning
>
> Il giorno ven 7 giu 2019 alle ore 11:31 Claus Ibsen <claus.ibsen@gmail.com
> >
> ha scritto:
>
> > Hi
> >
> > Also please work on master first, so we ensure changes that goes into
> > 2.x are also made into master.
> >
> > On Fri, Jun 7, 2019 at 11:25 AM <co...@apache.org> wrote:
> > >
> > > This is an automated email from the ASF dual-hosted git repository.
> > >
> > > coheigea pushed a change to branch camel-2.x
> > > in repository https://gitbox.apache.org/repos/asf/camel.git.
> > >
> > >
> > > from 76dbb1b Camel-google-sheets: Fixed test options naming
> > > new 49d8f11 Updating Rome dependency
> > > new 41e0d78 Fixing up camel-jxpath in Karaf
> > >
> > > The 2 revisions listed above as "new" are entirely new to this
> > > repository and will be described in separate emails. The revisions
> > > listed as "add" were already present in the repository and have only
> > > been added to this reference.
> > >
> > >
> > > Summary of changes:
> > > components/camel-rss/pom.xml | 2 +-
> > > .../camel/component/rss/AggregateRssFeedStrategy.java | 19
> > ++++++++++---------
> > > .../apache/camel/component/rss/RssDateComparator.java | 6 +++---
> > > .../org/apache/camel/component/rss/RssEndpoint.java | 14
> > ++++++++------
> > > .../camel/component/rss/RssEntryPollingConsumer.java | 3 ++-
> > > .../java/org/apache/camel/component/rss/RssUtils.java | 7 ++++---
> > > .../apache/camel/component/rss/UpdatedDateFilter.java | 3 ++-
> > > .../org/apache/camel/dataformat/rss/RssConverter.java | 15
> > ++++++++-------
> > > .../apache/camel/dataformat/rss/RssDataFormat.java | 3 ++-
> > > .../apache/camel/component/rss/JettyTestServer.java | 3 ++-
> > > .../rss/RssEntryPollingConsumerWithFilterTest.java | 7 ++++---
> > > .../apache/camel/component/rss/RssEntrySortTest.java | 7 ++++---
> > > .../org/apache/camel/component/rss/RssFilterTest.java | 9 +++++----
> > > .../camel/component/rss/RssPollingConsumerTest.java | 3 ++-
> > > .../camel/component/rss/UpdatedDateFilterTest.java | 7 ++++---
> > > .../apache/camel/dataformat/rss/RssConverterTest.java | 3 ++-
> > > .../camel/dataformat/rss/RssDataFormatTest.java | 7 ++++---
> > > parent/pom.xml | 10 ++--------
> > > .../karaf/features/src/main/resources/features.xml | 10 +++-------
> > > .../camel-spring-boot-dependencies/pom.xml | 5 -----
> > > 20 files changed, 72 insertions(+), 71 deletions(-)
> > >
> >
> >
> > --
> > Claus Ibsen
> > -----------------
> > http://davsclaus.com @davsclaus
> > Camel in Action 2: https://www.manning.com/ibsen2
> >
>
--
Colm O hEigeartaigh
Talend Community Coder
http://coders.talend.com
Re: [camel] branch camel-2.x updated (76dbb1b -> 41e0d78)
Posted by Andrea Cosentino <an...@gmail.com>.
This was already pushed on master, but I had to fix the CS this morning
Il giorno ven 7 giu 2019 alle ore 11:31 Claus Ibsen <cl...@gmail.com>
ha scritto:
> Hi
>
> Also please work on master first, so we ensure changes that goes into
> 2.x are also made into master.
>
> On Fri, Jun 7, 2019 at 11:25 AM <co...@apache.org> wrote:
> >
> > This is an automated email from the ASF dual-hosted git repository.
> >
> > coheigea pushed a change to branch camel-2.x
> > in repository https://gitbox.apache.org/repos/asf/camel.git.
> >
> >
> > from 76dbb1b Camel-google-sheets: Fixed test options naming
> > new 49d8f11 Updating Rome dependency
> > new 41e0d78 Fixing up camel-jxpath in Karaf
> >
> > The 2 revisions listed above as "new" are entirely new to this
> > repository and will be described in separate emails. The revisions
> > listed as "add" were already present in the repository and have only
> > been added to this reference.
> >
> >
> > Summary of changes:
> > components/camel-rss/pom.xml | 2 +-
> > .../camel/component/rss/AggregateRssFeedStrategy.java | 19
> ++++++++++---------
> > .../apache/camel/component/rss/RssDateComparator.java | 6 +++---
> > .../org/apache/camel/component/rss/RssEndpoint.java | 14
> ++++++++------
> > .../camel/component/rss/RssEntryPollingConsumer.java | 3 ++-
> > .../java/org/apache/camel/component/rss/RssUtils.java | 7 ++++---
> > .../apache/camel/component/rss/UpdatedDateFilter.java | 3 ++-
> > .../org/apache/camel/dataformat/rss/RssConverter.java | 15
> ++++++++-------
> > .../apache/camel/dataformat/rss/RssDataFormat.java | 3 ++-
> > .../apache/camel/component/rss/JettyTestServer.java | 3 ++-
> > .../rss/RssEntryPollingConsumerWithFilterTest.java | 7 ++++---
> > .../apache/camel/component/rss/RssEntrySortTest.java | 7 ++++---
> > .../org/apache/camel/component/rss/RssFilterTest.java | 9 +++++----
> > .../camel/component/rss/RssPollingConsumerTest.java | 3 ++-
> > .../camel/component/rss/UpdatedDateFilterTest.java | 7 ++++---
> > .../apache/camel/dataformat/rss/RssConverterTest.java | 3 ++-
> > .../camel/dataformat/rss/RssDataFormatTest.java | 7 ++++---
> > parent/pom.xml | 10 ++--------
> > .../karaf/features/src/main/resources/features.xml | 10 +++-------
> > .../camel-spring-boot-dependencies/pom.xml | 5 -----
> > 20 files changed, 72 insertions(+), 71 deletions(-)
> >
>
>
> --
> Claus Ibsen
> -----------------
> http://davsclaus.com @davsclaus
> Camel in Action 2: https://www.manning.com/ibsen2
>
Re: [camel] branch camel-2.x updated (76dbb1b -> 41e0d78)
Posted by Claus Ibsen <cl...@gmail.com>.
Hi
Also please work on master first, so we ensure changes that goes into
2.x are also made into master.
On Fri, Jun 7, 2019 at 11:25 AM <co...@apache.org> wrote:
>
> This is an automated email from the ASF dual-hosted git repository.
>
> coheigea pushed a change to branch camel-2.x
> in repository https://gitbox.apache.org/repos/asf/camel.git.
>
>
> from 76dbb1b Camel-google-sheets: Fixed test options naming
> new 49d8f11 Updating Rome dependency
> new 41e0d78 Fixing up camel-jxpath in Karaf
>
> The 2 revisions listed above as "new" are entirely new to this
> repository and will be described in separate emails. The revisions
> listed as "add" were already present in the repository and have only
> been added to this reference.
>
>
> Summary of changes:
> components/camel-rss/pom.xml | 2 +-
> .../camel/component/rss/AggregateRssFeedStrategy.java | 19 ++++++++++---------
> .../apache/camel/component/rss/RssDateComparator.java | 6 +++---
> .../org/apache/camel/component/rss/RssEndpoint.java | 14 ++++++++------
> .../camel/component/rss/RssEntryPollingConsumer.java | 3 ++-
> .../java/org/apache/camel/component/rss/RssUtils.java | 7 ++++---
> .../apache/camel/component/rss/UpdatedDateFilter.java | 3 ++-
> .../org/apache/camel/dataformat/rss/RssConverter.java | 15 ++++++++-------
> .../apache/camel/dataformat/rss/RssDataFormat.java | 3 ++-
> .../apache/camel/component/rss/JettyTestServer.java | 3 ++-
> .../rss/RssEntryPollingConsumerWithFilterTest.java | 7 ++++---
> .../apache/camel/component/rss/RssEntrySortTest.java | 7 ++++---
> .../org/apache/camel/component/rss/RssFilterTest.java | 9 +++++----
> .../camel/component/rss/RssPollingConsumerTest.java | 3 ++-
> .../camel/component/rss/UpdatedDateFilterTest.java | 7 ++++---
> .../apache/camel/dataformat/rss/RssConverterTest.java | 3 ++-
> .../camel/dataformat/rss/RssDataFormatTest.java | 7 ++++---
> parent/pom.xml | 10 ++--------
> .../karaf/features/src/main/resources/features.xml | 10 +++-------
> .../camel-spring-boot-dependencies/pom.xml | 5 -----
> 20 files changed, 72 insertions(+), 71 deletions(-)
>
--
Claus Ibsen
-----------------
http://davsclaus.com @davsclaus
Camel in Action 2: https://www.manning.com/ibsen2