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 <[email protected]> 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;
