From 3fc29758c8a76ab6110a5f9e9138a7d555ccb6d6 Mon Sep 17 00:00:00 2001
From: Michael Vorburger <vorburger@redhat.com>
Date: Mon, 13 Feb 2017 20:51:24 +0100
Subject: [PATCH] Remove x5 inactive projects (atrium centinel yang-push
 usecplugin lacp)

as discused during the Kernel Call on Feb 7th,
because the projects have not replied to this request in weeks:
https://git.opendaylight.org/gerrit/#/q/topic:bug/7662
including to direct emails from rel. mgr. An Ho

see also https://lists.opendaylight.org/pipermail/tsc/2017-February/006634.html

Change-Id: I0b99bc0978e846cce19f29a163ac700b0c47a742
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
---
 features-index/pom.xml                        | 35 -------------------
 .../src/main/resources/features.xml           |  5 ---
 features-test/src/main/resources/features.xml | 15 --------
 pom.xml                                       |  5 ---
 4 files changed, 60 deletions(-)

diff --git a/features-index/pom.xml b/features-index/pom.xml
index fd0343f9..575f8723 100644
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -67,13 +67,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.atrium</groupId>
-            <artifactId>atrium-features</artifactId>
-            <version>${feature.atrium.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>features-bgp</artifactId>
@@ -130,13 +123,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.centinel</groupId>
-            <artifactId>centinel-features</artifactId>
-            <version>${feature.centinel.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>features-extras</artifactId>
@@ -249,13 +235,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.lacp</groupId>
-            <artifactId>features-lacp</artifactId>
-            <version>${feature.lacp.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.lispflowmapping</groupId>
             <artifactId>features-lispflowmapping</artifactId>
@@ -509,13 +488,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.usecplugin</groupId>
-            <artifactId>usecplugin-features</artifactId>
-            <version>${feature.usecplugin.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.vtn</groupId>
             <artifactId>features-vtn-manager</artifactId>
@@ -523,13 +495,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yang-push</groupId>
-            <artifactId>yangpush-features</artifactId>
-            <version>${feature.yang-push.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
         <!-- test to validate features.xml -->
         <dependency>
             <groupId>org.opendaylight.odlparent</groupId>
diff --git a/features-index/src/main/resources/features.xml b/features-index/src/main/resources/features.xml
index 9853d984..edab9848 100644
--- a/features-index/src/main/resources/features.xml
+++ b/features-index/src/main/resources/features.xml
@@ -33,7 +33,6 @@
     <repository>mvn:org.opendaylight.aaa/features-aaa/${feature.aaa.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.aaa/features-aaa-shiro/${feature.aaa.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.alto/features-alto-release/${feature.alto.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.atrium/atrium-features/${feature.atrium.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>
@@ -42,7 +41,6 @@
     <repository>mvn:org.opendaylight.bier/features-bier/${feature.bier.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.capwap/capwap-features/${feature.capwap.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.cardinal/cardinal-features/${feature.cardinal.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.centinel/centinel-features/${feature.centinel.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-extras/${feature.controller.extras.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-mdsal/${feature.mdsal.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-mdsal-benchmark/${feature.benchmark.version}/xml/features</repository>
@@ -60,7 +58,6 @@
     <repository>mvn:org.opendaylight.integration/features-distribution/${project.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.iotdm/onem2mall-features/${feature.iotdm.version}/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.natapp/natapp-features/${feature.natapp.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.nemo/nemo-features/${feature.nemo.version}/xml/features</repository>
@@ -97,7 +94,5 @@
     <repository>mvn:org.opendaylight.ttp/features-ttp/${feature.ttp.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.unimgr/unimgr-features/${feature.unimgr.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.usc/usc-features/${feature.usc.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.usecplugin/usecplugin-features/${feature.usecplugin.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.vtn/features-vtn-manager/${feature.vtn-manager.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.yang-push/yangpush-features/${feature.yang-push.version}/xml/features</repository>
 </features>
diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index 1be50a9f..73896757 100644
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -66,12 +66,6 @@
         <feature version='${feature.bgpcep.version}'>odl-bgpcep-rsvp</feature>
         <feature version='${feature.capwap.version}'>odl-capwap-ac-rest</feature>
         <feature version='${feature.cardinal.version}'>odl-cardinal</feature>
-        <!-- Commented out because two of the features lead to Yang pares errors.
-        <feature version='${feature.centinel.version}'>odl-centinel-core</feature>
-        <feature version='${feature.centinel.version}'>odl-centinel-laas</feature>
-        <feature version='${feature.centinel.version}'>odl-centinel-streamhandler</feature>
-        <feature version='${feature.centinel.version}'>odl-centinel-ui</feature>
-        -->
         <feature version='${didm.version}'>odl-didm-all</feature>
         <feature version='${feature.dlux.version}'>odl-dlux-core</feature>
         <feature version='${project.version}'>odl-distribution-version</feature>
@@ -121,14 +115,11 @@
         <feature version='${feature.usc.version}'>odl-usc-channel</feature>
         <feature version='${feature.usc.version}'>odl-usc-channel-rest</feature>
         <feature version='${feature.usc.version}'>odl-usc-channel-ui</feature>
-        <feature version='${feature.usecplugin.version}'>odl-usecplugin-aaa</feature>
-        <feature version='${feature.usecplugin.version}'>odl-usecplugin-openflow</feature>
     </feature>
 
     <!-- Please use alphabetical order for non-compatible features -->
     <feature name='odl-integration-all' version='${project.version}'>
         <feature version='${feature.alto.version}'>odl-alto-release</feature>
-        <feature version='${feature.atrium.version}'>odl-atrium-all</feature>
         <feature version='${feature.bier.version}'>odl-bier-all</feature>
         <feature version='${feature.faas.version}'>odl-faas-base</feature>
         <feature version='${feature.genius.version}'>odl-genius-rest</feature>
@@ -149,10 +140,6 @@
         <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.
-        <feature version='${feature.lacp.version}'>odl-lacp-ui</feature>
-        -->
         <feature version='${feature.natapp.version}'>odl-natapp</feature>
         <feature version='${feature.natapp.version}'>odl-natapp-api</feature>
         <!-- The following two Netconf features are incompatible with each other.
@@ -179,8 +166,6 @@
         <feature version='${feature.unimgr.version}'>odl-unimgr</feature>
         <feature version='${feature.vtn-manager.version}'>odl-vtn-manager-neutron</feature>
         <feature version='${feature.vtn-manager.version}'>odl-vtn-manager-rest</feature>
-        <feature version='${feature.yang-push.version}'>odl-yangpush</feature>
-        <feature version='${feature.yang-push.version}'>odl-yangpush-api</feature>
     </feature>
 
 </features>
diff --git a/pom.xml b/pom.xml
index 425fe699..9cfd133b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,13 +33,11 @@
         <didm.version>0.4.0-SNAPSHOT</didm.version>
         <feature.aaa.version>0.5.0-SNAPSHOT</feature.aaa.version>
         <feature.alto.version>0.4.0-SNAPSHOT</feature.alto.version>
-        <feature.atrium.version>0.1.0-SNAPSHOT</feature.atrium.version>
         <feature.benchmark.version>1.3.0-SNAPSHOT</feature.benchmark.version>
         <feature.bgpcep.version>0.7.0-SNAPSHOT</feature.bgpcep.version>
         <feature.bier.version>0.1.0-SNAPSHOT</feature.bier.version>
         <feature.capwap.version>0.4.0-SNAPSHOT</feature.capwap.version>
         <feature.cardinal.version>0.2.0-SNAPSHOT</feature.cardinal.version>
-        <feature.centinel.version>0.3.0-SNAPSHOT</feature.centinel.version>
         <feature.controller.config.version>0.6.0-SNAPSHOT</feature.controller.config.version>
         <feature.controller.extras.version>1.8.0-SNAPSHOT</feature.controller.extras.version>
         <feature.dlux.version>0.5.0-SNAPSHOT</feature.dlux.version>
@@ -53,7 +51,6 @@
         <feature.infrautils.version>1.1.0-SNAPSHOT</feature.infrautils.version>
         <feature.iotdm.version>0.3.0-SNAPSHOT</feature.iotdm.version>
         <feature.l2switch.version>0.5.0-SNAPSHOT</feature.l2switch.version>
-        <feature.lacp.version>1.3.0-SNAPSHOT</feature.lacp.version>
         <feature.lispflowmapping.version>1.5.0-SNAPSHOT</feature.lispflowmapping.version>
         <feature.mdsal.version>1.5.0-SNAPSHOT</feature.mdsal.version>
         <feature.natapp.version>0.2.0-SNAPSHOT</feature.natapp.version>
@@ -81,9 +78,7 @@
         <feature.ttp.version>0.4.0-SNAPSHOT</feature.ttp.version>
         <feature.unimgr.version>0.2.0-SNAPSHOT</feature.unimgr.version>
         <feature.usc.version>1.3.0-SNAPSHOT</feature.usc.version>
-        <feature.usecplugin.version>1.2.0-SNAPSHOT</feature.usecplugin.version>
         <feature.vtn-manager.version>0.6.0-SNAPSHOT</feature.vtn-manager.version>
-        <feature.yang-push.version>1.2.0-SNAPSHOT</feature.yang-push.version>
         <feature.yangtools.version>1.1.0-SNAPSHOT</feature.yangtools.version>
         <karaf.branding.version>1.4.0-SNAPSHOT</karaf.branding.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-- 
2.36.6