From 1c7c717eb03fd488bd527234f18541c7c737f513 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Sat, 29 Jul 2017 11:48:45 +0200
Subject: [PATCH] Activate protocol-framework artifacts

This adds protocol-framework to compilation

Change-Id: I979961389495d1c7ea0ac045f94576307a170697
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 features/netconf/odl-netconf-api/pom.xml      | 11 ++++++++---
 features/pom.xml                              |  1 +
 .../features-protocol-framework/pom.xml       |  8 ++++----
 .../odl-protocol-framework/pom.xml            |  8 ++++----
 features/protocol-framework/pom.xml           |  4 ++--
 netconf/netconf-api/pom.xml                   |  7 +++----
 netconf/netconf-artifacts/pom.xml             | 19 +++++++++++++++++++
 pom.xml                                       |  1 +
 protocol-framework/pom.xml                    |  4 ++--
 9 files changed, 44 insertions(+), 19 deletions(-)

diff --git a/features/netconf/odl-netconf-api/pom.xml b/features/netconf/odl-netconf-api/pom.xml
index 4d32db212d..89ccc49389 100644
--- a/features/netconf/odl-netconf-api/pom.xml
+++ b/features/netconf/odl-netconf-api/pom.xml
@@ -34,21 +34,26 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yangtools-artifacts</artifactId>
+                <version>1.2.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-protocol-framework</artifactId>
-            <version>0.10.0-SNAPSHOT</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>odl-yangtools-yang-data</artifactId>
-            <version>1.2.0-SNAPSHOT</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
diff --git a/features/pom.xml b/features/pom.xml
index 3b183f224d..2372f0dfe0 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -23,6 +23,7 @@
   <modules>
     <module>netconf</module>
     <module>netconf-connector</module>
+    <module>protocol-framework</module>
     <module>restconf</module>
     <module>yanglib</module>
   </modules>
diff --git a/features/protocol-framework/features-protocol-framework/pom.xml b/features/protocol-framework/features-protocol-framework/pom.xml
index 5b904ec00c..0c829e52d0 100644
--- a/features/protocol-framework/features-protocol-framework/pom.xml
+++ b/features/protocol-framework/features-protocol-framework/pom.xml
@@ -18,16 +18,16 @@
         <relativePath/>
     </parent>
 
-    <groupId>org.opendaylight.controller</groupId>
+    <groupId>org.opendaylight.netconf</groupId>
     <artifactId>features-protocol-framework</artifactId>
-    <version>0.10.0-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <dependencies>
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>odl-protocol-framework</artifactId>
-            <version>0.10.0-SNAPSHOT</version>
+            <version>1.0.0-SNAPSHOT</version>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
diff --git a/features/protocol-framework/odl-protocol-framework/pom.xml b/features/protocol-framework/odl-protocol-framework/pom.xml
index e348b4ac60..d11a8b1850 100644
--- a/features/protocol-framework/odl-protocol-framework/pom.xml
+++ b/features/protocol-framework/odl-protocol-framework/pom.xml
@@ -18,9 +18,9 @@
         <relativePath/>
     </parent>
 
-    <groupId>org.opendaylight.controller</groupId>
+    <groupId>org.opendaylight.netconf</groupId>
     <artifactId>odl-protocol-framework</artifactId>
-    <version>0.10.0-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>OpenDaylight :: Protocol Framework</name>
@@ -41,10 +41,10 @@
             <classifier>features</classifier>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
+            <groupId>org.opendaylight.netconf</groupId>
             <artifactId>protocol-framework</artifactId>
             <version>${project.version}</version>
         </dependency>
     </dependencies>
 
-</project>
\ No newline at end of file
+</project>
diff --git a/features/protocol-framework/pom.xml b/features/protocol-framework/pom.xml
index 5678ac842e..cac7eb20aa 100644
--- a/features/protocol-framework/pom.xml
+++ b/features/protocol-framework/pom.xml
@@ -16,9 +16,9 @@
         <relativePath/>
     </parent>
 
-    <groupId>org.opendaylight.controller</groupId>
+    <groupId>org.opendaylight.netconf</groupId>
     <artifactId>features-protocol-framework-aggregator</artifactId>
-    <version>0.10.0-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <modules>
diff --git a/netconf/netconf-api/pom.xml b/netconf/netconf-api/pom.xml
index 33d61e9d4e..74bbe3508d 100644
--- a/netconf/netconf-api/pom.xml
+++ b/netconf/netconf-api/pom.xml
@@ -65,13 +65,12 @@
       <artifactId>ietf-netconf-monitoring-extension</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>config-util</artifactId>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>protocol-framework</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
-      <artifactId>protocol-framework</artifactId>
-      <version>0.10.0-SNAPSHOT</version>
+      <artifactId>config-util</artifactId>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal.model</groupId>
diff --git a/netconf/netconf-artifacts/pom.xml b/netconf/netconf-artifacts/pom.xml
index 761b103960..02d9ae1350 100644
--- a/netconf/netconf-artifacts/pom.xml
+++ b/netconf/netconf-artifacts/pom.xml
@@ -273,8 +273,27 @@
                 <artifactId>netconf-topology-singleton</artifactId>
                 <version>${project.version}</version>
             </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>protocol-framework</artifactId>
+                <version>1.0.0-SNAPSHOT</version>
+            </dependency>
 
             <!-- netconf features -->
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>features-protocol-framework</artifactId>
+                <version>1.0.0-SNAPSHOT</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>odl-protocol-framework</artifactId>
+                <version>1.0.0-SNAPSHOT</version>
+                <type>xml</type>
+                <classifier>features</classifier>
+            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>features-netconf</artifactId>
diff --git a/pom.xml b/pom.xml
index 7085fbbf3f..5bdade4d62 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,6 +23,7 @@
     <name>${project.artifactId}</name>
 
     <modules>
+        <module>protocol-framework</module>
         <module>netconf</module>
         <module>restconf</module>
 
diff --git a/protocol-framework/pom.xml b/protocol-framework/pom.xml
index a5124b39d8..5b2b68658b 100644
--- a/protocol-framework/pom.xml
+++ b/protocol-framework/pom.xml
@@ -11,9 +11,9 @@
     <relativePath/>
   </parent>
 
-  <groupId>org.opendaylight.controller</groupId>
+  <groupId>org.opendaylight.netconf</groupId>
   <artifactId>protocol-framework</artifactId>
-  <version>0.10.0-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>bundle</packaging>
   <name>${project.artifactId}</name>
   <description>Common protocol framework</description>
-- 
2.36.6