Rename odl-netconf-netty-util

A better name is odl-netconf-common, let's use that.

Change-Id: Ia40a3f63291d05a1e0aa1f7a9754b8935a0c73ab
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 78bb91e23efa2220fff77479610564dc11eeac22..4de9473ea23f5c3b710e28b1ec1c5e80379d532a 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -382,6 +382,13 @@
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-netconf-common</artifactId>
+                <version>${project.version}</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-netconf-impl</artifactId>
@@ -480,13 +487,6 @@
                 <type>xml</type>
                 <classifier>features</classifier>
             </dependency>
-            <dependency>
-                <groupId>${project.groupId}</groupId>
-                <artifactId>odl-netconf-netty-util</artifactId>
-                <version>${project.version}</version>
-                <type>xml</type>
-                <classifier>features</classifier>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>odl-netconf-util</artifactId>

diff --git a/features/features-netconf/pom.xml b/features/features-netconf/pom.xml
index dcde600c4482c1e2e3281a19cc57861bc53cea59..4f9055956226d98e5e41e4c0b5b13649c0ed2c73 100644 (file)
--- a/features/features-netconf/pom.xml
+++ b/features/features-netconf/pom.xml
@@ -58,6 +58,12 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>odl-netconf-common</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-netconf-impl</artifactId>
@@ -136,12 +142,6 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>odl-netconf-netty-util</artifactId>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-netconf-util</artifactId>

diff --git a/features/odl-netconf-all/pom.xml b/features/odl-netconf-all/pom.xml
index cd4d344b083185a7600dbb4ea2e022e42160f0e5..80f5e6a817f9e47b6a10cd02cf6a9c2022170368 100644 (file)
--- a/features/odl-netconf-all/pom.xml
+++ b/features/odl-netconf-all/pom.xml
@@ -29,25 +29,25 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>odl-netconf-util</artifactId>
+            <artifactId>odl-netconf-client</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>odl-netconf-impl</artifactId>
+            <artifactId>odl-netconf-common</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>odl-netconf-netty-util</artifactId>
+            <artifactId>odl-netconf-impl</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>odl-netconf-client</artifactId>
+            <artifactId>odl-netconf-util</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/odl-netconf-client/pom.xml b/features/odl-netconf-client/pom.xml
index 579f3d85e46cf5a070906d3e80385a95470d5752..d6efdfb752dff43251a487e50593ab9069282095 100644 (file)
--- a/features/odl-netconf-client/pom.xml
+++ b/features/odl-netconf-client/pom.xml
@@ -22,7 +22,7 @@
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>odl-netconf-netty-util</artifactId>
+            <artifactId>odl-netconf-common</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/odl-netconf-netty-util/pom.xml b/features/odl-netconf-common/pom.xml
similarity index 86%
rename from features/odl-netconf-netty-util/pom.xml
rename to features/odl-netconf-common/pom.xml
index c86bdc8b0b4f1b38ecd67c82ed464373c8984e93..30b751f691d975bbdf60db2d22b63871752963cf 100644 (file)
--- a/features/odl-netconf-netty-util/pom.xml
+++ b/features/odl-netconf-common/pom.xml
@@ -16,9 +16,10 @@
         <relativePath>../parent</relativePath>
     </parent>
 
-    <artifactId>odl-netconf-netty-util</artifactId>
+    <artifactId>odl-netconf-common</artifactId>
     <packaging>feature</packaging>
-    <name>OpenDaylight :: Netconf :: Netty Util</name>
+    <name>OpenDaylight :: Netconf :: Netconf Common</name>
+    <description>Shared NETCONF components</description>
 
     <dependencies>
         <dependency>
@@ -48,6 +49,10 @@
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>netconf-common</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>netconf-netty-util</artifactId>

diff --git a/features/odl-netconf-netty-util/src/main/feature/feature.xml b/features/odl-netconf-common/src/main/feature/feature.xml
similarity index 60%
rename from features/odl-netconf-netty-util/src/main/feature/feature.xml
rename to features/odl-netconf-common/src/main/feature/feature.xml
index 89114aa39a9f61faa9efedf83242b5d22d5c5f27..09a02ba7d1b45fa2eb537dc5bc7994d87594bac7 100644 (file)
--- a/features/odl-netconf-netty-util/src/main/feature/feature.xml
+++ b/features/odl-netconf-common/src/main/feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-netconf-netty-util-${project.version}">
-    <feature name="odl-netconf-netty-util" version="${project.version}">
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="odl-netconf-common-${project.version}">
+    <feature name="odl-netconf-common" version="${project.version}">
         <feature version="[13,14)">odl-netty-4</feature>
     </feature>
 </features>

diff --git a/features/odl-netconf-impl/pom.xml b/features/odl-netconf-impl/pom.xml
index 9195ae7a76ccc0f308374496542956c4e3dd7bce..628b18f9152288b4661c5a1226644665c1c66d91 100644 (file)
--- a/features/odl-netconf-impl/pom.xml
+++ b/features/odl-netconf-impl/pom.xml
@@ -29,13 +29,13 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>odl-netconf-util</artifactId>
+            <artifactId>odl-netconf-common</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
-            <artifactId>odl-netconf-netty-util</artifactId>
+            <artifactId>odl-netconf-util</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

diff --git a/features/pom.xml b/features/pom.xml
index 87804122800fc57def6f7723f645e42a191f3e7b..57b102597e60c150deb33d08897be2bba118b62c 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -50,13 +50,13 @@
         <module>odl-netconf-callhome-ssh</module>
         <module>odl-netconf-client</module>
         <module>odl-netconf-clustered-topology</module>
+        <module>odl-netconf-common</module>
         <module>odl-netconf-connector-all</module>
         <module>odl-netconf-connector</module>
         <module>odl-netconf-console</module>
         <module>odl-netconf-impl</module>
         <module>odl-netconf-keystore</module>
         <module>odl-netconf-mdsal</module>
-        <module>odl-netconf-netty-util</module>
         <module>odl-netconf-ssh</module>
         <module>odl-netconf-test-tools</module>
         <module>odl-netconf-topology</module>