Use Karaf 4 for the Karaf distribution

Change-Id: I6d8ce21866b4ffd5c25590076ad1042dba4e7346
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/distribution/karaf/pom.xml b/distribution/karaf/pom.xml
index 20be68307be103bd8a2ec4c990b365cd4d34da77..3f79a2e2c7a811127405da6589cb30b4e4b4e3f0 100644 (file)
--- a/distribution/karaf/pom.xml
+++ b/distribution/karaf/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>karaf-parent</artifactId>
+    <artifactId>karaf4-parent</artifactId>
     <version>1.8.0-SNAPSHOT</version>
     <relativePath></relativePath>
   </parent>
@@ -37,19 +37,22 @@
             into startup.properties and the feature repo itself is not installed -->
       <groupId>org.apache.karaf.features</groupId>
       <artifactId>framework</artifactId>
+      <version>${karaf4.version}</version>
       <type>kar</type>
     </dependency>
     <!-- openflowplugin feature -->
     <dependency>
-      <artifactId>features-openflowplugin-he</artifactId>
+      <artifactId>features4-openflowplugin-he</artifactId>
       <groupId>org.opendaylight.openflowplugin</groupId>
+      <version>${project.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <artifactId>features-openflowplugin</artifactId>
+      <artifactId>features4-openflowplugin</artifactId>
       <groupId>org.opendaylight.openflowplugin</groupId>
+      <version>${project.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>
@@ -57,14 +60,16 @@
     <!-- openflowplugin extension feature -->
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
-      <artifactId>features-openflowplugin-extension-he</artifactId>
+      <artifactId>features4-openflowplugin-extension-he</artifactId>
+      <version>${project.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
-      <artifactId>features-openflowplugin-extension</artifactId>
+      <artifactId>features4-openflowplugin-extension</artifactId>
+      <version>${project.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>