From 4932b7460f1e35c8fd9bab402342bd67c591f5db Mon Sep 17 00:00:00 2001
From: "Emiapwil (Gao Kai)" <gaok12@mails.tsinghua.edu.cn>
Date: Thu, 16 Apr 2015 15:41:43 +0800
Subject: [PATCH] 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>
---
 features/pom.xml                         | 10 +++++++++-
 features/src/main/resources/features.xml |  2 +-
 pom.xml                                  |  2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/features/pom.xml b/features/pom.xml
index 5abab117..10fef6bf 100644
--- 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 60913882..d8019510 100644
--- 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 4c327847..33403b66 100644
--- 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>
-- 
2.36.6