From: Michael Vorburger <vorburger@redhat.com>
Date: Thu, 13 Jul 2017 10:41:50 +0000 (+0530)
Subject: Add Daexim
X-Git-Tag: release/nitrogen~36
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Fdistribution.git;a=commitdiff_plain;h=ff78be16ad1fe73cc829e1f6a99ec29fe46de835

Add Daexim

https://wiki.opendaylight.org/view/Karaf_4_migration#Step_8:_add_your_karaf_4_features_to_distribution

I've done the following validation locally to test that it seems OK:

karaf/target/assembly/bin/karaf

opendaylight-user@root>diag
opendaylight-user@root>feature:install odl-daexim-all
opendaylight-user@root>diag
opendaylight-user@root>bundle:list | grep daexim
216 | Active | 80 | 1.2.0.SNAPSHOT | daexim-akka-infoprovider-impl
217 | Active | 80 | 1.2.0.SNAPSHOT | daexim-impl
218 | Active | 80 | 1.2.0.SNAPSHOT | daexim-model
219 | Active | 80 | 1.2.0.SNAPSHOT | daexim-spi
315 | Active | 80 | 0 | ... wrap_file__daexim-impl-1.2.0-SNAPSHOT.cfg

Change-Id: Ibbedf7605a6c7c1e40d979fbaed56d673129ec03
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
---

diff --git a/artifacts/upstream/artifacts/pom.xml b/artifacts/upstream/artifacts/pom.xml
index 66aee08d..43801e3d 100644
--- a/artifacts/upstream/artifacts/pom.xml
+++ b/artifacts/upstream/artifacts/pom.xml
@@ -62,6 +62,13 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>org.opendaylight.daexim</groupId>
+                <artifactId>daexim-artifacts</artifactId>
+                <version>${daexim.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <dependency>
                 <groupId>org.opendaylight.genius</groupId>
                 <artifactId>genius-artifacts</artifactId>
diff --git a/artifacts/upstream/properties/pom.xml b/artifacts/upstream/properties/pom.xml
index 5957b6fd..8cda2562 100644
--- a/artifacts/upstream/properties/pom.xml
+++ b/artifacts/upstream/properties/pom.xml
@@ -54,6 +54,7 @@
         <coe.version>0.2.0-SNAPSHOT</coe.version>
         <config.version>0.7.0-SNAPSHOT</config.version>
         <controller.extras.version>1.9.0-SNAPSHOT</controller.extras.version>
+        <daexim.version>1.2.0-SNAPSHOT</daexim.version>
         <didm.version>0.5.0-SNAPSHOT</didm.version>
         <dlux.version>0.6.0-SNAPSHOT</dlux.version>
         <dluxapps.version>0.6.0-SNAPSHOT</dluxapps.version>
diff --git a/features/repos/index/pom.xml b/features/repos/index/pom.xml
index 4f78317b..41e6f9af 100644
--- a/features/repos/index/pom.xml
+++ b/features/repos/index/pom.xml
@@ -129,6 +129,14 @@
             <type>xml</type>
         </dependency>
 
+        <!-- Daexim -->
+        <dependency>
+            <groupId>org.opendaylight.daexim</groupId>
+            <artifactId>daexim-features</artifactId>
+            <classifier>features</classifier>
+            <type>xml</type>
+        </dependency>
+
         <!-- Distribution -->
         <dependency>
             <groupId>${project.groupId}</groupId>
diff --git a/features/singles/odl-integration-compatible-with-all/pom.xml b/features/singles/odl-integration-compatible-with-all/pom.xml
index 9db9d406..a267a48d 100644
--- a/features/singles/odl-integration-compatible-with-all/pom.xml
+++ b/features/singles/odl-integration-compatible-with-all/pom.xml
@@ -62,6 +62,14 @@
             <classifier>features</classifier>
         </dependency>
 
+        <!-- Daexim -->
+        <dependency>
+	    <groupId>org.opendaylight.daexim</groupId>
+            <artifactId>odl-daexim-all</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+
         <!-- Distribution -->
         <dependency>
             <groupId>${project.groupId}</groupId>