From 048689adb24590efe55c3d20d54c7cdae8e7d415 Mon Sep 17 00:00:00 2001
From: Luis Gomez <ecelgp@gmail.com>
Date: Thu, 13 Apr 2017 12:30:43 -0700
Subject: [PATCH] Remove capwap from nitrogen distribution

They are not part of SR anymore.

Change-Id: I2caa31c8b72049b8b34b390b35c46365f70137e1
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
---
 artifacts/upstream/feature3-repos/pom.xml      | 8 --------
 artifacts/upstream/properties/pom.xml          | 1 -
 features3-index/pom.xml                        | 6 ------
 features3-index/src/main/features/features.xml | 1 -
 features3-test/src/main/features/features.xml  | 1 -
 5 files changed, 17 deletions(-)

diff --git a/artifacts/upstream/feature3-repos/pom.xml b/artifacts/upstream/feature3-repos/pom.xml
index 978bf51b..40b238ae 100644
--- a/artifacts/upstream/feature3-repos/pom.xml
+++ b/artifacts/upstream/feature3-repos/pom.xml
@@ -109,14 +109,6 @@
                 <version>${bier.version}</version>
                 <type>xml</type>
             </dependency>
-            <!-- Capwap -->
-            <dependency>
-                <groupId>org.opendaylight.capwap</groupId>
-                <artifactId>capwap-features</artifactId>
-                <version>${capwap.version}</version>
-                <classifier>features</classifier>
-                <type>xml</type>
-            </dependency>
             <!-- Cardinal -->
             <dependency>
                 <groupId>org.opendaylight.cardinal</groupId>
diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml
index 405180b4..a2ab1513 100644
--- a/artifacts/upstream/properties/pom.xml
+++ b/artifacts/upstream/properties/pom.xml
@@ -50,7 +50,6 @@
         <benchmark.version>1.4.0-SNAPSHOT</benchmark.version>
         <bgpcep.version>0.8.0-SNAPSHOT</bgpcep.version>
         <bier.version>0.2.0-SNAPSHOT</bier.version>
-        <capwap.version>0.5.0-SNAPSHOT</capwap.version>
         <cardinal.version>0.3.0-SNAPSHOT</cardinal.version>
         <config.version>0.7.0-SNAPSHOT</config.version>
         <controller.extras.version>1.9.0-SNAPSHOT</controller.extras.version>
diff --git a/features3-index/pom.xml b/features3-index/pom.xml
index da91f550..1f06bd2a 100644
--- a/features3-index/pom.xml
+++ b/features3-index/pom.xml
@@ -116,12 +116,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.capwap</groupId>
-            <artifactId>capwap-features</artifactId>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.cardinal</groupId>
             <artifactId>cardinal-features</artifactId>
diff --git a/features3-index/src/main/features/features.xml b/features3-index/src/main/features/features.xml
index e038fe8b..8731f281 100644
--- a/features3-index/src/main/features/features.xml
+++ b/features3-index/src/main/features/features.xml
@@ -39,7 +39,6 @@
     <repository>mvn:org.opendaylight.bgpcep/features-pcep/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.bgpcep/features-rsvp/{{VERSION}}/xml/features</repository>
     <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>
     <repository>mvn:org.opendaylight.controller/features-extras/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.controller/features-mdsal/{{VERSION}}/xml/features</repository>
diff --git a/features3-test/src/main/features/features.xml b/features3-test/src/main/features/features.xml
index 46849888..306b12fd 100644
--- a/features3-test/src/main/features/features.xml
+++ b/features3-test/src/main/features/features.xml
@@ -63,7 +63,6 @@
         <feature>odl-bgpcep-bmp</feature>
         <feature>odl-bgpcep-pcep-all</feature>
         <feature>odl-bgpcep-rsvp</feature>
-        <feature>odl-capwap-ac-rest</feature>
         <feature>odl-cardinal</feature>
         <feature>odl-didm-all</feature>
         <feature>odl-dlux-core</feature>
-- 
2.36.6