Bump odlparent 2.0.2 to 2.0.4

[netvirt.git] / vpnservice / distribution / karaf / pom.xml

diff --git a/vpnservice/distribution/karaf/pom.xml b/vpnservice/distribution/karaf/pom.xml
index a7d6e5011c5a59ae0f6dad4853b05ab9b43afc83..ada2674c9a46c7d49ba7b37219552817e81b1687 100644 (file)
--- a/vpnservice/distribution/karaf/pom.xml
+++ b/vpnservice/distribution/karaf/pom.xml
@@ -9,44 +9,34 @@ 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">
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
-    <artifactId>karaf-parent</artifactId>
-    <version>1.7.0-SNAPSHOT</version>
+    <artifactId>karaf4-parent</artifactId>
+    <version>2.0.4</version>
     <relativePath/>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.opendaylight.netvirt</groupId>
   <artifactId>vpnservice-karaf</artifactId>
-  <version>0.3.0-SNAPSHOT</version>
-  <name>${project.artifactId}</name>
-  <prerequisites>
-    <maven>3.1.1</maven>
-  </prerequisites>
+  <version>0.5.0-SNAPSHOT</version>
+  <name>ODL :: netvirt :: ${project.artifactId}</name>
   <properties>
     <!-- <karaf.localFeature>odl-vpnservice-core</karaf.localFeature> -->
   </properties>
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>vpnservice-artifacts</artifactId>
-        <version>${project.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
+
   <dependencies>
     <dependency>
       <!-- scope is compile so all features (there is only one) are installed
       into startup.properties and the feature repo itself is not installed -->
       <groupId>org.apache.karaf.features</groupId>
       <artifactId>framework</artifactId>
+      <version>${karaf.version}</version>
       <type>kar</type>
+      <scope>compile</scope>
     </dependency>
 
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>vpnservice-features</artifactId>
+      <version>${project.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>
@@ -55,12 +45,12 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 
   <build>
     <plugins>
-      <!-- DO NOT deploy the karaf artifact -->
+      <!-- Temporarily deploy the karaf artifact -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>
         <configuration>
-          <skip>true</skip>
+          <skip>false</skip>
         </configuration>
       </plugin>
     </plugins>