Add LACP back to distribution

Change-Id: I430c3ed7acf261adb49a0f6bf103b534a2d7eaed
Signed-off-by: Colin Dixon <colin@colindixon.com>

diff --git a/artifacts/upstream/feature3-repos/pom.xml b/artifacts/upstream/feature3-repos/pom.xml
index 7c50e5f31dc98c2e395fc3d85bde0eab1afc4585..704e8776431910f34368309ed7b12aadde7c5f58 100644 (file)
--- a/artifacts/upstream/feature3-repos/pom.xml
+++ b/artifacts/upstream/feature3-repos/pom.xml
@@ -254,7 +254,6 @@
                 <type>xml</type>
             </dependency>
             <!-- Lacp -->
-            <!-- Temporary remove because of karaf 4
             <dependency>
                 <groupId>org.opendaylight.lacp</groupId>
                 <artifactId>features-lacp</artifactId>
@@ -262,7 +261,6 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
-            -->
             <!-- Lispflowmapping -->
             <dependency>
                 <groupId>org.opendaylight.lispflowmapping</groupId>

diff --git a/features3-index/pom.xml b/features3-index/pom.xml
index 35572d8b28a761b78af886b04aa85df2dd7d6e28..4534b705ff93054117c497df35d91ec1c3c6a78c 100644 (file)
--- a/features3-index/pom.xml
+++ b/features3-index/pom.xml
@@ -228,14 +228,12 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <!-- Temporary remove because of karaf 4
         <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/features3-index/src/main/features/features.xml b/features3-index/src/main/features/features.xml
index 26f0875f46ba5fd727c615dcc8113c91a7543da2..70cb45c26d64e05fbcc663d235c0797752c07042 100644 (file)
--- a/features3-index/src/main/features/features.xml
+++ b/features3-index/src/main/features/features.xml
@@ -62,9 +62,7 @@
     <repository>mvn:org.opendaylight.integration/features3-distribution/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.iotdm/iotdmcsitdist-features/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.l2switch/features-l2switch/{{VERSION}}/xml/features</repository>
-    <!-- Temporay remove because of karaf 4
     <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.nemo/nemo-features/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.netconf/features-netconf/{{VERSION}}/xml/features</repository>

diff --git a/features3-test/src/main/features/features.xml b/features3-test/src/main/features/features.xml
index 26702ce8deb3feb0b3744ed911d112cfcf2fe800..383a08202dfed186839a2ec28c985880cd344b80 100644 (file)
--- a/features3-test/src/main/features/features.xml
+++ b/features3-test/src/main/features/features.xml
@@ -140,9 +140,7 @@
         <feature>odl-l2switch-switch</feature>
         <feature>odl-l2switch-switch-rest</feature>
         <feature>odl-l2switch-switch-ui</feature>
-        <!-- Temporary remove because of karaf 4
         <feature>odl-lacp-ui</feature>
-        -->
         <!-- The following two Netconf features are incompatible with each other.
         As CSIT jobs may use either of them, none of them can be in odl-integration-compatible-with-all. -->
         <feature>odl-netconf-clustered-topology</feature>