Rationalize features

[transportpce.git] / karaf / pom.xml

diff --git a/karaf/pom.xml b/karaf/pom.xml
index 60247ff1cb3924e8b042ffaba31373ce87f07754..10ebeb5c37c480513bc9f9bb52d50014e8eaedc0 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -12,75 +12,72 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>karaf4-parent</artifactId>
-    <version>4.0.10</version>
+    <version>6.0.4</version>
     <relativePath/>
   </parent>
 
   <groupId>org.opendaylight.transportpce</groupId>
   <artifactId>transportpce-karaf</artifactId>
-  <version>0.4.0-SNAPSHOT</version>
-  <name>${project.artifactId}</name>
+  <version>1.0.0-SNAPSHOT</version>
   <packaging>pom</packaging>
+  <name>${project.artifactId}</name>
 
-    <properties>
-        <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>
+  <properties>
+    <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>
-            <dependency>
-                <groupId>${project.groupId}.ordmodels</groupId>
-                <artifactId>transportpce-ordmodels-device</artifactId>
-                <version>${project.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
+  <dependencies>
 
-    <dependencies>
-        <dependency>
-            <!-- scope is compile so all features (there is only one) are installed into startup.properties
+    <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>
-            <type>kar</type>
-        </dependency>
-
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>features-transportpce</artifactId>
-            <version>${project.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
+      <groupId>org.apache.karaf.features</groupId>
+      <artifactId>framework</artifactId>
+      <type>kar</type>
+    </dependency>
 
-     <build>
-         <plugins>
-             <plugin>
-                 <groupId>org.apache.maven.plugins</groupId>
-                 <artifactId>maven-deploy-plugin</artifactId>
-                 <configuration>
-                     <skip>true</skip>
-                 </configuration>
-             </plugin>
-         </plugins>
-     </build>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <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>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
 </project>