Add CAPWAP back to integration/distribution for Beryllium

Change-Id: If414f230316ee742cdb2e6095ce06b1485755b80
Signed-off-by: gzhao <george.y.zhao@huawei.com>

diff --git a/features/index/pom.xml b/features/index/pom.xml
index 8ae220c1de71ad253d2cbdf5e743cf0ebf51cd9c..22616231c85097c32a117b8ece442231844e2ea0 100644 (file)
--- a/features/index/pom.xml
+++ b/features/index/pom.xml
@@ -93,6 +93,13 @@
        <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 469063a29e7098a26014da6cde33f91ee5c2fa6f..2acff022189610726dc72d154bd34f32cbce02f6 100644 (file)
--- a/features/index/src/main/resources/features.xml
+++ b/features/index/src/main/resources/features.xml
@@ -40,6 +40,7 @@
     <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 36388d5ab84c9421ca9bb5c50937118215228d5c..44215b20fef12eb56ff1fce05b51087fce3ef0a4 100644 (file)
--- a/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@ -68,6 +68,7 @@
         <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>
 <!--
         Commented out because two of the features lead to Yang pares errors.
         <feature version='${feature.centinel.version}'>odl-centinel-core</feature>

diff --git a/pom.xml b/pom.xml
index 91861fb74d3e8227b83086e5703132763f606174..4919f4d73af53a860631c35b72a94c53b6c73b7b 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -26,6 +26,7 @@
     <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>