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 <abonas@redhat.com>

diff --git a/opendaylight/commons/opendaylight/pom.xml b/opendaylight/commons/opendaylight/pom.xml
index 5183165752446b8e38507d7dd3cc239394051cdb..54585898551b0ec935a9ccd8e05590ae5230cf23 100644 (file)
--- a/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@ -46,7 +46,7 @@
     <sonar.skippedModules>org.openflow.openflowj,net.sf.jung2</sonar.skippedModules>
     <logback.version>1.0.9</logback.version>
     <slf4j.version>1.7.2</slf4j.version>
     <sonar.skippedModules>org.openflow.openflowj,net.sf.jung2</sonar.skippedModules>
     <logback.version>1.0.9</logback.version>
     <slf4j.version>1.7.2</slf4j.version>

-    <jackson.version>1.9.8</jackson.version>
+    <jackson.version>2.3.0</jackson.version>

     <spring.version>3.1.3.RELEASE</spring.version>
     <spring-security.version>3.1.3.RELEASE</spring-security.version>
     <spring-osgi.version>1.2.1</spring-osgi.version>
     <spring.version>3.1.3.RELEASE</spring.version>
     <spring-security.version>3.1.3.RELEASE</spring-security.version>
     <spring-osgi.version>1.2.1</spring-osgi.version>


@@ -149,26 +149,43 @@
         <artifactId>logback-classic</artifactId>
         <version>${logback.version}</version>
       </dependency>
         <artifactId>logback-classic</artifactId>
         <version>${logback.version}</version>
       </dependency>

-      <dependency>
-        <groupId>org.codehaus.jackson</groupId>
-        <artifactId>jackson-mapper-asl</artifactId>
-        <version>${jackson.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.jackson</groupId>
-        <artifactId>jackson-core-asl</artifactId>
+
+     <dependency>
+       <groupId>com.fasterxml.jackson.core</groupId>
+       <artifactId>jackson-annotations</artifactId>
+       <version>${jackson.version}</version>
+     </dependency>
+
+     <dependency>
+       <groupId>com.fasterxml.jackson.core</groupId>
+       <artifactId>jackson-core</artifactId>
+       <version>${jackson.version}</version>
+     </dependency>
+
+     <dependency>
+       <groupId>com.fasterxml.jackson.core</groupId>
+       <artifactId>jackson-databind</artifactId>
+       <version>${jackson.version}</version>
+     </dependency>
+
+     <dependency>
+        <groupId>com.fasterxml.jackson.jaxrs</groupId>
+        <artifactId>jackson-jaxrs-base</artifactId>

         <version>${jackson.version}</version>
         <version>${jackson.version}</version>

-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.jackson</groupId>
-        <artifactId>jackson-jaxrs</artifactId>
+     </dependency>
+
+    <dependency>
+        <groupId>com.fasterxml.jackson.jaxrs</groupId>
+        <artifactId>jackson-jaxrs-json-provider</artifactId>

         <version>${jackson.version}</version>
         <version>${jackson.version}</version>

-      </dependency>
-      <dependency>
-        <groupId>org.codehaus.jackson</groupId>
-        <artifactId>jackson-xc</artifactId>
+     </dependency>
+
+     <dependency>
+        <groupId>com.fasterxml.jackson.module</groupId>
+        <artifactId>jackson-module-jaxb-annotations</artifactId>

         <version>${jackson.version}</version>
         <version>${jackson.version}</version>

-      </dependency>
+     </dependency>
+

       <dependency>
         <groupId>org.codehaus.jettison</groupId>
         <artifactId>jettison</artifactId>
       <dependency>
         <groupId>org.codehaus.jettison</groupId>
         <artifactId>jettison</artifactId>


@@ -577,11 +594,7 @@
         <artifactId>jersey-client</artifactId>
         <version>${jersey.version}</version>
       </dependency>
         <artifactId>jersey-client</artifactId>
         <version>${jersey.version}</version>
       </dependency>

-      <dependency>
-        <groupId>com.sun.jersey</groupId>
-        <artifactId>jersey-json</artifactId>
-        <version>${jersey.version}</version>
-      </dependency>
+

       <dependency>
         <groupId>org.ow2.asm</groupId>
         <artifactId>asm-all</artifactId>
       <dependency>
         <groupId>org.ow2.asm</groupId>
         <artifactId>asm-all</artifactId>

diff --git a/opendaylight/distribution/opendaylight/opendaylight.target b/opendaylight/distribution/opendaylight/opendaylight.target
index e3d1e5275df29f7efc3f27b9f77dedc09ec0ddc5..7ae309cce499dc138c5c8032b168b60b801a0eca 100644 (file)
--- a/opendaylight/distribution/opendaylight/opendaylight.target
+++ b/opendaylight/distribution/opendaylight/opendaylight.target
@@ -51,7 +51,6 @@
 <unit id="org.eclipse.virgo.kernel.equinox.extensions" version="3.6.0.RELEASE"/>
 <unit id="org.eclipse.osgi.services" version="3.3.100.v20120522-1822"/>
 <unit id="org.eclipse.virgo.util.common" version="3.6.0.RELEASE"/>
 <unit id="org.eclipse.virgo.kernel.equinox.extensions" version="3.6.0.RELEASE"/>
 <unit id="org.eclipse.osgi.services" version="3.3.100.v20120522-1822"/>
 <unit id="org.eclipse.virgo.util.common" version="3.6.0.RELEASE"/>

-<unit id="com.sun.jersey.json" version="1.17.0"/>

 <unit id="org.eclipse.equinox.util" version="1.0.400.v20120522-2049"/>
 <unit id="org.springframework.core" version="3.1.3.RELEASE"/>
 <unit id="org.apache.commons.fileupload" version="1.2.2"/>
 <unit id="org.eclipse.equinox.util" version="1.0.400.v20120522-2049"/>
 <unit id="org.springframework.core" version="3.1.3.RELEASE"/>
 <unit id="org.apache.commons.fileupload" version="1.2.2"/>

diff --git a/opendaylight/distribution/opendaylight/pom.xml b/opendaylight/distribution/opendaylight/pom.xml
index b0f7ad89a4b81694c889c52e51f5cc00947c8c4f..f399e05dc463b875429677d9ca914856e37d67a2 100644 (file)
--- a/opendaylight/distribution/opendaylight/pom.xml
+++ b/opendaylight/distribution/opendaylight/pom.xml
@@ -903,22 +903,37 @@
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
     </dependency>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-classic</artifactId>
     </dependency>

+

     <dependency>
     <dependency>

-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-mapper-asl</artifactId>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-databind</artifactId>

     </dependency>
     </dependency>

+

     <dependency>
     <dependency>

-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-core-asl</artifactId>
+       <groupId>com.fasterxml.jackson.core</groupId>
+       <artifactId>jackson-annotations</artifactId>

     </dependency>
     </dependency>

+

     <dependency>
     <dependency>

-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-jaxrs</artifactId>
+       <groupId>com.fasterxml.jackson.core</groupId>
+       <artifactId>jackson-core</artifactId>

     </dependency>
     </dependency>

+

     <dependency>
     <dependency>

-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-xc</artifactId>
+      <groupId>com.fasterxml.jackson.jaxrs</groupId>
+      <artifactId>jackson-jaxrs-json-provider</artifactId>

     </dependency>
     </dependency>

+
+      <dependency>
+         <groupId>com.fasterxml.jackson.jaxrs</groupId>
+         <artifactId>jackson-jaxrs-base</artifactId>
+      </dependency>
+
+    <dependency>
+      <groupId>com.fasterxml.jackson.module</groupId>
+      <artifactId>jackson-module-jaxb-annotations</artifactId>
+    </dependency>
+

     <dependency>
       <groupId>org.codehaus.jettison</groupId>
       <artifactId>jettison</artifactId>
     <dependency>
       <groupId>org.codehaus.jettison</groupId>
       <artifactId>jettison</artifactId>


@@ -1244,11 +1259,7 @@
       <groupId>com.sun.jersey</groupId>
       <artifactId>jersey-client</artifactId>
     </dependency>
       <groupId>com.sun.jersey</groupId>
       <artifactId>jersey-client</artifactId>
     </dependency>

-    <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-json</artifactId>
-      <version>${jersey.version}</version>
-    </dependency>
+

     <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm-all</artifactId>
     <dependency>
       <groupId>org.ow2.asm</groupId>
       <artifactId>asm-all</artifactId>

diff --git a/opendaylight/distribution/opendaylight/src/assemble/bin.xml b/opendaylight/distribution/opendaylight/src/assemble/bin.xml
index 8fea1756148cee4774de9a3586c7ea1056821e81..6f8878bee950b87a3b234f00e19570a8b6256cfc 100644 (file)
--- a/opendaylight/distribution/opendaylight/src/assemble/bin.xml
+++ b/opendaylight/distribution/opendaylight/src/assemble/bin.xml
@@ -24,7 +24,6 @@
         <exclude>ch.qos.logback:logback-core</exclude>
         <exclude>ch.qos.logback:logback-classic</exclude>
         <exclude>com.sun.jersey:jersey-core</exclude>
         <exclude>ch.qos.logback:logback-core</exclude>
         <exclude>ch.qos.logback:logback-classic</exclude>
         <exclude>com.sun.jersey:jersey-core</exclude>

-        <exclude>com.sun.jersey:jersey-json</exclude>

         <exclude>com.sun.jersey:jersey-server</exclude>
         <exclude>org.opendaylight.controller:logging.bridge</exclude>
         <exclude>org.opendaylight.controller:sanitytest</exclude>
         <exclude>com.sun.jersey:jersey-server</exclude>
         <exclude>org.opendaylight.controller:logging.bridge</exclude>
         <exclude>org.opendaylight.controller:sanitytest</exclude>


@@ -52,7 +51,6 @@
         <include>ch.qos.logback:logback-core</include>
         <include>ch.qos.logback:logback-classic</include>
         <include>com.sun.jersey:jersey-core</include>
         <include>ch.qos.logback:logback-core</include>
         <include>ch.qos.logback:logback-classic</include>
         <include>com.sun.jersey:jersey-core</include>

-        <include>com.sun.jersey:jersey-json</include>

         <include>com.sun.jersey:jersey-server</include>
         <include>org.opendaylight.controller:logging.bridge</include>
       </includes>
         <include>com.sun.jersey:jersey-server</include>
         <include>org.opendaylight.controller:logging.bridge</include>
       </includes>

diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini b/opendaylight/distribution/opendaylight/src/main/resources/configuration/config.ini
index ba5d862c5789357a7d1eec08985d5569fa2ad457..8ffaff45c7487bb7a78e59c1818ca640c8d0fc58 100644 (file)
--- 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/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
     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 35b2a4b25064d86794938e59bfcacf5b47548d72..1fd4b762c173089c720ddf3842ccc202faf5c91c 100644 (file)
--- 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 @@
             </Export-Package>
             <Import-Package>
               com.sun.jersey.spi.container.servlet,
             </Export-Package>
             <Import-Package>
               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.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 c973498e8549888e4b076d7e102c388c6222b9e8..6c72a610a76c0b2150704d3b9fda03bacfbd953a 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/implementation/pom.xml
+++ b/opendaylight/md-sal/sal-remoterpc-connector/implementation/pom.xml
@@ -14,7 +14,7 @@
 
   <properties>
     <zeromq.version>0.3.1</zeromq.version>
 
   <properties>
     <zeromq.version>0.3.1</zeromq.version>

-    <jackson.version>1.9.8</jackson.version>
+    <jackson.version>2.3.0</jackson.version>

     <stax.version>1.0.1</stax.version>
   </properties>
 
     <stax.version>1.0.1</stax.version>
   </properties>
 


@@ -84,16 +84,25 @@
       <groupId> org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
       <groupId> org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>

+

     <dependency>
     <dependency>

-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-core-asl</artifactId>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>

       <version>${jackson.version}</version>
     </dependency>
       <version>${jackson.version}</version>
     </dependency>

+

     <dependency>
     <dependency>

-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-mapper-asl</artifactId>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>

       <version>${jackson.version}</version>
     </dependency>
       <version>${jackson.version}</version>
     </dependency>

+
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+      <version>${jackson.version}</version>
+    </dependency>
+

     <dependency>
       <groupId>stax</groupId>
       <artifactId>stax-api</artifactId>
     <dependency>
       <groupId>stax</groupId>
       <artifactId>stax-api</artifactId>

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 6c5e5fbf1163c398b40ae67c5777039b6b6e8eb4..06107a8773a6213f79df91c3a2bd637e085647ff 100644 (file)
--- 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;
 
  */
 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 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<QName, QName, InstanceIdentifier>,Serializable {
 
   transient ObjectMapper mapper = new ObjectMapper();
 public class RouteIdentifierImpl implements RpcRouter.RouteIdentifier<QName, QName, InstanceIdentifier>,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 550d9ef125c39551699a538477e50ed001d8e78c..f6b9004eae3139a17773688eba17a528fb5d1ae0 100644 (file)
--- 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;
 
 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;
 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 org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

-import java.net.URI;
-

 public class RouteIdentifierImplTest {
 
   Logger _logger = LoggerFactory.getLogger(RouteIdentifierImplTest.class);
 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 4305a283e2f0ac2e374629005c85fd0dbc65c7e2..8ee61c3a3f6a72561f45f7cde92ee8bea9567f4a 100644 (file)
--- 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 @@
     </scm>
 
     <properties>
     </scm>
 
     <properties>

+        <jackson.version>2.3.0</jackson.version>

         <exam.version>3.0.0</exam.version>
         <url.version>1.5.0</url.version>
         <config.version>0.2.3-SNAPSHOT</config.version>
         <exam.version>3.0.0</exam.version>
         <url.version>1.5.0</url.version>
         <config.version>0.2.3-SNAPSHOT</config.version>


@@ -389,20 +390,29 @@
         </dependency>
 
         <dependency>
         </dependency>
 
         <dependency>

-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-mapper-asl</artifactId>
-            <version>1.9.2</version>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson.version}</version>

         </dependency>
         </dependency>

+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>${jackson.version}</version>
+        </dependency>
+

         <dependency>
         <dependency>

-            <groupId>org.codehaus.jackson</groupId>
-            <artifactId>jackson-core-asl</artifactId>
-            <version>1.9.2</version>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>${jackson.version}</version>

         </dependency>
         </dependency>

+

         <dependency>
             <groupId>org.zeromq</groupId>
             <artifactId>jeromq</artifactId>
             <version>0.3.1</version>
         </dependency>
         <dependency>
             <groupId>org.zeromq</groupId>
             <artifactId>jeromq</artifactId>
             <version>0.3.1</version>
         </dependency>

+

         <dependency>
             <groupId>org.opendaylight.yangtools.thirdparty</groupId>
             <artifactId>xtend-lib-osgi</artifactId>
         <dependency>
             <groupId>org.opendaylight.yangtools.thirdparty</groupId>
             <artifactId>xtend-lib-osgi</artifactId>

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 62c094d7a6cd44ce90c19b773449c5b9a3e02c24..dd910ea34bdb760721d1cc3151ff961ea07e75d8 100644 (file)
--- 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(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
         //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 8569783ad79818056eb45303692ec869f57c0671..e49fb33780dd1b16d2dbcaf47245e80611c652d4 100644 (file)
--- 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 @@
             <artifactId>jersey-client</artifactId>
             <version>${jersey.version}</version>
         </dependency>
             <artifactId>jersey-client</artifactId>
             <version>${jersey.version}</version>
         </dependency>

-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-json</artifactId>
-            <version>${jersey.version}</version>
-        </dependency>
+

         <dependency>
             <groupId>eclipselink</groupId>
             <artifactId>javax.resource</artifactId>
         <dependency>
             <groupId>eclipselink</groupId>
             <artifactId>javax.resource</artifactId>

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 fda1e264e6babd472799340faeda579174c497b8..b8ebedfdfbdf36034f203e8f66e3c9796e7a8327 100644 (file)
--- 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(),
 
                 // 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(),
                 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-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/commons/pom.xml b/opendaylight/northbound/commons/pom.xml
index 8e769a23499edacd822f4b6a6a2375ecc3a401a3..0a05571a82b4e97631e5cd703bb055bd3c7e663c 100644 (file)
--- 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.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
             </Import-Package>
           </instructions>
               org.slf4j
             </Import-Package>
           </instructions>


@@ -83,18 +84,32 @@
       <artifactId>bundlescanner</artifactId>
       <version>0.4.1-SNAPSHOT</version>
     </dependency>
       <artifactId>bundlescanner</artifactId>
       <version>0.4.1-SNAPSHOT</version>
     </dependency>

+

     <dependency>
     <dependency>

-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-core-asl</artifactId>
+       <groupId>com.fasterxml.jackson.core</groupId>
+       <artifactId>jackson-annotations</artifactId>

     </dependency>
     </dependency>

+

     <dependency>
     <dependency>

-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-mapper-asl</artifactId>
+       <groupId>com.fasterxml.jackson.core</groupId>
+       <artifactId>jackson-core</artifactId>

     </dependency>
     </dependency>

+

     <dependency>
     <dependency>

-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-jaxrs</artifactId>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>

     </dependency>
     </dependency>

+
+    <dependency>
+       <groupId>com.fasterxml.jackson.jaxrs</groupId>
+       <artifactId>jackson-jaxrs-json-provider</artifactId>
+    </dependency>
+
+      <dependency>
+         <groupId>com.fasterxml.jackson.jaxrs</groupId>
+         <artifactId>jackson-jaxrs-base</artifactId>
+      </dependency>
+

     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>


@@ -114,10 +129,6 @@
       <artifactId>jersey-client</artifactId>
       <version>${jersey.version}</version>
     </dependency>
       <artifactId>jersey-client</artifactId>
       <version>${jersey.version}</version>
     </dependency>

-    <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-json</artifactId>
-      <version>${jersey.version}</version>
-    </dependency>
+

   </dependencies>
 </project>
   </dependencies>
 </project>

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 5e5dee3279a2642b2719316b110804bed0c716fb..eb43920826c18f052e6749fb223646dafe5e5a47 100644 (file)
--- 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 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
 
 /**
  * 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 e164abaf95c0ccd3adb07e3bb55d32b8f9f22ec8..47bb3ffd7c72df59e0804527412a5a897dc922db 100644 (file)
--- 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 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 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;
 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();
 
     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;
     }
                 false);
         return jsonProvider;
     }

diff --git a/opendaylight/northbound/connectionmanager/pom.xml b/opendaylight/northbound/connectionmanager/pom.xml
index 0ddfcdb3e19f730cb5768cd1da1bdaabdb3bd5f0..fbfba08444eca63d179981dddfe1b294ae228c40 100644 (file)
--- 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,
               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
             </Import-Package>
             <Export-Package>
               !org.codehaus.enunciate.jaxrs
             </Import-Package>
             <Export-Package>

diff --git a/opendaylight/northbound/containermanager/pom.xml b/opendaylight/northbound/containermanager/pom.xml
index 517f2e76a35b443a6f2afd0091278d6ecc43c346..ff64d1872467296c4e727a5558de41edb6dc1fa1 100644 (file)
--- 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,
               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
             </Import-Package>
             <Web-ContextPath>/controller/nb/v2/containermanager</Web-ContextPath>
               !org.codehaus.enunciate.jaxrs
             </Import-Package>
             <Web-ContextPath>/controller/nb/v2/containermanager</Web-ContextPath>

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 10559a2bbda3e1dd96cc25b6b9ddaeefb86a957e..b9d2200180dbd858c17624dbaa7b2bd8e0c97038 100644 (file)
--- 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 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
 
 /**
  * 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 d1299a2559830b3ce10ddb3437cacad9765b39de..fe3c2b9a5bf97933b42788fb1a4bfa2048d5b694 100644 (file)
--- 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,
               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
             </Import-Package>
             <Web-ContextPath>/controller/nb/v2/controllermanager</Web-ContextPath>
               !org.codehaus.enunciate.jaxrs
             </Import-Package>
             <Web-ContextPath>/controller/nb/v2/controllermanager</Web-ContextPath>

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 ac0d0397464b53a6bbbd32afcbbc8421a94784ac..1560f96072e438f5665784aabc59ba2d6bdd89bb 100644 (file)
--- 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 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 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;
 
 /**
 import org.opendaylight.controller.sal.core.Property;
 
 /**

diff --git a/opendaylight/northbound/flowprogrammer/pom.xml b/opendaylight/northbound/flowprogrammer/pom.xml
index 1b81ccb450f71a9050739830c3e57758e0a43fc4..61791692bfb3b9cd767ececc3b27e87c8a41fa31 100644 (file)
--- 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,
               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
             </Import-Package>
             <Export-Package>
               !org.codehaus.enunciate.jaxrs
             </Import-Package>
             <Export-Package>

diff --git a/opendaylight/northbound/hosttracker/pom.xml b/opendaylight/northbound/hosttracker/pom.xml
index 541dfcfe2d9b20919995332dafa7d8098e2cfac5..b9b5fb7514adeeb905804b404656053212f1759a 100644 (file)
--- 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,
               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
             </Import-Package>
             <Web-ContextPath>/controller/nb/v2/hosttracker</Web-ContextPath>
               !org.codehaus.enunciate.jaxrs
             </Import-Package>
             <Web-ContextPath>/controller/nb/v2/hosttracker</Web-ContextPath>

diff --git a/opendaylight/northbound/integrationtest/pom.xml b/opendaylight/northbound/integrationtest/pom.xml
index 793af2f5d779379f1f92227c80d584b231a6b361..d1815bbf8c80b0ca4f8eaec2f520061609805bc2 100644 (file)
--- a/opendaylight/northbound/integrationtest/pom.xml
+++ b/opendaylight/northbound/integrationtest/pom.xml
@@ -266,26 +266,32 @@
       <artifactId>logback-classic</artifactId>
       <version>${logback.version}</version>
     </dependency>
       <artifactId>logback-classic</artifactId>
       <version>${logback.version}</version>
     </dependency>

+

     <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>

     </dependency>
     </dependency>

+

     <dependency>
     <dependency>

-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-core-asl</artifactId>
-      <version>${jackson.version}</version>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>

     </dependency>
     </dependency>

+

     <dependency>
     <dependency>

-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-jaxrs</artifactId>
-      <version>${jackson.version}</version>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>

     </dependency>
     </dependency>

+

     <dependency>
     <dependency>

-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-xc</artifactId>
-      <version>${jackson.version}</version>
+      <groupId>com.fasterxml.jackson.jaxrs</groupId>
+      <artifactId>jackson-jaxrs-json-provider</artifactId>

     </dependency>
     </dependency>

+
+    <dependency>
+       <groupId>com.fasterxml.jackson.module</groupId>
+       <artifactId>jackson-module-jaxb-annotations</artifactId>
+    </dependency>
+

     <dependency>
       <groupId>org.codehaus.jettison</groupId>
       <artifactId>jettison</artifactId>
     <dependency>
       <groupId>org.codehaus.jettison</groupId>
       <artifactId>jettison</artifactId>


@@ -672,11 +678,7 @@
       <artifactId>jersey-client</artifactId>
       <version>${jersey.version}</version>
     </dependency>
       <artifactId>jersey-client</artifactId>
       <version>${jersey.version}</version>
     </dependency>

-    <dependency>
-      <groupId>com.sun.jersey</groupId>
-      <artifactId>jersey-json</artifactId>
-      <version>${jersey.version}</version>
-    </dependency>
+

     <dependency>
       <groupId>eclipselink</groupId>
       <artifactId>javax.resource</artifactId>
     <dependency>
       <groupId>eclipselink</groupId>
       <artifactId>javax.resource</artifactId>

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 602de9a1c6f28f8e195ed0aa00c78bd82f3da434..9c63f5e5aaaec452653004b04f57d5f6b72ee6b9 100644 (file)
--- 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 java.util.List;
 import java.util.Map;
 import java.util.Set;

-

 import javax.inject.Inject;
 
 import org.apache.commons.codec.binary.Base64;
 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.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.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;
 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());
             }
                 System.out.println("HTTP response code: " + response.getStatus());
                 System.out.println("HTTP response message: " + response.getEntity());
             }

-

             return response.getEntity();
         } catch (Exception e) {
             if (debugMsg) {
             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);
         // 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);
 
         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.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(),
                 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-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 aa9fea5467ecbe1e0793ed44fd15c2616f2a2547..2576441061e5e53847a53d199502cfbac6197db6 100644 (file)
--- 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,
               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
             </Import-Package>
             <Export-Package>
               !org.codehaus.enunciate.jaxrs
             </Import-Package>
             <Export-Package>

diff --git a/opendaylight/northbound/staticrouting/pom.xml b/opendaylight/northbound/staticrouting/pom.xml
index d169de9f2af44372d4099adb6015c82b14d8d85e..01f3ff76c862a75766264217a180bf2c79ebcf79 100644 (file)
--- 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,
               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
             </Import-Package>
             <Export-Package>
               !org.codehaus.enunciate.jaxrs
             </Import-Package>
             <Export-Package>

diff --git a/opendaylight/northbound/statistics/pom.xml b/opendaylight/northbound/statistics/pom.xml
index 8df02c976b63db49ed411fc962a79593c82f3a4b..b7891a4b86fe6aeacffe949f834e11cc8fe63494 100644 (file)
--- 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,
                 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
               </Import-Package>
             <Export-Package>
                 !org.codehaus.enunciate.jaxrs
               </Import-Package>
             <Export-Package>

diff --git a/opendaylight/northbound/subnets/pom.xml b/opendaylight/northbound/subnets/pom.xml
index bdf0b988f815a88c85e0f593b4ed1d2405cdd23d..225d097ecc00c94eff54a58704193715cfc4886a 100644 (file)
--- 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,
               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
             </Import-Package>
             <Export-Package>
               !org.codehaus.enunciate.jaxrs
             </Import-Package>
             <Export-Package>

diff --git a/opendaylight/northbound/switchmanager/pom.xml b/opendaylight/northbound/switchmanager/pom.xml
index e4447fee2d8528e75dbe0819b4a3a20303e56c92..29c9dd810df667860a1be34650eb2312ac8d5cf8 100644 (file)
--- 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,
               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
             </Import-Package>
             <Web-ContextPath>/controller/nb/v2/switchmanager</Web-ContextPath>
               !org.codehaus.enunciate.jaxrs
             </Import-Package>
             <Web-ContextPath>/controller/nb/v2/switchmanager</Web-ContextPath>

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 43d3aae57c71f33f735f5ad35e1f887e7ad52f1c..00f0d4b0544fd7c474efae06550e0961ef08025c 100644 (file)
--- 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 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.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.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;
 
 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 58a024c928d17be3f8060ed5fc812ce10d66f839..51e96c49eaf4cd7ac39803c1bde77abe96c821cc 100644 (file)
--- 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 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.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.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;
 
 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 3b3abc34368f7937e01bf736770a08c20078576c..45fe9e6d8b6cdf5f83323009e361e65240d5a61a 100644 (file)
--- 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.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,
               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
             </Import-Package>
             <Web-ContextPath>/controller/nb/v2/topology</Web-ContextPath>
               !org.codehaus.enunciate.jaxrs
             </Import-Package>
             <Web-ContextPath>/controller/nb/v2/topology</Web-ContextPath>

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 6614bbe640d804030c5aa8fd49fb9e26a2ccc45f..1d4a8a66eec478c963cd76f5cc14dffca76b8ddb 100644 (file)
--- 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 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;
 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 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;
 
 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 8a85dbb62202de158261e466beb20a997461808c..d2614f03ed999849f13cf38be4f01234b75941d9 100644 (file)
--- 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,
               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
             </Import-Package>
             <Export-Package>
               !org.codehaus.enunciate.jaxrs
             </Import-Package>
             <Export-Package>

diff --git a/opendaylight/samples/northbound/loadbalancer/pom.xml b/opendaylight/samples/northbound/loadbalancer/pom.xml
index 543aa8ca54be34ed6bdd1f120b11235267801757..1bbc5bf23efad487b6242cf48e444d76d78b5ec0 100644 (file)
--- 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,
               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
             </Import-Package>
             <Web-ContextPath>/one/nb/v2/lb</Web-ContextPath>
               !org.codehaus.enunciate.jaxrs
             </Import-Package>
             <Web-ContextPath>/one/nb/v2/lb</Web-ContextPath>

diff --git a/opendaylight/web/devices/pom.xml b/opendaylight/web/devices/pom.xml
index d66381f6ce737321c384f15c57aa9d64e19cf0bd..8f6e1cc593e9c3aea0eec97a9c62dde96d42531f 100644 (file)
--- 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.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,
               org.osgi.framework,
               org.slf4j,
               org.springframework.beans,


@@ -126,9 +124,10 @@
       <artifactId>forwarding.staticrouting</artifactId>
       <version>${forwarding.staticrouting}</version>
     </dependency>
       <artifactId>forwarding.staticrouting</artifactId>
       <version>${forwarding.staticrouting}</version>
     </dependency>

+

     <dependency>
     <dependency>

-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-mapper-asl</artifactId>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-databind</artifactId>

     </dependency>
   </dependencies>
 </project>
     </dependency>
   </dependencies>
 </project>

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 3d33edcbf2272c308cdb2236c574aaa42cd95ed9..a118ccfbba70658fd4e2c817ea5a9e60bce7b500 100644 (file)
--- 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 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;
 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 f0393c19cb0a04eb0fffae836840bff46441411f..2b4dcd3de5388881564cb11e206dd6cca7f22ef3 100644 (file)
--- 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.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,
               org.osgi.framework,
               org.slf4j,
               org.springframework.beans,

diff --git a/opendaylight/web/root/pom.xml b/opendaylight/web/root/pom.xml
index 85388d9b05f70587f6ba5006590411fac1363a25..8ebab10ca544f6383ac1dd8c6fe9c31847147e45 100644 (file)
--- 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.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,
               org.osgi.framework,
               org.slf4j,
               org.springframework.beans,

diff --git a/opendaylight/web/topology/pom.xml b/opendaylight/web/topology/pom.xml
index 226dcc87b7fb8bf34fa94937ec5e79b86eb8d577..97c5e3ccdc6ec50ef506f2ff9322c04667b74e96 100644 (file)
--- 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.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,
               org.osgi.framework,
               org.slf4j,
               org.springframework.beans,

diff --git a/opendaylight/web/troubleshoot/pom.xml b/opendaylight/web/troubleshoot/pom.xml
index bb5e9f1f18f1ac3682485e34f82088ee7e17ff3c..4550be87f9853e5d2d78f10d930301a70f7c3f8d 100644 (file)
--- 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.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,
               org.osgi.framework,
               org.slf4j,
               org.springframework.beans,


@@ -120,9 +119,10 @@
       <artifactId>web</artifactId>
       <version>0.4.1-SNAPSHOT</version>
     </dependency>
       <artifactId>web</artifactId>
       <version>0.4.1-SNAPSHOT</version>
     </dependency>

-    <dependency>
-      <groupId>org.codehaus.jackson</groupId>
-      <artifactId>jackson-mapper-asl</artifactId>
-    </dependency>
+
+   <dependency>
+         <groupId>com.fasterxml.jackson.core</groupId>
+         <artifactId>jackson-databind</artifactId>
+   </dependency>

   </dependencies>
 </project>
   </dependencies>
 </project>