From 449db3b67b8a20607aa8fa1a3479a4dc3daae4ab Mon Sep 17 00:00:00 2001
From: Vratko Polak <vrpolak@cisco.com>
Date: Thu, 9 Apr 2015 14:47:09 +0200
Subject: [PATCH] Adding back sfclisp to features index.

Sfclisp was removed in this change:
https://git.opendaylight.org/gerrit/#/c/17864/
to unblock distribution jobs.

Since then, SFC project has merged
https://git.opendaylight.org/gerrit/#/c/17725/
and there were many merges to other projects
which might have fixed sfclisp issues.

This patch tries to add sfclisp back to Integration
to see whether distribution-verify job succeeds.

Change-Id: I261dcd489675f64b3f140c95eeea5d5b4815e4f3
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
---
 features/index/pom.xml                         | 2 --
 features/index/src/main/resources/features.xml | 2 --
 features/test/src/main/resources/features.xml  | 2 --
 3 files changed, 6 deletions(-)

diff --git a/features/index/pom.xml b/features/index/pom.xml
index 6b334b7a..3d4aef3e 100644
--- a/features/index/pom.xml
+++ b/features/index/pom.xml
@@ -198,7 +198,6 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-<!--
     <dependency>
       <groupId>org.opendaylight.sfc</groupId>
       <artifactId>features-sfclisp</artifactId>
@@ -206,7 +205,6 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
--->
     <dependency>
       <groupId>org.opendaylight.sfc</groupId>
       <artifactId>features-sfcofl2</artifactId>
diff --git a/features/index/src/main/resources/features.xml b/features/index/src/main/resources/features.xml
index b1c2362a..792e3dc8 100644
--- a/features/index/src/main/resources/features.xml
+++ b/features/index/src/main/resources/features.xml
@@ -63,9 +63,7 @@
     <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 7464287d..c69b57a5 100644
--- a/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@ -90,9 +90,7 @@
         <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