From b52ca436e324d3326a3060d7628481f5c13e5c0c Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Tue, 13 Feb 2018 20:00:14 +0100
Subject: [PATCH] Package config-util into odl-config-util

Netconf is using the XML packages in config-util extensively,
so we should package it separately from odl-config-core to express
the dependency correctly.

JIRA: NETCONF-508
Change-Id: Id3f0b88f1ebcb9bd41292ecb948e15e6ffcde49d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 features/config/features-config/pom.xml       |  7 ++
 features/config/odl-config-core/pom.xml       |  6 +-
 features/config/odl-config-util/pom.xml       | 64 +++++++++++++++++++
 .../src/main/feature/feature.xml              | 13 ++++
 features/config/pom.xml                       |  1 +
 opendaylight/config/config-artifacts/pom.xml  |  7 ++
 6 files changed, 93 insertions(+), 5 deletions(-)
 create mode 100644 features/config/odl-config-util/pom.xml
 create mode 100644 features/config/odl-config-util/src/main/feature/feature.xml

diff --git a/features/config/features-config/pom.xml b/features/config/features-config/pom.xml
index bc76141d77..13a75cd801 100644
--- a/features/config/features-config/pom.xml
+++ b/features/config/features-config/pom.xml
@@ -59,6 +59,13 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-config-util</artifactId>
+            <version>${project.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/features/config/odl-config-core/pom.xml b/features/config/odl-config-core/pom.xml
index e464115a2c..818c4b8e57 100644
--- a/features/config/odl-config-core/pom.xml
+++ b/features/config/odl-config-core/pom.xml
@@ -51,14 +51,10 @@
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>odl-config-api</artifactId>
+            <artifactId>odl-config-util</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>config-util</artifactId>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>yang-jmx-generator</artifactId>
diff --git a/features/config/odl-config-util/pom.xml b/features/config/odl-config-util/pom.xml
new file mode 100644
index 0000000000..bb033a3522
--- /dev/null
+++ b/features/config/odl-config-util/pom.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright © 2018 Pantheon Technologies, s.r.o. and others.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+ and is available at http://www.eclipse.org/legal/epl-v10.html
+ -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.opendaylight.odlparent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>3.0.2</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.controller</groupId>
+    <artifactId>odl-config-util</artifactId>
+    <version>0.8.0-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yangtools-artifacts</artifactId>
+                <version>2.0.1</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>config-artifacts</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>odl-yangtools-data-api</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>odl-config-api</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>config-util</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/features/config/odl-config-util/src/main/feature/feature.xml b/features/config/odl-config-util/src/main/feature/feature.xml
new file mode 100644
index 0000000000..ec7ad36266
--- /dev/null
+++ b/features/config/odl-config-util/src/main/feature/feature.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright © 2018 Pantheon Technologies, s.r.o. and others.
+  ~
+  ~ This program and the accompanying materials are made available under the
+  ~ terms of the Eclipse Public License v1.0 which accompanies this distribution,
+  ~ and is available at http://www.eclipse.org/legal/epl-v10.html
+  -->
+<features name="odl-controller-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.4.0">
+    <feature name="odl-config-util" version="${project.version}">
+        <feature version="[2.0.1,3)">odl-yangtools-data-api</feature>
+    </feature>
+</features>
diff --git a/features/config/pom.xml b/features/config/pom.xml
index d3be32010f..876896fa46 100644
--- a/features/config/pom.xml
+++ b/features/config/pom.xml
@@ -28,6 +28,7 @@
         <module>odl-config-core</module>
         <module>odl-config-manager</module>
         <module>odl-config-netty-config-api</module>
+        <module>odl-config-util</module>
     </modules>
 
     <scm>
diff --git a/opendaylight/config/config-artifacts/pom.xml b/opendaylight/config/config-artifacts/pom.xml
index 2731e47ae4..164e8f1a09 100644
--- a/opendaylight/config/config-artifacts/pom.xml
+++ b/opendaylight/config/config-artifacts/pom.xml
@@ -277,6 +277,13 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-config-util</artifactId>
+                <version>${project.version}</version>
+                <classifier>features</classifier>
+                <type>xml</type>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>
-- 
2.36.6