Use new Karaf 3 odlparent features

This migrates controller to the new odlparent features. This is useful
as a stable base before the Karaf 4 migration (which only has the new
odlparent features).

Change-Id: Id638e57cdc4f30e2790f5677471310de666b7378
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/features/config/pom.xml b/features/config/pom.xml
index 543215ad999af595ecb642b5226f2df1b06d663b..58abc7566de4d6680d64a6affccebfa35fb1376c 100644 (file)
--- a/features/config/pom.xml
+++ b/features/config/pom.xml
@@ -17,6 +17,7 @@
     <yangtools.version>1.1.0-SNAPSHOT</yangtools.version>
     <mdsal.version>2.2.0-SNAPSHOT</mdsal.version>
     <config.version>0.6.0-SNAPSHOT</config.version>
     <yangtools.version>1.1.0-SNAPSHOT</yangtools.version>
     <mdsal.version>2.2.0-SNAPSHOT</mdsal.version>
     <config.version>0.6.0-SNAPSHOT</config.version>

+    <odlparent.version>1.8.0-SNAPSHOT</odlparent.version>

     <features.file>features.xml</features.file>
     <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
   </properties>
     <features.file>features.xml</features.file>
     <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
   </properties>

diff --git a/features/config/src/main/features/features.xml b/features/config/src/main/features/features.xml
index 960e5c8e509566d776696ddd39b8c1bdf65a3f7d..e34769d481fcc9fc5b17c976525aaff03fc92293 100644 (file)
--- a/features/config/src/main/features/features.xml
+++ b/features/config/src/main/features/features.xml
@@ -21,7 +21,7 @@
 
   <feature name='odl-config-netty-config-api' version='${project.version}' description="OpenDaylight :: Config :: Netty Config API">
     <feature version='${project.version}'>odl-config-api</feature>
 
   <feature name='odl-config-netty-config-api' version='${project.version}' description="OpenDaylight :: Config :: Netty Config API">
     <feature version='${project.version}'>odl-config-api</feature>

-    <feature version='[4.0.30,4.1.0)'>odl-netty</feature>
+    <feature version="${odlparent.version}">odl-netty-4</feature>

     <bundle>mvn:org.opendaylight.controller/netty-config-api/{{VERSION}}</bundle>
   </feature>
 
     <bundle>mvn:org.opendaylight.controller/netty-config-api/{{VERSION}}</bundle>
   </feature>
 

diff --git a/features/mdsal/pom.xml b/features/mdsal/pom.xml
index c2ffc48a83c67dd65a65eed9479126ce81dcd998..26e1ce581f1f840634478f79234f968c79d3ef36 100644 (file)
--- a/features/mdsal/pom.xml
+++ b/features/mdsal/pom.xml
@@ -19,6 +19,7 @@
     <yangtools.version>1.1.0-SNAPSHOT</yangtools.version>
     <mdsal.version>2.2.0-SNAPSHOT</mdsal.version>
     <mdsal.model.version>0.10.0-SNAPSHOT</mdsal.model.version>
     <yangtools.version>1.1.0-SNAPSHOT</yangtools.version>
     <mdsal.version>2.2.0-SNAPSHOT</mdsal.version>
     <mdsal.model.version>0.10.0-SNAPSHOT</mdsal.model.version>

+    <odlparent.version>1.8.0-SNAPSHOT</odlparent.version>

     <controller.mdsal.version>1.5.0-SNAPSHOT</controller.mdsal.version>
     <config.version>0.6.0-SNAPSHOT</config.version>
     <commons.opendaylight.version>1.8.0-SNAPSHOT</commons.opendaylight.version>
     <controller.mdsal.version>1.5.0-SNAPSHOT</controller.mdsal.version>
     <config.version>0.6.0-SNAPSHOT</config.version>
     <commons.opendaylight.version>1.8.0-SNAPSHOT</commons.opendaylight.version>

diff --git a/features/mdsal/src/main/features/features.xml b/features/mdsal/src/main/features/features.xml
index a7780bee524bef3e7ef1e3ba197fd2041c1987d4..1ba88d395bd16d62861e06585ca276daf0ded6b0 100644 (file)
--- a/features/mdsal/src/main/features/features.xml
+++ b/features/mdsal/src/main/features/features.xml
@@ -37,7 +37,7 @@
         <feature version='${project.version}'>odl-mdsal-common</feature>
         <feature version='${config.version}'>odl-config-startup</feature>
         <feature version='${config.version}'>odl-config-netty</feature>
         <feature version='${project.version}'>odl-mdsal-common</feature>
         <feature version='${config.version}'>odl-config-startup</feature>
         <feature version='${config.version}'>odl-config-netty</feature>

-        <feature version='[3.3.0,4.0.0)'>odl-lmax</feature>
+        <feature version="${odlparent.version}">odl-lmax-3</feature>

         <!-- FIXME: Bug 4202: Add MD-SAL provided odl-mdsal-binding-adapter -->
         <!-- FIXME: Bug 4202: Add MD-SAL provided odl-mdsal-dom-broker -->
         <feature version='${mdsal.version}'>odl-mdsal-dom</feature>
         <!-- FIXME: Bug 4202: Add MD-SAL provided odl-mdsal-binding-adapter -->
         <!-- FIXME: Bug 4202: Add MD-SAL provided odl-mdsal-dom-broker -->
         <feature version='${mdsal.version}'>odl-mdsal-dom</feature>


@@ -75,9 +75,9 @@
     </feature>
     <feature name ='odl-mdsal-clustering-commons' version='${project.version}'>
         <feature version='${project.version}'>odl-mdsal-broker-local</feature>
     </feature>
     <feature name ='odl-mdsal-clustering-commons' version='${project.version}'>
         <feature version='${project.version}'>odl-mdsal-broker-local</feature>

-        <feature version='[2.4.1,2.5.0)'>odl-akka-system</feature>
-        <feature version='[2.4.1,2.5.0)'>odl-akka-persistence</feature>
-        <feature version='[2.4.1,2.5.0)'>odl-akka-clustering</feature>
+        <feature version="${odlparent.version}">odl-akka-system-2.4</feature>
+        <feature version="${odlparent.version}">odl-akka-persistence-2.4</feature>
+        <feature version="${odlparent.version}">odl-akka-clustering-2.4</feature>

         <bundle>mvn:org.opendaylight.controller/sal-clustering-commons/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.controller/sal-akka-raft/{{VERSION}}</bundle>
         <bundle>mvn:io.dropwizard.metrics/metrics-core/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.controller/sal-clustering-commons/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.controller/sal-akka-raft/{{VERSION}}</bundle>
         <bundle>mvn:io.dropwizard.metrics/metrics-core/{{VERSION}}</bundle>


@@ -94,7 +94,7 @@
     <feature name ='odl-mdsal-remoterpc-connector' version='${project.version}'>
         <feature version='${project.version}'>odl-mdsal-broker-local</feature>
         <feature version='${project.version}'>odl-mdsal-clustering-commons</feature>
     <feature name ='odl-mdsal-remoterpc-connector' version='${project.version}'>
         <feature version='${project.version}'>odl-mdsal-broker-local</feature>
         <feature version='${project.version}'>odl-mdsal-clustering-commons</feature>

-        <feature version='0.7'>odl-akka-leveldb</feature>
+        <feature version="${odlparent.version}">odl-akka-leveldb-0.7</feature>

         <bundle>mvn:org.opendaylight.controller/sal-remoterpc-connector/{{VERSION}}</bundle>
     </feature>
     <feature name ='odl-mdsal-broker' version='${project.version}'>
         <bundle>mvn:org.opendaylight.controller/sal-remoterpc-connector/{{VERSION}}</bundle>
     </feature>
     <feature name ='odl-mdsal-broker' version='${project.version}'>