Add IOTDM compatible feature back to Integration

Change-Id: I68374252b47716f5bcad08daa897eeef367ff8a3
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/features/index/pom.xml b/features/index/pom.xml
index b5563de7c6f994bce0601f19df36f5cdc5c31e58..53b16dbbe99d83614cc08b84cea7f85d04e1ed95 100644 (file)
--- a/features/index/pom.xml
+++ b/features/index/pom.xml
@@ -151,7 +151,6 @@
       <classifier>features</classifier>
       <type>xml</type>
     </dependency>
-<!--
     <dependency>
       <groupId>org.opendaylight.iotdm</groupId>
       <artifactId>onem2m-features</artifactId>
@@ -159,7 +158,6 @@
       <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 252b5df9c32af73be27bb3c6e83b31e854986dfe..272050e9f2382eff1904d3632b0415704e610ea6 100644 (file)
--- a/features/index/src/main/resources/features.xml
+++ b/features/index/src/main/resources/features.xml
@@ -50,9 +50,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.3.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 5a24504c691a2e7ea39784dae5796d3de993b94c..10a15cef1260b1d12a59f4ce82ca67ca76409054 100644 (file)
--- a/features/test/src/main/resources/features.xml
+++ b/features/test/src/main/resources/features.xml
@@ -75,9 +75,7 @@
         <feature version='${didm.version}'>odl-didm-drivers-api</feature>
         <feature version='${feature.dlux.version}'>odl-dlux-core</feature>
         <feature version='${feature.coretutorials.version}'>odl-dsbenchmark-impl</feature>
-<!--
         <feature version='${feature.iotdm.version}'>odl-iotdm-onem2m</feature>
--->
         <feature version='${feature.lispflowmapping.version}'>odl-lispflowmapping-all</feature>
         <feature version='1.3.0-SNAPSHOT'>odl-mdsal-broker</feature>
         <feature version='${feature.mdsal.version}'>odl-netconf-connector-ssh</feature>