Remove NETCONF module reference from POM/features

[... but leave the actual code]

Change-Id: I54ec36db20944d0c3bcf96ad3a146f5b477987e5
Signed-off-by: Lorand Jakab <lojakab@cisco.com>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 08473676014d1f3259dc5bac86ab19cd74955b6f..157b02fcdeef904864ed4ba39f32b0b6fa8fdba4 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -37,11 +37,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
         <artifactId>mappingservice.inmemorydb</artifactId>
         <version>${project.version}</version>
       </dependency>
-<!--       <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>mappingservice.netconf</artifactId>
-        <version>${project.version}</version>
-      </dependency> -->
       <dependency>
         <groupId>${project.groupId}</groupId>
         <artifactId>mappingservice.neutron</artifactId>

diff --git a/commons/parent/pom.xml b/commons/parent/pom.xml
index 458c1930392cae77199ef112fd14f527dd391b59..7f9967dc6149ef9545a35247f228fb698ef30c57 100644 (file)
--- a/commons/parent/pom.xml
+++ b/commons/parent/pom.xml
@@ -112,13 +112,6 @@
         <classifier>features</classifier>
         <type>xml</type>
       </dependency>
-<!--       <dependency>
-        <groupId>org.opendaylight.controller</groupId>
-        <artifactId>features-netconf-connector</artifactId>
-        <version>${mdsal.version}</version>
-        <classifier>features</classifier>
-        <type>xml</type>
-      </dependency> -->
       <dependency>
         <groupId>org.opendaylight.neutron</groupId>
         <artifactId>features-neutron</artifactId>
@@ -227,11 +220,6 @@
         <artifactId>mappingservice.inmemorydb</artifactId>
         <version>${lispflowmapping.version}</version>
       </dependency>
-<!--       <dependency>
-        <groupId>org.opendaylight.lispflowmapping</groupId>
-        <artifactId>mappingservice.netconf</artifactId>
-        <version>${lispflowmapping.version}</version>
-      </dependency> -->
       <dependency>
         <groupId>org.opendaylight.lispflowmapping</groupId>
         <artifactId>mappingservice.neutron</artifactId>

diff --git a/features/pom.xml b/features/pom.xml
index 19add733a29e5af93e7d162a75ded64e0635d2d2..a0c72fbe39345051f4a9b2d6f8de01a75bb3d395 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -56,12 +56,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-<!--     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-netconf-connector</artifactId>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency> -->
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-mdsal</artifactId>
@@ -138,11 +132,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <classifier>config</classifier>
       <type>xml</type>
     </dependency>
-<!--     <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>mappingservice.netconf</artifactId>
-      <version>${project.version}</version>
-    </dependency> -->
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>mappingservice.neutron</artifactId>

diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index a08ba11fc5ea9184bcf2c07adb2b1a97789eede5..7723304e7c220a73701dab25555ff3a66018a5f8 100644 (file)
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -11,19 +11,19 @@
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
 
+    <!-- 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>
     <!-- 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>
-    <!-- <repository>mvn:org.opendaylight.controller/features-netconf-connector/${mdsal.version}/xml/features</repository> -->
     <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.dlux/features-dlux/${dlux.core.version}/xml/features</repository>
 
     <feature name="odl-lispflowmapping-all" description="OpenDaylight :: LISP Flow Mapping :: All" version='${project.version}'>
         <feature version="${project.version}">odl-lispflowmapping-mappingservice</feature>
         <feature version="${project.version}">odl-lispflowmapping-southbound</feature>
-        <!-- <feature version="${project.version}">odl-lispflowmapping-netconf</feature> -->
         <feature version="${project.version}">odl-lispflowmapping-neutron</feature>
     </feature>
 
@@ -66,12 +66,6 @@
         </configfile>
     </feature>
 
-<!--     <feature name="odl-lispflowmapping-netconf" description="OpenDaylight :: LISP Flow Mapping :: NETCONF" version='${project.version}'>
-        <feature version="${mdsal.version}">odl-netconf-connector-ssh</feature>
-        <feature version="${project.version}">odl-lispflowmapping-mappingservice</feature>
-        <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.netconf/${project.version}</bundle>
-    </feature> -->
-
     <feature name="odl-lispflowmapping-neutron" description="OpenDaylight :: LISP Flow Mapping :: Neutron Integration" version='${project.version}'>
         <feature version="${neutron.version}">odl-neutron-service</feature>
         <feature version="${project.version}">odl-lispflowmapping-mappingservice</feature>