From: Manoj <manoj.krishnan@wipro.com>
Date: Fri, 29 Jul 2016 06:31:42 +0000 (+0530)
Subject: Adding Atrium to integration-distribution
X-Git-Tag: release/boron~19
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F90%2F42790%2F3;p=integration%2Fdistribution.git

Adding Atrium to integration-distribution

Change-Id: Iea5f2fba7e0c3dacb6f5c10ef2d5eeb762f0f40d
Signed-off-by: Manoj <manoj.krishnan@wipro.com>
---

diff --git a/features-index/pom.xml b/features-index/pom.xml
index 008995ce..ff8111ff 100644
--- a/features-index/pom.xml
+++ b/features-index/pom.xml
@@ -85,6 +85,13 @@
             <type>xml</type>
         </dependency>
         -->
+        <dependency>
+            <groupId>org.opendaylight.atrium</groupId>
+            <artifactId>atrium-features</artifactId>
+            <version>${feature.atrium.version}</version>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.bgpcep</groupId>
             <artifactId>features-bgp</artifactId>
diff --git a/features-index/src/main/resources/features.xml b/features-index/src/main/resources/features.xml
index cb889b8b..18073dda 100644
--- a/features-index/src/main/resources/features.xml
+++ b/features-index/src/main/resources/features.xml
@@ -38,6 +38,7 @@
     https://lists.opendaylight.org/pipermail/armoury-dev/2016-January/000081.html.
     Need to be uncommented once in Boron -->
     <!-- <repository>mvn:org.opendaylight.armoury/armoury-features/${feature.armoury.version}/xml/features</repository> -->
+    <repository>mvn:org.opendaylight.atrium/atrium-features/${feature.atrium.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.bgpcep/features-bgp/${feature.bgpcep.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.bgpcep/features-bmp/${feature.bgpcep.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.bgpcep/features-extras/${feature.bgpcep.version}/xml/features</repository>
diff --git a/features-test/src/main/resources/features.xml b/features-test/src/main/resources/features.xml
index 050cd60d..152ffa46 100644
--- a/features-test/src/main/resources/features.xml
+++ b/features-test/src/main/resources/features.xml
@@ -67,6 +67,7 @@
             Needs to be uncommented once in Boron
         <feature version='${feature.armoury.version}'>odl-armoury-workloadmanager</feature>
         -->
+        <feature version='${feature.atrium.version}'>odl-atrium-all</feature>
         <feature version='${feature.bgpcep.version}'>odl-bgpcep-bgp-all</feature>
         <feature version='${feature.bgpcep.version}'>odl-bgpcep-bmp</feature>
         <feature version='${feature.bgpcep.version}'>odl-bgpcep-pcep-all</feature>
diff --git a/pom.xml b/pom.xml
index dcf5a2d5..e607f696 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,6 +33,7 @@
         <didm.version>0.3.0-SNAPSHOT</didm.version>
         <feature.aaa.version>0.4.0-SNAPSHOT</feature.aaa.version>
         <feature.alto.version>0.3.0-SNAPSHOT</feature.alto.version>
+        <feature.atrium.version>0.0.1-SNAPSHOT</feature.atrium.version>
         <feature.benchmark.version>1.2.0-SNAPSHOT</feature.benchmark.version>
         <feature.bgpcep.version>0.6.0-SNAPSHOT</feature.bgpcep.version>
         <feature.capwap.version>0.3.0-SNAPSHOT</feature.capwap.version>