From bbe00cdc2b5be5f257e13ef6306b9a288917f0c3 Mon Sep 17 00:00:00 2001
From: Luis Gomez <ecelgp@gmail.com>
Date: Tue, 7 Apr 2015 19:03:37 +0200
Subject: [PATCH] Removing sfclisp to unblock integration

Change-Id: Ic43d9bdfd2ff84e97f13f08dcb2b0d30a0c8b5b9
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
---
 features/index/pom.xml                         | 7 ++++---
 features/index/src/main/resources/features.xml | 2 ++
 features/test/src/main/resources/features.xml  | 2 ++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/features/index/pom.xml b/features/index/pom.xml
index 1a81a428..c9223321 100644
--- a/features/index/pom.xml
+++ b/features/index/pom.xml
@@ -126,7 +126,7 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-    <!-- plugin2oc -->
+<!--
     <dependency>
        <groupId>org.opendaylight.plugin2oc</groupId>
        <artifactId>features-plugin2oc</artifactId>
@@ -134,7 +134,7 @@
        <classifier>features</classifier>
        <type>xml</type>
     </dependency>
-
+-->
     <!-- AAA -->
     <dependency>
       <groupId>org.opendaylight.aaa</groupId>
@@ -199,6 +199,7 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+<!--
     <dependency>
       <groupId>org.opendaylight.sfc</groupId>
       <artifactId>features-sfclisp</artifactId>
@@ -206,6 +207,7 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+-->
     <dependency>
       <groupId>org.opendaylight.sfc</groupId>
       <artifactId>features-sfcofl2</artifactId>
@@ -229,7 +231,6 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-
 <!--
     <dependency>
        <groupId>org.opendaylight.packetcable</groupId>
diff --git a/features/index/src/main/resources/features.xml b/features/index/src/main/resources/features.xml
index d6c9fd8a..f07bd413 100644
--- a/features/index/src/main/resources/features.xml
+++ b/features/index/src/main/resources/features.xml
@@ -62,7 +62,9 @@
     <repository>mvn:org.opendaylight.sdninterfaceapp/features-sdninterfaceapp/1.5.0-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.sfc/features-sfc/0.1.0-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.sfc/features-sfc-sb-rest/0.1.0-SNAPSHOT/xml/features</repository>
+<!--
     <repository>mvn:org.opendaylight.sfc/features-sfclisp/0.1.0-SNAPSHOT/xml/features</repository>
+-->
     <repository>mvn:org.opendaylight.sfc/features-sfcofl2/0.1.0-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.snbi/features-snbi/${feature.snbi.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.snmp/features-snmp/${snmp.plugin.version}/xml/features</repository>
diff --git a/features/test/src/main/resources/features.xml b/features/test/src/main/resources/features.xml
index 2ffcd278..3e4ddcba 100644
--- a/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@ -89,7 +89,9 @@
         <feature version="1.5.0-SNAPSHOT">odl-sdninterfaceapp-all</feature>
         <feature version='0.1.0-SNAPSHOT'>odl-sfc-core</feature>
         <feature version='0.1.0-SNAPSHOT'>odl-sfc-test-consumer</feature>
+<!--
         <feature version='0.1.0-SNAPSHOT'>odl-sfclisp</feature>
+-->
         <feature version='0.1.0-SNAPSHOT'>odl-sfcofl2</feature>
         <feature version='0.1.0-SNAPSHOT'>odl-sfc-ui</feature>
         <feature version='0.1.0-SNAPSHOT'>odl-sfc-sb-rest</feature>
-- 
2.36.6