From: Vratko Polak <vrpolak@cisco.com>
Date: Mon, 7 Sep 2015 10:42:07 +0000 (+0200)
Subject: Use NETCONF project features instead of Controller ones
X-Git-Tag: release/beryllium~79
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=2968f3a3652627c2897ebb3ade1004d90d5a671e;p=integration%2Fdistribution.git

Use NETCONF project features instead of Controller ones

NETCONF is a standalone project in Beryllium.
Controller project still hosts netconf features,
but those are stale.

This makes integration/distribution
to depend on features from NETCONF project.

Change-Id: I5862ef3c7ebfb23858891ad16dee45d1ea99b00a
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
---

diff --git a/features/index/pom.xml b/features/index/pom.xml
index e7e1d72a..30613ee7 100644
--- a/features/index/pom.xml
+++ b/features/index/pom.xml
@@ -102,13 +102,6 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-netconf-connector</artifactId>
-      <version>${feature.mdsal.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-nsf</artifactId>
@@ -116,13 +109,6 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-restconf</artifactId>
-      <version>${feature.mdsal.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.coretutorials</groupId>
       <artifactId>dsbenchmark-features</artifactId>
@@ -179,6 +165,27 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>features-netconf</artifactId>
+      <version>${feature.netconf.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>features-netconf-connector</artifactId>
+      <version>${feature.netconf.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.netconf</groupId>
+      <artifactId>features-restconf</artifactId>
+      <version>${feature.restconf.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.neutron</groupId>
       <artifactId>features-neutron</artifactId>
diff --git a/features/index/src/main/resources/features.xml b/features/index/src/main/resources/features.xml
index 18c41bb1..4b4beae3 100644
--- a/features/index/src/main/resources/features.xml
+++ b/features/index/src/main/resources/features.xml
@@ -43,9 +43,7 @@
     <repository>mvn:org.opendaylight.capwap/capwap-features/${feature.capwap.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-adsal/${feature.adsal.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-mdsal/${feature.mdsal.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.controller/features-netconf-connector/${feature.mdsal.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-nsf/${feature.nsf.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.controller/features-restconf/${feature.mdsal.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.coretutorials/dsbenchmark-features/${feature.coretutorials.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.didm/didm-features/${didm.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.dlux/features-dlux/${feature.dlux.version}/xml/features</repository>
@@ -54,6 +52,9 @@
     <repository>mvn:org.opendaylight.l2switch/features-l2switch/0.3.0-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.lacp/features-lacp/${feature.lacp.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.lispflowmapping/features-lispflowmapping/${feature.lispflowmapping.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.netconf/features-netconf/${feature.netconf.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.netconf/features-netconf-connector/${feature.netconf.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.netconf/features-restconf/${feature.restconf.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.neutron/features-neutron/${feature.neutron.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.nic/features-nic/${feature.nic.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/${feature.openflowplugin.version}/xml/features</repository>
diff --git a/features/test/src/main/resources/features.xml b/features/test/src/main/resources/features.xml
index 17de110e..afae4ed9 100644
--- a/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@ -60,7 +60,7 @@
         <feature version='0.3.0-SNAPSHOT'>odl-aaa-api</feature>
         <feature version='0.3.0-SNAPSHOT'>odl-aaa-authn</feature>
         <feature version='0.3.0-SNAPSHOT'>odl-aaa-authz</feature>
-        <feature version='0.3.0-SNAPSHOT'>odl-aaa-netconf-plugin</feature>
+        <feature version='${feature.netconf.version}'>odl-aaa-netconf-plugin</feature>
         <feature version='0.3.0-SNAPSHOT'>odl-aaa-sssd-plugin</feature>
         <feature version='${feature.adsal.version}'>odl-adsal-all</feature>
 <!--
@@ -78,8 +78,8 @@
         <feature version='${feature.iotdm.version}'>odl-iotdm-onem2m</feature>
         <feature version='${feature.lispflowmapping.version}'>odl-lispflowmapping-all</feature>
         <feature version='1.3.0-SNAPSHOT'>odl-mdsal-broker</feature>
-        <feature version='${feature.mdsal.version}'>odl-netconf-connector-ssh</feature>
         <feature version='${feature.neutron.version}'>odl-neutron-service</feature>
+        <feature version='${feature.netconf.version}'>odl-netconf-connector-ssh</feature>
         <feature version='${feature.nsf.version}'>odl-nsf-all</feature>
         <feature version='0.7.0-SNAPSHOT'>odl-openflowjava-protocol</feature>
         <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-adsal-compatibility</feature>
@@ -90,7 +90,7 @@
         <feature version='${feature.ovsdb.version}'>odl-ovsdb-all</feature>
         <feature version='${feature.packetcable.version}'>odl-packetcable-policy-server-all</feature>
         <feature version='${feature.reservation.version}'>odl-reservation-models</feature>
-        <feature version='1.3.0-SNAPSHOT'>odl-restconf</feature>
+        <feature version='${feature.restconf.version}'>odl-restconf-noauth</feature>
         <feature version="1.6.0-SNAPSHOT">odl-sdninterfaceapp-all</feature>
         <feature version='${feature.sfc.version}'>odl-sfc-core</feature>
         <feature version='${feature.sfc.version}'>odl-sfc-test-consumer</feature>
diff --git a/pom.xml b/pom.xml
index 815c1889..a1b0485d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,6 +34,7 @@
     <feature.lacp.version>1.1.0-SNAPSHOT</feature.lacp.version>
     <feature.lispflowmapping.version>1.3.0-SNAPSHOT</feature.lispflowmapping.version>
     <feature.mdsal.version>1.3.0-SNAPSHOT</feature.mdsal.version>
+    <feature.netconf.version>1.0.0-SNAPSHOT</feature.netconf.version>
     <feature.nic.version>1.1.0-SNAPSHOT</feature.nic.version>
     <feature.nsf.version>0.6.0-SNAPSHOT</feature.nsf.version>
     <feature.neutron.version>0.6.0-SNAPSHOT</feature.neutron.version>
@@ -42,6 +43,7 @@
     <feature.ovsdb.version>1.2.0-SNAPSHOT</feature.ovsdb.version>
     <feature.packetcable.version>1.3.0-SNAPSHOT</feature.packetcable.version>
     <feature.reservation.version>1.1.0-SNAPSHOT</feature.reservation.version>
+    <feature.restconf.version>1.3.0-SNAPSHOT</feature.restconf.version>
     <feature.sfc.version>0.2.0-SNAPSHOT</feature.sfc.version>
     <feature.snbi.version>1.2.0-SNAPSHOT</feature.snbi.version>
     <feature.sxp.version>1.2.0-SNAPSHOT</feature.sxp.version>