Revert "Remove BIER from Carbon distribution"

This reverts commit 79977b9036aef577fedfb4268fdbe219c2893c32.

Change-Id: I755fb4938d397d479481433adc991946508b47c4
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>

diff --git a/artifacts/upstream/feature3-repos/pom.xml b/artifacts/upstream/feature3-repos/pom.xml
index a3707577c01bab2f635609b693fb818ce7abeb32..31639752e45dd34ed6a0427354ddbff19087ff55 100644 (file)
--- a/artifacts/upstream/feature3-repos/pom.xml
+++ b/artifacts/upstream/feature3-repos/pom.xml
@@ -102,7 +102,6 @@
                 <type>xml</type>
             </dependency>
             <!-- Bier -->
-            <!-- Temporarily remove because of sporadic Karaf 4 SFT failures
             <dependency>
                 <groupId>org.opendaylight.bier</groupId>
                 <artifactId>features-bier</artifactId>
@@ -110,7 +109,6 @@
                 <version>${bier.version}</version>
                 <type>xml</type>
             </dependency>
-            -->
             <!-- Cardinal -->
             <!-- Temporary remove because of karaf 4
             <dependency>

diff --git a/features3-index/pom.xml b/features3-index/pom.xml
index a49ed42fa6e02677c919db144c133e5731910c4d..882404f3cd0a4033853d4726b6759e47e3234f47 100644 (file)
--- a/features3-index/pom.xml
+++ b/features3-index/pom.xml
@@ -110,14 +110,12 @@
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        <!-- Temporarily remove because of sporadic Karaf 4 SFT failures
         <dependency>
             <groupId>org.opendaylight.bier</groupId>
             <artifactId>features-bier</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
-        -->
         <!-- Temporary remove because of karaf 4
         <dependency>
             <groupId>org.opendaylight.cardinal</groupId>

diff --git a/features3-index/src/main/features/features.xml b/features3-index/src/main/features/features.xml
index b010cf44af9872b66b68a3fff3602cb61bedf3fa..aecb08a24b08502fea016e1f0793331a6ea93bb5 100644 (file)
--- a/features3-index/src/main/features/features.xml
+++ b/features3-index/src/main/features/features.xml
@@ -38,9 +38,7 @@
     <repository>mvn:org.opendaylight.bgpcep/features-extras/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.bgpcep/features-pcep/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.bgpcep/features-rsvp/{{VERSION}}/xml/features</repository>
-    <!-- Temporarily remove because of sporadic Karaf 4 SFT failures
     <repository>mvn:org.opendaylight.bier/features-bier/{{VERSION}}/xml/features</repository>
-    -->
     <!-- Temporay remove because of karaf 4
     <repository>mvn:org.opendaylight.cardinal/cardinal-features/{{VERSION}}/xml/features</repository>
     -->

diff --git a/features3-test/src/main/features/features.xml b/features3-test/src/main/features/features.xml
index 6fe0e5c3f5f7c0efb776ea714f20a54a5a5fbdc3..8acae834e3d07870018391343200f7737f7597a6 100644 (file)
--- a/features3-test/src/main/features/features.xml
+++ b/features3-test/src/main/features/features.xml
@@ -124,9 +124,7 @@
     <feature name='odl-integration-all' version='${project.version}'>
         <!-- Please use alphabetical order for non-compatible features -->
         <feature>odl-alto-release</feature>
-        <!-- Temporarily remove because of sporadic Karaf 4 SFT failures
         <feature>odl-bier-all</feature>
-        -->
         <feature>odl-faas-base</feature>
         <feature>odl-genius-rest</feature>
         <feature>odl-groupbasedpolicy-faas</feature>