From 222da8475ea0ceb437e71832fd30bc31c7dfe4f4 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Fri, 18 Jan 2019 11:25:59 +0100
Subject: [PATCH] Bump yangtools to 2.1.8

yangtools-2.1.8 should address compatibility issues with woodstox,
bump to it.

Change-Id: I417b22698df04edc8263b57e6fcd5d0a558c6ef4
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 netconf/mdsal-netconf-connector/pom.xml                    | 1 +
 netconf/netconf-topology-singleton/pom.xml                 | 1 +
 netconf/netconf-util/pom.xml                               | 1 +
 netconf/sal-netconf-connector/pom.xml                      | 1 +
 restconf/restconf-nb-bierman02/pom.xml                     | 7 +------
 .../sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java      | 2 +-
 restconf/restconf-nb-rfc8040/pom.xml                       | 1 +
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/netconf/mdsal-netconf-connector/pom.xml b/netconf/mdsal-netconf-connector/pom.xml
index 6706a7a765..18e5c989d9 100644
--- a/netconf/mdsal-netconf-connector/pom.xml
+++ b/netconf/mdsal-netconf-connector/pom.xml
@@ -92,6 +92,7 @@
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-data-codec-xml</artifactId>
+      <version>2.1.8</version>
     </dependency>
   </dependencies>
 </project>
diff --git a/netconf/netconf-topology-singleton/pom.xml b/netconf/netconf-topology-singleton/pom.xml
index 7009ca52d3..14e0e70e16 100644
--- a/netconf/netconf-topology-singleton/pom.xml
+++ b/netconf/netconf-topology-singleton/pom.xml
@@ -49,6 +49,7 @@
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-codec-xml</artifactId>
+            <version>2.1.8</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
diff --git a/netconf/netconf-util/pom.xml b/netconf/netconf-util/pom.xml
index 3b697f4bb5..af0cd31971 100644
--- a/netconf/netconf-util/pom.xml
+++ b/netconf/netconf-util/pom.xml
@@ -73,6 +73,7 @@
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-data-codec-xml</artifactId>
+      <version>2.1.8</version>
     </dependency>
     <dependency>
       <groupId>org.osgi</groupId>
diff --git a/netconf/sal-netconf-connector/pom.xml b/netconf/sal-netconf-connector/pom.xml
index 607be6814f..83c656c4ad 100644
--- a/netconf/sal-netconf-connector/pom.xml
+++ b/netconf/sal-netconf-connector/pom.xml
@@ -90,6 +90,7 @@
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-data-codec-xml</artifactId>
+      <version>2.1.8</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
diff --git a/restconf/restconf-nb-bierman02/pom.xml b/restconf/restconf-nb-bierman02/pom.xml
index aa361efa5b..77e4261b39 100644
--- a/restconf/restconf-nb-bierman02/pom.xml
+++ b/restconf/restconf-nb-bierman02/pom.xml
@@ -97,6 +97,7 @@
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-data-codec-xml</artifactId>
+      <version>2.1.8</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
@@ -145,12 +146,6 @@
     </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-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java
index e5d4c8cc7c..01d3d8e63b 100644
--- a/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java
+++ b/restconf/restconf-nb-bierman02/src/test/java/org/opendaylight/controller/sal/restconf/impl/nn/to/xml/test/NnToXmlTest.java
@@ -226,7 +226,7 @@ public class NnToXmlTest extends AbstractBodyReaderTest {
         final String elName = "lfEmpty";
         final NormalizedNodeContext normalizedNodeContext = prepareNNC(
                 TypeDefinitionAwareCodec.from(BaseTypes.emptyType()).deserialize(""), elName);
-        nnToXml(normalizedNodeContext, "<" + elName + "></" + elName + ">");
+        nnToXml(normalizedNodeContext, "<" + elName + "/>");
     }
 
     @Test
diff --git a/restconf/restconf-nb-rfc8040/pom.xml b/restconf/restconf-nb-rfc8040/pom.xml
index 8af83e1c19..d31099f61b 100644
--- a/restconf/restconf-nb-rfc8040/pom.xml
+++ b/restconf/restconf-nb-rfc8040/pom.xml
@@ -59,6 +59,7 @@
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
       <artifactId>yang-data-codec-xml</artifactId>
+      <version>2.1.8</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.yangtools</groupId>
-- 
2.36.6