X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=karaf%2Fpom.xml;h=f4fffb44a57128712ea9847939f907b96afb18be;hb=refs%2Fchanges%2F47%2F87047%2F9;hp=00d1b203ef61c486d685fb65a53c8cb2936a69ee;hpb=8a7f42cd34b2f618b4bc67e0a420f11ccdd0db0c;p=netvirt.git

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 00d1b203ef..f4fffb44a5 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -6,24 +6,25 @@ 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 INTERNAL
 -->
-<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">
 
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf4-parent</artifactId>
-        <version>3.0.2</version>
+        <version>6.0.4</version>
         <relativePath/>
     </parent>
 
     <groupId>org.opendaylight.netvirt</groupId>
     <artifactId>karaf</artifactId>
-    <version>0.7.0-SNAPSHOT</version>
+    <version>0.11.0-SNAPSHOT</version>
     <name>ODL :: netvirt :: ${project.artifactId}</name>
     <modelVersion>4.0.0</modelVersion>
 
     <properties>
         <!-- <karaf.localFeature>odl-netvirt-openstack</karaf.localFeature> -->
+        <maven.deploy.skip>true</maven.deploy.skip>
+        <maven.install.skip>true</maven.install.skip>
     </properties>
 
     <dependencies>
@@ -58,7 +59,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
              -->
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>features-mdsal-trace</artifactId>
-            <version>1.8.0-SNAPSHOT</version>
+            <version>1.11.0</version>
             <classifier>features</classifier>
             <type>xml</type>
             <scope>runtime</scope>
@@ -68,7 +69,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
             <!-- This ensures we have odl-jolokia in the distribution -->
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>features-extras</artifactId>
-            <version>1.11.0-SNAPSHOT</version>
+            <version>1.14.0</version>
             <type>xml</type>
             <classifier>features</classifier>
             <scope>runtime</scope>
@@ -78,7 +79,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
             <!-- This ensures aaa-cli is available for the copy below -->
             <groupId>org.opendaylight.aaa</groupId>
             <artifactId>aaa-cli-jar</artifactId>
-            <version>0.8.0-SNAPSHOT</version>
+            <version>0.12.0-SNAPSHOT</version>
             <!-- Use scope test (and not more!) just so we have the dependency for the maven-dependency-plugin below -->
             <scope>test</scope>
         </dependency>
@@ -101,7 +102,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
                                 <artifactItem>
                                     <groupId>org.opendaylight.aaa</groupId>
                                     <artifactId>aaa-cli-jar</artifactId>
-                                    <version>0.8.0-SNAPSHOT</version>
+                                    <version>0.12.0-SNAPSHOT</version>
                                 </artifactItem>
                             </artifactItems>
                             <outputDirectory>${project.build.directory}/assembly/bin</outputDirectory>
@@ -118,34 +119,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
                     </execution>
                 </executions>
             </plugin>
-            <!-- Temporarily deploy the karaf artifact -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>false</skip>
-                </configuration>
-            </plugin>
-            <!-- NETVIRT-1126: 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>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <delete includeemptydirs="true">
-                                    <fileset dir="${project.build.directory}/assembly/system/mysql"/>
-                                </delete>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 </project>