From: Quan Xiong <xiong.quan@zte.com.cn>
Date: Tue, 27 Dec 2016 08:11:16 +0000 (+0800)
Subject: Add bier project to distribution.
X-Git-Tag: release/carbon~47
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Fdistribution.git;a=commitdiff_plain;h=2e21f444acc7c463a811a6faab795c2882314f36

Add bier project to distribution.

Change-Id: I44b51f37f2090c7a0ead25efd071fe6da017f66e
Signed-off-by: Quan Xiong <xiong.quan@zte.com.cn>
---

diff --git a/features-index/pom.xml b/features-index/pom.xml
index 0e729bec..eef5f411 100644
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -109,6 +109,13 @@
             <version>${feature.bgpcep.version}</version>
             <type>xml</type>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.bier</groupId>
+            <artifactId>features-bier</artifactId>
+            <classifier>features</classifier>
+            <version>${feature.bier.version}</version>
+            <type>xml</type>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.capwap</groupId>
             <artifactId>capwap-features</artifactId>
diff --git a/features-index/src/main/resources/features.xml b/features-index/src/main/resources/features.xml
index 637ad8c4..08352a9a 100644
--- a/features-index/src/main/resources/features.xml
+++ b/features-index/src/main/resources/features.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- vi: set et smarttab sw=4 tabstop=4: -->
 <!--
  Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
@@ -39,6 +39,7 @@
     <repository>mvn:org.opendaylight.bgpcep/features-extras/${feature.bgpcep.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.bgpcep/features-pcep/${feature.bgpcep.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.bgpcep/features-rsvp/${feature.bgpcep.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.bier/features-bier/${feature.bier.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.capwap/capwap-features/${feature.capwap.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.cardinal/cardinal-features/${feature.cardinal.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.centinel/centinel-features/${feature.centinel.version}/xml/features</repository>
diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index a52a05d2..a8d9b758 100644
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- vi: set et smarttab sw=4 tabstop=4: -->
 <!--
  Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
@@ -131,6 +131,7 @@
     <feature name='odl-integration-all' version='${project.version}'>
         <feature version='${feature.alto.version}'>odl-alto-release</feature>
         <feature version='${feature.atrium.version}'>odl-atrium-all</feature>
+        <feature version='${feature.bier.version}'>odl-bier-all</feature>
         <feature version='${feature.faas.version}'>odl-faas-base</feature>
         <feature version='${feature.genius.version}'>odl-genius-rest</feature>
         <feature version='${feature.groupbasedpolicy.version}'>odl-groupbasedpolicy-faas</feature>
diff --git a/pom.xml b/pom.xml
index 36edf205..425fe699 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,6 +36,7 @@
         <feature.atrium.version>0.1.0-SNAPSHOT</feature.atrium.version>
         <feature.benchmark.version>1.3.0-SNAPSHOT</feature.benchmark.version>
         <feature.bgpcep.version>0.7.0-SNAPSHOT</feature.bgpcep.version>
+        <feature.bier.version>0.1.0-SNAPSHOT</feature.bier.version>
         <feature.capwap.version>0.4.0-SNAPSHOT</feature.capwap.version>
         <feature.cardinal.version>0.2.0-SNAPSHOT</feature.cardinal.version>
         <feature.centinel.version>0.3.0-SNAPSHOT</feature.centinel.version>