From: Anil Belur <abelur@linuxfoundation.org>
Date: Tue, 2 Aug 2016 14:13:04 +0000 (+1000)
Subject: Removed circuitsw since autorelease does not build it for Boron
X-Git-Tag: release/boron~13
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Fdistribution.git;a=commitdiff_plain;h=44e45d3e84c9c64ccf692ccd36de9826a88e2b06

Removed circuitsw since autorelease does not build it for Boron

Change-Id: I83bba95fae273d9be7eb5a4a70aedcd427d6c462
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
---

diff --git a/features-index/pom.xml b/features-index/pom.xml
index cecf4054..ed35b978 100644
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -367,13 +367,6 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.ofextensions.circuitsw</groupId>
-            <artifactId>circuitsw-features</artifactId>
-            <version>${feature.circuitsw.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.openflowplugin</groupId>
             <artifactId>features-openflowplugin</artifactId>
diff --git a/features-index/src/main/resources/features.xml b/features-index/src/main/resources/features.xml
index 3c30438e..00dff41b 100644
--- a/features-index/src/main/resources/features.xml
+++ b/features-index/src/main/resources/features.xml
@@ -81,7 +81,6 @@
     <repository>mvn:org.opendaylight.odlparent/features-akka/${feature.odlparent.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.odlparent/features-odlparent/${feature.odlparent.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.of-config/features-of-config/${feature.of-config.version}/xml/features</repository>
-    <repository>mvn:org.opendaylight.ofextensions.circuitsw/circuitsw-features/${feature.circuitsw.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin/${feature.openflowplugin.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin-he/${feature.openflowplugin.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.openflowplugin/features-openflowplugin-extension/${feature.openflowplugin.version}/xml/features</repository>
diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index 1e0b2c3f..7a3f35c6 100644
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -80,9 +80,6 @@
         <feature version='${feature.centinel.version}'>odl-centinel-streamhandler</feature>
         <feature version='${feature.centinel.version}'>odl-centinel-ui</feature>
         -->
-        <feature version='${feature.circuitsw.version}'>odl-circuitsw-switch</feature>
-        <feature version='${feature.circuitsw.version}'>odl-circuitsw-switch-rest</feature>
-        <feature version='${feature.circuitsw.version}'>odl-circuitsw-switch-ui</feature>
         <feature version='${didm.version}'>odl-didm-all</feature>
         <feature version='${feature.dlux.version}'>odl-dlux-core</feature>
         <feature version='${project.version}'>odl-distribution-version</feature>
diff --git a/pom.xml b/pom.xml
index 868b0229..2c78df86 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,7 +39,6 @@
         <feature.capwap.version>0.3.0-SNAPSHOT</feature.capwap.version>
         <feature.cardinal.version>0.1.0-SNAPSHOT</feature.cardinal.version>
         <feature.centinel.version>0.2.0-SNAPSHOT</feature.centinel.version>
-        <feature.circuitsw.version>1.1.0-SNAPSHOT</feature.circuitsw.version>
         <feature.controller.config.version>0.5.0-SNAPSHOT</feature.controller.config.version>
         <feature.controller.extras.version>1.7.0-SNAPSHOT</feature.controller.extras.version>
         <feature.dlux.version>0.4.0-SNAPSHOT</feature.dlux.version>