Merge "Bug 8535: Fix IPv6 OXMHeader Mask issue"

[openflowplugin.git] / distribution / karaf / pom.xml

diff --git a/distribution/karaf/pom.xml b/distribution/karaf/pom.xml
index 91b1871efacfec1f6e829c093bca9ddd24c4d9ce..1b1b97afcd06f3247db5e1185ebea8c1baea0f2a 100644 (file)
--- a/distribution/karaf/pom.xml
+++ b/distribution/karaf/pom.xml
@@ -2,21 +2,18 @@
 <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">
   <modelVersion>4.0.0</modelVersion>
   <parent>
-    <groupId>org.opendaylight.controller</groupId>
+    <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <version>1.9.0-SNAPSHOT</version>
     <relativePath></relativePath>
   </parent>
   <groupId>org.opendaylight.openflowplugin</groupId>
   <artifactId>openflowplugin-karaf</artifactId>
-  <version>0.3.0-SNAPSHOT</version>
+  <version>0.5.0-SNAPSHOT</version>
   <packaging>pom</packaging>
-  <prerequisites>
-    <maven>3.0</maven>
-  </prerequisites>
 
   <properties>
-    <openflowplugin.version>0.3.0-SNAPSHOT</openflowplugin.version>
+    <openflowplugin.version>0.5.0-SNAPSHOT</openflowplugin.version>
   </properties>
 
   <dependencyManagement>
@@ -41,14 +38,14 @@
     </dependency>
     <!-- openflowplugin feature -->
     <dependency>
-      <artifactId>features-openflowplugin</artifactId>
+      <artifactId>features-openflowplugin-he</artifactId>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
     <dependency>
-      <artifactId>features-openflowplugin-li</artifactId>
+      <artifactId>features-openflowplugin</artifactId>
       <groupId>org.opendaylight.openflowplugin</groupId>
       <classifier>features</classifier>
       <type>xml</type>
@@ -57,14 +54,14 @@
     <!-- openflowplugin extension feature -->
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
-      <artifactId>features-openflowplugin-extension</artifactId>
+      <artifactId>features-openflowplugin-extension-he</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.openflowplugin</groupId>
-      <artifactId>features-openflowplugin-extension-li</artifactId>
+      <artifactId>features-openflowplugin-extension</artifactId>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>