From e2cc31b0f626783bbbec35340363fe38b5572233 Mon Sep 17 00:00:00 2001
From: Luis Gomez <ecelgp@gmail.com>
Date: Sun, 7 Jan 2018 12:52:49 -0800
Subject: [PATCH] Remove bier project from distribution

Failed project merge job is making distribution check to fail.

Change-Id: Id55504b283ccdab8716d6484e6a47be5d0f71da4
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
---
 artifacts/upstream/feature-repos/pom.xml     | 2 ++
 artifacts/upstream/single-features/pom.xml   | 2 ++
 features/repos/index/pom.xml                 | 2 ++
 features/singles/odl-integration-all/pom.xml | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/artifacts/upstream/feature-repos/pom.xml b/artifacts/upstream/feature-repos/pom.xml
index 1be16e79..e930d08f 100644
--- a/artifacts/upstream/feature-repos/pom.xml
+++ b/artifacts/upstream/feature-repos/pom.xml
@@ -63,6 +63,7 @@
 
 
             <!-- BIER -->
+            <!-- Comment due to fail merge job
             <dependency>
                 <groupId>org.opendaylight.bier</groupId>
                 <artifactId>features-bier</artifactId>
@@ -70,6 +71,7 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
 
             <!-- Controller -->
             <dependency>
diff --git a/artifacts/upstream/single-features/pom.xml b/artifacts/upstream/single-features/pom.xml
index bf26c1ff..99a2bd1e 100644
--- a/artifacts/upstream/single-features/pom.xml
+++ b/artifacts/upstream/single-features/pom.xml
@@ -96,6 +96,7 @@
             </dependency>
 
             <!-- BIER -->
+            <!-- Comment due to fail merge job
             <dependency>
                 <groupId>org.opendaylight.bier</groupId>
                 <artifactId>odl-bier-all</artifactId>
@@ -103,6 +104,7 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
+            -->
 
             <!-- CONTROLLER -->
             <dependency>
diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index 88366142..8f8f7298 100644
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -104,12 +104,14 @@
         </dependency>
 
         <!-- BIER -->
+        <!-- Comment due to fail merge job
         <dependency>
             <groupId>org.opendaylight.bier</groupId>
             <artifactId>features-bier</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>
+        -->
 
         <!-- COE -->
         <dependency>
diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml
index 016b45e2..99123b70 100644
--- a/features/singles/odl-integration-all/pom.xml
+++ b/features/singles/odl-integration-all/pom.xml
@@ -61,12 +61,14 @@
         <!-- External single feature dependencies in alphabetical order -->
 
         <!-- BIER -->
+        <!-- Comment due to fail merge job
         <dependency>
             <groupId>org.opendaylight.bier</groupId>
             <artifactId>odl-bier-all</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
+        -->
 
         <!-- COE -->
         <dependency>
-- 
2.36.6