Use actual version number in karaf pom.xml

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

diff --git a/karaf/pom.xml b/karaf/pom.xml
index d4e5dd8e361aa69b93f3f628d3bb28ad484b963c..d755eb41d632a061bcc902146a31ffef8e61ab8e 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -7,17 +7,18 @@
  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>karaf4-parent</artifactId>
-        <version>4.0.5</version>
+        <version>8.1.0</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
     <artifactId>karaf</artifactId>
-    <version>0.10.0-SNAPSHOT</version>
+    <version>0.15.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. -->
@@ -40,9 +41,9 @@
     <dependencyManagement>
         <dependencies>
             <dependency>
-                <groupId>${project.groupId}</groupId>
+                <groupId>org.opendaylight.integration</groupId>
                 <artifactId>all-artifacts</artifactId>
-                <version>${project.version}</version>
+                <version>0.15.0-SNAPSHOT</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -51,7 +52,7 @@
     <dependencies>
         <!-- Integration index feature repository. -->
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.integration</groupId>
             <artifactId>features-index</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
@@ -61,10 +62,6 @@
                     <groupId>org.opendaylight.odlparent</groupId>
                     <artifactId>opendaylight-karaf4-empty</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>org.opendaylight.controller</groupId>
-                    <artifactId>opendaylight-karaf-empty</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>org.opendaylight.odlparent</groupId>
                     <artifactId>opendaylight-karaf-empty</artifactId>
@@ -73,7 +70,7 @@
         </dependency>
         <!-- Integration test feature repository. -->
         <dependency>
-            <groupId>${project.groupId}</groupId>
+            <groupId>org.opendaylight.integration</groupId>
             <artifactId>features-test</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
@@ -83,10 +80,6 @@
                     <groupId>org.opendaylight.odlparent</groupId>
                     <artifactId>opendaylight-karaf4-empty</artifactId>
                 </exclusion>
-                <exclusion>
-                    <groupId>org.opendaylight.controller</groupId>
-                    <artifactId>opendaylight-karaf-empty</artifactId>
-                </exclusion>
                 <exclusion>
                     <groupId>org.opendaylight.odlparent</groupId>
                     <artifactId>opendaylight-karaf-empty</artifactId>
@@ -94,10 +87,17 @@
             </exclusions>
         </dependency>
 
+        <!-- This scope test here is just a trick, so that we can use the dependencies
+         in maven-dependency-plugin, but don't have karaf-maven-plugin choke on it -->
         <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>
+        <dependency>
+            <groupId>org.opendaylight.integration</groupId>
+            <artifactId>karaf-scripts</artifactId>
+            <version>0.15.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -127,6 +127,21 @@
                             <stripVersion>true</stripVersion>
                         </configuration>
                     </execution>
+                    <execution>
+                        <id>unpack-odl-karaf-resources</id>
+                        <goals>
+                            <goal>unpack-dependencies</goal>
+                        </goals>
+                        <phase>prepare-package</phase>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/assembly</outputDirectory>
+                            <groupId>org.opendaylight.integration</groupId>
+                            <includeArtifactIds>karaf-scripts</includeArtifactIds>
+                            <excludes>META-INF\/**</excludes>
+                            <excludeTransitive>true</excludeTransitive>
+                            <ignorePermissions>false</ignorePermissions>
+                        </configuration>
+                    </execution>
                 </executions>
             </plugin>
         </plugins>