Migrate to karaf4 for the local karaf distribution

Several folks have put in incredible effort to make karaf4 a reality in ODL.
Kudos to those folks for this great effort.  This patch officially converts
ovsdb's local karaf distributions to use odlparent's karaf4-parent artifact.

Change-Id: Ia86905565f739c42bb13cecb0f9e11e1cc20e02d
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>

diff --git a/hwvtepsouthbound/hwvtepsouthbound-karaf/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-karaf/pom.xml
index 51e7c24c1445dedb07ccbbdf9e1286bc0dc4931f..19bd5203c3bc38505f0dd39c494dc66ec5de5f7b 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-karaf/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-karaf/pom.xml
@@ -8,7 +8,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>karaf-parent</artifactId>
+    <artifactId>karaf4-parent</artifactId>
     <version>1.9.0</version>
     <relativePath/>
   </parent>
@@ -44,7 +44,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>hwvtepsouthbound-features</artifactId>
+      <artifactId>hwvtepsouthbound-features4</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>

diff --git a/library/karaf/pom.xml b/library/karaf/pom.xml
index cebfc827e49c86aff332946ccad217259c269150..32229fec8b4acaca33ccea9bbff6a8b88702e3cf 100644 (file)
--- a/library/karaf/pom.xml
+++ b/library/karaf/pom.xml
@@ -8,7 +8,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>karaf-parent</artifactId>
+    <artifactId>karaf4-parent</artifactId>
     <version>1.9.0</version>
     <relativePath/>
   </parent>
@@ -44,7 +44,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>library-features</artifactId>
+      <artifactId>library-features4</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>

diff --git a/southbound/southbound-karaf/pom.xml b/southbound/southbound-karaf/pom.xml
index ff3a706dcbd1ded47702738dbddc0429af3bbb0c..caadba9bd5276f45064d84e90cd8ffbf86e2f793 100644 (file)
--- a/southbound/southbound-karaf/pom.xml
+++ b/southbound/southbound-karaf/pom.xml
@@ -8,7 +8,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>karaf-parent</artifactId>
+    <artifactId>karaf4-parent</artifactId>
     <version>1.9.0</version>
     <relativePath/>
   </parent>
@@ -64,7 +64,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>southbound-features</artifactId>
+      <artifactId>southbound-features4</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>