Migrate netconf and restconf dependencies

Migrate project's restconf and netconf dependencies
and features to new groupId/version

Change-Id: I1c5f7fd7b0d781e1e3df378dd0b16e4a618fe1f0
Signed-off-by: JMorvay <jmorvay@cisco.com>

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 5e6fab38496e6fb2b629d907c49ed69243d841e3..59c61fa617285734ea6ff111fe02eb1e6d704c0f 100644 (file)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -42,6 +42,7 @@
     <neutron.version>0.6.0-SNAPSHOT</neutron.version>
     <nexusproxy>http://nexus.opendaylight.org/content</nexusproxy>
     <nsf.version>0.6.0-SNAPSHOT</nsf.version>
+    <restconf.version>1.3.0-SNAPSHOT</restconf.version>
     <sal.version>0.10.0-SNAPSHOT</sal.version>
     <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>
     <statisticsmanager.version>0.5.0</statisticsmanager.version>
@@ -103,9 +104,9 @@
         <type>xml</type>
       </dependency>
       <dependency>
-        <groupId>org.opendaylight.controller</groupId>
+        <groupId>org.opendaylight.netconf</groupId>
         <artifactId>features-restconf</artifactId>
-        <version>${mdsal.version}</version>
+        <version>${restconf.version}</version>
         <classifier>features</classifier>
         <type>xml</type>
       </dependency>

diff --git a/features/pom.xml b/features/pom.xml
index a0c72fbe39345051f4a9b2d6f8de01a75bb3d395..adebedfe51641aa4b7f62cca334f4b9c8665d073 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -32,6 +32,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <features.file>features.xml</features.file>
     <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
     <neutron.version>0.6.0-SNAPSHOT</neutron.version>
+    <restconf.version>1.3.0-SNAPSHOT</restconf.version>
     <yangtools.version>0.8.0-SNAPSHOT</yangtools.version>
   </properties>
 
@@ -64,8 +65,9 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
+      <groupId>org.opendaylight.netconf</groupId>
       <artifactId>features-restconf</artifactId>
+      <version>${restconf.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>

diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index 7723304e7c220a73701dab25555ff3a66018a5f8..2fb1ccfad286a4a024c4d71f0359a50d4455fda0 100644 (file)
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -14,7 +14,7 @@
     <!-- Needed for odl-mdsal-broker -->
     <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
     <!-- Needed for odl-mdsal-apidocs -->
-    <repository>mvn:org.opendaylight.controller/features-restconf/${mdsal.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features</repository>
     <!-- TODO features-base should be removed when we get rid of Activators, hopefully soon -->
     <repository>mvn:org.opendaylight.controller/features-base/${commons.opendaylight.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.neutron/features-neutron/${neutron.version}/xml/features</repository>
@@ -31,7 +31,7 @@
         <!-- TODO felix-dm should be removed when we get rid of Activators, hopefully soon -->
         <feature>odl-base-felix-dm</feature>
         <feature version="${mdsal.version}">odl-mdsal-broker</feature>
-        <feature version="${mdsal.version}">odl-mdsal-apidocs</feature>
+        <feature version="${restconf.version}">odl-mdsal-apidocs</feature>
         <feature version='${yangtools.version}'>odl-yangtools-binding</feature>
         <feature version='${yangtools.version}'>odl-yangtools-models</feature>
         <feature version="${project.version}">odl-lispflowmapping-inmemorydb</feature>

diff --git a/mappingservice/netconf/pom.xml b/mappingservice/netconf/pom.xml
index 3d506a27415b991fd706bb2a16b7be52ffc0ca33..c277c4b1e7d5d5f8c3480d4f245c173e4922eb1d 100644 (file)
--- a/mappingservice/netconf/pom.xml
+++ b/mappingservice/netconf/pom.xml
@@ -14,6 +14,10 @@
   <packaging>bundle</packaging>
   <name>Mapping Service NETCONF Connector</name>
 
+  <properties>
+    <netconf.connector.version>1.3.0-SNAPSHOT</netconf.connector.version>
+  </properties>
+
   <dependencies>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
@@ -52,8 +56,9 @@
       <artifactId>sal-common-util</artifactId>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
+      <groupId>org.opendaylight.netconf</groupId>
       <artifactId>sal-netconf-connector</artifactId>
+      <version>${netconf.connector.version}</version>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>