Remove Armoury from Beryllium release

link to the mall where the committers have reached to a consensus: https://lists.opendaylight.org/pipermail/armoury-dev/2016-January/000081.html

Change-Id: I227393393810d85df76338a55afc7d309c0b5915
Signed-off-by: adetalhouet <adetalhouet@inocybe.com>

diff --git a/features-index/pom.xml b/features-index/pom.xml
index 264c856aa8140bf319a56274e5e55abb63666f1b..da494e4692a406137a55a13a8c86191b63482ef8 100644 (file)
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -51,13 +51,16 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <dependency>
+    <!-- Remove Armoury from Beryllium release as per as committers consent:
+    https://lists.opendaylight.org/pipermail/armoury-dev/2016-January/000081.html.
+    Need to be uncommented once in Boron -->
+    <!-- <dependency>
       <groupId>org.opendaylight.armoury</groupId>
       <artifactId>armoury-features</artifactId>
       <version>${feature.armoury.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
-    </dependency>
+    </dependency> -->
     <dependency>
        <groupId>org.opendaylight.bgpcep</groupId>
        <artifactId>features-bgp</artifactId>

diff --git a/features-index/src/main/resources/features.xml b/features-index/src/main/resources/features.xml
index d2935053c620d9ca59a82c7e395109e5678885f9..31794e02a7048b2133bc1d10cacb8a8e217d400d 100644 (file)
--- a/features-index/src/main/resources/features.xml
+++ b/features-index/src/main/resources/features.xml
@@ -34,7 +34,10 @@
     <repository>mvn:org.opendaylight.aaa/features-aaa-authz/0.3.0-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.aaa/features-aaa-api/0.3.0-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.alto/features-alto-release/${feature.alto.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.armoury/armoury-features/${feature.armoury.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.
+    Need to be uncommented once in Boron -->
+    <!-- <repository>mvn:org.opendaylight.armoury/armoury-features/${feature.armoury.version}/xml/features</repository> -->
     <repository>mvn:org.opendaylight.bgpcep/features-bgp/${feature.bgpcep.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.bgpcep/features-bmp/${feature.bgpcep.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.bgpcep/features-extras/${feature.bgpcep.version}/xml/features</repository>

diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index 063eac0895f89624ff92940b5d75322b115c9af5..e49f6e9ffafbddcdd17a19eb2325d7092c53a979 100644 (file)
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -63,7 +63,10 @@
         <feature version='${feature.netconf.version}'>odl-aaa-netconf-plugin</feature>
         <feature version='0.3.0-SNAPSHOT'>odl-aaa-sssd-plugin</feature>
         <feature version='${feature.alto.version}'>odl-alto-release</feature>
-        <feature version='${feature.armoury.version}'>odl-armoury-workloadmanager</feature>
+        <!-- Remove Armoury from Beryllium release as per as committers consent:
+        https://lists.opendaylight.org/pipermail/armoury-dev/2016-January/000081.html.
+        Need to be uncommented once in Boron -->
+        <!-- <feature version='${feature.armoury.version}'>odl-armoury-workloadmanager</feature> -->
         <feature version='${feature.bgpcep.version}'>odl-bgpcep-bgp-all</feature>
         <feature version='${feature.bgpcep.version}'>odl-bgpcep-bmp</feature>
         <feature version='${feature.bgpcep.version}'>odl-bgpcep-pcep-all</feature>

diff --git a/pom.xml b/pom.xml
index d3a0b7c697ee4e8e05dc6d0c4576b87cd88f7e71..1d7e87f8c6132dd20bf2c318becd7eaffe1ca679 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,10 @@
     <!-- Keep this list sorted alphabetically please -->
     <didm.version>0.2.0-SNAPSHOT</didm.version>
     <feature.alto.version>0.2.0-SNAPSHOT</feature.alto.version>
-    <feature.armoury.version>1.0.0-SNAPSHOT</feature.armoury.version>
+    <!-- Remove Armoury from Beryllium release as per as committers consent:
+    https://lists.opendaylight.org/pipermail/armoury-dev/2016-January/000081.html.
+    Need to be uncommented once in Boron -->
+    <!-- <feature.armoury.version>1.0.0-SNAPSHOT</feature.armoury.version> -->
     <feature.benchmark.version>1.1.0-SNAPSHOT</feature.benchmark.version>
     <feature.bgpcep.version>0.5.0-SNAPSHOT</feature.bgpcep.version>
     <feature.capwap.version>0.2.0-SNAPSHOT</feature.capwap.version>