Move protocol framework from BGPCEP project

This moves the current parts of BGPCEP protocol framework into the
controller project, eliminating the circular dependency forced by
netconf being resident in this project.

Change-Id: I7c8457ebaec5c261217587d60a95a7b35e473d1e
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/opendaylight/netconf/netconf-api/pom.xml b/opendaylight/netconf/netconf-api/pom.xml
index 856bd77c202ee73ee0cd65758f64ad598fd96f6a..d085986d2a52086a291e4210f5939e7f12d88a38 100644 (file)
--- a/opendaylight/netconf/netconf-api/pom.xml
+++ b/opendaylight/netconf/netconf-api/pom.xml
@@ -18,6 +18,10 @@
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>config-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>protocol-framework</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
@@ -35,12 +39,6 @@
             <artifactId>ietf-netconf-monitoring-extension</artifactId>
             <version>${project.version}</version>
         </dependency>
-
-        <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>framework</artifactId>
-            <version>${bgpcep.version}</version>
-        </dependency>
     </dependencies>
 
     <build>

diff --git a/opendaylight/netconf/netconf-client/pom.xml b/opendaylight/netconf/netconf-client/pom.xml
index de4fb101f9d6fefb065e26f4b03bd46af4979cf3..56982a134baceb0091115e4530aa264674e83303 100644 (file)
--- a/opendaylight/netconf/netconf-client/pom.xml
+++ b/opendaylight/netconf/netconf-client/pom.xml
@@ -22,9 +22,8 @@
             <artifactId>netconf-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>framework</artifactId>
-            <version>${bgpcep.version}</version>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>protocol-framework</artifactId>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>

diff --git a/opendaylight/netconf/netconf-impl/pom.xml b/opendaylight/netconf/netconf-impl/pom.xml
index 981a81d7b6e5c56e5998ee82187d4702d735ac03..766772b1e93d17089affe5ab0370576a8578c873 100644 (file)
--- a/opendaylight/netconf/netconf-impl/pom.xml
+++ b/opendaylight/netconf/netconf-impl/pom.xml
@@ -36,6 +36,10 @@
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>config-util</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>protocol-framework</artifactId>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>netconf-mapping-api</artifactId>
@@ -46,11 +50,6 @@
             <artifactId>ietf-inet-types</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>framework</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>

diff --git a/opendaylight/netconf/netconf-util/pom.xml b/opendaylight/netconf/netconf-util/pom.xml
index 2f6da9e3c6f0d04c048985a7ff5e539be0e275ca..9078d7de9df01128b4c627dd041a16705d1ec85e 100644 (file)
--- a/opendaylight/netconf/netconf-util/pom.xml
+++ b/opendaylight/netconf/netconf-util/pom.xml
@@ -27,8 +27,8 @@
             <artifactId>config-api</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.opendaylight.bgpcep</groupId>
-            <artifactId>framework</artifactId>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>protocol-framework</artifactId>
         </dependency>
 
         <dependency>

diff --git a/opendaylight/netconf/pom.xml b/opendaylight/netconf/pom.xml
index 21a1ffe81dab64f9fab54bdf316b03631937ed6c..3a96b422637d796789a46bde64069eec2b318086 100644 (file)
--- a/opendaylight/netconf/pom.xml
+++ b/opendaylight/netconf/pom.xml
@@ -74,12 +74,6 @@
                 <artifactId>org.osgi.core</artifactId>
                 <version>${osgi.version}</version>
             </dependency>
-            <dependency>
-                <groupId>org.opendaylight.bgpcep</groupId>
-                <artifactId>mockito-configuration</artifactId>
-                <version>${bgpcep.version}</version>
-                <scope>test</scope>
-            </dependency>
             <dependency>
                 <groupId>${project.groupId}</groupId>
                 <artifactId>config-api</artifactId>