Merge "Upgrade jackson library to version 2.3.0"

diff --combined opendaylight/commons/opendaylight/pom.xml
index 430496152668f8dd72e6f660e41f68c7581c02ef,54585898551b0ec935a9ccd8e05590ae5230cf23..8933b1442feaec0988b62f19e297a3d8b4b6c99b
--- 1/opendaylight/commons/opendaylight/pom.xml
--- 2/opendaylight/commons/opendaylight/pom.xml
+++ b/opendaylight/commons/opendaylight/pom.xml
@@@ -46,7 -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>
-     <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>
@@@ -95,21 -95,12 +95,21 @@@
      <jolokia.bridge.version>0.0.1-SNAPSHOT</jolokia.bridge.version>
      <netty.version>4.0.10.Final</netty.version>
      <commons.io.version>2.4</commons.io.version>
 -    <!-- Sonar properties using jacoco to retrieve integration test results -->
 -    <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
 -    <sonar.language>java</sonar.language>
 +    <bundlescanner.version>0.4.1-SNAPSHOT</bundlescanner.version>
 +    <usermanager.version>0.4.1-SNAPSHOT</usermanager.version>
      <forwardingrulesmanager.version>0.5.0-SNAPSHOT</forwardingrulesmanager.version>
      <statisticsmanager.version>0.5.0-SNAPSHOT</statisticsmanager.version>
      <clustering.services.version>0.5.0-SNAPSHOT</clustering.services.version>
 +    <configuration.version>0.4.1-SNAPSHOT</configuration.version>
 +    <topologymanager.version>0.4.1-SNAPSHOT</topologymanager.version>
 +    <!-- Third party version -->
 +    <jersey-servlet.version>1.18-SNAPSHOT</jersey-servlet.version>
 +    <corsfilter.version>7.0.43-SNAPSHOT</corsfilter.version>
 +    <!-- Northbound API version -->
 +    <commons.northbound.version>0.4.1-SNAPSHOT</commons.northbound.version>
 +    <!-- Sonar properties using jacoco to retrieve integration test results -->
 +    <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
 +    <sonar.language>java</sonar.language>
      <maven.compile.plugin.version>2.5.1</maven.compile.plugin.version>
      <java.version.source>1.7</java.version.source>
      <java.version.target>1.7</java.version.target>
@@@ -158,26 -149,43 +158,43 @@@
          <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>
-       </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>
-       </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>
-       </dependency>
+      </dependency>
+ 
        <dependency>
          <groupId>org.codehaus.jettison</groupId>
          <artifactId>jettison</artifactId>
@@@ -586,11 -594,7 +603,7 @@@
          <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>
@@@ -630,12 -634,12 +643,12 @@@
        <dependency>
          <groupId>org.opendaylight.controller.thirdparty</groupId>
          <artifactId>com.sun.jersey.jersey-servlet</artifactId>
 -        <version>1.17</version>
 +        <version>${jersey-servlet.version}</version>
        </dependency>
        <dependency>
          <groupId>org.opendaylight.controller.thirdparty</groupId>
          <artifactId>org.apache.catalina.filters.CorsFilter</artifactId>
 -        <version>7.0.42</version>
 +        <version>${corsfilter.version}</version>
        </dependency>
        <dependency>
          <groupId>org.opendaylight.controller.thirdparty</groupId>
@@@ -735,7 -739,7 +748,7 @@@
        <dependency>
          <groupId>org.opendaylight.controller</groupId>
          <artifactId>switchmanager</artifactId>
 -        <version>0.5.1-SNAPSHOT</version>
 +        <version>${switchmanager.api.version}</version>
        </dependency>
  
        <!-- equinox http service bridge -->

diff --combined opendaylight/distribution/opendaylight/pom.xml
index 64872e9f1179713c3a2b8e5818bbc67645157191,f399e05dc463b875429677d9ca914856e37d67a2..6fca9db636e71479d986710b921912a68b2850a8
--- 1/opendaylight/distribution/opendaylight/pom.xml
--- 2/opendaylight/distribution/opendaylight/pom.xml
+++ b/opendaylight/distribution/opendaylight/pom.xml
@@@ -134,31 -134,6 +134,31 @@@
            <artifactId>forwardingrules-manager</artifactId>
            <version>${mdsal.version}</version>
          </dependency>
 +        <dependency>
 +          <groupId>org.opendaylight.controller.md</groupId>
 +          <artifactId>topology-lldp-discovery</artifactId>
 +          <version>${mdsal.version}</version>
 +        </dependency>
 +        <dependency>
 +          <groupId>org.opendaylight.controller.md</groupId>
 +          <artifactId>topology-manager</artifactId>
 +          <version>${mdsal.version}</version>
 +        </dependency>
 +        <dependency>
 +            <groupId>org.opendaylight.controller.model</groupId>
 +            <artifactId>model-topology</artifactId>
 +            <version>1.0-SNAPSHOT</version>
 +        </dependency>
 +        <dependency>
 +         <groupId>org.opendaylight.yangtools.model</groupId>
 +         <artifactId>ietf-topology</artifactId>
 +         <version>2013.07.12.2-SNAPSHOT</version>
 +        </dependency>
 +        <dependency>
 +            <groupId>org.opendaylight.controller</groupId>
 +            <artifactId>sal-binding-util</artifactId>
 +            <version>1.0-SNAPSHOT</version>
 +        </dependency>
          <dependency>
            <groupId>org.opendaylight.controller.md</groupId>
            <artifactId>statistics-manager</artifactId>
@@@ -928,22 -903,37 +928,37 @@@
        <groupId>ch.qos.logback</groupId>
        <artifactId>logback-classic</artifactId>
      </dependency>
+ 
      <dependency>
-       <groupId>org.codehaus.jackson</groupId>
-       <artifactId>jackson-mapper-asl</artifactId>
+         <groupId>com.fasterxml.jackson.core</groupId>
+         <artifactId>jackson-databind</artifactId>
      </dependency>
+ 
      <dependency>
-       <groupId>org.codehaus.jackson</groupId>
-       <artifactId>jackson-core-asl</artifactId>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-annotations</artifactId>
      </dependency>
+ 
      <dependency>
-       <groupId>org.codehaus.jackson</groupId>
-       <artifactId>jackson-jaxrs</artifactId>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-core</artifactId>
      </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>
+          <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>
@@@ -1269,11 -1259,7 +1284,7 @@@
        <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>

diff --combined opendaylight/northbound/commons/pom.xml
index 8e52242105680b8505b7a2e2cdd90dba261a3061,0a05571a82b4e97631e5cd703bb055bd3c7e663c..2169f3f3e7c679670f24c94516217fe9bbceaf9b
--- 1/opendaylight/northbound/commons/pom.xml
--- 2/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
              </Import-Package>
            </instructions>
@@@ -71,30 -72,44 +72,44 @@@
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>sal</artifactId>
 -      <version>0.5.1-SNAPSHOT</version>
 +      <version>${sal.version}</version>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>usermanager</artifactId>
 -      <version>0.4.1-SNAPSHOT</version>
 +      <version>${usermanager.version}</version>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>bundlescanner</artifactId>
 -      <version>0.4.1-SNAPSHOT</version>
 +      <version>${bundlescanner.version}</version>
      </dependency>
+ 
      <dependency>
-       <groupId>org.codehaus.jackson</groupId>
-       <artifactId>jackson-core-asl</artifactId>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-annotations</artifactId>
      </dependency>
+ 
      <dependency>
-       <groupId>org.codehaus.jackson</groupId>
-       <artifactId>jackson-mapper-asl</artifactId>
+        <groupId>com.fasterxml.jackson.core</groupId>
+        <artifactId>jackson-core</artifactId>
      </dependency>
+ 
      <dependency>
-       <groupId>org.codehaus.jackson</groupId>
-       <artifactId>jackson-jaxrs</artifactId>
+       <groupId>com.fasterxml.jackson.core</groupId>
+       <artifactId>jackson-databind</artifactId>
      </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>
@@@ -114,10 -129,6 +129,6 @@@
        <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>

diff --combined opendaylight/northbound/connectionmanager/pom.xml
index b1f699bd36143c21d1a5d28903bef9cb78fc8b15,fbfba08444eca63d179981dddfe1b294ae228c40..8ade6134e6b3a715d223288d9e0719098aa5b4df
--- 1/opendaylight/northbound/connectionmanager/pom.xml
--- 2/opendaylight/northbound/connectionmanager/pom.xml
+++ b/opendaylight/northbound/connectionmanager/pom.xml
@@@ -27,7 -27,7 +27,7 @@@
            <dependency>
              <groupId>org.opendaylight.controller</groupId>
              <artifactId>sal</artifactId>
 -            <version>0.5.1-SNAPSHOT</version>
 +            <version>${sal.version}</version>
            </dependency>
          </dependencies>
        </plugin>
@@@ -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
              </Import-Package>
              <Export-Package>
@@@ -75,22 -76,22 +76,22 @@@
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>sal</artifactId>
 -      <version>0.5.1-SNAPSHOT</version>
 +      <version>${sal.version}</version>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>sal.connection</artifactId>
 -      <version>0.1.1-SNAPSHOT</version>
 +      <version>${sal.connection.version}</version>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>connectionmanager</artifactId>
 -      <version>0.1.1-SNAPSHOT</version>
 +      <version>${connectionmanager.version}</version>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>containermanager</artifactId>
 -      <version>0.5.1-SNAPSHOT</version>
 +      <version>${containermanager.version}</version>
      </dependency>
      <dependency>
        <groupId>org.codehaus.enunciate</groupId>
@@@ -100,7 -101,7 +101,7 @@@
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>commons.northbound</artifactId>
 -      <version>0.4.1-SNAPSHOT</version>
 +      <version>${commons.northbound.version}</version>
      </dependency>
    </dependencies>
  </project>

diff --combined opendaylight/northbound/containermanager/pom.xml
index 9e5bcba74723fb4994c514ef9ac1b1fa012982c9,ff64d1872467296c4e727a5558de41edb6dc1fa1..a8b8f2a5d0e4ae44cc6ca3183dadadbd1586edf3
--- 1/opendaylight/northbound/containermanager/pom.xml
--- 2/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
              </Import-Package>
              <Web-ContextPath>/controller/nb/v2/containermanager</Web-ContextPath>
@@@ -66,7 -67,7 +67,7 @@@
    <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>containermanager</artifactId>
 -      <version>0.5.1-SNAPSHOT</version>
 +      <version>${containermanager.version}</version>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
@@@ -81,7 -82,7 +82,7 @@@
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>sal</artifactId>
 -      <version>0.5.1-SNAPSHOT</version>
 +      <version>${sal.version}</version>
      </dependency>
      <dependency>
        <groupId>org.codehaus.enunciate</groupId>
@@@ -91,7 -92,7 +92,7 @@@
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>commons.northbound</artifactId>
 -      <version>0.4.1-SNAPSHOT</version>
 +      <version>${commons.northbound.version}</version>
      </dependency>
    </dependencies>
  </project>

diff --combined opendaylight/northbound/controllermanager/pom.xml
index 596f0223651dfd53ee0bf11f025fb1e7ab544a19,fe3c2b9a5bf97933b42788fb1a4bfa2048d5b694..8c3279e6c7b6857630bb5e7855b93cfd1064f906
--- 1/opendaylight/northbound/controllermanager/pom.xml
--- 2/opendaylight/northbound/controllermanager/pom.xml
+++ b/opendaylight/northbound/controllermanager/pom.xml
@@@ -27,7 -27,7 +27,7 @@@
            <dependency>
              <groupId>org.opendaylight.controller</groupId>
              <artifactId>sal</artifactId>
 -            <version>0.5.1-SNAPSHOT</version>
 +            <version>${sal.version}</version>
            </dependency>
          </dependencies>
        </plugin>
@@@ -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
              </Import-Package>
              <Web-ContextPath>/controller/nb/v2/controllermanager</Web-ContextPath>
@@@ -75,30 -76,30 +76,30 @@@
      <dependency>
        <groupId>org.opendaylight.controller.thirdparty</groupId>
        <artifactId>com.sun.jersey.jersey-servlet</artifactId>
 -      <version>1.18-SNAPSHOT</version>
 +      <version>${jersey-servlet.version}</version>
      </dependency>
  
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>containermanager</artifactId>
 -      <version>0.5.1-SNAPSHOT</version>
 +      <version>${containermanager.version}</version>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>switchmanager</artifactId>
 -      <version>0.6.1-SNAPSHOT</version>
 +      <version>${switchmanager.api.version}</version>
      </dependency>
  
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>sal</artifactId>
 -      <version>0.5.1-SNAPSHOT</version>
 +      <version>${sal.version}</version>
      </dependency>
  
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>commons.northbound</artifactId>
 -      <version>0.4.1-SNAPSHOT</version>
 +      <version>${commons.northbound.version}</version>
      </dependency>
  
      <dependency>
@@@ -120,7 -121,7 +121,7 @@@
      <dependency>
        <groupId>org.opendaylight.controller.thirdparty</groupId>
        <artifactId>org.apache.catalina.filters.CorsFilter</artifactId>
 -      <version>7.0.43-SNAPSHOT</version>
 +      <version>${corsfilter.version}</version>
      </dependency>
    </dependencies>
  </project>

diff --combined opendaylight/northbound/flowprogrammer/pom.xml
index 5e3328a1f9ec4698688d2b749dc1600fcfdd8355,61791692bfb3b9cd767ececc3b27e87c8a41fa31..565bd5f6aa1961452041069baa57f5fd5b997615
--- 1/opendaylight/northbound/flowprogrammer/pom.xml
--- 2/opendaylight/northbound/flowprogrammer/pom.xml
+++ b/opendaylight/northbound/flowprogrammer/pom.xml
@@@ -28,7 -28,7 +28,7 @@@
            <dependency>
              <groupId>org.opendaylight.controller</groupId>
              <artifactId>sal</artifactId>
 -            <version>0.5.1-SNAPSHOT</version>
 +            <version>${sal.version}</version>
            </dependency>
          </dependencies>
        </plugin>
@@@ -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
              </Import-Package>
              <Export-Package>
@@@ -74,7 -75,7 +75,7 @@@
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>containermanager</artifactId>
 -      <version>0.5.1-SNAPSHOT</version>
 +      <version>${containermanager.version}</version>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
@@@ -83,12 -84,12 +84,12 @@@
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>forwardingrulesmanager</artifactId>
 -      <version>0.4.1-SNAPSHOT</version>
 +      <version>${forwardingrulesmanager.version}</version>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>sal</artifactId>
 -      <version>0.7.0-SNAPSHOT</version>
 +      <version>${sal.version}</version>
      </dependency>
      <dependency>
        <groupId>org.codehaus.enunciate</groupId>
@@@ -98,7 -99,7 +99,7 @@@
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>commons.northbound</artifactId>
 -      <version>0.4.1-SNAPSHOT</version>
 +      <version>${commons.northbound.version}</version>
      </dependency>
      <dependency>
        <groupId>junit</groupId>

diff --combined opendaylight/northbound/hosttracker/pom.xml
index b7b4a731c116043345d1ba3d0c4fe5b14a98dc5b,b9b5fb7514adeeb905804b404656053212f1759a..aab519e5f682746f9478a311bdf4966fe29243ab
--- 1/opendaylight/northbound/hosttracker/pom.xml
--- 2/opendaylight/northbound/hosttracker/pom.xml
+++ b/opendaylight/northbound/hosttracker/pom.xml
@@@ -27,7 -27,7 +27,7 @@@
            <dependency>
              <groupId>org.opendaylight.controller</groupId>
              <artifactId>sal</artifactId>
 -            <version>0.5.1-SNAPSHOT</version>
 +            <version>${sal.version}</version>
            </dependency>
          </dependencies>
        </plugin>
@@@ -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
              </Import-Package>
              <Web-ContextPath>/controller/nb/v2/hosttracker</Web-ContextPath>
@@@ -74,7 -75,7 +75,7 @@@
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>containermanager</artifactId>
 -      <version>0.5.1-SNAPSHOT</version>
 +      <version>${containermanager.version}</version>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
@@@ -88,12 -89,12 +89,12 @@@
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>sal</artifactId>
 -      <version>0.5.1-SNAPSHOT</version>
 +      <version>${sal.version}</version>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>commons.northbound</artifactId>
 -      <version>0.4.1-SNAPSHOT</version>
 +      <version>${commons.northbound.version}</version>
      </dependency>
      <dependency>
        <groupId>org.codehaus.enunciate</groupId>

diff --combined opendaylight/northbound/networkconfiguration/bridgedomain/pom.xml
index 3e47e5512198526b0fb43d57060ffe2603dc6611,2576441061e5e53847a53d199502cfbac6197db6..483d993d04a0e872034fae5f1a926846d4639b9b
--- 1/opendaylight/northbound/networkconfiguration/bridgedomain/pom.xml
--- 2/opendaylight/northbound/networkconfiguration/bridgedomain/pom.xml
+++ b/opendaylight/northbound/networkconfiguration/bridgedomain/pom.xml
@@@ -27,7 -27,7 +27,7 @@@
            <dependency>
              <groupId>org.opendaylight.controller</groupId>
              <artifactId>sal</artifactId>
 -            <version>0.5.1-SNAPSHOT</version>
 +            <version>${sal.version}</version>
            </dependency>
          </dependencies>
        </plugin>
@@@ -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
              </Import-Package>
              <Export-Package>
@@@ -76,27 -77,27 +77,27 @@@
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>sal</artifactId>
 -      <version>0.5.1-SNAPSHOT</version>
 +      <version>${sal.version}</version>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>sal.connection</artifactId>
 -      <version>0.1.1-SNAPSHOT</version>
 +      <version>${sal.connection.version}</version>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>sal.networkconfiguration</artifactId>
 -      <version>0.0.2-SNAPSHOT</version>
 +      <version>${sal.networkconfiguration.version}</version>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>connectionmanager</artifactId>
 -      <version>0.1.1-SNAPSHOT</version>
 +      <version>${connectionmanager.version}</version>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>containermanager</artifactId>
 -      <version>0.5.1-SNAPSHOT</version>
 +      <version>${containermanager.version}</version>
      </dependency>
      <dependency>
        <groupId>org.codehaus.enunciate</groupId>
@@@ -106,7 -107,7 +107,7 @@@
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>commons.northbound</artifactId>
 -      <version>0.4.1-SNAPSHOT</version>
 +      <version>${commons.northbound.version}</version>
      </dependency>
    </dependencies>
  </project>

diff --combined opendaylight/northbound/staticrouting/pom.xml
index 2a3ae10ce3b89e0021e170a37893e43110db0051,01f3ff76c862a75766264217a180bf2c79ebcf79..c020e6b2a24e32226c96b4892a5530a2257feb2e
--- 1/opendaylight/northbound/staticrouting/pom.xml
--- 2/opendaylight/northbound/staticrouting/pom.xml
+++ b/opendaylight/northbound/staticrouting/pom.xml
@@@ -27,7 -27,7 +27,7 @@@
            <dependency>
              <groupId>org.opendaylight.controller</groupId>
              <artifactId>sal</artifactId>
 -            <version>0.5.1-SNAPSHOT</version>
 +            <version>${sal.version}</version>
            </dependency>
          </dependencies>
        </plugin>
@@@ -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
              </Import-Package>
              <Export-Package>
@@@ -74,12 -75,12 +75,12 @@@
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>sal</artifactId>
 -      <version>0.5.1-SNAPSHOT</version>
 +      <version>${sal.version}</version>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>containermanager</artifactId>
 -      <version>0.5.1-SNAPSHOT</version>
 +      <version>${containermanager.version}</version>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
@@@ -94,7 -95,7 +95,7 @@@
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>commons.northbound</artifactId>
 -      <version>0.4.1-SNAPSHOT</version>
 +      <version>${commons.northbound.version}</version>
      </dependency>
      <dependency>
        <groupId>junit</groupId>

diff --combined opendaylight/northbound/statistics/pom.xml
index 4ce5d5437a4fb8d671312410f390bbe793357109,b7891a4b86fe6aeacffe949f834e11cc8fe63494..95410b0d3a34a4a879e0fde3f3ed00561c495992
--- 1/opendaylight/northbound/statistics/pom.xml
--- 2/opendaylight/northbound/statistics/pom.xml
+++ b/opendaylight/northbound/statistics/pom.xml
@@@ -27,7 -27,7 +27,7 @@@
            <dependency>
              <groupId>org.opendaylight.controller</groupId>
              <artifactId>sal</artifactId>
 -            <version>0.5.1-SNAPSHOT</version>
 +            <version>${sal.version}</version>
            </dependency>
          </dependencies>
        </plugin>
@@@ -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
                </Import-Package>
              <Export-Package>
@@@ -82,22 -83,22 +83,22 @@@
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>containermanager</artifactId>
 -      <version>0.5.1-SNAPSHOT</version>
 +      <version>${containermanager.version}</version>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>statisticsmanager</artifactId>
 -      <version>0.4.1-SNAPSHOT</version>
 +      <version>${statisticsmanager.version}</version>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>sal</artifactId>
 -      <version>0.5.1-SNAPSHOT</version>
 +      <version>${sal.version}</version>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>commons.northbound</artifactId>
 -      <version>0.4.1-SNAPSHOT</version>
 +      <version>${commons.northbound.version}</version>
      </dependency>
      <dependency>
        <groupId>org.codehaus.enunciate</groupId>

diff --combined opendaylight/northbound/subnets/pom.xml
index ed0e9428beaa632ee974bc2702d3ca34416544ec,225d097ecc00c94eff54a58704193715cfc4886a..c7108b2efaa9ec375d9597afa8ccceb62835fa92
--- 1/opendaylight/northbound/subnets/pom.xml
--- 2/opendaylight/northbound/subnets/pom.xml
+++ b/opendaylight/northbound/subnets/pom.xml
@@@ -27,22 -27,22 +27,22 @@@
            <dependency>
              <groupId>org.opendaylight.controller</groupId>
              <artifactId>sal</artifactId>
 -            <version>0.5.1-SNAPSHOT</version>
 +            <version>${sal.version}</version>
            </dependency>
            <dependency>
              <groupId>org.opendaylight.controller</groupId>
              <artifactId>clustering.services</artifactId>
 -            <version>0.4.1-SNAPSHOT</version>
 +            <version>${clustering.services.version}</version>
            </dependency>
            <dependency>
              <groupId>org.opendaylight.controller</groupId>
              <artifactId>configuration</artifactId>
 -            <version>0.4.1-SNAPSHOT</version>
 +            <version>${configuration.version}</version>
            </dependency>
            <dependency>
              <groupId>org.opendaylight.controller</groupId>
              <artifactId>switchmanager</artifactId>
 -            <version>0.5.1-SNAPSHOT</version>
 +            <version>${switchmanager.api.version}</version>
            </dependency>
          </dependencies>
        </plugin>
@@@ -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
              </Import-Package>
              <Export-Package>
@@@ -89,12 -90,12 +90,12 @@@
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>sal</artifactId>
 -      <version>0.5.1-SNAPSHOT</version>
 +      <version>${sal.version}</version>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>containermanager</artifactId>
 -      <version>0.5.1-SNAPSHOT</version>
 +      <version>${containermanager.version}</version>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
@@@ -103,7 -104,7 +104,7 @@@
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>commons.northbound</artifactId>
 -      <version>0.4.1-SNAPSHOT</version>
 +      <version>${commons.northbound.version}</version>
      </dependency>
      <dependency>
        <groupId>org.codehaus.enunciate</groupId>

diff --combined opendaylight/northbound/switchmanager/pom.xml
index bad129a54dbef96675fed591940405a5c742ebd8,29c9dd810df667860a1be34650eb2312ac8d5cf8..a1932f521bcec302e30e4b77fb5d2cdfaa5afb8d
--- 1/opendaylight/northbound/switchmanager/pom.xml
--- 2/opendaylight/northbound/switchmanager/pom.xml
+++ b/opendaylight/northbound/switchmanager/pom.xml
@@@ -28,7 -28,7 +28,7 @@@
            <dependency>
              <groupId>org.opendaylight.controller</groupId>
              <artifactId>sal</artifactId>
 -            <version>0.5.1-SNAPSHOT</version>
 +            <version>${sal.version}</version>
            </dependency>
          </dependencies>
        </plugin>
@@@ -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
              </Import-Package>
              <Web-ContextPath>/controller/nb/v2/switchmanager</Web-ContextPath>
@@@ -75,7 -75,7 +75,7 @@@
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>containermanager</artifactId>
 -      <version>0.5.1-SNAPSHOT</version>
 +      <version>${containermanager.version}</version>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
@@@ -85,13 -85,13 +85,13 @@@
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>sal</artifactId>
 -      <version>0.5.1-SNAPSHOT</version>
 +      <version>${sal.version}</version>
      </dependency>
  
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>commons.northbound</artifactId>
 -      <version>0.4.1-SNAPSHOT</version>
 +      <version>${commons.northbound.version}</version>
      </dependency>
  
      <dependency>

diff --combined opendaylight/northbound/topology/pom.xml
index a7ef3e1cbacdee9373a884c03a1092ee0bca0447,45fe9e6d8b6cdf5f83323009e361e65240d5a61a..4cdfb02d58ee81d77fb29e938fb6f64a95c1951a
--- 1/opendaylight/northbound/topology/pom.xml
--- 2/opendaylight/northbound/topology/pom.xml
+++ b/opendaylight/northbound/topology/pom.xml
@@@ -29,7 -29,7 +29,7 @@@
            <dependency>
              <groupId>org.opendaylight.controller</groupId>
              <artifactId>sal</artifactId>
 -            <version>0.5.1-SNAPSHOT</version>
 +            <version>${sal.version}</version>
            </dependency>
          </dependencies>
        </plugin>
@@@ -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
              </Import-Package>
              <Web-ContextPath>/controller/nb/v2/topology</Web-ContextPath>
@@@ -83,22 -84,22 +84,22 @@@
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>containermanager</artifactId>
 -      <version>0.5.1-SNAPSHOT</version>
 +      <version>${containermanager.version}</version>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>commons.northbound</artifactId>
 -      <version>0.4.1-SNAPSHOT</version>
 +      <version>${commons.northbound.version}</version>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>sal</artifactId>
 -      <version>0.5.1-SNAPSHOT</version>
 +      <version>${sal.version}</version>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>topologymanager</artifactId>
 -      <version>0.4.1-SNAPSHOT</version>
 +      <version>${topologymanager.version}</version>
      </dependency>
      <dependency>
        <groupId>junit</groupId>

diff --combined opendaylight/northbound/usermanager/pom.xml
index ed94369da3dece4f2bc0ba72b55e37e1789be812,d2614f03ed999849f13cf38be4f01234b75941d9..b48d67252e1bac2165f8d7a8bdec5c25b952ea91
--- 1/opendaylight/northbound/usermanager/pom.xml
--- 2/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
              </Import-Package>
              <Export-Package>
@@@ -64,17 -65,17 +65,17 @@@
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>sal</artifactId>
 -      <version>0.5.1-SNAPSHOT</version>
 +      <version>${sal.version}</version>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>usermanager</artifactId>
 -      <version>0.4.1-SNAPSHOT</version>
 +      <version>${usermanager.version}</version>
      </dependency>
      <dependency>
        <groupId>org.opendaylight.controller</groupId>
        <artifactId>commons.northbound</artifactId>
 -      <version>0.4.1-SNAPSHOT</version>
 +      <version>${commons.northbound.version}</version>
      </dependency>
      <dependency>
        <groupId>org.codehaus.enunciate</groupId>