You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/05/09 07:11:29 UTC
[camel] branch master updated (7f928eb -> 46c5c1b)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 7f928eb Camel-Soroush: Regen docs
new 65d842b CAMEL-13492 - Camel-Weather: Move to Jackson 2.x
new ae99bb7 CAMEL-13492 - Camel-Weather: Make Integration tests work
new 46c5c1b [ENTESB-9892] Camel-Weather: Fixed Karaf feature
The 3 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-weather/pom.xml | 18 +++++++++++++++---
.../geolocation/FreeGeoIpGeoLocationProvider.java | 5 +++--
.../weather/CurrentWeatherMadridProducerTest.java | 2 +-
.../karaf/features/src/main/resources/features.xml | 5 +++--
4 files changed, 22 insertions(+), 8 deletions(-)
[camel] 02/03: CAMEL-13492 - Camel-Weather: Make Integration tests
work
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit ae99bb75a89d2f7d4e2a4feb00da3509dad982ea
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu May 9 08:27:08 2019 +0200
CAMEL-13492 - Camel-Weather: Make Integration tests work
---
.../camel/component/weather/CurrentWeatherMadridProducerTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherMadridProducerTest.java b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherMadridProducerTest.java
index 23355b0..b876a28 100644
--- a/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherMadridProducerTest.java
+++ b/components/camel-weather/src/test/java/org/apache/camel/component/weather/CurrentWeatherMadridProducerTest.java
@@ -63,7 +63,7 @@ public class CurrentWeatherMadridProducerTest extends BaseWeatherConsumerTest {
}
@Test
- public void testHeaderOverrideCurrent() throws Exception {
+ public void testHeaderOverrideLondon() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
// as the default delay option is one hour long, we expect exactly one message exchange
mock.expectedMessageCount(1);
[camel] 01/03: CAMEL-13492 - Camel-Weather: Move to Jackson 2.x
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 65d842b56119eb3b06ee151035a4023436955422
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu May 9 08:18:41 2019 +0200
CAMEL-13492 - Camel-Weather: Move to Jackson 2.x
---
components/camel-weather/pom.xml | 18 +++++++++++++++---
.../geolocation/FreeGeoIpGeoLocationProvider.java | 5 +++--
2 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/components/camel-weather/pom.xml b/components/camel-weather/pom.xml
index 52617e1..8852b74 100644
--- a/components/camel-weather/pom.xml
+++ b/components/camel-weather/pom.xml
@@ -47,10 +47,22 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-support</artifactId>
</dependency>
+
+ <!-- Jackson -->
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${jackson2-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-annotations</artifactId>
+ <version>${jackson2-version}</version>
+ </dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-mapper-asl</artifactId>
- <version>${jackson-version}</version>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <version>${jackson2-version}</version>
</dependency>
<!-- test dependencies -->
diff --git a/components/camel-weather/src/main/java/org/apache/camel/component/weather/geolocation/FreeGeoIpGeoLocationProvider.java b/components/camel-weather/src/main/java/org/apache/camel/component/weather/geolocation/FreeGeoIpGeoLocationProvider.java
index 9df70cb..84b8815 100644
--- a/components/camel-weather/src/main/java/org/apache/camel/component/weather/geolocation/FreeGeoIpGeoLocationProvider.java
+++ b/components/camel-weather/src/main/java/org/apache/camel/component/weather/geolocation/FreeGeoIpGeoLocationProvider.java
@@ -21,8 +21,9 @@ import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpStatus;
import org.apache.commons.httpclient.NameValuePair;
import org.apache.commons.httpclient.methods.GetMethod;
-import org.codehaus.jackson.JsonNode;
-import org.codehaus.jackson.map.ObjectMapper;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
import static org.apache.camel.util.ObjectHelper.isEmpty;
import static org.apache.camel.util.ObjectHelper.notNull;
[camel] 03/03: [ENTESB-9892] Camel-Weather: Fixed Karaf feature
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 46c5c1b4677e69fb7e2caa8bed838341db521260
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Thu May 9 08:35:21 2019 +0200
[ENTESB-9892] Camel-Weather: Fixed Karaf feature
---
.../component/weather/geolocation/FreeGeoIpGeoLocationProvider.java | 6 +++---
platforms/karaf/features/src/main/resources/features.xml | 5 +++--
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/components/camel-weather/src/main/java/org/apache/camel/component/weather/geolocation/FreeGeoIpGeoLocationProvider.java b/components/camel-weather/src/main/java/org/apache/camel/component/weather/geolocation/FreeGeoIpGeoLocationProvider.java
index 84b8815..9114d5c 100644
--- a/components/camel-weather/src/main/java/org/apache/camel/component/weather/geolocation/FreeGeoIpGeoLocationProvider.java
+++ b/components/camel-weather/src/main/java/org/apache/camel/component/weather/geolocation/FreeGeoIpGeoLocationProvider.java
@@ -16,15 +16,15 @@
*/
package org.apache.camel.component.weather.geolocation;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
import org.apache.camel.component.weather.WeatherComponent;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpStatus;
import org.apache.commons.httpclient.NameValuePair;
import org.apache.commons.httpclient.methods.GetMethod;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
import static org.apache.camel.util.ObjectHelper.isEmpty;
import static org.apache.camel.util.ObjectHelper.notNull;
diff --git a/platforms/karaf/features/src/main/resources/features.xml b/platforms/karaf/features/src/main/resources/features.xml
index b580a4b..3fd8cb1 100644
--- a/platforms/karaf/features/src/main/resources/features.xml
+++ b/platforms/karaf/features/src/main/resources/features.xml
@@ -2569,8 +2569,9 @@
<bundle dependency='true'>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.commons-httpclient/${commons-httpclient-bundle-version}</bundle>
<bundle dependency='true'>mvn:commons-codec/commons-codec/${commons-codec-version}</bundle>
<bundle dependency='true'>mvn:javax.servlet/javax.servlet-api/${javax.servlet-api-version}</bundle>
- <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-core-asl/${jackson-version}</bundle>
- <bundle dependency='true'>mvn:org.codehaus.jackson/jackson-mapper-asl/${jackson-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>
+ <bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
<bundle>mvn:org.apache.camel/camel-weather/${project.version}</bundle>
</feature>
<feature name='camel-websocket' version='${project.version}' start-level='50'>