Bump versions by x.(y+1).z for next dev cycle

[aaa.git] / karaf / pom.xml

diff --git a/karaf/pom.xml b/karaf/pom.xml
index e9ca001bd94f0daf347c68fc49d82288a82f787d..e8dafade43381af388553835856439b74f9b9462 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -6,20 +6,19 @@
  terms of the Eclipse Public License v1.0 which accompanies this distribution,
  and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
-<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">
+<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.odlparent</groupId>
-        <artifactId>karaf-parent</artifactId>
-        <version>1.8.0-Carbon</version>
-        <relativePath></relativePath>
+        <artifactId>karaf4-parent</artifactId>
+        <version>3.1.3</version>
+        <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.aaa</groupId>
     <artifactId>aaa-karaf</artifactId>
-    <version>0.6.0-SNAPSHOT</version>
+    <version>0.9.0-SNAPSHOT</version>
     <name>ODL :: aaa :: ${project.artifactId}</name>
     <packaging>pom</packaging>
 
@@ -47,13 +46,7 @@
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>features-aaa</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.aaa</groupId>
-            <artifactId>features-aaa-shiro</artifactId>
+            <version>${project.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
             <scope>runtime</scope>