removing capwap from distribution

capwap no longer participating in Beryllium release

Change-Id: I164918de436539bd23be2f0b42a26ad9334f48cf
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>

diff --git a/features/index/pom.xml b/features/index/pom.xml
index 22616231c85097c32a117b8ece442231844e2ea0..8ae220c1de71ad253d2cbdf5e743cf0ebf51cd9c 100644 (file)
--- a/features/index/pom.xml
+++ b/features/index/pom.xml
@@ -93,13 +93,6 @@
        <version>${feature.bgpcep.version}</version>
        <type>xml</type>
     </dependency>
-    <dependency>
-      <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.centinel</groupId>
       <artifactId>centinel-features</artifactId>

diff --git a/features/index/src/main/resources/features.xml b/features/index/src/main/resources/features.xml
index 2acff022189610726dc72d154bd34f32cbce02f6..469063a29e7098a26014da6cde33f91ee5c2fa6f 100644 (file)
--- a/features/index/src/main/resources/features.xml
+++ b/features/index/src/main/resources/features.xml
@@ -40,7 +40,6 @@
     <repository>mvn:org.opendaylight.bgpcep/features-extras/${feature.bgpcep.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.bgpcep/features-pcep/${feature.bgpcep.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.bgpcep/features-rsvp/${feature.bgpcep.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.capwap/capwap-features/${feature.capwap.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.centinel/centinel-features/${feature.centinel.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>

diff --git a/features/test/src/main/resources/features.xml b/features/test/src/main/resources/features.xml
index e4d8211aa704876de47e908fdb37b6c13499b496..b48c589e427f19680d55e9654a47e03c1660efbb 100644 (file)
--- a/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@ -68,7 +68,6 @@
         <feature version='${feature.bgpcep.version}'>odl-bgpcep-bmp</feature>
         <feature version='${feature.bgpcep.version}'>odl-bgpcep-pcep-all</feature>
         <feature version='${feature.bgpcep.version}'>odl-bgpcep-rsvp</feature>
-        <feature version='${feature.capwap.version}'>odl-capwap-ac-rest</feature>
         <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>

diff --git a/pom.xml b/pom.xml
index c2ec06bb54bfb9ce2b287204e99dc40efa7f87c7..8c9cfd7288fa9aa56e9852a1c4532e9ddcce44a1 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -26,7 +26,6 @@
     <feature.armoury.version>1.0.0-SNAPSHOT</feature.armoury.version>
     <feature.benchmark.version>1.1.0-SNAPSHOT</feature.benchmark.version>
     <feature.bgpcep.version>0.5.0-SNAPSHOT</feature.bgpcep.version>
-    <feature.capwap.version>0.2.0-SNAPSHOT</feature.capwap.version>
     <feature.centinel.version>0.1.0-SNAPSHOT</feature.centinel.version>
     <feature.circuitsw.version>1.0.0-SNAPSHOT</feature.circuitsw.version>
     <feature.dlux.version>0.3.0-SNAPSHOT</feature.dlux.version>