Merge "Upgrade xercesImpl"

diff --git a/features/netconf/odl-netconf-netty-util/pom.xml b/features/netconf/odl-netconf-netty-util/pom.xml
index ee7fa62eb24f38867b3952b19ced01c485d0167e..6294139ec0b42dc84f056a7aa1cf5a60f2fa1d0c 100644 (file)
--- a/features/netconf/odl-netconf-netty-util/pom.xml
+++ b/features/netconf/odl-netconf-netty-util/pom.xml
@@ -88,10 +88,5 @@
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-netty-util</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.siemens.ct.exi</groupId>
-            <artifactId>exificient</artifactId>
-            <version>1.0.1</version>
-        </dependency>
     </dependencies>
 </project>

diff --git a/netconf/netconf-netty-util/pom.xml b/netconf/netconf-netty-util/pom.xml
index 0f7254bd24d7b444bd09586ace16dffd56360da8..89f2c85190e26b58d803c579c10e647e9e1dd6fc 100644 (file)
--- a/netconf/netconf-netty-util/pom.xml
+++ b/netconf/netconf-netty-util/pom.xml
@@ -62,10 +62,18 @@
       <groupId>org.apache.sshd</groupId>
       <artifactId>sshd-netty</artifactId>
     </dependency>
+
     <dependency>
       <groupId>com.siemens.ct.exi</groupId>
       <artifactId>exificient</artifactId>
     </dependency>
+    <dependency>
+      <!-- Override until exificient ships a newer version -->
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl</artifactId>
+      <version>2.12.0</version>
+    </dependency>
+
     <dependency>
       <groupId>xml-apis</groupId>
       <artifactId>xml-apis</artifactId>