Improve Karaf3 features before Karaf4 migration

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

diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml
index 7f6952331aed89a5268b74835cb77ea75a2b503b..996c6e2c03929cd14b4bd15ec19bd70bc2451229 100644 (file)
--- a/distribution-karaf/pom.xml
+++ b/distribution-karaf/pom.xml
@@ -1,4 +1,12 @@
 <?xml version="1.0"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+ Copyright (c) 2014-2017 Cisco Systems, Inc. and others.  All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ 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">
     <modelVersion>4.0.0</modelVersion>
     <parent>
@@ -8,6 +16,7 @@
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
+    <!-- TODO: Rename to "distribution" or "karaf". -->
     <artifactId>distribution-karaf</artifactId>
     <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
@@ -27,6 +36,17 @@
         <url>https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=distribution-karaf;hb=HEAD</url>
         <tag>HEAD</tag>
     </scm>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>all-artifacts</artifactId>
+                <version>${project.version}</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
         <!-- opendaylight-karaf-parent uses this too -->
         <dependency>
@@ -34,11 +54,10 @@
             <artifactId>framework</artifactId>
             <type>kar</type>
         </dependency>
-        <!-- integration feature -->
+        <!-- Integration index feature repository. -->
         <dependency>
             <artifactId>features-integration-index</artifactId>
             <groupId>org.opendaylight.integration</groupId>
-            <version>${project.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
             <scope>runtime</scope>
@@ -53,11 +72,10 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <!-- integration test feature -->
+        <!-- Integration test feature repository. -->
         <dependency>
             <artifactId>features-integration-test</artifactId>
             <groupId>org.opendaylight.integration</groupId>
-            <version>${project.version}</version>
             <classifier>features</classifier>
             <type>xml</type>
             <scope>test</scope>
@@ -73,11 +91,10 @@
             </exclusions>
         </dependency>
 
-        <!-- external application -->
+        <!-- External applications. -->
         <dependency>
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>aaa-cli-jar</artifactId>
-            <version>0.5.0-SNAPSHOT</version>
         </dependency>
     </dependencies>