From da083803801632d2d34042e322f2f427768f0105 Mon Sep 17 00:00:00 2001
From: Vratko Polak <vrpolak@cisco.com>
Date: Tue, 28 Mar 2017 16:54:59 +0200
Subject: [PATCH] Remove mentions of projects not in release

Change-Id: I244745ca19cd17b3ef395c8e3575e1af940ce0f2
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
---
 artifacts/upstream/feature3-repos/pom.xml     | 40 -------------------
 artifacts/upstream/properties/pom.xml         | 12 ------
 features3-index/pom.xml                       | 32 ---------------
 .../src/main/features/features.xml            | 12 ------
 features3-test/src/main/features/features.xml | 18 ---------
 5 files changed, 114 deletions(-)

diff --git a/artifacts/upstream/feature3-repos/pom.xml b/artifacts/upstream/feature3-repos/pom.xml
index 488bdd79..a8ca470f 100644
--- a/artifacts/upstream/feature3-repos/pom.xml
+++ b/artifacts/upstream/feature3-repos/pom.xml
@@ -65,16 +65,6 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-            <!-- Atrium
-                Removed from autorelease due to inactivity.
-            <dependency>
-                <groupId>org.opendaylight.atrium</groupId>
-                <artifactId>atrium-features</artifactId>
-                <version>${atrium.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            -->
             <!-- Bgpcep -->
             <dependency>
                 <groupId>org.opendaylight.bgpcep</groupId>
@@ -135,16 +125,6 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-            <!-- Centinel
-                Removed from autorelease due to inactivity.
-            <dependency>
-                <groupId>org.opendaylight.centinel</groupId>
-                <artifactId>centinel-features</artifactId>
-                <version>${centinel.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            -->
             <!-- Controller -->
             <dependency>
                 <groupId>org.opendaylight.controller</groupId>
@@ -546,16 +526,6 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-            <!-- Usecplugin
-                Removed from autorelease due to inactivity.
-            <dependency>
-                <groupId>org.opendaylight.usecplugin</groupId>
-                <artifactId>usecplugin-features</artifactId>
-                <version>${usecplugin.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            -->
             <!-- Vtn -->
             <dependency>
                 <groupId>org.opendaylight.vtn</groupId>
@@ -564,16 +534,6 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-            <!-- Yang-push
-                Removed from autorelease due to inactivity.
-            <dependency>
-                <groupId>org.opendaylight.yang-push</groupId>
-                <artifactId>yangpush-features</artifactId>
-                <version>${yang-push.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
-            -->
         </dependencies>
     </dependencyManagement>
 </project>
diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml
index aa9f3dc2..b5468ee7 100644
--- a/artifacts/upstream/properties/pom.xml
+++ b/artifacts/upstream/properties/pom.xml
@@ -47,17 +47,11 @@
         <!-- Keep this list sorted alphabetically please. -->
         <aaa.version>0.5.0-SNAPSHOT</aaa.version>
         <alto.version>0.4.0-SNAPSHOT</alto.version>
-        <!-- Removed from autoreelase due to inactivity.
-        <atrium.version>0.1.0-SNAPSHOT</atrium.version>
-        -->
         <benchmark.version>1.3.0-SNAPSHOT</benchmark.version>
         <bgpcep.version>0.7.0-SNAPSHOT</bgpcep.version>
         <bier.version>0.1.0-SNAPSHOT</bier.version>
         <capwap.version>0.4.0-SNAPSHOT</capwap.version>
         <cardinal.version>0.2.0-SNAPSHOT</cardinal.version>
-        <!-- Removed from autoreelase due to inactivity.
-        <centinel.version>0.3.0-SNAPSHOT</centinel.version>
-        -->
         <config.version>0.6.0-SNAPSHOT</config.version>
         <controller.extras.version>1.8.0-SNAPSHOT</controller.extras.version>
         <didm.version>0.4.0-SNAPSHOT</didm.version>
@@ -99,14 +93,8 @@
         <ttp.version>0.4.0-SNAPSHOT</ttp.version>
         <unimgr.version>0.2.0-SNAPSHOT</unimgr.version>
         <usc.version>1.3.0-SNAPSHOT</usc.version>
-        <!-- Removed from autoreelase due to inactivity.
-        <usecplugin.version>1.2.0-SNAPSHOT</usecplugin.version>
-        -->
         <vpnservice.version>0.4.0-SNAPSHOT</vpnservice.version>
         <vtn-manager.version>0.6.0-SNAPSHOT</vtn-manager.version>
-        <!-- Removed from autoreelase due to inactivity.
-        <yang-push.version>1.2.0-SNAPSHOT</yang-push.version>
-        -->
         <yangtools.version>1.1.0-SNAPSHOT</yangtools.version>
         <!-- Keep this list sorted alphabetically please. -->
     </properties>
diff --git a/features3-index/pom.xml b/features3-index/pom.xml
index b31befd3..01c7f800 100644
--- a/features3-index/pom.xml
+++ b/features3-index/pom.xml
@@ -80,14 +80,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <!-- Removed from autorelease due to inactivity.
-        <dependency>
-            <groupId>org.opendaylight.atrium</groupId>
-            <artifactId>atrium-features</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-         -->
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>features-bgp</artifactId>
@@ -136,14 +128,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <!-- Removed from autorelease due to inactivity.
-        <dependency>
-            <groupId>org.opendaylight.centinel</groupId>
-            <artifactId>centinel-features</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        -->
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>features-extras</artifactId>
@@ -456,27 +440,11 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <!-- Removed from autorelease due to inactivity.
-        <dependency>
-            <groupId>org.opendaylight.usecplugin</groupId>
-            <artifactId>usecplugin-features</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        -->
         <dependency>
             <groupId>org.opendaylight.vtn</groupId>
             <artifactId>features-vtn-manager</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <!-- Removed from autorelease due to inactivity.
-        <dependency>
-            <groupId>org.opendaylight.yang-push</groupId>
-            <artifactId>yangpush-features</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
-        -->
     </dependencies>
 </project>
diff --git a/features3-index/src/main/features/features.xml b/features3-index/src/main/features/features.xml
index 3e9ea12f..e038fe8b 100644
--- a/features3-index/src/main/features/features.xml
+++ b/features3-index/src/main/features/features.xml
@@ -33,9 +33,6 @@
     <repository>mvn:org.opendaylight.aaa/features-aaa/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.aaa/features-aaa-shiro/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.alto/features-alto-release/{{VERSION}}/xml/features</repository>
-    <!-- Removed from autorelease due to inactivity.
-    <repository>mvn:org.opendaylight.atrium/atrium-features/{{VERSION}}/xml/features</repository>
-    -->
     <repository>mvn:org.opendaylight.bgpcep/features-bgp/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.bgpcep/features-bmp/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.bgpcep/features-extras/{{VERSION}}/xml/features</repository>
@@ -44,9 +41,6 @@
     <repository>mvn:org.opendaylight.bier/features-bier/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.capwap/capwap-features/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.cardinal/cardinal-features/{{VERSION}}/xml/features</repository>
-    <!-- Removed from autorelease due to inactivity.
-    <repository>mvn:org.opendaylight.centinel/centinel-features/{{VERSION}}/xml/features</repository>
-    -->
     <repository>mvn:org.opendaylight.controller/features-extras/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-mdsal/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-mdsal-benchmark/{{VERSION}}/xml/features</repository>
@@ -100,11 +94,5 @@
     <repository>mvn:org.opendaylight.ttp/features-ttp/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.unimgr/unimgr-features/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.usc/usc-features/{{VERSION}}/xml/features</repository>
-    <!-- Removed from autorelease due to inactivity.
-    <repository>mvn:org.opendaylight.usecplugin/usecplugin-features/{{VERSION}}/xml/features</repository>
-    -->
     <repository>mvn:org.opendaylight.vtn/features-vtn-manager/{{VERSION}}/xml/features</repository>
-    <!-- Removed from autorelease due to inactivity.
-    <repository>mvn:org.opendaylight.yang-push/yangpush-features/{{VERSION}}/xml/features</repository>
-    -->
 </features>
diff --git a/features3-test/src/main/features/features.xml b/features3-test/src/main/features/features.xml
index 5ed8769b..46849888 100644
--- a/features3-test/src/main/features/features.xml
+++ b/features3-test/src/main/features/features.xml
@@ -65,13 +65,6 @@
         <feature>odl-bgpcep-rsvp</feature>
         <feature>odl-capwap-ac-rest</feature>
         <feature>odl-cardinal</feature>
-        <!-- Commented out because two of the features lead to Yang pares errors.
-            Also, removed from autorelease due to inactivity.
-        <feature>odl-centinel-core</feature>
-        <feature>odl-centinel-laas</feature>
-        <feature>odl-centinel-streamhandler</feature>
-        <feature>odl-centinel-ui</feature>
-        -->
         <feature>odl-didm-all</feature>
         <feature>odl-dlux-core</feature>
         <feature>odl-distribution-version</feature>
@@ -121,18 +114,11 @@
         <feature>odl-usc-channel</feature>
         <feature>odl-usc-channel-rest</feature>
         <feature>odl-usc-channel-ui</feature>
-        <!-- Removed from autorelease due to inactivity.
-        <feature>odl-usecplugin-aaa</feature>
-        <feature>odl-usecplugin-openflow</feature>
-        -->
     </feature>
 
     <feature name='odl-integration-all' version='${project.version}'>
         <!-- Please use alphabetical order for non-compatible features -->
         <feature>odl-alto-release</feature>
-        <!-- Removed from autorelease due to inactivity.
-        <feature>odl-atrium-all</feature>
-        -->
         <feature>odl-bier-all</feature>
         <feature>odl-faas-base</feature>
         <feature>odl-genius-rest</feature>
@@ -175,10 +161,6 @@
         <feature>odl-unimgr</feature>
         <feature>odl-vtn-manager-neutron</feature>
         <feature>odl-vtn-manager-rest</feature>
-        <!-- Removed from autorelease due to inactivity.
-        <feature>odl-yangpush</feature>
-        <feature>odl-yangpush-api</feature>
-        -->
     </feature>
 
 </features>
-- 
2.36.6