Merge "Added iotdm feature to integration"

diff --git a/features/index/pom.xml b/features/index/pom.xml
index 28a7be17db2c8f6047510caeaef9c7304a0772a6..555120aa1e607c05cba8c572b188324135e69016 100644 (file)
--- a/features/index/pom.xml
+++ b/features/index/pom.xml
@@ -128,6 +128,13 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.iotdm</groupId>
+      <artifactId>onem2m-features</artifactId>
+      <version>${feature.iotdm.version}</version>
+      <classifier>features</classifier>
+      <type>xml</type>
+    </dependency>
     <dependency>
       <groupId>org.opendaylight.l2switch</groupId>
       <artifactId>features-l2switch</artifactId>

diff --git a/features/index/src/main/resources/features.xml b/features/index/src/main/resources/features.xml
index 792e3dc8f5105340543503d2212704b17d9dfe40..e7c9905ea5ac73e87aa62a4c34cee3852b6f9401 100644 (file)
--- a/features/index/src/main/resources/features.xml
+++ b/features/index/src/main/resources/features.xml
@@ -45,6 +45,7 @@
     <repository>mvn:org.opendaylight.didm/didm-features/${didm.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.dlux/features-dlux/${feature.dlux.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.groupbasedpolicy/features-groupbasedpolicy/${feature.groupbasedpolicy.version}/xml/features</repository>
+    <repository>mvn:org.opendaylight.iotdm/onem2m-features/${feature.iotdm.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.l2switch/features-l2switch/0.2.0-SNAPSHOT/xml/features</repository>
     <repository>mvn:org.opendaylight.lacp/features-lacp/${feature.lacp.version}/xml/features</repository>
     <repository>mvn:org.opendaylight.lispflowmapping/features-lispflowmapping/${feature.lispflowmapping.version}/xml/features</repository>

diff --git a/features/test/src/main/resources/features.xml b/features/test/src/main/resources/features.xml
index c69b57a5eac11cfa24ec824a85b268053a056d8e..204c69667ebd86de65fe0832d2ce6101debea332 100644 (file)
--- a/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@ -70,6 +70,7 @@
         <feature version='${didm.version}'>odl-didm-identification</feature>
         <feature version='${didm.version}'>odl-didm-drivers-api</feature>
         <feature version='${feature.dlux.version}'>odl-dlux-core</feature>
+        <feature version='${feature.iotdm.version}'>odl-iotdm-onem2m</feature>
         <feature version='${feature.lacp.version}'>odl-lacp-ui</feature>
         <feature version='${feature.lispflowmapping.version}'>odl-lispflowmapping-all</feature>
         <feature version='1.2.0-SNAPSHOT'>odl-mdsal-broker</feature>

diff --git a/pom.xml b/pom.xml
index cf073ffa2c43eb148ecf15952c09e969f54e2b11..500a3892c9b7bfa557b04a882f2a7f8f052611c8 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -51,6 +51,7 @@
     <enforcer.version>1.3.1</enforcer.version>
     <snmp.plugin.version>1.0-SNAPSHOT</snmp.plugin.version>
     <didm.version>0.1.0-SNAPSHOT</didm.version>
+    <feature.iotdm.version>0.0.1-SNAPSHOT</feature.iotdm.version>
     <feature.vpnservice.version>1.0-SNAPSHOT</feature.vpnservice.version>
     <feature.lacp.version>1.0.0-SNAPSHOT</feature.lacp.version>
   </properties>