X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=karaf%2Fpom.xml;h=b61c8758b0db81301f3a3b7691d0941c4663ec4c;hb=refs%2Ftags%2F1.2.0;hp=83c78b13db34a52c39b1fa42b9ac6326afad730a;hpb=fa70a417a7d45d199b9597942dddebadf83a3d0e;p=transportpce.git

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 83c78b13d..b61c8758b 100644
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -5,40 +5,38 @@ 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">
-  <modelVersion>4.0.0</modelVersion>
+<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>karaf-parent</artifactId>
-    <version>1.8.0-SNAPSHOT</version>
+    <artifactId>karaf4-parent</artifactId>
+    <version>6.0.11</version>
+    <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.transportpce</groupId>
   <artifactId>transportpce-karaf</artifactId>
-  <version>0.1.0-SNAPSHOT</version>
+  <version>1.2.0</version>
+  <packaging>pom</packaging>
   <name>${project.artifactId}</name>
 
   <properties>
-    <karaf.localFeature>odl-transportpce-ui</karaf.localFeature>
+    <karaf.localFeature>odl-transportpce</karaf.localFeature>
+    <device.yang.jar.extract.directory>
+        ${project.build.outputDirectory}/../yang-models/schema
+    </device.yang.jar.extract.directory>
+    <device.yang.final.directory>
+        ${project.build.outputDirectory}/../assembly/cache/schema
+    </device.yang.final.directory>
   </properties>
 
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>${project.groupId}</groupId>
-        <artifactId>transportpce-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 -->
+    <!-- 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>
       <type>kar</type>
@@ -46,16 +44,33 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>transportpce-features</artifactId>
+      <artifactId>odl-transportpce</artifactId>
+      <version>${project.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>odl-transportpce-tapi</artifactId>
+      <version>${project.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
       <scope>runtime</scope>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>odl-transportpce-inventory</artifactId>
+      <version>${project.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+      <scope>runtime</scope>
+    </dependency>
+
   </dependencies>
 
   <build>
     <plugins>
-      <!-- DO NOT deploy the karaf artifact -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-deploy-plugin</artifactId>