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 66aee08dccbeaf28bd7a81ac057679e457e16f14..43801e3d0faafd6862a748ba1adf51318d9c09b1 100644 (file)
--- 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 5957b6fd53287fe9350b11315378408eb4736a3a..8cda25628b7256e9e66b3a23d0973edd4d2c3a11 100644 (file)
--- 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 4f78317b59f6611bbd69d52cc36d41de0d56e9f1..41e6f9afaed6ae794ef4d90a2e5dac526b326c5e 100644 (file)
--- 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 9db9d4061a4d8376ab7f1628e2c4aa6a5e112502..a267a48d3f6f65e4be60628bfab0f29777f4cc7e 100644 (file)
--- 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>