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>

diff --git a/artifacts/upstream/feature-repos/pom.xml b/artifacts/upstream/feature-repos/pom.xml
index 1be16e79e6960ebd6fc0df8430484ba54ab2b1e1..e930d08fcd1fe55889b9cbe04ae32b44091f2386 100644 (file)
--- a/artifacts/upstream/feature-repos/pom.xml
+++ b/artifacts/upstream/feature-repos/pom.xml
@@ -63,6 +63,7 @@
 
 
             <!-- BIER -->
 
 
             <!-- BIER -->

+            <!-- Comment due to fail merge job

             <dependency>
                 <groupId>org.opendaylight.bier</groupId>
                 <artifactId>features-bier</artifactId>
             <dependency>
                 <groupId>org.opendaylight.bier</groupId>
                 <artifactId>features-bier</artifactId>


@@ -70,6 +71,7 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>

+            -->

 
             <!-- Controller -->
             <dependency>
 
             <!-- Controller -->
             <dependency>

diff --git a/artifacts/upstream/single-features/pom.xml b/artifacts/upstream/single-features/pom.xml
index bf26c1ff64bbd0adf72549dd032164b4ccf075da..99a2bd1ea10ae725df6ced848cb22dd40be8fc97 100644 (file)
--- a/artifacts/upstream/single-features/pom.xml
+++ b/artifacts/upstream/single-features/pom.xml
@@ -96,6 +96,7 @@
             </dependency>
 
             <!-- BIER -->
             </dependency>
 
             <!-- BIER -->

+            <!-- Comment due to fail merge job

             <dependency>
                 <groupId>org.opendaylight.bier</groupId>
                 <artifactId>odl-bier-all</artifactId>
             <dependency>
                 <groupId>org.opendaylight.bier</groupId>
                 <artifactId>odl-bier-all</artifactId>


@@ -103,6 +104,7 @@
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>
                 <classifier>features</classifier>
                 <type>xml</type>
             </dependency>

+            -->

 
             <!-- CONTROLLER -->
             <dependency>
 
             <!-- CONTROLLER -->
             <dependency>

diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index 883661424a6cbe1c3b524aba765232685d78506c..8f8f7298bde8bd43cf4fbb055ebe749fb959cc4f 100644 (file)
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -104,12 +104,14 @@
         </dependency>
 
         <!-- BIER -->
         </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>
         <dependency>
             <groupId>org.opendaylight.bier</groupId>
             <artifactId>features-bier</artifactId>
             <classifier>features</classifier>
             <type>xml</type>
         </dependency>

+        -->

 
         <!-- COE -->
         <dependency>
 
         <!-- COE -->
         <dependency>

diff --git a/features/singles/odl-integration-all/pom.xml b/features/singles/odl-integration-all/pom.xml
index 016b45e269bfe9d13f75689992621e197f159f93..99123b70b3b1f4f39f1dc46f72394405ce5c00ec 100644 (file)
--- 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 -->
         <!-- 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>
         <dependency>
             <groupId>org.opendaylight.bier</groupId>
             <artifactId>odl-bier-all</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>

+        -->

 
         <!-- COE -->
         <dependency>
 
         <!-- COE -->
         <dependency>