Make all features use version properties

Openflowjava feature was removed, as it is not user-facing
and it is available anyway when an openflowplugin feature is installed.

Change-Id: I8833706e4301f8f26b5469a6280794bc5a6b9cfb
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/features-index/pom.xml b/features-index/pom.xml
index 91ac1457ed50493eee0e8e85dc4ad5ae98a7a51d..cc58043a0d5998ad7ba96a63757dbd64f8d177eb 100644 (file)
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -26,28 +26,28 @@
     <dependency>
       <groupId>org.opendaylight.aaa</groupId>
       <artifactId>features-aaa-api</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <version>${feature.aaa.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.aaa</groupId>
       <artifactId>features-aaa</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <version>${feature.aaa.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.aaa</groupId>
       <artifactId>features-aaa-authz</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <version>${feature.aaa.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.alto</groupId>
       <artifactId>features-alto-release</artifactId>
-      <version>0.3.0-SNAPSHOT</version>
+      <version>${feature.alto.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
@@ -183,7 +183,7 @@
     <dependency>
       <groupId>org.opendaylight.l2switch</groupId>
       <artifactId>features-l2switch</artifactId>
-      <version>0.4.0-SNAPSHOT</version>
+      <version>${feature.l2switch.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
@@ -346,14 +346,14 @@
     <dependency>
       <groupId>org.opendaylight.sdninterfaceapp</groupId>
       <artifactId>features-sdninterfaceapp</artifactId>
-      <version>1.7.0-SNAPSHOT</version>
+      <version>${feature.sdninterfaceapp.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
       <groupId>org.opendaylight.sfc</groupId>
       <artifactId>features-sfc</artifactId>
-      <version>0.3.0-SNAPSHOT</version>
+      <version>${feature.sfc.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
@@ -402,7 +402,7 @@
     <dependency>
       <groupId>org.opendaylight.tsdr</groupId>
       <artifactId>features-tsdr</artifactId>
-      <version>1.2.0-SNAPSHOT</version>
+      <version>${feature.tsdr.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
@@ -459,7 +459,7 @@
     <dependency>
       <groupId>org.opendaylight.odlparent</groupId>
       <artifactId>features-test</artifactId>
-      <version>1.7.0-SNAPSHOT</version>
+      <version>${feature.odlparent.version}</version>
     </dependency>
     <dependency>
       <groupId>junit</groupId>
@@ -470,7 +470,7 @@
     <dependency>
       <groupId>org.opendaylight.controller</groupId>
       <artifactId>opendaylight-karaf-empty</artifactId>
-      <version>1.7.0-SNAPSHOT</version>
+      <version>${feature.odlparent.version}</version>
       <type>zip</type>
     </dependency>
    </dependencies>
@@ -541,7 +541,7 @@
               <systemPropertyVariables>
                 <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
                 <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
-                <karaf.distro.version>1.7.0-SNAPSHOT</karaf.distro.version>
+                <karaf.distro.version>${feature.odlparent.version}</karaf.distro.version>
               </systemPropertyVariables>
               <dependenciesToScan>
                <dependency>org.opendaylight.odlparent:features-test</dependency>

diff --git a/features-index/src/main/resources/features.xml b/features-index/src/main/resources/features.xml
index 9085b2a7d919c6b623c123d80e25048a929841d7..55d6a8cf5138dba63950548cc6307442a2eac9b9 100644 (file)
--- a/features-index/src/main/resources/features.xml
+++ b/features-index/src/main/resources/features.xml
@@ -30,9 +30,9 @@
 
 
     <!-- Please add new repository in an alphabetical order -->
-    <repository>mvn:org.opendaylight.aaa/features-aaa/0.4.0-SNAPSHOT/xml/features</repository>
-    <repository>mvn:org.opendaylight.aaa/features-aaa-authz/0.4.0-SNAPSHOT/xml/features</repository>
-    <repository>mvn:org.opendaylight.aaa/features-aaa-api/0.4.0-SNAPSHOT/xml/features</repository>
+    <repository>mvn:org.opendaylight.aaa/features-aaa/${feature.aaa.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.aaa/features-aaa-authz/${feature.aaa.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.aaa/features-aaa-api/${feature.aaa.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.alto/features-alto-release/${feature.alto.version}/xml/features</repository>
     <!-- Remove Armoury from Beryllium release as per as committers consent:
     https://lists.opendaylight.org/pipermail/armoury-dev/2016-January/000081.html.
@@ -55,7 +55,7 @@
     <repository>mvn:org.opendaylight.faas/features-faas/${feature.faas.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.groupbasedpolicy/features-groupbasedpolicy/${feature.groupbasedpolicy.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.iotdm/onem2m-features/${feature.iotdm.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.l2switch/features-l2switch/0.4.0-SNAPSHOT/xml/features</repository>
+    <repository>mvn:org.opendaylight.l2switch/features-l2switch/${feature.l2switch.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.lacp/features-lacp/${feature.lacp.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.lispflowmapping/features-lispflowmapping/${feature.lispflowmapping.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.messaging4transport/messaging4transport-features/${feature.messaging4transport.version}/xml/features</repository>
@@ -80,7 +80,7 @@
     <repository>mvn:org.opendaylight.ovsdb/southbound-features/${feature.ovsdb.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.packetcable/features-packetcable-policy/${feature.packetcable.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.reservation/features-reservation/${feature.reservation.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.sdninterfaceapp/features-sdninterfaceapp/1.7.0-SNAPSHOT/xml/features</repository>
+    <repository>mvn:org.opendaylight.sdninterfaceapp/features-sdninterfaceapp/${feature.sdninterfaceapp.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.sfc/features-sfc/${feature.sfc.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.snbi/features-snbi/${feature.snbi.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.snmp/features-snmp/${snmp.plugin.version}/xml/features</repository>

diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index 353daf78dfdcd7d76466d59b55be04c88cf91c16..6a50d3bf8c83d838052c6bdc64076d8eeae64d4c 100644 (file)
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -57,11 +57,11 @@
 
     <!-- Please use alphabetical order to add a compatible with all features -->
     <feature name='odl-integration-compatible-with-all' version='${project.version}'>
-        <feature version='0.4.0-SNAPSHOT'>odl-aaa-api</feature>
-        <feature version='0.4.0-SNAPSHOT'>odl-aaa-authn</feature>
-        <feature version='0.4.0-SNAPSHOT'>odl-aaa-authz</feature>
+        <feature version='${feature.aaa.version}'>odl-aaa-api</feature>
+        <feature version='${feature.aaa.version}'>odl-aaa-authn</feature>
+        <feature version='${feature.aaa.version}'>odl-aaa-authz</feature>
         <feature version='${feature.netconf.version}'>odl-aaa-netconf-plugin</feature>
-        <feature version='0.4.0-SNAPSHOT'>odl-aaa-sssd-plugin</feature>
+        <feature version='${feature.aaa.version}'>odl-aaa-sssd-plugin</feature>
         <feature version='${feature.alto.version}'>odl-alto-release</feature>
         <!-- Remove Armoury from Beryllium release as per as committers consent:
         https://lists.opendaylight.org/pipermail/armoury-dev/2016-January/000081.html.
@@ -87,7 +87,7 @@
         <feature version='${feature.lispflowmapping.version}'>odl-lispflowmapping-neutron</feature>
         <feature version='${feature.lispflowmapping.version}'>odl-lispflowmapping-ui</feature>
         <feature version='${feature.benchmark.version}'>odl-mdsal-benchmark</feature>
-        <feature version='1.4.0-SNAPSHOT'>odl-mdsal-broker</feature>
+        <feature version='${feature.mdsal.version}'>odl-mdsal-broker</feature>
         <feature version='${feature.messaging4transport.version}'>odl-messaging4transport-api</feature>
         <feature version='${feature.messaging4transport.version}'>odl-messaging4transport</feature>
         <feature version='${feature.nemo.version}'>odl-nemo-engine</feature>
@@ -99,7 +99,6 @@
 <!-- Issue with of-config merge requires this line commented out
         <feature version='${feature.of-config.version}'>odl-of-config-all</feature>
 -->
-        <feature version='0.8.0-SNAPSHOT'>odl-openflowjava-protocol</feature>
         <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-flow-services</feature>
         <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-flow-services-rest</feature>
         <feature version='${feature.openflowplugin.version}'>odl-openflowplugin-flow-services-ui</feature>
@@ -111,7 +110,7 @@
         <feature version='${feature.reservation.version}'>odl-reservation-models</feature>
         <feature version='${feature.restconf.version}'>odl-restconf-noauth</feature>
 <!--
-        <feature version="1.7.0-SNAPSHOT">odl-sdninterfaceapp-all</feature>
+        <feature version="${feature.sdninterfaceapp.version}">odl-sdninterfaceapp-all</feature>
 -->
         <feature version='${feature.sfc.version}'>odl-sfc-test-consumer</feature>
         <feature version='${feature.sfc.version}'>odl-sfclisp</feature>
@@ -154,9 +153,9 @@
         <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-ui</feature>
         <feature version='${project.version}'>odl-integration-compatible-with-all</feature>
         <feature version='${feature.iotdm.version}'>odl-iotdm-onem2m</feature>
-        <feature version='0.4.0-SNAPSHOT'>odl-l2switch-switch</feature>
-        <feature version='0.4.0-SNAPSHOT'>odl-l2switch-switch-rest</feature>
-        <feature version='0.4.0-SNAPSHOT'>odl-l2switch-switch-ui</feature>
+        <feature version='${feature.l2switch.version}'>odl-l2switch-switch</feature>
+        <feature version='${feature.l2switch.version}'>odl-l2switch-switch-rest</feature>
+        <feature version='${feature.l2switch.version}'>odl-l2switch-switch-ui</feature>
 <!--
         Commented out, because LACP brings in Li designed OpenFlowPlugin
         which leads to BindException.

diff --git a/pom.xml b/pom.xml
index 204521bbb0bd353937d3c79b8e803498437f73a5..5385997e9b9f279517b7805500bbe281f8346474 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -22,6 +22,7 @@
   <properties>
     <!-- Keep this list sorted alphabetically please -->
     <didm.version>0.3.0-SNAPSHOT</didm.version>
+    <feature.aaa.version>0.4.0-SNAPSHOT</feature.aaa.version>
     <feature.alto.version>0.3.0-SNAPSHOT</feature.alto.version>
     <!-- Remove Armoury from Beryllium release as per as committers consent:
     https://lists.opendaylight.org/pipermail/armoury-dev/2016-January/000081.html.
@@ -38,6 +39,7 @@
     <feature.flow.version>1.4.0-SNAPSHOT</feature.flow.version>
     <feature.groupbasedpolicy.version>0.4.0-SNAPSHOT</feature.groupbasedpolicy.version>
     <feature.iotdm.version>0.2.0-SNAPSHOT</feature.iotdm.version>
+    <feature.l2switch.version>0.4.0-SNAPSHOT</feature.l2switch.version>
     <feature.lacp.version>1.2.0-SNAPSHOT</feature.lacp.version>
     <feature.lispflowmapping.version>1.4.0-SNAPSHOT</feature.lispflowmapping.version>
     <feature.mdsal.version>1.4.0-SNAPSHOT</feature.mdsal.version>
@@ -47,12 +49,14 @@
     <feature.netide.version>0.2.0-SNAPSHOT</feature.netide.version>
     <feature.nic.version>1.2.0-SNAPSHOT</feature.nic.version>
     <feature.neutron.version>0.7.0-SNAPSHOT</feature.neutron.version>
+    <feature.odlparent.version>1.7.0-SNAPSHOT</feature.odlparent.version>
     <feature.of-config.version>1.1.0-SNAPSHOT</feature.of-config.version>
     <feature.openflowplugin.version>0.3.0-SNAPSHOT</feature.openflowplugin.version>
     <feature.ovsdb.version>1.3.0-SNAPSHOT</feature.ovsdb.version>
     <feature.packetcable.version>1.4.0-SNAPSHOT</feature.packetcable.version>
     <feature.reservation.version>1.2.0-SNAPSHOT</feature.reservation.version>
     <feature.restconf.version>1.4.0-SNAPSHOT</feature.restconf.version>
+    <feature.sdninterfaceapp.version>1.7.0-SNAPSHOT</feature.sdninterfaceapp.version>
     <feature.sfc.version>0.3.0-SNAPSHOT</feature.sfc.version>
     <feature.snbi.version>1.3.0-SNAPSHOT</feature.snbi.version>
     <feature.snmp4sdn.version>0.4.0-SNAPSHOT</feature.snmp4sdn.version>