X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=karaf%2Fpom.xml;h=987fc828093ada11b273f4cf5876c9572cfa992e;hb=f8e506160aac3441bfde498dc27b3c3e6b0de036;hp=e7da3377d3a84a2f07fe348c554c977bb07f9eb4;hpb=36f004c3aaaa2b38306e5d0ac1f48cd54f7d5d83;p=integration%2Fdistribution.git

diff --git a/karaf/pom.xml b/karaf/pom.xml
index e7da3377..987fc828 100644
--- 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>3.1.3</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
     <artifactId>karaf</artifactId>
-    <version>0.10.0-SNAPSHOT</version>
+    <version>0.12.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. -->
@@ -94,10 +95,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>${project.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -127,25 +135,19 @@
                             <stripVersion>true</stripVersion>
                         </configuration>
                     </execution>
-                </executions>
-            </plugin>
-
-            <!-- ODLPARENT-142: Heavy-handed workaround to remove mysql dependencies from system -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
                     <execution>
-                        <phase>prepare-package</phase>
+                        <id>unpack-odl-karaf-resources</id>
                         <goals>
-                            <goal>run</goal>
+                            <goal>unpack-dependencies</goal>
                         </goals>
+                        <phase>prepare-package</phase>
                         <configuration>
-                            <tasks>
-                                <delete includeemptydirs="true">
-                                    <fileset dir="${project.build.directory}/assembly/system/mysql"/>
-                                </delete>
-                            </tasks>
+                            <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>