Update MRI projects for Aluminium

[integration/distribution.git] / onap-karaf / pom.xml

diff --git a/onap-karaf/pom.xml b/onap-karaf/pom.xml
index 1d16061245cbbc0c8002e7a175794801bfe5336e..06c7a2014eb91cc46d17c108eb40c75f1fab800e 100644 (file)
--- a/onap-karaf/pom.xml
+++ b/onap-karaf/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf4-parent</artifactId>
-        <version>6.0.4</version>
+        <version>7.0.1</version>
         <relativePath/>
     </parent>
 
@@ -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>