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>

diff --git a/artifacts/upstream/pom.xml b/artifacts/upstream/pom.xml
index cb7fbbf446df91a369b5706b317647f67a111224..eee5e087d07e486097c1e3fb9f28c1d2bcd015fc 100644 (file)
--- 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 6cf35aa907422e3e7ec90345d60dac7a5e04fc93..12038f724f6f537f2fa642e9806b8c46bf0744c1 100644 (file)
--- 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 8dfd4b6d9d9fa087a4bc43f8dec1d6d429993ef5..e648665cc07375ff55c91e4936c05acf773bbe48 100644 (file)
--- 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 10c4b99dffd2b0e456a8562fa49d827e87516784..fb1f3ab2d0e97ff8c8e698347b16d43fae3a90bd 100644 (file)
--- 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>