X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=onap-karaf%2Fpom.xml;h=06c7a2014eb91cc46d17c108eb40c75f1fab800e;hb=153d8943f9b7456535d2f2058ecea9156543ffc4;hp=f1b5fb41be74042a17bb0951011718cb519915f1;hpb=5802d0044d092282744b8e855a518bd0bf72dab3;p=integration%2Fdistribution.git

diff --git a/onap-karaf/pom.xml b/onap-karaf/pom.xml
index f1b5fb41..06c7a201 100644
--- a/onap-karaf/pom.xml
+++ b/onap-karaf/pom.xml
@@ -4,13 +4,13 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf4-parent</artifactId>
-        <version>6.0.3</version>
+        <version>7.0.1</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.integration</groupId>
     <artifactId>onap-karaf</artifactId>
-    <version>0.12.0-SNAPSHOT</version>
+    <version>0.13.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>ODL :: integration :: ${project.artifactId}</name>
     <modelVersion>4.0.0</modelVersion>
@@ -55,37 +55,42 @@
         <!-- Controller -->
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
-            <artifactId>features-extras</artifactId>
+            <artifactId>features-controller</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
-            <artifactId>features-mdsal</artifactId>
+            <artifactId>features-controller-experimental</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
             <scope>runtime</scope>
         </dependency>
+
+        <!-- Daexim -->
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>features-mdsal-benchmark</artifactId>
+            <groupId>org.opendaylight.daexim</groupId>
+            <artifactId>daexim-features</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
             <scope>runtime</scope>
         </dependency>
+
+        <!-- MD-SAL -->
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>features-mdsal-trace</artifactId>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>features-mdsal</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
             <scope>runtime</scope>
         </dependency>
 
-        <!-- Daexim -->
+        <!-- MD-SAL Trace -->
+        <!-- FIXME: remove this with mdsal-6.0.1+ -->
         <dependency>
-            <groupId>org.opendaylight.daexim</groupId>
-            <artifactId>daexim-features</artifactId>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>odl-mdsal-trace</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
             <scope>runtime</scope>