Merge topic 'clean-up'

[packetcable.git] / features-packetcable / src / main / resources / features.xml

diff --git a/features-packetcable/src/main/resources/features.xml b/features-packetcable/src/main/resources/features.xml
index 9596431c071956585deb2e2d3a0168a433eee0da..fdcfef9dcece7bc3d915515d20b9cada95f1287e 100644 (file)
--- a/features-packetcable/src/main/resources/features.xml
+++ b/features-packetcable/src/main/resources/features.xml
@@ -14,56 +14,60 @@
     -->
     <!--
     Add repo entries for the repositories of features you refer to in this feature file but do not define here.
-    <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/0.0.3-SNAPSHOT/xml/features</repository>
+    <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/0.2.0-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-adsal/${feature.adsal.version}/xml/features</repository>      
-    <repository>mvn:org.opendaylight.controller/features-adsal-compatibility/1.4.2-SNAPSHOT/xml/features</repository>
+    <repository>mvn:org.opendaylight.controller/features-adsal-compatibility/1.6.0-SNAPSHOT/xml/features</repository>
     -->
-    <repository>mvn:org.opendaylight.controller/features-flow/${mdsal.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.yangtools/features-yangtools/0.6.2-SNAPSHOT/xml/features</repository>
-    <repository>mvn:org.opendaylight.controller/features-mdsal/1.1-SNAPSHOT/xml/features</repository>
+    <repository>mvn:org.opendaylight.yangtools/features-yangtools/0.8.0-SNAPSHOT/xml/features</repository>
+    <repository>mvn:org.opendaylight.controller/features-mdsal/1.3.0-SNAPSHOT/xml/features</repository>
+    <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/${openflowplugin.version}/xml/features</repository>
 
     <feature name='odl-packetcable-all' version='${project.version}' description='OpenDaylight :: packetcable :: All'>
             <feature version='${project.version}'>odl-packetcable-provider</feature>
             <feature version='${project.version}'>odl-packetcable-model</feature>
+            <feature version='${project.version}'>odl-packetcable-consumer</feature>
             <feature version='${project.version}'>odl-packetcable-driver</feature>
     </feature>
+
     <!--
         Define your features.  It is useful to list then in order of dependency.  So if A depends on B, list A first.
         It's also nice to list inside a feature, first the features it needs, then the bundles it needs, then the configfiles.
-            <feature version='0.0.3-SNAPSHOT'>odl-openflowplugin-flow-services</feature>
+            <feature version='0.2.0-SNAPSHOT'>odl-openflowplugin-flow-services</feature>
            <bundle>mvn:com.google.common.collect/collect/14.0</bundle>
+
+    -->
+        <!--- * Basic MD-SAL Consumer -->
         <feature name='odl-packetcable-consumer' version='${project.version}' description='OpenDaylight :: packetcable :: Consumer '>
-            <feature version='1.1-SNAPSHOT'>odl-mdsal-broker</feature>
+            <feature version='1.3.0-SNAPSHOT'>odl-mdsal-broker</feature>
             <feature version='${project.version}'>odl-packetcable-model</feature>
-            <feature version='${project.version}'>odl-packetcable-provider</feature>
             <feature version='${project.version}'>odl-packetcable-driver</feature>
-            <bundle>mvn:org.opendaylight.packetcable/packetcable-model/${project.version}</bundle>
-            <bundle>mvn:org.opendaylight.packetcable/packetcable-provider/${project.version}</bundle>
             <bundle>mvn:org.opendaylight.packetcable/packetcable-driver/${project.version}</bundle>
+            <bundle>mvn:org.opendaylight.packetcable/packetcable-consumer/${project.version}</bundle>
+            <configfile finalname="etc/opendaylight/karaf/80-packetcable.xml">mvn:org.opendaylight.packetcable/packetcable-config/${project.version}/xml/config</configfile>
         </feature>
-    -->
-
+    
         <!--- * Basic MD-SAL Model feature -->
         <feature name='odl-packetcable-model' version='${project.version}' description='OpenDaylight :: packetcable :: Model'>
-            <feature version='0.6.2-SNAPSHOT'>odl-yangtools-binding</feature>
-            <feature version='0.6.2-SNAPSHOT'>odl-yangtools-models</feature>
-           <feature version='${project.version}'>odl-flow-model</feature>
+            <feature version='0.8.0-SNAPSHOT'>odl-yangtools-binding</feature>
+            <feature version='0.8.0-SNAPSHOT'>odl-yangtools-models</feature>
+               <feature version='${openflowplugin.version}'>odl-openflowplugin-nsf-model</feature>
             <bundle>mvn:org.opendaylight.packetcable/packetcable-model/${project.version}</bundle>
         </feature>
 
         <!--- * Basic MD-SAL Provider -->
         <feature name='odl-packetcable-provider' version='${project.version}' description='OpenDaylight :: packetcable :: Provider'>
-            <feature version='1.1-SNAPSHOT'>odl-mdsal-broker</feature>
+            <feature version='1.3.0-SNAPSHOT'>odl-mdsal-broker</feature>
             <bundle>mvn:org.opendaylight.packetcable/packetcable-provider/${project.version}</bundle>
             <bundle>mvn:org.opendaylight.packetcable/packetcable-driver/${project.version}</bundle>
-           <feature version='${project.version}'>odl-flow-model</feature>
+               <feature version='${openflowplugin.version}'>odl-openflowplugin-nsf-model</feature>
             <feature version='${project.version}'>odl-packetcable-model</feature>
             <feature version='${project.version}'>odl-packetcable-driver</feature>
+            <configfile finalname="etc/opendaylight/karaf/80-packetcable.xml">mvn:org.opendaylight.packetcable/packetcable-config/${project.version}/xml/config</configfile>
         </feature>
 
         <!--- * * -->
         <feature name='odl-packetcable-driver' version='${project.version}' description='OpenDaylight :: packetcable :: Driver'>
-            <feature version='1.1-SNAPSHOT'>odl-mdsal-broker</feature>
+            <feature version='1.3.0-SNAPSHOT'>odl-mdsal-broker</feature>
        </feature>
 
 </features>