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 899d1ecb7bf744e28f866e720dfb01807b9373b4..996c6e2c03929cd14b4bd15ec19bd70bc2451229 100644 (file)
--- a/distribution-karaf/pom.xml
+++ b/distribution-karaf/pom.xml
@@ -1,17 +1,26 @@
 <?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>
-        <groupId>org.opendaylight.controller</groupId>
+        <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf-parent</artifactId>
-        <version>1.7.0-SNAPSHOT</version>
+        <version>1.8.0-SNAPSHOT</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
+    <!-- TODO: Rename to "distribution" or "karaf". -->
     <artifactId>distribution-karaf</artifactId>
-    <version>0.5.0-SNAPSHOT</version>
+    <version>0.6.0-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <name>${project.groupId}:${project.artifactId}</name>
+    <name>distribution:${project.artifactId}</name>
     <description>The actual Karaf building sub-project.</description>
     <url>https://wiki.opendaylight.org/view/Integration/Distribution</url>
     <licenses>
@@ -27,10 +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>
-    <properties>
-        <odlparent.version>1.7.0-SNAPSHOT</odlparent.version>
-        <vtn.coordinator.version>6.3.0-SNAPSHOT</vtn.coordinator.version>
-    </properties>
+    <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>
@@ -38,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>
@@ -51,13 +66,16 @@
                     <groupId>org.opendaylight.controller</groupId>
                     <artifactId>opendaylight-karaf-empty</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.opendaylight.odlparent</groupId>
+                    <artifactId>opendaylight-karaf-empty</artifactId>
+                </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>
@@ -66,54 +84,36 @@
                     <groupId>org.opendaylight.controller</groupId>
                     <artifactId>opendaylight-karaf-empty</artifactId>
                 </exclusion>
-            </exclusions>
-        </dependency>
-        <!-- external application -->
-        <dependency>
-            <groupId>org.opendaylight.vtn</groupId>
-            <artifactId>distribution.vtn-coordinator</artifactId>
-            <version>${vtn.coordinator.version}</version>
-            <type>tar.bz2</type>
-            <classifier>bin</classifier>
-            <exclusions>
                 <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
+                    <groupId>org.opendaylight.odlparent</groupId>
+                    <artifactId>opendaylight-karaf-empty</artifactId>
                 </exclusion>
             </exclusions>
         </dependency>
+
+        <!-- External applications. -->
         <dependency>
-            <groupId>org.opendaylight.vtn</groupId>
-            <artifactId>distribution.vtn-coordinator</artifactId>
-            <version>${vtn.coordinator.version}</version>
-            <type>txt</type>
-            <classifier>README</classifier>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>org.opendaylight.aaa</groupId>
+            <artifactId>aaa-cli-jar</artifactId>
         </dependency>
     </dependencies>
+
     <build>
         <plugins>
-            <!-- Overriding executions from parent. -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
                 <executions>
-                    <!-- This replaces one of executions (defined in parent) which would exclude the app. -->
                     <execution>
-                        <id>copy-externalapps</id>
+                        <id>copy-aaa-cli-jar</id>
                         <phase>prepare-package</phase>
                         <goals>
                             <goal>copy-dependencies</goal>
                         </goals>
                         <configuration>
-                            <outputDirectory>${project.build.directory}/assembly/externalapps</outputDirectory>
-                            <includeArtifactIds>distribution.vtn-coordinator</includeArtifactIds>
-                            <overWriteReleases>false</overWriteReleases>
+                            <outputDirectory>${project.build.directory}/assembly/bin</outputDirectory>
+                            <includeArtifactIds>aaa-cli-jar</includeArtifactIds>
+                            <overWriteReleases>true</overWriteReleases>
                             <overWriteSnapshots>true</overWriteSnapshots>
                             <overWriteIfNewer>true</overWriteIfNewer>
                             <excludeTransitive>true</excludeTransitive>
@@ -121,23 +121,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <!-- karaf-parent does not use karaf-plugin (yet) -->
-            <plugin>
-                <groupId>org.opendaylight.odlparent</groupId>
-                <artifactId>karaf-plugin</artifactId>
-                <version>${odlparent.version}</version>
-                <executions>
-                    <execution>
-                        <id>populate-local-repo</id>
-                        <goals>
-                            <goal>populate-local-repo</goal>
-                        </goals>
-                        <configuration>
-                            <localRepo>${project.build.directory}/assembly/system</localRepo>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>