X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=distribution-karaf%2Fpom.xml;h=996c6e2c03929cd14b4bd15ec19bd70bc2451229;hb=b7a7f8ccb61d02e68ec3fe31932cef9bd6bde7b3;hp=0b284a341ec184a7635b935e894f1b864c7e2ace;hpb=4ed22e4f90625d4706d6cf9de131f9cc04249372;p=integration%2Fdistribution.git

diff --git a/distribution-karaf/pom.xml b/distribution-karaf/pom.xml
index 0b284a34..996c6e2c 100644
--- a/distribution-karaf/pom.xml
+++ b/distribution-karaf/pom.xml
@@ -1,136 +1,126 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
-      <artifactId>karaf-parent</artifactId>
-      <version>1.7.0-SNAPSHOT</version>
-      <relativePath/>
-  </parent>
-  <groupId>org.opendaylight.integration</groupId>
-  <artifactId>distribution-karaf</artifactId>
-  <version>0.5.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
+<?xml version="1.0"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<!--
+ Copyright (c) 2014-2017 Cisco Systems, Inc. and others.  All rights reserved.
 
-  <properties>
-    <odlparent.version>1.7.0-SNAPSHOT</odlparent.version>
-    <vtn.coordinator.version>6.3.0-SNAPSHOT</vtn.coordinator.version>
-  </properties>
+ 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.odlparent</groupId>
+        <artifactId>karaf-parent</artifactId>
+        <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.6.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>distribution:${project.artifactId}</name>
+    <description>The actual Karaf building sub-project.</description>
+    <url>https://wiki.opendaylight.org/view/Integration/Distribution</url>
+    <licenses>
+        <license>
+            <name>Eclipse Public License v1.0</name>
+            <url>http://www.eclipse.org/legal/epl-v10.html</url>
+        </license>
+    </licenses>
+    <!-- FIXME: Add developers section -->
+    <scm>
+        <connection>scm:git:https://git.opendaylight.org/gerrit/integration/distribution.git</connection>
+        <developerConnection>scm:git:ssh://git.opendaylight.org:29418/integration/distribution.git</developerConnection>
+        <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>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>framework</artifactId>
+            <type>kar</type>
+        </dependency>
+        <!-- Integration index feature repository. -->
+        <dependency>
+            <artifactId>features-integration-index</artifactId>
+            <groupId>org.opendaylight.integration</groupId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>runtime</scope>
+            <exclusions>
+                <exclusion>
+                    <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 repository. -->
+        <dependency>
+            <artifactId>features-integration-test</artifactId>
+            <groupId>org.opendaylight.integration</groupId>
+            <classifier>features</classifier>
+            <type>xml</type>
+            <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <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>
 
-  <dependencies>
-    <!-- opendaylight-karaf-parent uses this too -->
-    <dependency>
-      <groupId>org.apache.karaf.features</groupId>
-      <artifactId>framework</artifactId>
-      <type>kar</type>
-    </dependency>
-    <!-- integration feature -->
-    <dependency>
-      <artifactId>features-integration-index</artifactId>
-      <groupId>org.opendaylight.integration</groupId>
-      <version>${project.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>runtime</scope>
-      <exclusions>
-        <exclusion>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>opendaylight-karaf-empty</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <!-- integration test feature -->
-    <dependency>
-      <artifactId>features-integration-test</artifactId>
-      <groupId>org.opendaylight.integration</groupId>
-      <version>${project.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-      <scope>test</scope>
-      <exclusions>
-        <exclusion>
-          <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>
-        </exclusion>
-      </exclusions>
-    </dependency>
-    <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>
-    </dependency>
-  </dependencies>
+        <!-- External applications. -->
+        <dependency>
+            <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>
-            <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>
-              <overWriteSnapshots>true</overWriteSnapshots>
-              <overWriteIfNewer>true</overWriteIfNewer>
-              <excludeTransitive>true</excludeTransitive>
-            </configuration>
-          </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>
-  <scm>
-    <connection>scm:git:ssh://git.opendaylight.org:29418/integration/distribution.git</connection>
-    <developerConnection>scm:git:ssh://git.opendaylight.org:29418/integration/distribution.git</developerConnection>
-    <tag>HEAD</tag>
-    <url>https://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=tree;f=distribution-karaf;hb=HEAD</url>
-  </scm>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>copy-aaa-cli-jar</id>
+                        <phase>prepare-package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/assembly/bin</outputDirectory>
+                            <includeArtifactIds>aaa-cli-jar</includeArtifactIds>
+                            <overWriteReleases>true</overWriteReleases>
+                            <overWriteSnapshots>true</overWriteSnapshots>
+                            <overWriteIfNewer>true</overWriteIfNewer>
+                            <excludeTransitive>true</excludeTransitive>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 </project>