X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=karaf%2Fpom.xml;h=cc760268fa4efe0d2d4bac7e5b7a571515349804;hb=d2c2643ec42e1bf3d23b47d2407cceed9a40ba6a;hp=7598c8f484525c945937be8bfe27537e830f6c97;hpb=1d0856d1badf8461472be1d2c1c40f2952657f58;p=controller.git

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 7598c8f484..cc760268fa 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -11,15 +11,27 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>7.0.1</version>
+    <version>7.0.5</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.controller</groupId>
-  <artifactId>distribution.opendaylight-karaf</artifactId>
-  <version>1.15.0-SNAPSHOT</version>
+  <artifactId>controller-test-karaf</artifactId>
+  <version>2.0.3-SNAPSHOT</version>
   <packaging>pom</packaging>
 
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>org.opendaylight.controller</groupId>
+        <artifactId>controller-artifacts</artifactId>
+        <version>${project.version}</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,28 +46,23 @@
           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.12.0-SNAPSHOT</version>
+      <artifactId>features-controller</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-experimental</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.mdsal</groupId>
-      <artifactId>features-mdsal</artifactId>
-      <version>6.0.0</version>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>features-controller-testing</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>