Fixed some dependency issues in features.

Also rename alto-features to features-alto.

Change-Id: I81f48d2a16ebd766928892e39e664c642b7dcd60
Signed-off-by: Emiapwil (Gao Kai) <gaok12@mails.tsinghua.edu.cn>

diff --git a/features/pom.xml b/features/pom.xml
index 5abab11715f1e86e237b2e91995d32cefb41fbc7..10fef6bf4b146aff808fe8d06acf64bf726d0b0f 100644 (file)
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -14,7 +14,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <relativePath>../</relativePath>
   </parent>
 
-  <artifactId>alto-features</artifactId>
+  <artifactId>features-alto</artifactId>
   <name>${project.artifactId}</name>
 
   <properties>
@@ -44,6 +44,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
       <scope>runtime</scope>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.karaf.features</groupId>
+      <artifactId>standard</artifactId>
+      <version>${karaf.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>features-mdsal</artifactId>

diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index 609138828be215c87c396ca144338f641ba675ca..d801951066a54a7bde5bc1204c63e5b1a33ec1ed 100644 (file)
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -68,7 +68,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 
   <feature name='odl-alto-northbound' version='${project.version}' description='Opendaylight :: alto :: Northbound'>
     <feature version='${jersey.version}'>odl-base-jersey</feature>
-    <feature version='${war.version}'>war</feature>
+    <feature>war</feature>
     <feature version='${controller.commons.northbound.version}'>odl-adsal-northbound</feature>
     <feature version='${project.version}'>odl-alto-commons</feature>
     <bundle>mvn:org.opendaylight.alto/service-api-rfc7285/${project.version}</bundle>

diff --git a/pom.xml b/pom.xml
index 4c3278477127da25296c94c25a97faf8cc246810..33403b660e2efef287ee8899ea698969bb549356 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -45,7 +45,7 @@
     <config.version>0.3.0-SNAPSHOT</config.version>
 
     <sal.version>0.7.1-SNAPSHOT</sal.version>
-    <war.version>3.0.1</war.version>
+    <war.version>${karaf.version}</war.version>
     <mdsal.version>1.2.0-SNAPSHOT</mdsal.version>
     <jmxGeneratorPath>src/main/yang-gen-config</jmxGeneratorPath>
     <salGeneratorPath>src/main/yang-gen-sal</salGeneratorPath>