Bump odlparent 2.0.4 to 2.0.5

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

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 0b5cd857978db80b61d78d4d2ab8fd6076a5b8fb..0fed79059f4148fc242b92e82d8ed23acec8b82b 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -14,12 +14,12 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf4-parent</artifactId>
-        <version>2.0.2</version>
+        <version>2.0.5</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
     <artifactId>karaf</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <version>0.8.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <!-- <name> formatting is used by autorelease to parse and notify projects on
          build failure. Please do not modify this unless you have a good reason. -->
@@ -96,18 +96,16 @@
             </exclusions>
         </dependency>
 
-        <!-- External applications. -->
-        <!-- This leads to "Unsupported 'Bundle-ManifestVersion' value: 1". Uncomment when fixed.
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>aaa-cli-jar</artifactId>
+            <!-- This scope test here is just a trick, so that we can use aaa-cli-jar in maven-dependency-plugin, but don't have karaf-maven-plugin choke on it -->
+            <scope>test</scope>
         </dependency>
-        -->
     </dependencies>
 
     <build>
         <plugins>
-            <!-- This leads to "Unsupported 'Bundle-ManifestVersion' value: 1". Uncomment when fixed.
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
@@ -125,15 +123,14 @@
                             <overWriteSnapshots>true</overWriteSnapshots>
                             <overWriteIfNewer>true</overWriteIfNewer>
                             <excludeTransitive>true</excludeTransitive>
-                            < ! - - Do not include version in JAR filename, as external scripts call this utility,
+                            <!-- Do not include version in JAR filename, as external scripts call this utility,
                                  and they understandly do not want to have to adjust for every ODL release;
-                                 see e.g. https://github.com/dfarrell07/puppet-opendaylight/pull/140 - - >
+                                 see e.g. https://github.com/dfarrell07/puppet-opendaylight/pull/140 -->
                             <stripVersion>true</stripVersion>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
-            -->
         </plugins>
     </build>
 </project>