Use odl-jackson-2.8

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

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

diff --git a/library/features/odl-ovsdb-library/pom.xml b/library/features/odl-ovsdb-library/pom.xml
index eb89e29d167bd2d1973f15de92014c9970c58b7d..53d67cb8fe6e351e71678eac91606f052d7f54b1 100644 (file)
--- a/library/features/odl-ovsdb-library/pom.xml
+++ b/library/features/odl-ovsdb-library/pom.xml
@@ -26,6 +26,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <name>ODL :: ovsdb :: ${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>

diff --git a/library/features/odl-ovsdb-library/src/main/feature/feature.xml b/library/features/odl-ovsdb-library/src/main/feature/feature.xml
index 7789fc19ede37512ee5e1b6b49afe965ffe83d56..b43198b7faf127108166c906ee24bf1a706d6456 100644 (file)
--- a/library/features/odl-ovsdb-library/src/main/feature/feature.xml
+++ b/library/features/odl-ovsdb-library/src/main/feature/feature.xml
@@ -8,6 +8,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <features name="odl-ovsdb-library-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
     <feature name="odl-ovsdb-library" version="${project.version}">
+        <feature version="[3.1.0,4)">odl-jackson-2.8</feature>
         <configfile finalname="etc/org.opendaylight.ovsdb.library.cfg">
             mvn:org.opendaylight.ovsdb/library/${project.version}/cfg/config
         </configfile>