From: Harman Singh <harmasin@cisco.com>
Date: Tue, 9 Sep 2014 22:39:17 +0000 (-0700)
Subject: Fixing the integrateremoving clustering app feature, was causing integration breakage
X-Git-Tag: release/lithium-sr2~103
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=b3e0e6e04193a6b2e8f5ace25ffeccb81fa8d32e;p=integration%2Fdistribution.git

Fixing the integrateremoving clustering app feature, was causing integration breakage

Signed-off-by: Harman Singh <harmasin@cisco.com>
---

diff --git a/features/pom.xml b/features/pom.xml
index b1aaceba..52fdfe30 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -164,22 +164,6 @@
        <classifier>features</classifier>
        <type>xml</type>
     </dependency>
-    <!-- clustering test application -->
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>clustering-it-config</artifactId>
-      <version>${clustering.it.test.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>clustering-it-model</artifactId>
-      <version>${clustering.it.test.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.controller</groupId>
-      <artifactId>clustering-it-provider</artifactId>
-      <version>${clustering.it.test.version}</version>
-    </dependency>
 
     <!-- test to validate features.xml -->
     <dependency>
diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml
index 0e23a0c2..b896ce0d 100644
--- a/features/src/main/resources/features.xml
+++ b/features/src/main/resources/features.xml
@@ -134,13 +134,4 @@
             <feature version='0.0.1-SNAPSHOT'>odl-ovsdb-ovssfc</feature>
         </feature>
 
-    <feature name='odl-clustering-test-app' version='${project.version}'>
-        <feature version='${feature.mdsal.version}'>odl-mdsal-clustering</feature>
-        <feature version='${feature.mdsal.version}'>odl-restconf</feature>
-        <feature version='${yangtools.version}'>odl-yangtools-models</feature>
-        <bundle>mvn:org.opendaylight.controller/clustering-it-model/${clustering.it.test.version}</bundle>
-        <bundle>mvn:org.opendaylight.controller/clustering-it-provider/${clustering.it.test.version}</bundle>
-        <configfile finalname="${config.configfile.directory}/20-clustering-test-app.xml">mvn:org.opendaylight.controller/clustering-it-config/${clustering.it.test.version}/xml/config</configfile>
-    </feature>
-
 </features>
diff --git a/pom.xml b/pom.xml
index c41871b6..44e09d30 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,13 +39,8 @@
     <karaf.version>3.0.1</karaf.version>
     <maven.surefire.version>2.16</maven.surefire.version>
     <checkstyle.version>2.12</checkstyle.version>
-    <checkstyle.version>2.12</checkstyle.version>
-    <clustering.it.test.version>1.1-SNAPSHOT</clustering.it.test.version>
-    <config.configfile.directory>etc/opendaylight/karaf</config.configfile.directory>
-    <yangtools.version>0.6.2-SNAPSHOT</yangtools.version>
   </properties>
   <modules>
-    <module>test/tools/odl-mdsal-clustering-tests/clustering-test-app/</module>
     <module>distributions/</module>
     <module>features/</module>
   </modules>