Remove adsal-related modules from features

Change-Id: Id53932e243803e8d1cfc58b438cebaadb7fbcf1f
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/features/ovsdb/pom.xml b/features/ovsdb/pom.xml
index 80771a776b4167e14e0e18c5479b90ccec35b7a4..aedc3e3320149286db972f6121ffa5622e870bd5 100644 (file)
--- a/features/ovsdb/pom.xml
+++ b/features/ovsdb/pom.xml
@@ -45,24 +45,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   </scm>
 
   <properties>
-    <!-- all this added to work around sun.reflect bug
-    <appauth.version>0.6.0-SNAPSHOT</appauth.version>
-    <bundlescanner.api.version>0.6.0-SNAPSHOT</bundlescanner.api.version>
-    <clustering.services.version>0.7.0-SNAPSHOT</clustering.services.version>
-    <configuration.implementation.version>0.6.0-SNAPSHOT</configuration.implementation.version>
-    <configuration.version>0.6.0-SNAPSHOT</configuration.version>
-    <containermanager.version>0.7.0-SNAPSHOT</containermanager.version>
-    <northbound.commons.version>0.6.0-SNAPSHOT</northbound.commons.version>
-    <switchmanager.api.version>0.9.0-SNAPSHOT</switchmanager.api.version>
-    <topologymanager.version>0.6.0-SNAPSHOT</topologymanager.version>
-    <usermanager.version>0.6.0-SNAPSHOT</usermanager.version>
-    all this added to work around sun.reflect bug -->
+    <dummy-console.version>1.3.0-SNAPSHOT</dummy-console.version>
     <odl.karaf.base.version>1.6.0-SNAPSHOT</odl.karaf.base.version>
     <mdsal.version>1.3.0-SNAPSHOT</mdsal.version>
+    <io.netty.version>3.8.0.Final</io.netty.version>
     <networkconfig.neutron.version>0.6.0-SNAPSHOT</networkconfig.neutron.version>
-    <nsf.version>0.6.0-SNAPSHOT</nsf.version>
     <ovsdb.library.version>1.2.0-SNAPSHOT</ovsdb.library.version>
-    <ovsdb.northbound.version>0.8.0-SNAPSHOT</ovsdb.northbound.version>
     <openstack.netvirt.version>1.2.0-SNAPSHOT</openstack.netvirt.version>
     <openstack.netvirt.providers.version>1.2.0-SNAPSHOT</openstack.netvirt.providers.version>
     <ovsdb.plugin.version>1.2.0-SNAPSHOT</ovsdb.plugin.version>
@@ -96,33 +84,145 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   </dependencyManagement>
   <dependencies>
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-base</artifactId>
-      <version>${odl.karaf.base.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.compendium</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-adsal</artifactId>
-      <version>${sal.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.core</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-nsf</artifactId>
-      <version>${nsf.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
+      <groupId>org.apache.felix</groupId>
+      <artifactId>org.apache.felix.dependencymanager</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-annotations</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-databind</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-lang3</artifactId>
+      <version>${commons.lang3.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty</artifactId>
+      <version>${io.netty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-all</artifactId>
+      <version>${netty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-buffer</artifactId>
+      <version>${netty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-codec</artifactId>
+      <version>${netty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-codec-http</artifactId>
+      <version>${netty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-common</artifactId>
+      <version>${netty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-handler</artifactId>
+      <version>${netty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport</artifactId>
+      <version>${netty.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>javax.servlet</artifactId>
+      <version>3.0.0.v201112011016</version>
+    </dependency>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>javax.servlet.jsp</artifactId>
+      <version>2.2.0.v201112011158</version>
+    </dependency>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>org.apache.felix.gogo.command</artifactId>
+      <version>0.8.0.v201108120515</version>
+    </dependency>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>org.apache.felix.gogo.runtime</artifactId>
+      <version>0.8.0.v201108120515</version>
+    </dependency>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>org.apache.felix.gogo.shell</artifactId>
+      <version>0.8.0.v201110170705</version>
+    </dependency>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>org.eclipse.equinox.cm</artifactId>
+      <version>1.0.400.v20120522-1841</version>
+    </dependency>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>org.eclipse.equinox.console</artifactId>
+      <version>1.0.0.v20120522-1841</version>
+    </dependency>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>org.eclipse.equinox.ds</artifactId>
+      <version>1.4.0.v20120522-1841</version>
+    </dependency>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>org.eclipse.equinox.launcher</artifactId>
+      <version>1.3.0.v20120522-1813</version>
+    </dependency>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>org.eclipse.equinox.util</artifactId>
+      <version>1.0.400.v20120522-2049</version>
+    </dependency>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>org.eclipse.osgi</artifactId>
+      <version>3.8.1.v20120830-144521</version>
+    </dependency>
+    <dependency>
+      <groupId>equinoxSDK381</groupId>
+      <artifactId>org.eclipse.osgi.services</artifactId>
+      <version>3.3.100.v20120522-1822</version>
     </dependency>
-    <!-- sun.reflect
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
-      <artifactId>commons.northbound</artifactId>
-      <version>${northbound.commons.version}</version>
+      <artifactId>dummy-console</artifactId>
+      <version>${dummy-console.version}</version>
     </dependency>
-    sun.reflect -->
     <dependency>
       <groupId>org.opendaylight.neutron</groupId>
       <artifactId>features-neutron</artifactId>
@@ -149,11 +249,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>library</artifactId>
       <version>${ovsdb.library.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>northbound</artifactId>
-      <version>${ovsdb.northbound.version}</version>
-    </dependency>
     <dependency>
       <groupId>org.opendaylight.ovsdb</groupId>
       <artifactId>openstack.net-virt</artifactId>

diff --git a/features/ovsdb/src/main/features/features.xml b/features/ovsdb/src/main/features/features.xml
index cf2b07834b22202c059877e296c6458c94e33123..ffe52774907f99c30cd284e614b7671394f2548e 100644 (file)
--- a/features/ovsdb/src/main/features/features.xml
+++ b/features/ovsdb/src/main/features/features.xml
@@ -2,8 +2,6 @@
 <features name="ovsdb-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
           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">
-  <repository>mvn:org.opendaylight.controller/features-adsal/${sal.version}/xml/features</repository>
-  <repository>mvn:org.opendaylight.controller/features-nsf/${nsf.version}/xml/features</repository>
   <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin-extension/${openflowplugin.version}/xml/features</repository>
   <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/${openflowplugin.version}/xml/features</repository>
   <repository>mvn:org.opendaylight.neutron/features-neutron/${networkconfig.neutron.version}/xml/features</repository>
@@ -14,12 +12,27 @@
            version='${project.version}'>
     <feature version="${ovsdb.library.version}">odl-ovsdb-library</feature>
     <feature version="${ovsdb.plugin.version}">odl-ovsdb-plugin</feature>
-    <feature version="${ovsdb.northbound.version}">odl-ovsdb-northbound</feature>
   </feature>
 
   <feature name="odl-ovsdb-library" description="OVSDB :: Library"
            version='${ovsdb.library.version}'>
-    <feature version="${odl.karaf.base.version}">odl-base-all</feature>
+    <bundle>mvn:org.osgi/org.osgi.compendium/${osgi.compendium.version}</bundle>
+    <bundle>mvn:org.apache.felix/org.apache.felix.dependencymanager/${felix.dependencymanager.version}</bundle>
+    <bundle>mvn:org.apache.felix/org.apache.felix.dependencymanager.shell/${felix.dependencymanager.shell.version}</bundle>
+    <bundle>mvn:org.opendaylight.controller/dummy-console/1.3.0-SNAPSHOT</bundle>
+    <bundle start="true">mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson.version}</bundle>
+    <bundle start="true">mvn:com.fasterxml.jackson.core/jackson-core/${jackson.version}</bundle>
+    <bundle start="true">mvn:com.fasterxml.jackson.core/jackson-databind/${jackson.version}</bundle>
+    <bundle start="true">mvn:com.google.guava/guava/${guava.version}</bundle>
+    <bundle>wrap:mvn:io.netty/netty-buffer/${netty.version}</bundle>
+    <bundle>wrap:mvn:io.netty/netty-codec/${netty.version}</bundle>
+    <bundle>wrap:mvn:io.netty/netty-transport/${netty.version}</bundle>
+    <bundle>wrap:mvn:io.netty/netty-common/${netty.version}</bundle>
+    <bundle>wrap:mvn:io.netty/netty-handler/${netty.version}</bundle>
+    <bundle>wrap:mvn:io.netty/netty-codec-http/${netty.version}</bundle>
+    <bundle>mvn:io.netty/netty/${io.netty.version}</bundle>
+    <bundle>mvn:org.apache.commons/commons-lang3/${commons.lang3.version}</bundle>
+    <bundle>mvn:org.osgi/org.osgi.core/${osgi.core.version}</bundle>
     <bundle>mvn:com.google.code.gson/gson/${gson.version}</bundle>
     <bundle>mvn:org.opendaylight.ovsdb/library/${ovsdb.library.version}</bundle>
   </feature>
@@ -46,37 +59,6 @@
     <bundle>mvn:org.opendaylight.ovsdb/plugin-shell/${plugin.shell.version}</bundle>
   </feature>
 
-  <feature name="odl-ovsdb-northbound" description="OpenDaylight :: OVSDB :: Northbound"
-           version='${ovsdb.northbound.version}'>
-    <feature version="${ovsdb.plugin.version}">odl-ovsdb-plugin</feature>
-    <feature version="${nsf.version}">odl-adsal-northbound</feature>
-    <!-- workaround for sun.reflect problem
-    <feature version="${sal.version}">odl-adsal-core</feature>
-    <bundle>mvn:org.opendaylight.controller/clustering.services/${clustering.services.version}</bundle>
-    <bundle>mvn:org.opendaylight.controller/usermanager/${usermanager.version}</bundle>
-    <bundle>mvn:org.opendaylight.controller/usermanager.implementation/${usermanager.version}</bundle>
-    <bundle>mvn:org.opendaylight.controller/containermanager/${containermanager.version}</bundle>
-    <bundle>mvn:org.opendaylight.controller/containermanager.implementation/${containermanager.version}</bundle>
-    <bundle>mvn:org.opendaylight.controller/configuration/${configuration.version}</bundle>
-    <bundle>mvn:org.opendaylight.controller/configuration.implementation/${configuration.implementation.version}</bundle>
-    <bundle>mvn:org.opendaylight.controller/appauth/${appauth.version}</bundle>
-    <bundle>mvn:org.opendaylight.controller/commons.northbound/${northbound.commons.version}</bundle>
-    <bundle>mvn:org.opendaylight.controller/topologymanager/${topologymanager.version}</bundle>
-    <bundle>mvn:org.opendaylight.controller/switchmanager/${switchmanager.api.version}</bundle>
-    <bundle>mvn:org.opendaylight.controller/bundlescanner/${bundlescanner.api.version}</bundle>
-    workaround for sun.reflect problem -->
-    <bundle>mvn:org.opendaylight.ovsdb/utils.servicehelper/${ovsdb.utils.servicehelper.version}</bundle>
-    <bundle>mvn:org.opendaylight.ovsdb/northbound/${ovsdb.northbound.version}</bundle>
-  </feature>
-
-  <feature name="odl-ovsdb-compatibility-layer" description="OpenDaylight :: OVSDB :: Plugin Compatibility Layer"
-           version='${ovsdb.plugin.compatibility.layer.version}'>
-    <feature version="${sal.version}">odl-adsal-core</feature>
-    <feature version="${ovsdb.plugin.version}">odl-ovsdb-plugin</feature>
-    <bundle>mvn:org.opendaylight.ovsdb/ovsdb-plugin-compatibility-layer/${ovsdb.plugin.compatibility.layer.version}
-    </bundle>
-  </feature>
-
   <feature name="odl-ovsdb-openstack" description="OpenDaylight :: OVSDB :: OpenStack Network Virtualization"
            version='${openstack.netvirt.version}'>
     <feature version='${mdsal.version}'>odl-mdsal-broker</feature>