From: Madhu Venugopal Date: Sat, 4 Jan 2014 22:11:02 +0000 (+0000) Subject: Merge "Upgrade jackson library to version 2.3.0" X-Git-Tag: jenkins-controller-bulk-release-prepare-only-2-1~142 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=454f93d530edea269105cebd0020d0bf1aa75c79;hp=-c Merge "Upgrade jackson library to version 2.3.0" --- 454f93d530edea269105cebd0020d0bf1aa75c79 diff --combined opendaylight/commons/opendaylight/pom.xml index 4304961526,5458589855..8933b1442f --- a/opendaylight/commons/opendaylight/pom.xml +++ b/opendaylight/commons/opendaylight/pom.xml @@@ -46,7 -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 @@@ -95,21 -95,12 +95,21 @@@ 0.0.1-SNAPSHOT 4.0.10.Final 2.4 - - jacoco - java + 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT 0.5.0-SNAPSHOT 0.5.0-SNAPSHOT 0.5.0-SNAPSHOT + 0.4.1-SNAPSHOT + 0.4.1-SNAPSHOT + + 1.18-SNAPSHOT + 7.0.43-SNAPSHOT + + 0.4.1-SNAPSHOT + + jacoco + java 2.5.1 1.7 1.7 @@@ -158,26 -149,43 +158,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 @@@ -586,11 -594,7 +603,7 @@@ jersey-client ${jersey.version} - - com.sun.jersey - jersey-json - ${jersey.version} - + org.ow2.asm asm-all @@@ -630,12 -634,12 +643,12 @@@ org.opendaylight.controller.thirdparty com.sun.jersey.jersey-servlet - 1.17 + ${jersey-servlet.version} org.opendaylight.controller.thirdparty org.apache.catalina.filters.CorsFilter - 7.0.42 + ${corsfilter.version} org.opendaylight.controller.thirdparty @@@ -735,7 -739,7 +748,7 @@@ org.opendaylight.controller switchmanager - 0.5.1-SNAPSHOT + ${switchmanager.api.version} diff --combined opendaylight/distribution/opendaylight/pom.xml index 64872e9f11,f399e05dc4..6fca9db636 --- a/opendaylight/distribution/opendaylight/pom.xml +++ b/opendaylight/distribution/opendaylight/pom.xml @@@ -134,31 -134,6 +134,31 @@@ forwardingrules-manager ${mdsal.version} + + org.opendaylight.controller.md + topology-lldp-discovery + ${mdsal.version} + + + org.opendaylight.controller.md + topology-manager + ${mdsal.version} + + + org.opendaylight.controller.model + model-topology + 1.0-SNAPSHOT + + + org.opendaylight.yangtools.model + ietf-topology + 2013.07.12.2-SNAPSHOT + + + org.opendaylight.controller + sal-binding-util + 1.0-SNAPSHOT + org.opendaylight.controller.md statistics-manager @@@ -928,22 -903,37 +928,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 @@@ -1269,11 -1259,7 +1284,7 @@@ com.sun.jersey jersey-client - - com.sun.jersey - jersey-json - ${jersey.version} - + org.ow2.asm asm-all diff --combined opendaylight/northbound/commons/pom.xml index 8e52242105,0a05571a82..2169f3f3e7 --- a/opendaylight/northbound/commons/pom.xml +++ b/opendaylight/northbound/commons/pom.xml @@@ -52,9 -52,10 +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 @@@ -71,30 -72,44 +72,44 @@@ org.opendaylight.controller sal - 0.5.1-SNAPSHOT + ${sal.version} org.opendaylight.controller usermanager - 0.4.1-SNAPSHOT + ${usermanager.version} org.opendaylight.controller bundlescanner - 0.4.1-SNAPSHOT + ${bundlescanner.version} + - 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 +129,6 @@@ jersey-client ${jersey.version} - - com.sun.jersey - jersey-json - ${jersey.version} - + diff --combined opendaylight/northbound/connectionmanager/pom.xml index b1f699bd36,fbfba08444..8ade6134e6 --- a/opendaylight/northbound/connectionmanager/pom.xml +++ b/opendaylight/northbound/connectionmanager/pom.xml @@@ -27,7 -27,7 +27,7 @@@ org.opendaylight.controller sal - 0.5.1-SNAPSHOT + ${sal.version} @@@ -58,7 -58,8 +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 @@@ -75,22 -76,22 +76,22 @@@ org.opendaylight.controller sal - 0.5.1-SNAPSHOT + ${sal.version} org.opendaylight.controller sal.connection - 0.1.1-SNAPSHOT + ${sal.connection.version} org.opendaylight.controller connectionmanager - 0.1.1-SNAPSHOT + ${connectionmanager.version} org.opendaylight.controller containermanager - 0.5.1-SNAPSHOT + ${containermanager.version} org.codehaus.enunciate @@@ -100,7 -101,7 +101,7 @@@ org.opendaylight.controller commons.northbound - 0.4.1-SNAPSHOT + ${commons.northbound.version} diff --combined opendaylight/northbound/containermanager/pom.xml index 9e5bcba747,ff64d18724..a8b8f2a5d0 --- a/opendaylight/northbound/containermanager/pom.xml +++ b/opendaylight/northbound/containermanager/pom.xml @@@ -52,7 -52,8 +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 @@@ -66,7 -67,7 +67,7 @@@ org.opendaylight.controller containermanager - 0.5.1-SNAPSHOT + ${containermanager.version} org.opendaylight.controller @@@ -81,7 -82,7 +82,7 @@@ org.opendaylight.controller sal - 0.5.1-SNAPSHOT + ${sal.version} org.codehaus.enunciate @@@ -91,7 -92,7 +92,7 @@@ org.opendaylight.controller commons.northbound - 0.4.1-SNAPSHOT + ${commons.northbound.version} diff --combined opendaylight/northbound/controllermanager/pom.xml index 596f022365,fe3c2b9a5b..8c3279e6c7 --- a/opendaylight/northbound/controllermanager/pom.xml +++ b/opendaylight/northbound/controllermanager/pom.xml @@@ -27,7 -27,7 +27,7 @@@ org.opendaylight.controller sal - 0.5.1-SNAPSHOT + ${sal.version} @@@ -59,8 -59,9 +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 @@@ -75,30 -76,30 +76,30 @@@ org.opendaylight.controller.thirdparty com.sun.jersey.jersey-servlet - 1.18-SNAPSHOT + ${jersey-servlet.version} org.opendaylight.controller containermanager - 0.5.1-SNAPSHOT + ${containermanager.version} org.opendaylight.controller switchmanager - 0.6.1-SNAPSHOT + ${switchmanager.api.version} org.opendaylight.controller sal - 0.5.1-SNAPSHOT + ${sal.version} org.opendaylight.controller commons.northbound - 0.4.1-SNAPSHOT + ${commons.northbound.version} @@@ -120,7 -121,7 +121,7 @@@ org.opendaylight.controller.thirdparty org.apache.catalina.filters.CorsFilter - 7.0.43-SNAPSHOT + ${corsfilter.version} diff --combined opendaylight/northbound/flowprogrammer/pom.xml index 5e3328a1f9,61791692bf..565bd5f6aa --- a/opendaylight/northbound/flowprogrammer/pom.xml +++ b/opendaylight/northbound/flowprogrammer/pom.xml @@@ -28,7 -28,7 +28,7 @@@ org.opendaylight.controller sal - 0.5.1-SNAPSHOT + ${sal.version} @@@ -57,7 -57,8 +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 @@@ -74,7 -75,7 +75,7 @@@ org.opendaylight.controller containermanager - 0.5.1-SNAPSHOT + ${containermanager.version} org.opendaylight.controller @@@ -83,12 -84,12 +84,12 @@@ org.opendaylight.controller forwardingrulesmanager - 0.4.1-SNAPSHOT + ${forwardingrulesmanager.version} org.opendaylight.controller sal - 0.7.0-SNAPSHOT + ${sal.version} org.codehaus.enunciate @@@ -98,7 -99,7 +99,7 @@@ org.opendaylight.controller commons.northbound - 0.4.1-SNAPSHOT + ${commons.northbound.version} junit diff --combined opendaylight/northbound/hosttracker/pom.xml index b7b4a731c1,b9b5fb7514..aab519e5f6 --- a/opendaylight/northbound/hosttracker/pom.xml +++ b/opendaylight/northbound/hosttracker/pom.xml @@@ -27,7 -27,7 +27,7 @@@ org.opendaylight.controller sal - 0.5.1-SNAPSHOT + ${sal.version} @@@ -59,7 -59,8 +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 @@@ -74,7 -75,7 +75,7 @@@ org.opendaylight.controller containermanager - 0.5.1-SNAPSHOT + ${containermanager.version} org.opendaylight.controller @@@ -88,12 -89,12 +89,12 @@@ org.opendaylight.controller sal - 0.5.1-SNAPSHOT + ${sal.version} org.opendaylight.controller commons.northbound - 0.4.1-SNAPSHOT + ${commons.northbound.version} org.codehaus.enunciate diff --combined opendaylight/northbound/networkconfiguration/bridgedomain/pom.xml index 3e47e55121,2576441061..483d993d04 --- a/opendaylight/northbound/networkconfiguration/bridgedomain/pom.xml +++ b/opendaylight/northbound/networkconfiguration/bridgedomain/pom.xml @@@ -27,7 -27,7 +27,7 @@@ org.opendaylight.controller sal - 0.5.1-SNAPSHOT + ${sal.version} @@@ -59,7 -59,8 +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 @@@ -76,27 -77,27 +77,27 @@@ org.opendaylight.controller sal - 0.5.1-SNAPSHOT + ${sal.version} org.opendaylight.controller sal.connection - 0.1.1-SNAPSHOT + ${sal.connection.version} org.opendaylight.controller sal.networkconfiguration - 0.0.2-SNAPSHOT + ${sal.networkconfiguration.version} org.opendaylight.controller connectionmanager - 0.1.1-SNAPSHOT + ${connectionmanager.version} org.opendaylight.controller containermanager - 0.5.1-SNAPSHOT + ${containermanager.version} org.codehaus.enunciate @@@ -106,7 -107,7 +107,7 @@@ org.opendaylight.controller commons.northbound - 0.4.1-SNAPSHOT + ${commons.northbound.version} diff --combined opendaylight/northbound/staticrouting/pom.xml index 2a3ae10ce3,01f3ff76c8..c020e6b2a2 --- a/opendaylight/northbound/staticrouting/pom.xml +++ b/opendaylight/northbound/staticrouting/pom.xml @@@ -27,7 -27,7 +27,7 @@@ org.opendaylight.controller sal - 0.5.1-SNAPSHOT + ${sal.version} @@@ -57,7 -57,8 +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 @@@ -74,12 -75,12 +75,12 @@@ org.opendaylight.controller sal - 0.5.1-SNAPSHOT + ${sal.version} org.opendaylight.controller containermanager - 0.5.1-SNAPSHOT + ${containermanager.version} org.opendaylight.controller @@@ -94,7 -95,7 +95,7 @@@ org.opendaylight.controller commons.northbound - 0.4.1-SNAPSHOT + ${commons.northbound.version} junit diff --combined opendaylight/northbound/statistics/pom.xml index 4ce5d5437a,b7891a4b86..95410b0d3a --- a/opendaylight/northbound/statistics/pom.xml +++ b/opendaylight/northbound/statistics/pom.xml @@@ -27,7 -27,7 +27,7 @@@ org.opendaylight.controller sal - 0.5.1-SNAPSHOT + ${sal.version} @@@ -65,7 -65,8 +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 @@@ -82,22 -83,22 +83,22 @@@ org.opendaylight.controller containermanager - 0.5.1-SNAPSHOT + ${containermanager.version} org.opendaylight.controller statisticsmanager - 0.4.1-SNAPSHOT + ${statisticsmanager.version} org.opendaylight.controller sal - 0.5.1-SNAPSHOT + ${sal.version} org.opendaylight.controller commons.northbound - 0.4.1-SNAPSHOT + ${commons.northbound.version} org.codehaus.enunciate diff --combined opendaylight/northbound/subnets/pom.xml index ed0e9428be,225d097ecc..c7108b2efa --- a/opendaylight/northbound/subnets/pom.xml +++ b/opendaylight/northbound/subnets/pom.xml @@@ -27,22 -27,22 +27,22 @@@ org.opendaylight.controller sal - 0.5.1-SNAPSHOT + ${sal.version} org.opendaylight.controller clustering.services - 0.4.1-SNAPSHOT + ${clustering.services.version} org.opendaylight.controller configuration - 0.4.1-SNAPSHOT + ${configuration.version} org.opendaylight.controller switchmanager - 0.5.1-SNAPSHOT + ${switchmanager.api.version} @@@ -72,7 -72,8 +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 @@@ -89,12 -90,12 +90,12 @@@ org.opendaylight.controller sal - 0.5.1-SNAPSHOT + ${sal.version} org.opendaylight.controller containermanager - 0.5.1-SNAPSHOT + ${containermanager.version} org.opendaylight.controller @@@ -103,7 -104,7 +104,7 @@@ org.opendaylight.controller commons.northbound - 0.4.1-SNAPSHOT + ${commons.northbound.version} org.codehaus.enunciate diff --combined opendaylight/northbound/switchmanager/pom.xml index bad129a54d,29c9dd810d..a1932f521b --- a/opendaylight/northbound/switchmanager/pom.xml +++ b/opendaylight/northbound/switchmanager/pom.xml @@@ -28,7 -28,7 +28,7 @@@ org.opendaylight.controller sal - 0.5.1-SNAPSHOT + ${sal.version} @@@ -59,8 -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 @@@ -75,7 -75,7 +75,7 @@@ org.opendaylight.controller containermanager - 0.5.1-SNAPSHOT + ${containermanager.version} org.opendaylight.controller @@@ -85,13 -85,13 +85,13 @@@ org.opendaylight.controller sal - 0.5.1-SNAPSHOT + ${sal.version} org.opendaylight.controller commons.northbound - 0.4.1-SNAPSHOT + ${commons.northbound.version} diff --combined opendaylight/northbound/topology/pom.xml index a7ef3e1cba,45fe9e6d8b..4cdfb02d58 --- a/opendaylight/northbound/topology/pom.xml +++ b/opendaylight/northbound/topology/pom.xml @@@ -29,7 -29,7 +29,7 @@@ org.opendaylight.controller sal - 0.5.1-SNAPSHOT + ${sal.version} @@@ -56,14 -56,15 +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 @@@ -83,22 -84,22 +84,22 @@@ org.opendaylight.controller containermanager - 0.5.1-SNAPSHOT + ${containermanager.version} org.opendaylight.controller commons.northbound - 0.4.1-SNAPSHOT + ${commons.northbound.version} org.opendaylight.controller sal - 0.5.1-SNAPSHOT + ${sal.version} org.opendaylight.controller topologymanager - 0.4.1-SNAPSHOT + ${topologymanager.version} junit diff --combined opendaylight/northbound/usermanager/pom.xml index ed94369da3,d2614f03ed..b48d67252e --- a/opendaylight/northbound/usermanager/pom.xml +++ b/opendaylight/northbound/usermanager/pom.xml @@@ -47,7 -47,8 +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 @@@ -64,17 -65,17 +65,17 @@@ org.opendaylight.controller sal - 0.5.1-SNAPSHOT + ${sal.version} org.opendaylight.controller usermanager - 0.4.1-SNAPSHOT + ${usermanager.version} org.opendaylight.controller commons.northbound - 0.4.1-SNAPSHOT + ${commons.northbound.version} org.codehaus.enunciate