From f1aa76f591c72bed1430bdaf6c47be2e6f2eda69 Mon Sep 17 00:00:00 2001
From: Jamo Luhrsen <jluhrsen@redhat.com>
Date: Thu, 23 Feb 2017 21:06:00 -0800
Subject: [PATCH] Add LACP back to carbon distro

reference email:

  https://lists.opendaylight.org/pipermail/lacp-dev/2017-February/000168.html

Change-Id: If7aeec75470fddeb6c7cc98a4b8e47377a3eccad
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>
---
 artifacts/upstream/pom.xml                    | 6 +-----
 features-index/pom.xml                        | 2 --
 features-index/src/main/features/features.xml | 2 --
 features-test/src/main/features/features.xml  | 1 -
 4 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/artifacts/upstream/pom.xml b/artifacts/upstream/pom.xml
index cb7fbbf4..eee5e087 100644
--- a/artifacts/upstream/pom.xml
+++ b/artifacts/upstream/pom.xml
@@ -66,9 +66,7 @@
         <infrautils.version>1.1.0-SNAPSHOT</infrautils.version>
         <iotdm.version>0.3.0-SNAPSHOT</iotdm.version>
         <l2switch.version>0.5.0-SNAPSHOT</l2switch.version>
-        <!-- Removed from autorelease due to inactivity.
         <lacp.version>1.3.0-SNAPSHOT</lacp.version>
-        -->
         <lispflowmapping.version>1.5.0-SNAPSHOT</lispflowmapping.version>
         <mdsal.version>1.5.0-SNAPSHOT</mdsal.version>
         <natapp.version>0.2.0-SNAPSHOT</natapp.version>
@@ -352,8 +350,7 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-            <!-- Lacp
-                Removed from autorelease due to inactivity.
+            <!-- Lacp -->
             <dependency>
                 <groupId>org.opendaylight.lacp</groupId>
                 <artifactId>features-lacp</artifactId>
@@ -361,7 +358,6 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-            -->
             <!-- Lispflowmapping -->
             <dependency>
                 <groupId>org.opendaylight.lispflowmapping</groupId>
diff --git a/features-index/pom.xml b/features-index/pom.xml
index 6cf35aa9..12038f72 100644
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -235,14 +235,12 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <!-- Removed from autorelease due to inactivity.
         <dependency>
             <groupId>org.opendaylight.lacp</groupId>
             <artifactId>features-lacp</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        -->
         <dependency>
             <groupId>org.opendaylight.lispflowmapping</groupId>
             <artifactId>features-lispflowmapping</artifactId>
diff --git a/features-index/src/main/features/features.xml b/features-index/src/main/features/features.xml
index 8dfd4b6d..e648665c 100644
--- a/features-index/src/main/features/features.xml
+++ b/features-index/src/main/features/features.xml
@@ -64,9 +64,7 @@
     <repository>mvn:org.opendaylight.integration/features-distribution/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.iotdm/onem2mall-features/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.l2switch/features-l2switch/{{VERSION}}/xml/features</repository>
-    <!-- Removed from autorelease due to inactivity.
     <repository>mvn:org.opendaylight.lacp/features-lacp/{{VERSION}}/xml/features</repository>
-    -->
     <repository>mvn:org.opendaylight.lispflowmapping/features-lispflowmapping/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.natapp/natapp-features/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.nemo/nemo-features/{{VERSION}}/xml/features</repository>
diff --git a/features-test/src/main/features/features.xml b/features-test/src/main/features/features.xml
index 10c4b99d..fb1f3ab2 100644
--- a/features-test/src/main/features/features.xml
+++ b/features-test/src/main/features/features.xml
@@ -156,7 +156,6 @@
         <feature>odl-l2switch-switch-ui</feature>
         <!-- Commented out, because LACP brings in Li designed OpenFlowPlugin
             which leads to BindException.
-            Also, removed from autorelease due to inactivity.
         <feature>odl-lacp-ui</feature>
         -->
         <feature>odl-natapp</feature>
-- 
2.36.6