From 184858982132ea682e185164c267d1743d487604 Mon Sep 17 00:00:00 2001
From: Luis Gomez <ecelgp@gmail.com>
Date: Fri, 10 Apr 2015 13:44:39 -0700
Subject: [PATCH] Cleaning pom.xml file duplicate dependencies

Change-Id: Icd08f100609b0e09a2806e1c8bdaeec5a55db9ff
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
---
 features/index/pom.xml | 235 ++++++++++++++++++++---------------------
 pom.xml                | 154 ---------------------------
 2 files changed, 117 insertions(+), 272 deletions(-)

diff --git a/features/index/pom.xml b/features/index/pom.xml
index 6b334b7a..796fe222 100644
--- a/features/index/pom.xml
+++ b/features/index/pom.xml
@@ -24,42 +24,23 @@
    <dependencies>
     <!-- dependencies on feature repos -->
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-mdsal</artifactId>
-      <version>${feature.mdsal.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-netconf-connector</artifactId>
-      <version>${feature.mdsal.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-restconf</artifactId>
-      <version>${feature.mdsal.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.neutron</groupId>
-      <artifactId>features-neutron</artifactId>
-      <version>${feature.neutron.version}</version>
+      <groupId>org.opendaylight.aaa</groupId>
+      <artifactId>features-aaa-api</artifactId>
+      <version>0.2.0-SNAPSHOT</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-nsf</artifactId>
+      <groupId>org.opendaylight.aaa</groupId>
+      <artifactId>features-aaa</artifactId>
+      <version>0.2.0-SNAPSHOT</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>features-ovsdb</artifactId>
+      <groupId>org.opendaylight.aaa</groupId>
+      <artifactId>features-aaa-authz</artifactId>
+      <version>0.2.0-SNAPSHOT</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
@@ -85,23 +66,51 @@
        <type>xml</type>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.openflowplugin</groupId>
-      <artifactId>features-openflowplugin</artifactId>
-      <version>${feature.openflowplugin.version}</version>
+      <groupId>org.opendaylight.capwap</groupId>
+      <artifactId>capwap-features</artifactId>
+      <version>${feature.capwap.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.openflowplugin</groupId>
-      <artifactId>features-openflowplugin-extension</artifactId>
-      <version>${feature.openflowplugin.version}</version>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>features-adsal</artifactId>
+      <version>${feature.adsal.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.openflowplugin.legacy</groupId>
-      <artifactId>features-legacy</artifactId>
-      <version>${feature.openflowplugin.version}</version>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>features-mdsal</artifactId>
+      <version>${feature.mdsal.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>features-netconf-connector</artifactId>
+      <version>${feature.mdsal.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>features-nsf</artifactId>
+      <version>${feature.nsf.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>features-restconf</artifactId>
+      <version>${feature.mdsal.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.didm</groupId>
+      <artifactId>didm-features</artifactId>
+      <version>${didm.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
@@ -112,6 +121,13 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.groupbasedpolicy</groupId>
+      <artifactId>features-groupbasedpolicy</artifactId>
+      <version>${feature.groupbasedpolicy.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.l2switch</groupId>
       <artifactId>features-l2switch</artifactId>
@@ -120,70 +136,86 @@
       <type>xml</type>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>features-adsal-compatibility</artifactId>
-      <version>1.5.0-SNAPSHOT</version>
+      <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.plugin2oc</groupId>
-       <artifactId>features-plugin2oc</artifactId>
-       <version>0.2.0-SNAPSHOT</version>
-       <classifier>features</classifier>
-       <type>xml</type>
+      <groupId>org.opendaylight.lispflowmapping</groupId>
+      <artifactId>features-lispflowmapping</artifactId>
+      <version>${feature.lispflowmapping.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
     </dependency>
--->
     <dependency>
-      <groupId>org.opendaylight.aaa</groupId>
-      <artifactId>features-aaa-api</artifactId>
-      <version>0.2.0-SNAPSHOT</version>
+      <groupId>org.opendaylight.neutron</groupId>
+      <artifactId>features-neutron</artifactId>
+      <version>${feature.neutron.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.aaa</groupId>
-      <artifactId>features-aaa</artifactId>
-      <version>0.2.0-SNAPSHOT</version>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <artifactId>features-openflowplugin</artifactId>
+      <version>${feature.openflowplugin.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.aaa</groupId>
-      <artifactId>features-aaa-authz</artifactId>
-      <version>0.2.0-SNAPSHOT</version>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <artifactId>features-openflowplugin-extension</artifactId>
+      <version>${feature.openflowplugin.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.ttp</groupId>
-      <artifactId>features-ttp</artifactId>
-      <version>${feature.ttp.version}</version>
+      <groupId>org.opendaylight.openflowplugin.legacy</groupId>
+      <artifactId>features-legacy</artifactId>
+      <version>${feature.openflowplugin.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.lispflowmapping</groupId>
-      <artifactId>features-lispflowmapping</artifactId>
-      <version>${feature.lispflowmapping.version}</version>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>features-ovsdb</artifactId>
+      <version>${feature.ovsdb.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
     <dependency>
-      <groupId>org.opendaylight.vtn</groupId>
-      <artifactId>features-vtn-manager</artifactId>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>features-ovs-sfc</artifactId>
+      <version>0.1.0-SNAPSHOT</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+<!--
     <dependency>
-      <groupId>org.opendaylight.groupbasedpolicy</groupId>
-      <artifactId>features-groupbasedpolicy</artifactId>
-      <version>${feature.groupbasedpolicy.version}</version>
+       <groupId>org.opendaylight.packetcable</groupId>
+       <artifactId>features-packetcable</artifactId>
+       <version>${feature.packetcable.version}</version>
+       <classifier>features</classifier>
+       <type>xml</type>
+    </dependency>
+-->
+<!--
+    <dependency>
+       <groupId>org.opendaylight.plugin2oc</groupId>
+       <artifactId>features-plugin2oc</artifactId>
+       <version>0.2.0-SNAPSHOT</version>
+       <classifier>features</classifier>
+       <type>xml</type>
+    </dependency>
+-->
+    <dependency>
+      <groupId>org.opendaylight.sdninterfaceapp</groupId>
+      <artifactId>features-sdninterfaceapp</artifactId>
+      <version>1.5.0-SNAPSHOT</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-
     <dependency>
       <groupId>org.opendaylight.sfc</groupId>
       <artifactId>features-sfc</artifactId>
@@ -214,15 +246,6 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>features-ovs-sfc</artifactId>
-      <version>0.1.0-SNAPSHOT</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
-
     <dependency>
       <groupId>org.opendaylight.snbi</groupId>
       <artifactId>features-snbi</artifactId>
@@ -230,15 +253,13 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-<!--
     <dependency>
-       <groupId>org.opendaylight.packetcable</groupId>
-       <artifactId>features-packetcable</artifactId>
-       <version>${feature.packetcable.version}</version>
-       <classifier>features</classifier>
-       <type>xml</type>
+      <groupId>org.opendaylight.snmp</groupId>
+      <artifactId>features-snmp</artifactId>
+      <version>${snmp.plugin.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
     </dependency>
--->
     <dependency>
       <groupId>org.opendaylight.snmp4sdn</groupId>
       <artifactId>features-snmp4sdn</artifactId>
@@ -246,15 +267,13 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-
     <dependency>
-      <groupId>org.opendaylight.sdninterfaceapp</groupId>
-      <artifactId>features-sdninterfaceapp</artifactId>
-      <version>1.5.0-SNAPSHOT</version>
+      <groupId>org.opendaylight.tcpmd5</groupId>
+      <artifactId>features-tcpmd5</artifactId>
+      <version>${feature.tcpmd5.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-
     <dependency>
       <groupId>org.opendaylight.topoprocessing</groupId>
       <artifactId>features-topoprocessing</artifactId>
@@ -262,39 +281,27 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-
-    <dependency>
-      <groupId>org.opendaylight.usc</groupId>
-      <artifactId>usc-features</artifactId>
-      <version>${feature.usc.version}</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
-
     <dependency>
-      <groupId>org.opendaylight.capwap</groupId>
-      <artifactId>capwap-features</artifactId>
-      <version>${feature.capwap.version}</version>
+      <groupId>org.opendaylight.ttp</groupId>
+      <artifactId>features-ttp</artifactId>
+      <version>${feature.ttp.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-
     <dependency>
-      <groupId>org.opendaylight.snmp</groupId>
-      <artifactId>features-snmp</artifactId>
-      <version>${snmp.plugin.version}</version>
+      <groupId>org.opendaylight.usc</groupId>
+      <artifactId>usc-features</artifactId>
+      <version>${feature.usc.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-
     <dependency>
-      <groupId>org.opendaylight.didm</groupId>
-      <artifactId>didm-features</artifactId>
-      <version>${didm.version}</version>
+      <groupId>org.opendaylight.vtn</groupId>
+      <artifactId>features-vtn-manager</artifactId>
+      <version>${feature.vtn-manager.version}</version>
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-
     <dependency>
       <groupId>org.opendaylight.vpnservice</groupId>
       <artifactId>vpnservice-features</artifactId>
@@ -302,14 +309,6 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.lacp</groupId>
-      <artifactId>features-lacp</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
-      <classifier>features</classifier>
-      <type>xml</type>
-    </dependency>
-
     <!-- test to validate features.xml -->
     <dependency>
       <groupId>org.opendaylight.odlparent</groupId>
diff --git a/pom.xml b/pom.xml
index 7d88b463..cf073ffa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -41,9 +41,7 @@
     <feature.capwap.version>0.1.0-SNAPSHOT</feature.capwap.version>
     <feature.vtn-manager.version>0.3.0-SNAPSHOT</feature.vtn-manager.version>
     <feature.bgpcep.version>0.4.0-SNAPSHOT</feature.bgpcep.version>
-<!--
     <feature.packetcable.version>1.2.0-SNAPSHOT</feature.packetcable.version>
--->
     <feature.plugin2oc.version>0.2.0-SNAPSHOT</feature.plugin2oc.version>
     <feature.tcpmd5.version>1.1.0-SNAPSHOT</feature.tcpmd5.version>
     <feature.topoprocessing.version>0.0.1-SNAPSHOT</feature.topoprocessing.version>
@@ -61,9 +59,7 @@
     <module>features/</module>
     <module>feature-selector</module>
   </modules>
-
   <repositories>
-
     <!-- OpenDayLight Repo Mirror -->
     <repository>
       <id>opendaylight-mirror</id>
@@ -90,7 +86,6 @@
       </releases>
     </repository>
   </repositories>
-
   <pluginRepositories>
     <pluginRepository>
       <id>central2</id>
@@ -103,7 +98,6 @@
       <url>${nexusproxy}/repositories/opendaylight.snapshot/</url>
     </pluginRepository>
   </pluginRepositories>
-
   <distributionManagement>
     <!-- OpenDayLight Released artifact -->
     <repository>
@@ -120,153 +114,6 @@
       <url>./</url>
     </site>
   </distributionManagement>
-  <dependencyManagement>
-      <dependencies>
-        <!-- Karaf basic pieces -->
-        <dependency>
-          <!-- scope is compile so all features (there is only one) are installed
-            into startup.properties and the feature repo itself is not installed -->
-          <groupId>org.apache.karaf.features</groupId>
-          <artifactId>framework</artifactId>
-          <version>${karaf.version}</version>
-          <type>kar</type>
-        </dependency>
-        <!-- scope is runtime so the feature repo is listed in the features
-          service config file, and features may be installed using the
-          karaf-maven-plugin configuration -->
-        <dependency>
-          <groupId>org.apache.karaf.features</groupId>
-          <artifactId>standard</artifactId>
-          <version>${karaf.version}</version>
-          <classifier>features</classifier>
-          <type>xml</type>
-        </dependency>
-
-        <!-- Karaf Branding -->
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>karaf.branding</artifactId>
-          <version>${karaf.branding.version}</version>
-        </dependency>
-
-        <!-- Integration features -->
-        <dependency>
-          <groupId>org.opendaylight.integration</groupId>
-          <artifactId>features-integration</artifactId>
-          <version>${project.version}</version>
-          <classifier>features</classifier>
-          <type>xml</type>
-        </dependency>
-        <!-- MD-SAL Related Features -->
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>features-mdsal</artifactId>
-          <version>${feature.mdsal.version}</version>
-          <classifier>features</classifier>
-          <type>xml</type>
-        </dependency>
-        <!-- AD-SAL Related Features -->
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>features-adsal</artifactId>
-          <version>${feature.adsal.version}</version>
-          <classifier>features</classifier>
-          <type>xml</type>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.controller</groupId>
-          <artifactId>features-nsf</artifactId>
-          <version>${feature.nsf.version}</version>
-          <classifier>features</classifier>
-          <type>xml</type>
-        </dependency>
-        <!-- VTN Features -->
-        <dependency>
-          <groupId>org.opendaylight.vtn</groupId>
-          <artifactId>features-vtn-manager</artifactId>
-          <version>${feature.vtn-manager.version}</version>
-          <classifier>features</classifier>
-          <type>xml</type>
-        </dependency>
-
-
-        <!-- GBP Features -->
-        <dependency>
-          <groupId>org.opendaylight.groupbasedpolicy</groupId>
-          <artifactId>features-groupbasedpolicy</artifactId>
-          <version>${feature.groupbasedpolicy.version}</version>
-          <classifier>features</classifier>
-          <type>xml</type>
-        </dependency>
-
-        <!-- SFC features -->
-       <dependency>
-          <groupId>org.opendaylight.sfc</groupId>
-          <artifactId>features-sfc</artifactId>
-          <version>${feature.sfc.version}</version>
-          <classifier>features</classifier>
-          <type>xml</type>
-       </dependency>
-
-        <dependency>
-          <groupId>org.opendaylight.tcpmd5</groupId>
-          <artifactId>features-tcpmd5</artifactId>
-          <version>${feature.tcpmd5.version}</version>
-          <classifier>features</classifier>
-          <type>xml</type>
-        </dependency>
-
-        <dependency>
-          <groupId>org.opendaylight.bgpcep</groupId>
-          <artifactId>features-bgp</artifactId>
-          <version>${feature.bgpcep.version}</version>
-          <classifier>features</classifier>
-          <type>xml</type>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.bgpcep</groupId>
-          <artifactId>features-extras</artifactId>
-          <version>${feature.bgpcep.version}</version>
-          <classifier>features</classifier>
-          <type>xml</type>
-        </dependency>
-        <dependency>
-          <groupId>org.opendaylight.bgpcep</groupId>
-          <artifactId>features-pcep</artifactId>
-          <version>${feature.bgpcep.version}</version>
-          <classifier>features</classifier>
-          <type>xml</type>
-        </dependency>
-
-        <!-- OVSDB Related Features -->
-        <dependency>
-          <groupId>org.opendaylight.ovsdb</groupId>
-          <artifactId>features-ovsdb</artifactId>
-          <version>${feature.ovsdb.version}</version>
-          <classifier>features</classifier>
-          <type>xml</type>
-        </dependency>
-
-        <!-- Plugin2oc Related Features -->
-        <dependency>
-          <groupId>org.opendaylight.plugin2oc</groupId>
-          <artifactId>features-plugin2oc</artifactId>
-          <version>0.2.0-SNAPSHOT</version>
-          <classifier>features</classifier>
-          <type>xml</type>
-        </dependency>
-
-        <!-- packetcable Related Features
-        <dependency>
-           <groupId>org.opendaylight.packetcable</groupId>
-           <artifactId>features-packetcable</artifactId>
-           <version>${feature.packetcable.version}</version>
-           <classifier>features</classifier>
-          <type>xml</type>
-        </dependency>
-         -->
-      </dependencies>
-  </dependencyManagement>
   <build>
     <pluginManagement>
       <plugins>
@@ -277,7 +124,6 @@
         </plugin>
       </plugins>
     </pluginManagement>
-
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-- 
2.36.6