From: Stephen Kitt <skitt@redhat.com>
Date: Tue, 27 Mar 2018 00:24:13 +0000 (-0700)
Subject: Use odl-jackson-2.8
X-Git-Tag: release/fluorine~57
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=fe8f630936bda4a95846ab073555c340c27043bb;p=sfc.git

Use odl-jackson-2.8

We should use the odl-jackson-2.8 feature to fulfill our dependencies
on Jackson.

Change-Id: If859f41c3e8f94819376267db65bc578dfe51e82
Signed-off-by: Stephen Kitt <skitt@redhat.com>
---

diff --git a/features/odl-sfc-sb-rest/pom.xml b/features/odl-sfc-sb-rest/pom.xml
index 68f76f5f5..be664131b 100644
--- a/features/odl-sfc-sb-rest/pom.xml
+++ b/features/odl-sfc-sb-rest/pom.xml
@@ -31,6 +31,13 @@
     <name>ODL :: sfc :: ${project.artifactId}</name>
 
     <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>odl-jackson-2.8</artifactId>
+            <version>3.1.0</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.sfc</groupId>
             <artifactId>odl-sfc-provider-rest</artifactId>
@@ -43,41 +50,5 @@
             <artifactId>sfc-sb-rest</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.jaxrs</groupId>
-            <artifactId>jackson-jaxrs-base</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.jaxrs</groupId>
-            <artifactId>jackson-jaxrs-json-provider</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.module</groupId>
-            <artifactId>jackson-module-jaxb-annotations</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.glassfish</groupId>
-            <artifactId>javax.json</artifactId>
-        </dependency>
     </dependencies>
 </project>
diff --git a/features/odl-sfc-vnfm-tacker/pom.xml b/features/odl-sfc-vnfm-tacker/pom.xml
index fa7f35ab0..0cdcd92b7 100644
--- a/features/odl-sfc-vnfm-tacker/pom.xml
+++ b/features/odl-sfc-vnfm-tacker/pom.xml
@@ -31,6 +31,13 @@
     <name>ODL :: sfc :: ${project.artifactId}</name>
 
     <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>odl-jackson-2.8</artifactId>
+            <version>3.1.0</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>odl-mdsal-broker</artifactId>
@@ -45,27 +52,10 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.sfc</groupId>
-            <artifactId>sfc-vnfm-spi</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.sfc</groupId>
             <artifactId>sfc-vnfm-tacker</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-client</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-        </dependency>
     </dependencies>
 </project>