From: cs512 <wangjunzhuo200@gmail.com>
Date: Fri, 14 Aug 2015 08:24:48 +0000 (+0800)
Subject: Update the dependency version in alto-parent
X-Git-Tag: release/beryllium~23^2
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=2f353567605fcb7f1120855c796af065293bf876;p=alto.git

Update the dependency version in alto-parent

Change-Id: Ic18690d870d1d53c5141bbc7d94f81b5783d38ef
Signed-off-by: cs512 <wangjunzhuo200@gmail.com>
---

diff --git a/alto-manager/pom.xml b/alto-manager/pom.xml
index 392944d9..51373c52 100644
--- a/alto-manager/pom.xml
+++ b/alto-manager/pom.xml
@@ -51,6 +51,7 @@
               org.apache.karaf.shell.console,
               org.apache.http.*,
               org.opendaylight.alto.commons.*,
+              org.osgi.framework.*,
               org.slf4j
             </Import-Package>
             <Bundle-Name>${project.groupId}.${project.artifactId}</Bundle-Name>
diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index 06caf98f..aad9dcfe 100644
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -56,11 +56,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <bundle>mvn:org.opendaylight.alto.alto-hosttracker/alto-hosttracker-model/${project.version}</bundle>
   </feature>
 
-  <feature name='odl-alto-extension' version='${project.version}' description='Opendaylight :: alto :: extension'>
-    <feature version='${project.version}'>odl-alto-commons</feature>
-    <bundle>mvn:org.opendaylight.alto/services.ext.fs-map/${project.version}</bundle>
-  </feature>
-
   <feature name='odl-alto-manager' version='${project.version}' description='OpenDaylight :: alto :: Provider'>
     <feature version='${project.version}'>odl-alto-commons</feature>
     <bundle>mvn:org.apache.httpcomponents/httpclient-osgi/${httpclient.version}</bundle>
@@ -68,14 +63,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <bundle>mvn:org.opendaylight.alto/alto-manager/${project.version}</bundle>
   </feature>
 
-  <feature name='odl-alto-services' version='${project.version}' description='OpenDaylight :: alto :: Services'>
-    <feature version='${project.version}'>odl-alto-commons</feature>
-    <feature version='${mdsal.version}'>odl-mdsal-common</feature>
-    <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
-    <feature version='${project.version}'>odl-alto-commons</feature>
-    <bundle>mvn:org.opendaylight.alto/alto-services/${project.version}</bundle>
-  </feature>
-
   <feature name='odl-alto-simple' version='${project.version}' description='OpenDaylight :: alto :: Simple'>
     <feature version='${mdsal.version}'>odl-mdsal-common</feature>
     <feature version='${mdsal.version}'>odl-mdsal-broker</feature>
diff --git a/pom.xml b/pom.xml
index 720bd9b6..4bdea6ff 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
 
   <properties>
     <odl.version>1.6.0-SNAPSHOT</odl.version>
-    <karaf.shell.version>2.2.11</karaf.shell.version>
+    <karaf.shell.version>${karaf.version}</karaf.shell.version>
 
     <!-- required by alto command line -->
     <httpclient.version>4.4.1</httpclient.version>