Clean up features-config-netty

[controller.git] / karaf / pom.xml

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 7598c8f484525c945937be8bfe27537e830f6c97..beffc09253a8d180cdae6f218c403863dc2f6904 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -20,6 +20,18 @@
   <version>1.15.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>mdsal-parent</artifactId>
+        <version>1.12.0-SNAPSHOT</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <!-- scope is compile so all features (there is only one) are installed
@@ -34,12 +46,18 @@
           Note: Nothing should go here that is not locked
           down with testing... ie, no broken feature repos
     -->
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>features-controller-experimental</artifactId>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
 
     <!-- MD-SAL Related Features -->
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-mdsal</artifactId>
-      <version>1.12.0-SNAPSHOT</version>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>
@@ -47,15 +65,14 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-extras</artifactId>
-      <version>${project.version}</version>
       <classifier>features</classifier>
+      <version>${project.version}</version>
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>features-mdsal</artifactId>
-      <version>6.0.0</version>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>