Remove capwap from carbon distribution

They are not part of SR anymore.

Change-Id: I2caa31c8b72049b8b34b390b35c46365f70137e1
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/artifacts/upstream/feature3-repos/pom.xml b/artifacts/upstream/feature3-repos/pom.xml
index a8ca470f029913cd0572bede209ff46ddc88e166..a610019cb8f55ae08a38e71abf29e86247a3e1c0 100644 (file)
--- 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 b5468ee79c7194f61b6a62f72e9415d8f8be8950..449dba615756fd8e25e66388f03d44cc2d0bdaeb 100644 (file)
--- a/artifacts/upstream/properties/pom.xml
+++ b/artifacts/upstream/properties/pom.xml
@@ -50,7 +50,6 @@
         <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>
         <config.version>0.6.0-SNAPSHOT</config.version>
         <controller.extras.version>1.8.0-SNAPSHOT</controller.extras.version>

diff --git a/features3-index/pom.xml b/features3-index/pom.xml
index 01c7f80089b38981ee89262476dc427bff6472aa..c66b5efc2fb22da5c3156a73295421d21eb37c57 100644 (file)
--- 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 e038fe8b2aba54a3af450b5343a50150de3f0e71..8731f2812487b0f4f39ee30de61a4333b6363346 100644 (file)
--- 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 46849888ed7eb092f16215af70cac11af59b5bad..306b12fdc6143cd28d4719bb1d560c43a2c9cd95 100644 (file)
--- 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>