X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=karaf%2Fpom.xml;h=85d85b717c365bd4f74704f8c4df794628013ada;hb=d0f9ab9c6979bc07dfaccc5b08260d58df107782;hp=52f70c591b928c2661271aa6b26a4e8f8c9a7256;hpb=14c92df74247c884a43c5aaea2f154992b0ec798;p=controller.git

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 52f70c591b..85d85b717c 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -11,15 +11,27 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>6.0.0</version>
+    <version>7.0.1</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.controller</groupId>
   <artifactId>distribution.opendaylight-karaf</artifactId>
-  <version>1.14.0-SNAPSHOT</version>
+  <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,20 +46,16 @@
           Note: Nothing should go here that is not locked
           down with testing... ie, no broken feature repos
     -->
-
-    <!-- MD-SAL Related Features -->
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-mdsal</artifactId>
-      <version>1.11.0-SNAPSHOT</version>
+      <artifactId>features-controller-experimental</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-extras</artifactId>
-      <version>${project.version}</version>
+      <artifactId>features-controller</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>
@@ -55,7 +63,6 @@
     <dependency>
       <groupId>org.opendaylight.mdsal</groupId>
       <artifactId>features-mdsal</artifactId>
-      <version>4.0.6</version>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>