Remove dependency on features-adsal and features-nsf

We also need to add the org.opendaylight.controller:sal:0.7.0 bundle
to the odl-snmp4sdn-snmp4sdn feature.

Bug: 4720
Change-Id: I6f84e55e8c556514cc1634aaf343b101347e5dbf
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/features/pom.xml b/features/pom.xml
index fc846db9cb776ed89cb69d996fec642683f41c5e..c560e75d45002f9a78750c00e3acc43e3a99656f 100755 (executable)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -53,20 +53,6 @@
         <mdsal.model.version>0.8.0-SNAPSHOT</mdsal.model.version>
     </properties>
     <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>features-adsal</artifactId>
-            <version>${sal.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-            <!-- declare the exclusion here -->
-            <exclusions>
-                <exclusion>
-                    <groupId>org.ops4j.pax.exam</groupId>
-                    <artifactId>pax-exam-container-native</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>org.apache.servicemix.bundles</groupId>
             <artifactId>org.apache.servicemix.bundles.dom4j</artifactId><!--xml parser-->
@@ -141,13 +127,6 @@
           <classifier>features</classifier>
           <type>xml</type>
         </dependency>
-        <!--<dependency>//odl-nsf-managers can't be installed successfully, many dependency missing
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>features-nsf</artifactId>
-          <version>${nsf.version}</version>
-          <classifier>features</classifier>
-          <type>xml</type>
-        </dependency>-->
         <!--<dependency>
           <groupId>org.opendaylight.controller</groupId>
           <artifactId>features-base</artifactId>

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index b81c544debeb48278e3e144bf506c396d0aed636..a9d4e07c8d54b73e87e5931c561e639958011cb5 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -12,9 +12,6 @@
           xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
 
     <repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
-
-    <repository>mvn:org.opendaylight.controller/features-adsal/${sal.version}/xml/features</repository>
-    <!--<repository>mvn:org.opendaylight.controller/features-nsf/${nsf.version}/xml/features</repository>--><!--odl-nsf-managers can't be installed successfully, many dependency missing--><!--for odl-adsal-northbound-->
     <repository>mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.netconf/features-restconf/${restconf.version}/xml/features</repository>
     <!--NOT to add snmp4sdn repo, cause recursive loading--><!--<repository>mvn:org.opendaylight.snmp4sdn/features-snmp4sdn/${project.version}/xml/features</repository>-->
@@ -24,20 +21,17 @@
     </feature>
     <feature name='odl-snmp4sdn-snmp4sdn' version='${project.version}' description='OpenDaylight :: SNMP4SDN :: Plugin'>
             <!--these marked are in Helium first release-->
-            <feature version="${sal.version}">odl-adsal-core</feature>
             <feature version='${yangtools.version}'>odl-mdsal-models</feature>
             <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
 
-            <feature version='${sal.version}'>odl-adsal-all</feature><!--TODO: may need not this, odl-adsal-core is enough?-->
-            <!--<feature version='${nsf.version}'>odl-adsal-northbound</feature>-->
             <feature version='${mdsal.version}'>odl-mdsal-apidocs</feature>
             <feature version='${restconf.version}'>odl-restconf</feature>
-            <!--<feature version='${nsf.version}'>odl-nsf-managers</feature>--><!--odl-nsf-managers can't be installed successfully, many dependency missing-->
 
             <bundle>mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.dom4j/1.6.1_5</bundle>
             <!--<bundle>mvn:org.opendaylight.controller/topologymanager/0.4.1</bundle>--><!--remove, because odl-nsf-managers can't be installed successfully, many dependency missing-->
             <bundle>mvn:org.opendaylight.snmp4sdn/md-model/${project.version}</bundle>
             <bundle>mvn:org.opendaylight.snmp4sdn/snmp4sdn/${project.version}</bundle>
             <bundle>mvn:org.opendaylight.snmp4sdn/plugin-shell/${project.version}</bundle>
+        <bundle>mvn:org.opendaylight.controller/sal/0.7.0</bundle>
     </feature>
 </features>

diff --git a/snmp4sdn/pom.xml b/snmp4sdn/pom.xml
index ddb80dee76540197e4fc8d166e4f80c3259bf544..78b520e526d6eb8dca5bd0162f467bc32f770ef0 100644 (file)
--- a/snmp4sdn/pom.xml
+++ b/snmp4sdn/pom.xml
@@ -16,14 +16,14 @@
   <name>snmp4sdn plugin</name>
   <description>The snmp4sdn plugin</description>
   <url>https://wiki.opendaylight.org/view/SNMP4SDN:Main</url>
-  
+
   <licenses>
     <license>
       <name>Eclipse Public License v1.0</name>
       <url>http://www.eclipse.org/legal/epl-v10.html</url>
     </license>
   </licenses>
-  
+
   <developers>
     <developer>
       <name>Yi-Ling Hsieh</name>