X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=karaf%2Fpom.xml;h=43ca5bd371e7b7cd6a5b8899e9a5cf4a9eed1b9d;hb=63e815bfd6d2c8b83c03bdeb853c6d27ecfc15f3;hp=d2e9e2d63c8384bb1b43900c7828e04ca3a74b13;hpb=890d24b7ed566addf2c52fd10dd66122b064f654;p=integration%2Fdistribution.git

diff --git a/karaf/pom.xml b/karaf/pom.xml
index d2e9e2d6..43ca5bd3 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>7.0.3</version>
         <relativePath/>
     </parent>
     <groupId>org.opendaylight.integration</groupId>
     <artifactId>karaf</artifactId>
-    <version>0.9.0-SNAPSHOT</version>
+    <version>0.13.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. -->
@@ -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>
@@ -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>${project.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -127,29 +127,49 @@
                             <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>
             </plugin>
         </plugins>
     </build>
+
+    <profiles>
+        <profile>
+            <id>dependency-convergence</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-enforcer-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <id>enforce-dependency-convergence</id>
+                                <goals>
+                                    <goal>enforce</goal>
+                                </goals>
+                                <configuration>
+                                    <rules>
+                                        <dependencyConvergence/>
+                                    </rules>
+                                </configuration>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
 </project>