From b3819fe67e039dfd82d1e2a5915685d5d5be5eae Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Wed, 16 Jan 2019 15:55:58 +0100
Subject: [PATCH] Remove jackson dependency from restconf

Restconf actually does not depend on jackson, but a single test
relies on woodstox-core's XML formatting behavior.

Remove odl-jackson dependency and add a temporary woodstox-core
dependency for testing only.

Change-Id: I34038dbaa7807f25fe03de2514eb9b469b4b7979
JIRA: NETCONF-591
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 features/restconf/odl-restconf-common/pom.xml          |  7 -------
 .../odl-restconf-common/src/main/feature/feature.xml   |  1 -
 restconf/restconf-nb-bierman02/pom.xml                 | 10 ++++++----
 restconf/restconf-nb-rfc8040/pom.xml                   |  5 -----
 4 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/features/restconf/odl-restconf-common/pom.xml b/features/restconf/odl-restconf-common/pom.xml
index d21103aaaf..14ed498e32 100644
--- a/features/restconf/odl-restconf-common/pom.xml
+++ b/features/restconf/odl-restconf-common/pom.xml
@@ -120,13 +120,6 @@
         </dependency>
 
         <!-- TODO: Remove this when RESTCONF is converted to GSON -->
-        <dependency>
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>odl-jackson-2.9</artifactId>
-            <version>4.0.8</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
diff --git a/features/restconf/odl-restconf-common/src/main/feature/feature.xml b/features/restconf/odl-restconf-common/src/main/feature/feature.xml
index 35984eb7b4..17e93e991e 100644
--- a/features/restconf/odl-restconf-common/src/main/feature/feature.xml
+++ b/features/restconf/odl-restconf-common/src/main/feature/feature.xml
@@ -9,7 +9,6 @@
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.4.0" name="odl-netconf-${project.version}">
     <feature name="odl-restconf-common" version="${project.version}">
         <feature version="[4,5)">odl-karaf-feat-jetty</feature>
-        <feature version="[4,5)">odl-jackson-2.9</feature>
         <feature version="[2.1,3)">odl-yangtools-export</feature>
     </feature>
 </features>
diff --git a/restconf/restconf-nb-bierman02/pom.xml b/restconf/restconf-nb-bierman02/pom.xml
index 9cd37dd097..aa361efa5b 100644
--- a/restconf/restconf-nb-bierman02/pom.xml
+++ b/restconf/restconf-nb-bierman02/pom.xml
@@ -118,10 +118,6 @@
       <groupId>net.java.dev.stax-utils</groupId>
       <artifactId>stax-utils</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.fasterxml.jackson.dataformat</groupId>
-      <artifactId>jackson-dataformat-xml</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.json</groupId>
       <artifactId>json</artifactId>
@@ -149,6 +145,12 @@
     </dependency>
 
     <!-- Testing Dependencies -->
+    <!-- FIXME: remove this and fixup the one test which relies on it -->
+    <dependency>
+      <groupId>com.fasterxml.woodstox</groupId>
+      <artifactId>woodstox-core</artifactId>
+      <version>5.0.3</version>
+    </dependency>
     <dependency>
       <groupId>org.glassfish.jersey.test-framework.providers</groupId>
       <artifactId>jersey-test-framework-provider-grizzly2</artifactId>
diff --git a/restconf/restconf-nb-rfc8040/pom.xml b/restconf/restconf-nb-rfc8040/pom.xml
index ed88e7a2a4..8af83e1c19 100644
--- a/restconf/restconf-nb-rfc8040/pom.xml
+++ b/restconf/restconf-nb-rfc8040/pom.xml
@@ -96,11 +96,6 @@
       <artifactId>netty-codec-http</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>com.fasterxml.jackson.dataformat</groupId>
-      <artifactId>jackson-dataformat-xml</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>net.java.dev.stax-utils</groupId>
       <artifactId>stax-utils</artifactId>
-- 
2.36.6