Promote replicate to a full feature

There are a few issues in packaging, fix them up and drop
the -exp- infix from feature names.

JIRA: MDSAL-671
Change-Id: I4f3fc6fbba71da77a8c1b8c0ee149955cb43080f
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index c39124ade61448cf57b5879fa3b0e1085b7ed0bf..a56dc34bd76efc6e8db7499fe87fca393213a74d 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -453,14 +453,14 @@
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-mdsal-exp-replicate-common</artifactId>
+                <artifactId>odl-mdsal-replicate-common</artifactId>
                 <version>8.0.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
-                <artifactId>odl-mdsal-exp-replicate-netty</artifactId>
+                <artifactId>odl-mdsal-replicate-netty</artifactId>
                 <version>8.0.0-SNAPSHOT</version>
                 <classifier>features</classifier>
                 <type>xml</type>

diff --git a/docs/incremental-backup.rst b/docs/incremental-backup.rst
index 019c05462da852c7b58d06ed5e5daacc7172093f..6d33742354d03d554f5dbd53e6fcc788edf6cff3 100644 (file)
--- a/docs/incremental-backup.rst
+++ b/docs/incremental-backup.rst
@@ -51,18 +51,18 @@ will be replicated to the Sink. At this point they are synchronized again and th
 can continue without any issue.
 
 * Features
-    * odl-mdsal-exp-replicate-netty
+    * odl-mdsal-replicate-netty
         .. code-block:: xml
 
           <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>odl-mdsal-exp-replicate-common</artifactId>
+            <artifactId>odl-mdsal-replicate-common</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
           </dependency>
           <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>odl-mdsal-exp-replicate-netty</artifactId>
+            <artifactId>odl-mdsal-replicate-netty</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
           </dependency>
@@ -74,7 +74,7 @@ Configuration and Installation
 #. **Install the features on the primary and secondary site**
     .. code-block::
 
-      feature:install odl-mdsal-exp-replicate-netty odl-mdsal-exp-replicate-common
+      feature:install odl-mdsal-replicate-netty odl-mdsal-replicate-common
 
 #. **Enable Source (on the primary site)**
     .. code-block::
@@ -125,13 +125,13 @@ Running one ODL instance locally and one in Docker
 
     Karaf Terminal - Start features
       - features-mdsal - core MDSAL features
-      - odl-mdsal-exp-replicate-netty - netty replicator
+      - odl-mdsal-replicate-netty - netty replicator
       - odl-restconf-nb-bierman02 - we'll be using Postman to access datastore
       - odl-netconf-clustered-topolog - we will change data of some netconf devices
 
       .. code-block::
 
-        feature:install features-mdsal odl-mdsal-exp-replicate-netty odl-restconf-nb-bierman02 odl-netconf-clustered-topolog
+        feature:install features-mdsal odl-mdsal-replicate-netty odl-restconf-nb-bierman02 odl-netconf-clustered-topolog
 
     Start Source
       .. code-block::
@@ -149,7 +149,7 @@ Running one ODL instance locally and one in Docker
     Start features in the Docker's Karaf Terminal
       .. code-block::
 
-        feature:install features-mdsal odl-mdsal-exp-replicate-netty odl-restconf-nb-bierman02 odl-netconf-clustered-topolog
+        feature:install features-mdsal odl-mdsal-replicate-netty odl-restconf-nb-bierman02 odl-netconf-clustered-topolog
 
     Start Sink - Let's say the Docker runs at 172.17.0.2 meaning it will find the local Source is at 172.17.0.1
       .. code-block::
@@ -198,4 +198,4 @@ Running one ODL instance locally and one in Docker
 
         .. code-block::
 
-          GET http://172.17.0.2:8181/restconf/config/network-topology:network-topology/
\ No newline at end of file
+          GET http://172.17.0.2:8181/restconf/config/network-topology:network-topology/

diff --git a/features/features-mdsal-experimental/pom.xml b/features/features-mdsal-experimental/pom.xml
index 1e42c4844373284ff33c8c511ffe2daf8921d1d7..826b8c9280d273d22e223041b9f6db91b06f067e 100644 (file)
--- a/features/features-mdsal-experimental/pom.xml
+++ b/features/features-mdsal-experimental/pom.xml
@@ -61,18 +61,5 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>odl-mdsal-exp-replicate-common</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>odl-mdsal-exp-replicate-netty</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
     </dependencies>
 </project>

diff --git a/features/features-mdsal/pom.xml b/features/features-mdsal/pom.xml
index 5e68fb3eea4672b9a8d76462af3d8a6bb00994cf..53fe0b532d94831f4e38fb9df6d901a44cb2439c 100644 (file)
--- a/features/features-mdsal/pom.xml
+++ b/features/features-mdsal/pom.xml
@@ -152,6 +152,20 @@
             <type>xml</type>
         </dependency>
 
+        <!-- Netty datastore replication -->
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>odl-mdsal-replicate-common</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>odl-mdsal-replicate-netty</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
         <!-- Models -->
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>

diff --git a/features/odl-mdsal-exp-replicate-common/pom.xml b/features/odl-mdsal-replicate-common/pom.xml
similarity index 89%
rename from features/odl-mdsal-exp-replicate-common/pom.xml
rename to features/odl-mdsal-replicate-common/pom.xml
index 327785309f236db2fbcebe38ed45e1233067a8ff..320b4e6c40562e541e9af9c4e73a131eb1ef03ea 100644 (file)
--- a/features/odl-mdsal-exp-replicate-common/pom.xml
+++ b/features/odl-mdsal-replicate-common/pom.xml
@@ -16,15 +16,11 @@
         <relativePath>../feature-parent</relativePath>
     </parent>
 
-    <artifactId>odl-mdsal-exp-replicate-common</artifactId>
+    <artifactId>odl-mdsal-replicate-common</artifactId>
     <packaging>feature</packaging>
 
     <name>OpenDaylight :: MD-SAL :: Replicate :: Common</name>
 
-    <properties>
-        <skip.karaf.featureTest>true</skip.karaf.featureTest>
-    </properties>
-
     <dependencies>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>

diff --git a/features/odl-mdsal-exp-replicate-netty/pom.xml b/features/odl-mdsal-replicate-netty/pom.xml
similarity index 62%
rename from features/odl-mdsal-exp-replicate-netty/pom.xml
rename to features/odl-mdsal-replicate-netty/pom.xml
index feb3dd2162e8acd81ed1e3d4ccf99b98c86a1e7f..89d3204216eed465d92a860408c2abdda1773411 100644 (file)
--- a/features/odl-mdsal-exp-replicate-netty/pom.xml
+++ b/features/odl-mdsal-replicate-netty/pom.xml
@@ -16,7 +16,7 @@
         <relativePath>../feature-parent</relativePath>
     </parent>
 
-    <artifactId>odl-mdsal-exp-replicate-netty</artifactId>
+    <artifactId>odl-mdsal-replicate-netty</artifactId>
     <packaging>feature</packaging>
 
     <name>OpenDaylight :: MD-SAL :: Replicate :: Netty</name>
@@ -26,9 +26,27 @@
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>odl-netty-4</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>odl-yangtools-codec</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>odl-mdsal-replicate-common</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>odl-mdsal-exp-replicate-common</artifactId>
+            <artifactId>odl-mdsal-singleton-common</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>

diff --git a/features/odl-mdsal-exp-replicate-netty/src/main/feature/feature.xml b/features/odl-mdsal-replicate-netty/src/main/feature/feature.xml
similarity index 55%
rename from features/odl-mdsal-exp-replicate-netty/src/main/feature/feature.xml
rename to features/odl-mdsal-replicate-netty/src/main/feature/feature.xml
index b5552cbd4563479884917f82fa7f73b15ca77898..23fe06fe6bf40e200e830b1a053d8d784ea9de65 100644 (file)
--- a/features/odl-mdsal-exp-replicate-netty/src/main/feature/feature.xml
+++ b/features/odl-mdsal-replicate-netty/src/main/feature/feature.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<features name="odl-mdsal-exp-replicate-netty-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
-    <feature name="odl-mdsal-exp-replicate-netty" version="${project.version}">
+<features name="odl-mdsal-replicate-netty-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0">
+    <feature name="odl-mdsal-replicate-netty" version="${project.version}">
         <configfile finalname="etc/org.opendaylight.mdsal.replicate.netty.sink.cfg">mvn:org.opendaylight.mdsal/mdsal-replicate-netty/${project.version}/config/sink</configfile>
         <configfile finalname="etc/org.opendaylight.mdsal.replicate.netty.source.cfg">mvn:org.opendaylight.mdsal/mdsal-replicate-netty/${project.version}/config/source</configfile>
+        <feature version="[9,10)">odl-netty-4</feature>
+        <feature version="[7,8)">odl-yangtools-codec</feature>
     </feature>
-</features>
\ No newline at end of file
+</features>

diff --git a/features/pom.xml b/features/pom.xml
index 8e69e77bb92521fc41effa0b17e8752f9606d166..c616c424b4100863fbeee89b3ba6a6cfaea43e5d 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -65,8 +65,8 @@
         <module>odl-mdsal-rfc8294-netty</module>
 
         <!-- Datastore replication -->
-        <module>odl-mdsal-exp-replicate-common</module>
-        <module>odl-mdsal-exp-replicate-netty</module>
+        <module>odl-mdsal-replicate-common</module>
+        <module>odl-mdsal-replicate-netty</module>
 
         <!-- Models -->
         <!-- Standards -->

diff --git a/replicate/mdsal-replicate-common/pom.xml b/replicate/mdsal-replicate-common/pom.xml
index 4b9aa78dcddf50f2145988c947f380173e651abf..316f67a08a5c39917253baf322564a1c0a3e1a59 100644 (file)
--- a/replicate/mdsal-replicate-common/pom.xml
+++ b/replicate/mdsal-replicate-common/pom.xml
@@ -20,18 +20,10 @@
     <packaging>bundle</packaging>
 
     <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-data-codec-binfmt</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-dom-spi</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>mdsal-singleton-common-api</artifactId>
-        </dependency>
     </dependencies>
 
     <scm>

diff --git a/replicate/mdsal-replicate-netty/pom.xml b/replicate/mdsal-replicate-netty/pom.xml
index 76eee7701c8e2d2a00a891f317762f89275c2637..ae2df1cc853b878f33ac4a603bdf6864fd77b385 100644 (file)
--- a/replicate/mdsal-replicate-netty/pom.xml
+++ b/replicate/mdsal-replicate-netty/pom.xml
@@ -24,6 +24,14 @@
             <groupId>org.opendaylight.mdsal</groupId>
             <artifactId>mdsal-replicate-common</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-singleton-common-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>yang-data-codec-binfmt</artifactId>
+        </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-handler</artifactId>