From: Alissa Bonas Date: Sat, 21 Dec 2013 18:59:31 +0000 (+0200) Subject: Upgrade jackson library to version 2.3.0 X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~142^2 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=0b6e6ac086a8daf9f2c860b8a9dd8b45465124f4 Upgrade jackson library to version 2.3.0 This change purpose is to use a newer version of the library, as well as align it with the jackson version used by ovsdb project repo. Main change areas: 1.Upgrade the jackson from codehaus.jackson version 1.9.x to fasterxml.jackson version 2.3.0. change all usages in pom files and fix the imports in Java classes. 2.Remove the usage of jersey-json library. Main resource for upgrade information: http://wiki.fasterxml.com/JacksonUpgradeFrom19To20 Change-Id: I2caa9f94a81af1e5ad0ead90c60c912396b8a390 Signed-off-by: Alissa Bonas --- diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml index 5183165752..5458589855 100644 --- a/opendaylight/commons/opendaylight/pom.xml +++ b/opendaylight/commons/opendaylight/pom.xml @@ -46,7 +46,7 @@ org.openflow.openflowj,net.sf.jung2 1.0.9 1.7.2 - 1.9.8 + 2.3.0 3.1.3.RELEASE 3.1.3.RELEASE 1.2.1 @@ -149,26 +149,43 @@ logback-classic ${logback.version} - - org.codehaus.jackson - jackson-mapper-asl - ${jackson.version} - - - org.codehaus.jackson - jackson-core-asl + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-base ${jackson.version} - - - org.codehaus.jackson - jackson-jaxrs + + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider ${jackson.version} - - - org.codehaus.jackson - jackson-xc + + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations ${jackson.version} - + + org.codehaus.jettison jettison @@ -577,11 +594,7 @@ jersey-client ${jersey.version} - - com.sun.jersey - jersey-json - ${jersey.version} - + org.ow2.asm asm-all diff --git a/opendaylight/distribution/opendaylight/opendaylight.target b/opendaylight/distribution/opendaylight/opendaylight.target index e3d1e5275d..7ae309cce4 100644 --- a/opendaylight/distribution/opendaylight/opendaylight.target +++ b/opendaylight/distribution/opendaylight/opendaylight.target @@ -51,7 +51,6 @@ - diff --git a/opendaylight/distribution/opendaylight/pom.xml b/opendaylight/distribution/opendaylight/pom.xml index b0f7ad89a4..f399e05dc4 100644 --- a/opendaylight/distribution/opendaylight/pom.xml +++ b/opendaylight/distribution/opendaylight/pom.xml @@ -903,22 +903,37 @@ ch.qos.logback logback-classic + - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind + - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-annotations + - org.codehaus.jackson - jackson-jaxrs + com.fasterxml.jackson.core + jackson-core + - org.codehaus.jackson - jackson-xc + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-base + + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + + org.codehaus.jettison jettison @@ -1244,11 +1259,7 @@ com.sun.jersey jersey-client - - com.sun.jersey - jersey-json - ${jersey.version} - + org.ow2.asm asm-all diff --git a/opendaylight/distribution/opendaylight/src/assemble/bin.xml b/opendaylight/distribution/opendaylight/src/assemble/bin.xml index 8fea175614..6f8878bee9 100644 --- a/opendaylight/distribution/opendaylight/src/assemble/bin.xml +++ b/opendaylight/distribution/opendaylight/src/assemble/bin.xml @@ -24,7 +24,6 @@ ch.qos.logback:logback-core ch.qos.logback:logback-classic com.sun.jersey:jersey-core - com.sun.jersey:jersey-json com.sun.jersey:jersey-server org.opendaylight.controller:logging.bridge org.opendaylight.controller:sanitytest @@ -52,7 +51,6 @@ ch.qos.logback:logback-core ch.qos.logback:logback-classic com.sun.jersey:jersey-core - com.sun.jersey:jersey-json com.sun.jersey:jersey-server org.opendaylight.controller:logging.bridge diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini b/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini index ba5d862c57..8ffaff45c7 100644 --- a/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini +++ b/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini @@ -10,7 +10,6 @@ osgi.bundles=\ reference\:file\:../lib/logback-core-1.0.9.jar@1:start,\ reference\:file\:../lib/logging.bridge-0.4.1-SNAPSHOT@1:start,\ reference\:file\:../lib/jersey-core-1.17.jar@2:start,\ - reference\:file\:../lib/jersey-json-1.17.jar@2:start,\ reference\:file\:../lib/jersey-server-1.17.jar@2:start # Netconf startup configuration diff --git a/opendaylight/md-sal/remoterpc-routingtable/integrationtest/test-nb/pom.xml b/opendaylight/md-sal/remoterpc-routingtable/integrationtest/test-nb/pom.xml index 35b2a4b250..1fd4b762c1 100644 --- a/opendaylight/md-sal/remoterpc-routingtable/integrationtest/test-nb/pom.xml +++ b/opendaylight/md-sal/remoterpc-routingtable/integrationtest/test-nb/pom.xml @@ -25,7 +25,7 @@ com.sun.jersey.spi.container.servlet, - org.codehaus.jackson.annotate, + com.fasterxml.jackson.annotation, javax.ws.rs, javax.ws.rs.core, javax.xml.bind, diff --git a/opendaylight/md-sal/sal-remoterpc-connector/implementation/pom.xml b/opendaylight/md-sal/sal-remoterpc-connector/implementation/pom.xml index c973498e85..6c72a610a7 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/implementation/pom.xml +++ b/opendaylight/md-sal/sal-remoterpc-connector/implementation/pom.xml @@ -14,7 +14,7 @@ 0.3.1 - 1.9.8 + 2.3.0 1.0.1 @@ -84,16 +84,25 @@ org.slf4j slf4j-api + - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-annotations ${jackson.version} + - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-core ${jackson.version} + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + stax stax-api diff --git a/opendaylight/md-sal/sal-remoterpc-connector/implementation/src/main/java/org/opendaylight/controller/sal/connector/remoterpc/dto/RouteIdentifierImpl.java b/opendaylight/md-sal/sal-remoterpc-connector/implementation/src/main/java/org/opendaylight/controller/sal/connector/remoterpc/dto/RouteIdentifierImpl.java index 6c5e5fbf11..06107a8773 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/implementation/src/main/java/org/opendaylight/controller/sal/connector/remoterpc/dto/RouteIdentifierImpl.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/implementation/src/main/java/org/opendaylight/controller/sal/connector/remoterpc/dto/RouteIdentifierImpl.java @@ -7,15 +7,15 @@ */ package org.opendaylight.controller.sal.connector.remoterpc.dto; -import org.codehaus.jackson.JsonNode; -import org.codehaus.jackson.map.ObjectMapper; +import java.io.Serializable; +import java.net.URI; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; import org.opendaylight.controller.sal.connector.api.RpcRouter; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier; -import java.io.Serializable; -import java.net.URI; - public class RouteIdentifierImpl implements RpcRouter.RouteIdentifier,Serializable { transient ObjectMapper mapper = new ObjectMapper(); diff --git a/opendaylight/md-sal/sal-remoterpc-connector/implementation/src/test/java/org/opendaylight/controller/sal/connector/remoterpc/RouteIdentifierImplTest.java b/opendaylight/md-sal/sal-remoterpc-connector/implementation/src/test/java/org/opendaylight/controller/sal/connector/remoterpc/RouteIdentifierImplTest.java index 550d9ef125..f6b9004eae 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/implementation/src/test/java/org/opendaylight/controller/sal/connector/remoterpc/RouteIdentifierImplTest.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/implementation/src/test/java/org/opendaylight/controller/sal/connector/remoterpc/RouteIdentifierImplTest.java @@ -1,6 +1,8 @@ package org.opendaylight.controller.sal.connector.remoterpc; -import org.codehaus.jackson.JsonParseException; +import java.net.URI; + +import com.fasterxml.jackson.core.JsonParseException; import org.junit.Assert; import org.junit.Test; import org.opendaylight.controller.sal.connector.remoterpc.dto.RouteIdentifierImpl; @@ -8,8 +10,6 @@ import org.opendaylight.yangtools.yang.common.QName; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.net.URI; - public class RouteIdentifierImplTest { Logger _logger = LoggerFactory.getLogger(RouteIdentifierImplTest.class); diff --git a/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/pom.xml b/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/pom.xml index 4305a283e2..8ee61c3a3f 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/pom.xml +++ b/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/pom.xml @@ -14,6 +14,7 @@ + 2.3.0 3.0.0 1.5.0 0.2.3-SNAPSHOT @@ -389,20 +390,29 @@ - org.codehaus.jackson - jackson-mapper-asl - 1.9.2 + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + - org.codehaus.jackson - jackson-core-asl - 1.9.2 + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + org.zeromq jeromq 0.3.1 + org.opendaylight.yangtools.thirdparty xtend-lib-osgi diff --git a/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/src/test/java/org/opendaylight/controller/sample/zeromq/test/it/RouterTest.java b/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/src/test/java/org/opendaylight/controller/sample/zeromq/test/it/RouterTest.java index 62c094d7a6..dd910ea34b 100644 --- a/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/src/test/java/org/opendaylight/controller/sample/zeromq/test/it/RouterTest.java +++ b/opendaylight/md-sal/sal-remoterpc-connector/integrationtest/test-it/src/test/java/org/opendaylight/controller/sample/zeromq/test/it/RouterTest.java @@ -416,8 +416,9 @@ public class RouterTest { mavenBundle(YANG + ".thirdparty", "antlr4-runtime-osgi-nohead").versionAsInProject(), // mavenBundle("com.google.guava", "guava").versionAsInProject(), // mavenBundle("org.zeromq", "jeromq").versionAsInProject(), - mavenBundle("org.codehaus.jackson", "jackson-mapper-asl").versionAsInProject(), - mavenBundle("org.codehaus.jackson", "jackson-core-asl").versionAsInProject(), + mavenBundle("com.fasterxml.jackson.core", "jackson-annotations").versionAsInProject(), + mavenBundle("com.fasterxml.jackson.core", "jackson-core").versionAsInProject(), + mavenBundle("com.fasterxml.jackson.core", "jackson-databind").versionAsInProject(), //routingtable dependencies systemPackages("sun.reflect", "sun.reflect.misc", "sun.misc"), // List framework bundles diff --git a/opendaylight/md-sal/test/sal-rest-connector-it/pom.xml b/opendaylight/md-sal/test/sal-rest-connector-it/pom.xml index 8569783ad7..e49fb33780 100644 --- a/opendaylight/md-sal/test/sal-rest-connector-it/pom.xml +++ b/opendaylight/md-sal/test/sal-rest-connector-it/pom.xml @@ -622,11 +622,7 @@ jersey-client ${jersey.version} - - com.sun.jersey - jersey-json - ${jersey.version} - + eclipselink javax.resource diff --git a/opendaylight/md-sal/test/sal-rest-connector-it/src/test/java/org/opendaylight/controller/test/restconf/it/ServiceProviderController.java b/opendaylight/md-sal/test/sal-rest-connector-it/src/test/java/org/opendaylight/controller/test/restconf/it/ServiceProviderController.java index fda1e264e6..b8ebedfdfb 100644 --- a/opendaylight/md-sal/test/sal-rest-connector-it/src/test/java/org/opendaylight/controller/test/restconf/it/ServiceProviderController.java +++ b/opendaylight/md-sal/test/sal-rest-connector-it/src/test/java/org/opendaylight/controller/test/restconf/it/ServiceProviderController.java @@ -182,10 +182,13 @@ public class ServiceProviderController { // Northbound bundles mavenBundle("org.opendaylight.controller", "commons.northbound").versionAsInProject(), - mavenBundle("org.codehaus.jackson", "jackson-mapper-asl").versionAsInProject(), - mavenBundle("org.codehaus.jackson", "jackson-core-asl").versionAsInProject(), - mavenBundle("org.codehaus.jackson", "jackson-jaxrs").versionAsInProject(), - mavenBundle("org.codehaus.jackson", "jackson-xc").versionAsInProject(), + + mavenBundle("com.fasterxml.jackson.core", "jackson-annotations").versionAsInProject(), + mavenBundle("com.fasterxml.jackson.core", "jackson-core").versionAsInProject(), + mavenBundle("com.fasterxml.jackson.core", "jackson-databind").versionAsInProject(), + mavenBundle("com.fasterxml.jackson.jaxrs", "jackson-jaxrs-json-provider").versionAsInProject(), + mavenBundle("com.fasterxml.jackson.module", "jackson-module-jaxb-annotations").versionAsInProject(), + mavenBundle("org.codehaus.jettison", "jettison").versionAsInProject(), mavenBundle("commons-io", "commons-io").versionAsInProject(), @@ -318,8 +321,6 @@ public class ServiceProviderController { mavenBundle("com.sun.jersey", "jersey-client").versionAsInProject(), mavenBundle("com.sun.jersey", "jersey-server").versionAsInProject().startLevel(2), mavenBundle("com.sun.jersey", "jersey-core").versionAsInProject().startLevel(2), - mavenBundle("com.sun.jersey", "jersey-json").versionAsInProject().startLevel(2), - junitBundles()); } diff --git a/opendaylight/northbound/commons/pom.xml b/opendaylight/northbound/commons/pom.xml index 8e769a2349..0a05571a82 100644 --- a/opendaylight/northbound/commons/pom.xml +++ b/opendaylight/northbound/commons/pom.xml @@ -52,9 +52,10 @@ org.osgi.service.packageadmin, org.osgi.util.tracker, javax.servlet.http, - org.codehaus.jackson, - org.codehaus.jackson.jaxrs, - org.codehaus.jackson.map, + com.fasterxml.jackson.core, + com.fasterxml.jackson.databind, + com.fasterxml.jackson.jaxrs.base, + com.fasterxml.jackson.jaxrs.json, org.slf4j @@ -83,18 +84,32 @@ bundlescanner 0.4.1-SNAPSHOT + - org.codehaus.jackson - jackson-core-asl + com.fasterxml.jackson.core + jackson-annotations + - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-core + - org.codehaus.jackson - jackson-jaxrs + com.fasterxml.jackson.core + jackson-databind + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + + com.fasterxml.jackson.jaxrs + jackson-jaxrs-base + + junit junit @@ -114,10 +129,6 @@ jersey-client ${jersey.version} - - com.sun.jersey - jersey-json - ${jersey.version} - + diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/JacksonJsonProcessingExceptionMapper.java b/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/JacksonJsonProcessingExceptionMapper.java index 5e5dee3279..eb43920826 100644 --- a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/JacksonJsonProcessingExceptionMapper.java +++ b/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/JacksonJsonProcessingExceptionMapper.java @@ -15,7 +15,8 @@ import javax.ws.rs.core.Response; import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; -import org.codehaus.jackson.JsonProcessingException; +import com.fasterxml.jackson.core.JsonProcessingException; + /** * A custom exception mapper for handling Jackson JsonProcessingException types diff --git a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/NorthboundApplication.java b/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/NorthboundApplication.java index e164abaf95..47bb3ffd7c 100644 --- a/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/NorthboundApplication.java +++ b/opendaylight/northbound/commons/src/main/java/org/opendaylight/controller/northbound/commons/NorthboundApplication.java @@ -12,15 +12,14 @@ import java.util.Dictionary; import java.util.HashSet; import java.util.List; import java.util.Set; - import javax.ws.rs.core.Application; import javax.ws.rs.ext.ContextResolver; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBException; import javax.xml.bind.annotation.XmlRootElement; -import org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider; -import org.codehaus.jackson.map.DeserializationConfig; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; import org.opendaylight.controller.northbound.bundlescanner.IBundleScanService; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; @@ -78,7 +77,7 @@ public class NorthboundApplication extends Application { private static final JacksonJaxbJsonProvider getJsonProvider() { JacksonJaxbJsonProvider jsonProvider = new JacksonJaxbJsonProvider(); - jsonProvider.configure(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES, + jsonProvider.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); return jsonProvider; } diff --git a/opendaylight/northbound/connectionmanager/pom.xml b/opendaylight/northbound/connectionmanager/pom.xml index 0ddfcdb3e1..fbfba08444 100644 --- a/opendaylight/northbound/connectionmanager/pom.xml +++ b/opendaylight/northbound/connectionmanager/pom.xml @@ -58,7 +58,8 @@ javax.xml.bind.annotation, javax.xml.bind, org.apache.catalina.filters, - org.codehaus.jackson.jaxrs, + com.fasterxml.jackson.jaxrs.base, + com.fasterxml.jackson.jaxrs.json, !org.codehaus.enunciate.jaxrs diff --git a/opendaylight/northbound/containermanager/pom.xml b/opendaylight/northbound/containermanager/pom.xml index 517f2e76a3..ff64d18724 100644 --- a/opendaylight/northbound/containermanager/pom.xml +++ b/opendaylight/northbound/containermanager/pom.xml @@ -52,7 +52,8 @@ javax.xml.bind, org.slf4j, org.apache.catalina.filters, - org.codehaus.jackson.jaxrs, + com.fasterxml.jackson.jaxrs.base, + com.fasterxml.jackson.jaxrs.json, !org.codehaus.enunciate.jaxrs /controller/nb/v2/containermanager diff --git a/opendaylight/northbound/containermanager/src/main/java/org/opendaylight/controller/containermanager/northbound/ContainerManagerNorthboundRSApplication.java b/opendaylight/northbound/containermanager/src/main/java/org/opendaylight/controller/containermanager/northbound/ContainerManagerNorthboundRSApplication.java index 10559a2bbd..b9d2200180 100644 --- a/opendaylight/northbound/containermanager/src/main/java/org/opendaylight/controller/containermanager/northbound/ContainerManagerNorthboundRSApplication.java +++ b/opendaylight/northbound/containermanager/src/main/java/org/opendaylight/controller/containermanager/northbound/ContainerManagerNorthboundRSApplication.java @@ -13,7 +13,7 @@ import java.util.HashSet; import java.util.Set; import javax.ws.rs.core.Application; -import org.codehaus.jackson.jaxrs.JacksonJaxbJsonProvider; +import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider; /** * Instance of javax.ws.rs.core.Application used to return the classes diff --git a/opendaylight/northbound/controllermanager/pom.xml b/opendaylight/northbound/controllermanager/pom.xml index d1299a2559..fe3c2b9a5b 100644 --- a/opendaylight/northbound/controllermanager/pom.xml +++ b/opendaylight/northbound/controllermanager/pom.xml @@ -59,8 +59,9 @@ javax.xml.bind, org.slf4j, org.apache.catalina.filters, - org.codehaus.jackson.jaxrs, - org.codehaus.jackson.annotate, + com.fasterxml.jackson.annotation, + com.fasterxml.jackson.jaxrs.base, + com.fasterxml.jackson.jaxrs.json, !org.codehaus.enunciate.jaxrs /controller/nb/v2/controllermanager diff --git a/opendaylight/northbound/controllermanager/src/main/java/org/opendaylight/controller/controllermanager/northbound/ControllerProperties.java b/opendaylight/northbound/controllermanager/src/main/java/org/opendaylight/controller/controllermanager/northbound/ControllerProperties.java index ac0d039746..1560f96072 100644 --- a/opendaylight/northbound/controllermanager/src/main/java/org/opendaylight/controller/controllermanager/northbound/ControllerProperties.java +++ b/opendaylight/northbound/controllermanager/src/main/java/org/opendaylight/controller/controllermanager/northbound/ControllerProperties.java @@ -4,15 +4,14 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; - import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElementRef; import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlRootElement; -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; import org.opendaylight.controller.sal.core.Property; /** diff --git a/opendaylight/northbound/flowprogrammer/pom.xml b/opendaylight/northbound/flowprogrammer/pom.xml index 1b81ccb450..61791692bf 100644 --- a/opendaylight/northbound/flowprogrammer/pom.xml +++ b/opendaylight/northbound/flowprogrammer/pom.xml @@ -57,7 +57,8 @@ javax.xml.bind.annotation, javax.xml.bind, org.slf4j, - org.codehaus.jackson.jaxrs, + com.fasterxml.jackson.jaxrs.base, + com.fasterxml.jackson.jaxrs.json, !org.codehaus.enunciate.jaxrs diff --git a/opendaylight/northbound/hosttracker/pom.xml b/opendaylight/northbound/hosttracker/pom.xml index 541dfcfe2d..b9b5fb7514 100644 --- a/opendaylight/northbound/hosttracker/pom.xml +++ b/opendaylight/northbound/hosttracker/pom.xml @@ -59,7 +59,8 @@ javax.xml.bind, org.slf4j, org.apache.catalina.filters, - org.codehaus.jackson.jaxrs, + com.fasterxml.jackson.jaxrs.base, + com.fasterxml.jackson.jaxrs.json, !org.codehaus.enunciate.jaxrs /controller/nb/v2/hosttracker diff --git a/opendaylight/northbound/integrationtest/pom.xml b/opendaylight/northbound/integrationtest/pom.xml index 793af2f5d7..d1815bbf8c 100644 --- a/opendaylight/northbound/integrationtest/pom.xml +++ b/opendaylight/northbound/integrationtest/pom.xml @@ -266,26 +266,32 @@ logback-classic ${logback.version} + - org.codehaus.jackson - jackson-mapper-asl - ${jackson.version} + com.fasterxml.jackson.core + jackson-databind + - org.codehaus.jackson - jackson-core-asl - ${jackson.version} + com.fasterxml.jackson.core + jackson-annotations + - org.codehaus.jackson - jackson-jaxrs - ${jackson.version} + com.fasterxml.jackson.core + jackson-core + - org.codehaus.jackson - jackson-xc - ${jackson.version} + com.fasterxml.jackson.jaxrs + jackson-jaxrs-json-provider + + + com.fasterxml.jackson.module + jackson-module-jaxb-annotations + + org.codehaus.jettison jettison @@ -672,11 +678,7 @@ jersey-client ${jersey.version} - - com.sun.jersey - jersey-json - ${jersey.version} - + eclipselink javax.resource diff --git a/opendaylight/northbound/integrationtest/src/test/java/org/opendaylight/controller/northbound/integrationtest/NorthboundIT.java b/opendaylight/northbound/integrationtest/src/test/java/org/opendaylight/controller/northbound/integrationtest/NorthboundIT.java index 602de9a1c6..9c63f5e5aa 100644 --- a/opendaylight/northbound/integrationtest/src/test/java/org/opendaylight/controller/northbound/integrationtest/NorthboundIT.java +++ b/opendaylight/northbound/integrationtest/src/test/java/org/opendaylight/controller/northbound/integrationtest/NorthboundIT.java @@ -15,7 +15,6 @@ import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; - import javax.inject.Inject; import org.apache.commons.codec.binary.Base64; @@ -44,8 +43,8 @@ import org.opendaylight.controller.sal.topology.IListenTopoUpdates; import org.opendaylight.controller.sal.topology.TopoEdgeUpdate; import org.opendaylight.controller.switchmanager.IInventoryListener; import org.opendaylight.controller.usermanager.IUserManager; -import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.Configuration; +import org.ops4j.pax.exam.Option; import org.ops4j.pax.exam.junit.PaxExam; import org.ops4j.pax.exam.util.PathUtils; import org.osgi.framework.Bundle; @@ -187,7 +186,6 @@ public class NorthboundIT { System.out.println("HTTP response code: " + response.getStatus()); System.out.println("HTTP response message: " + response.getEntity()); } - return response.getEntity(); } catch (Exception e) { if (debugMsg) { @@ -863,7 +861,7 @@ public class NorthboundIT { // code fc = "{\"name\":\"test1\", \"node\":{\"id\":\"51966\",\"type\":\"STUB\"}, \"actions\":[\"LOOPBACK\"]}"; result = getJsonResult(baseURL + "node/STUB/51966/staticFlow/test1", "PUT", fc); - Assert.assertTrue(result.equals("Success")); + Assert.assertTrue(result.contains("Success")); fc = "{\"name\":\"test2\", \"node\":{\"id\":\"51966\",\"type\":\"STUB\"}, \"actions\":[\"DROP\"]}"; result = getJsonResult(baseURL + "node/STUB/51966/staticFlow/test2", "PUT", fc); @@ -1391,10 +1389,13 @@ public class NorthboundIT { mavenBundle("org.opendaylight.controller", "flowprogrammer.northbound").versionAsInProject(), mavenBundle("org.opendaylight.controller", "subnets.northbound").versionAsInProject(), - mavenBundle("org.codehaus.jackson", "jackson-mapper-asl").versionAsInProject(), - mavenBundle("org.codehaus.jackson", "jackson-core-asl").versionAsInProject(), - mavenBundle("org.codehaus.jackson", "jackson-jaxrs").versionAsInProject(), - mavenBundle("org.codehaus.jackson", "jackson-xc").versionAsInProject(), + mavenBundle("com.fasterxml.jackson.core", "jackson-annotations").versionAsInProject(), + mavenBundle("com.fasterxml.jackson.core", "jackson-core").versionAsInProject(), + mavenBundle("com.fasterxml.jackson.core", "jackson-databind").versionAsInProject(), + mavenBundle("com.fasterxml.jackson.jaxrs", "jackson-jaxrs-json-provider").versionAsInProject(), + mavenBundle("com.fasterxml.jackson.jaxrs", "jackson-jaxrs-base").versionAsInProject(), + mavenBundle("com.fasterxml.jackson.module", "jackson-module-jaxb-annotations").versionAsInProject(), + mavenBundle("org.codehaus.jettison", "jettison").versionAsInProject(), mavenBundle("commons-io", "commons-io").versionAsInProject(), @@ -1493,7 +1494,7 @@ public class NorthboundIT { mavenBundle("com.sun.jersey", "jersey-client").versionAsInProject(), mavenBundle("com.sun.jersey", "jersey-server").versionAsInProject().startLevel(2), mavenBundle("com.sun.jersey", "jersey-core").versionAsInProject().startLevel(2), - mavenBundle("com.sun.jersey", "jersey-json").versionAsInProject().startLevel(2), junitBundles()); + junitBundles()); } } diff --git a/opendaylight/northbound/networkconfiguration/bridgedomain/pom.xml b/opendaylight/northbound/networkconfiguration/bridgedomain/pom.xml index aa9fea5467..2576441061 100644 --- a/opendaylight/northbound/networkconfiguration/bridgedomain/pom.xml +++ b/opendaylight/northbound/networkconfiguration/bridgedomain/pom.xml @@ -59,7 +59,8 @@ javax.xml.bind.annotation, javax.xml.bind, org.apache.catalina.filters, - org.codehaus.jackson.jaxrs, + com.fasterxml.jackson.jaxrs.base, + com.fasterxml.jackson.jaxrs.json, !org.codehaus.enunciate.jaxrs diff --git a/opendaylight/northbound/staticrouting/pom.xml b/opendaylight/northbound/staticrouting/pom.xml index d169de9f2a..01f3ff76c8 100644 --- a/opendaylight/northbound/staticrouting/pom.xml +++ b/opendaylight/northbound/staticrouting/pom.xml @@ -57,7 +57,8 @@ javax.xml.bind.annotation, javax.xml.bind, org.apache.catalina.filters, - org.codehaus.jackson.jaxrs, + com.fasterxml.jackson.jaxrs.base, + com.fasterxml.jackson.jaxrs.json, !org.codehaus.enunciate.jaxrs diff --git a/opendaylight/northbound/statistics/pom.xml b/opendaylight/northbound/statistics/pom.xml index 8df02c976b..b7891a4b86 100644 --- a/opendaylight/northbound/statistics/pom.xml +++ b/opendaylight/northbound/statistics/pom.xml @@ -65,7 +65,8 @@ javax.xml.bind, org.slf4j, org.apache.catalina.filters, - org.codehaus.jackson.jaxrs, + com.fasterxml.jackson.jaxrs.base, + com.fasterxml.jackson.jaxrs.json, !org.codehaus.enunciate.jaxrs diff --git a/opendaylight/northbound/subnets/pom.xml b/opendaylight/northbound/subnets/pom.xml index bdf0b988f8..225d097ecc 100644 --- a/opendaylight/northbound/subnets/pom.xml +++ b/opendaylight/northbound/subnets/pom.xml @@ -72,7 +72,8 @@ javax.xml.bind.annotation, org.slf4j, org.apache.catalina.filters, - org.codehaus.jackson.jaxrs, + com.fasterxml.jackson.jaxrs.base, + com.fasterxml.jackson.jaxrs.json, !org.codehaus.enunciate.jaxrs diff --git a/opendaylight/northbound/switchmanager/pom.xml b/opendaylight/northbound/switchmanager/pom.xml index e4447fee2d..29c9dd810d 100644 --- a/opendaylight/northbound/switchmanager/pom.xml +++ b/opendaylight/northbound/switchmanager/pom.xml @@ -59,8 +59,8 @@ javax.xml.bind, org.slf4j, org.apache.catalina.filters, - org.codehaus.jackson.jaxrs, - org.codehaus.jackson.annotate, + com.fasterxml.jackson.annotation, + com.fasterxml.jackson.databind, !org.codehaus.enunciate.jaxrs /controller/nb/v2/switchmanager diff --git a/opendaylight/northbound/switchmanager/src/main/java/org/opendaylight/controller/switchmanager/northbound/NodeConnectorProperties.java b/opendaylight/northbound/switchmanager/src/main/java/org/opendaylight/controller/switchmanager/northbound/NodeConnectorProperties.java index 43d3aae57c..00f0d4b054 100644 --- a/opendaylight/northbound/switchmanager/src/main/java/org/opendaylight/controller/switchmanager/northbound/NodeConnectorProperties.java +++ b/opendaylight/northbound/switchmanager/src/main/java/org/opendaylight/controller/switchmanager/northbound/NodeConnectorProperties.java @@ -13,15 +13,15 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlElementRef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementRef; import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlRootElement; -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; import org.opendaylight.controller.sal.core.NodeConnector; import org.opendaylight.controller.sal.core.Property; diff --git a/opendaylight/northbound/switchmanager/src/main/java/org/opendaylight/controller/switchmanager/northbound/NodeProperties.java b/opendaylight/northbound/switchmanager/src/main/java/org/opendaylight/controller/switchmanager/northbound/NodeProperties.java index 58a024c928..51e96c49ea 100644 --- a/opendaylight/northbound/switchmanager/src/main/java/org/opendaylight/controller/switchmanager/northbound/NodeProperties.java +++ b/opendaylight/northbound/switchmanager/src/main/java/org/opendaylight/controller/switchmanager/northbound/NodeProperties.java @@ -13,15 +13,15 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlElementRef; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementRef; import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlRootElement; -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; import org.opendaylight.controller.sal.core.Node; import org.opendaylight.controller.sal.core.Property; diff --git a/opendaylight/northbound/topology/pom.xml b/opendaylight/northbound/topology/pom.xml index 3b3abc3436..45fe9e6d8b 100644 --- a/opendaylight/northbound/topology/pom.xml +++ b/opendaylight/northbound/topology/pom.xml @@ -56,14 +56,15 @@ org.opendaylight.controller.usermanager, org.opendaylight.controller.topologymanager, com.sun.jersey.spi.container.servlet, - org.codehaus.jackson.annotate, + com.fasterxml.jackson.annotation, javax.ws.rs, javax.ws.rs.core, javax.xml.bind, javax.xml.bind.annotation, org.slf4j, org.apache.catalina.filters, - org.codehaus.jackson.jaxrs, + com.fasterxml.jackson.jaxrs.base, + com.fasterxml.jackson.jaxrs.json, !org.codehaus.enunciate.jaxrs /controller/nb/v2/topology diff --git a/opendaylight/northbound/topology/src/main/java/org/opendaylight/controller/topology/northbound/EdgeProperties.java b/opendaylight/northbound/topology/src/main/java/org/opendaylight/controller/topology/northbound/EdgeProperties.java index 6614bbe640..1d4a8a66ee 100644 --- a/opendaylight/northbound/topology/src/main/java/org/opendaylight/controller/topology/northbound/EdgeProperties.java +++ b/opendaylight/northbound/topology/src/main/java/org/opendaylight/controller/topology/northbound/EdgeProperties.java @@ -13,7 +13,6 @@ import java.util.HashMap; import java.util.HashSet; import java.util.Map; import java.util.Set; - import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; @@ -21,8 +20,8 @@ import javax.xml.bind.annotation.XmlElementRef; import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlRootElement; -import org.codehaus.jackson.annotate.JsonIgnore; -import org.codehaus.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonProperty; import org.opendaylight.controller.sal.core.Edge; import org.opendaylight.controller.sal.core.Property; diff --git a/opendaylight/northbound/usermanager/pom.xml b/opendaylight/northbound/usermanager/pom.xml index 8a85dbb622..d2614f03ed 100644 --- a/opendaylight/northbound/usermanager/pom.xml +++ b/opendaylight/northbound/usermanager/pom.xml @@ -47,7 +47,8 @@ javax.xml.bind.annotation, org.slf4j, org.apache.catalina.filters, - org.codehaus.jackson.jaxrs, + com.fasterxml.jackson.jaxrs.base, + com.fasterxml.jackson.jaxrs.json, !org.codehaus.enunciate.jaxrs diff --git a/opendaylight/samples/northbound/loadbalancer/pom.xml b/opendaylight/samples/northbound/loadbalancer/pom.xml index 543aa8ca54..1bbc5bf23e 100644 --- a/opendaylight/samples/northbound/loadbalancer/pom.xml +++ b/opendaylight/samples/northbound/loadbalancer/pom.xml @@ -59,7 +59,8 @@ javax.xml.bind, org.slf4j, org.apache.catalina.filters, - org.codehaus.jackson.jaxrs, + com.fasterxml.jackson.jaxrs.base, + com.fasterxml.jackson.jaxrs.json, !org.codehaus.enunciate.jaxrs /one/nb/v2/lb diff --git a/opendaylight/web/devices/pom.xml b/opendaylight/web/devices/pom.xml index d66381f6ce..8f6e1cc593 100644 --- a/opendaylight/web/devices/pom.xml +++ b/opendaylight/web/devices/pom.xml @@ -66,10 +66,8 @@ org.apache.taglibs.standard.tag.rt.fmt, org.apache.taglibs.standard.tei, org.apache.taglibs.standard.tlv, - org.codehaus.jackson, - org.codehaus.jackson.annotate, - org.codehaus.jackson.map, - org.codehaus.jackson.map.annotate, + com.fasterxml.jackson.databind, + com.fasterxml.jackson.annotation, org.osgi.framework, org.slf4j, org.springframework.beans, @@ -126,9 +124,10 @@ forwarding.staticrouting ${forwarding.staticrouting} + - org.codehaus.jackson - jackson-mapper-asl + com.fasterxml.jackson.core + jackson-databind diff --git a/opendaylight/web/devices/src/main/java/org/opendaylight/controller/devices/web/Devices.java b/opendaylight/web/devices/src/main/java/org/opendaylight/controller/devices/web/Devices.java index 3d33edcbf2..a118ccfbba 100644 --- a/opendaylight/web/devices/src/main/java/org/opendaylight/controller/devices/web/Devices.java +++ b/opendaylight/web/devices/src/main/java/org/opendaylight/controller/devices/web/Devices.java @@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentMap; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import org.codehaus.jackson.map.ObjectMapper; +import com.fasterxml.jackson.databind.ObjectMapper; import org.opendaylight.controller.connectionmanager.IConnectionManager; import org.opendaylight.controller.forwarding.staticrouting.IForwardingStaticRouting; import org.opendaylight.controller.forwarding.staticrouting.StaticRouteConfig; diff --git a/opendaylight/web/flows/pom.xml b/opendaylight/web/flows/pom.xml index f0393c19cb..2b4dcd3de5 100644 --- a/opendaylight/web/flows/pom.xml +++ b/opendaylight/web/flows/pom.xml @@ -63,10 +63,9 @@ org.apache.taglibs.standard.tag.rt.fmt, org.apache.taglibs.standard.tei, org.apache.taglibs.standard.tlv, - org.codehaus.jackson, - org.codehaus.jackson.annotate, - org.codehaus.jackson.map, - org.codehaus.jackson.map.annotate, + com.fasterxml.jackson.core, + com.fasterxml.jackson.annotation, + com.fasterxml.jackson.databind, org.osgi.framework, org.slf4j, org.springframework.beans, diff --git a/opendaylight/web/root/pom.xml b/opendaylight/web/root/pom.xml index 85388d9b05..8ebab10ca5 100644 --- a/opendaylight/web/root/pom.xml +++ b/opendaylight/web/root/pom.xml @@ -61,10 +61,9 @@ org.apache.taglibs.standard.tag.rt.fmt, org.apache.taglibs.standard.tei, org.apache.taglibs.standard.tlv, - org.codehaus.jackson, - org.codehaus.jackson.annotate, - org.codehaus.jackson.map, - org.codehaus.jackson.map.annotate, + com.fasterxml.jackson.core, + com.fasterxml.jackson.databind, + com.fasterxml.jackson.annotation, org.osgi.framework, org.slf4j, org.springframework.beans, diff --git a/opendaylight/web/topology/pom.xml b/opendaylight/web/topology/pom.xml index 226dcc87b7..97c5e3ccdc 100644 --- a/opendaylight/web/topology/pom.xml +++ b/opendaylight/web/topology/pom.xml @@ -66,10 +66,9 @@ org.apache.taglibs.standard.tag.rt.fmt, org.apache.taglibs.standard.tei, org.apache.taglibs.standard.tlv, - org.codehaus.jackson, - org.codehaus.jackson.annotate, - org.codehaus.jackson.map, - org.codehaus.jackson.map.annotate, + com.fasterxml.jackson.core, + com.fasterxml.jackson.databind, + com.fasterxml.jackson.annotation, org.osgi.framework, org.slf4j, org.springframework.beans, diff --git a/opendaylight/web/troubleshoot/pom.xml b/opendaylight/web/troubleshoot/pom.xml index bb5e9f1f18..4550be87f9 100644 --- a/opendaylight/web/troubleshoot/pom.xml +++ b/opendaylight/web/troubleshoot/pom.xml @@ -65,10 +65,9 @@ org.apache.taglibs.standard.tag.rt.fmt, org.apache.taglibs.standard.tei, org.apache.taglibs.standard.tlv, - org.codehaus.jackson, - org.codehaus.jackson.annotate, - org.codehaus.jackson.map, - org.codehaus.jackson.map.annotate, + com.fasterxml.jackson.core, + com.fasterxml.jackson.databind, + com.fasterxml.jackson.annotation, org.osgi.framework, org.slf4j, org.springframework.beans, @@ -120,9 +119,10 @@ web 0.4.1-SNAPSHOT - - org.codehaus.jackson - jackson-mapper-asl - + + + com.fasterxml.jackson.core + jackson-databind +