From a798d05abc6e946f2c73777b266ce094922b15cd Mon Sep 17 00:00:00 2001
From: Vratko Polak <vrpolak@cisco.com>
Date: Fri, 7 Aug 2015 20:43:18 +0200
Subject: [PATCH] Add IOTDM compatible feature back to Integration

Change-Id: I68374252b47716f5bcad08daa897eeef367ff8a3
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
---
 features/index/pom.xml                         | 2 --
 features/index/src/main/resources/features.xml | 2 --
 features/test/src/main/resources/features.xml  | 2 --
 3 files changed, 6 deletions(-)

diff --git a/features/index/pom.xml b/features/index/pom.xml
index b5563de7..53b16dbb 100644
--- 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 252b5df9..272050e9 100644
--- 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 5a24504c..10a15cef 100644
--- 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>
-- 
2.36.6