X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=onap-karaf%2Fpom.xml;h=965a014eee4bb861b4a50fbb3db771cbb6c2b5a2;hb=refs%2Fheads%2Fheads%2Ffor%2Fstable%2Faluminium;hp=d85cfa9584d8facb3ad318396d6fd4b0c465347f;hpb=436c17d26019695a23ca27d731a0df98350c3fb5;p=integration%2Fdistribution.git

diff --git a/onap-karaf/pom.xml b/onap-karaf/pom.xml
index d85cfa95..965a014e 100644
--- a/onap-karaf/pom.xml
+++ b/onap-karaf/pom.xml
@@ -4,13 +4,13 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf4-parent</artifactId>
-        <version>6.0.1</version>
+        <version>7.0.8</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.integration</groupId>
     <artifactId>onap-karaf</artifactId>
-    <version>0.12.0-SNAPSHOT</version>
+    <version>0.13.4-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>ODL :: integration :: ${project.artifactId}</name>
     <modelVersion>4.0.0</modelVersion>
@@ -55,37 +55,32 @@
         <!-- Controller -->
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
-            <artifactId>features-extras</artifactId>
+            <artifactId>features-controller</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
             <scope>runtime</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
-            <artifactId>features-mdsal</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-            <scope>runtime</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>features-mdsal-benchmark</artifactId>
+            <artifactId>features-controller-experimental</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
             <scope>runtime</scope>
         </dependency>
+
+        <!-- Daexim -->
         <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>features-mdsal-trace</artifactId>
+            <groupId>org.opendaylight.daexim</groupId>
+            <artifactId>daexim-features</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
             <scope>runtime</scope>
         </dependency>
 
-        <!-- Daexim -->
+        <!-- MD-SAL -->
         <dependency>
-            <groupId>org.opendaylight.daexim</groupId>
-            <artifactId>daexim-features</artifactId>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>features-mdsal</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
             <scope>runtime</scope>
@@ -136,6 +131,13 @@
             <!-- 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>
 
     <build>
@@ -163,6 +165,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>