From 253b5faac56d585d40470ebfe1c2d01da4b8f32e Mon Sep 17 00:00:00 2001
From: warunalakshitha <warudanu@gmail.com>
Date: Wed, 9 Aug 2017 12:08:47 +0530
Subject: [PATCH 1/4] add remote session control feature to product

---
 modules/p2-profile/iot-core-profile/pom.xml | 27 +++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml
index 54f1315b..b8492fee 100644
--- a/modules/p2-profile/iot-core-profile/pom.xml
+++ b/modules/p2-profile/iot-core-profile/pom.xml
@@ -755,6 +755,11 @@
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.iot.geo.dashboard.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
                                 <!-- End of Geo Dashboard feature -->
+                                <!-- Realtime Operations Feature -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.remote.session.feature:${carbon.device.mgt.plugin.version}
+                                </featureArtifactDef>
+                                <!-- End of Realtime Operations Feature -->
                             </featureArtifacts>
                         </configuration>
                     </execution>
@@ -1632,6 +1637,12 @@
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
                                 <!-- End of Geo Dashboard Feature -->
+                                <!-- Realtime Operations Feature -->
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.remote.session.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <!-- End of Realtime Operations Feature -->
                             </features>
                         </configuration>
                     </execution>
@@ -2517,6 +2528,12 @@
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
                                 <!-- End of Geo Dashboard Feature -->
+                                <!-- Realtime Operations Feature -->
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.remote.session.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <!-- End of Realtime Operations Feature -->
                             </features>
                         </configuration>
                     </execution>
@@ -2684,6 +2701,10 @@
 									<id>org.wso2.carbon.device.mgt.notification.listener.feature.group</id>
 									<version>${carbon.device.mgt.plugin.version}</version>
 								</feature>
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.notification.listener.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.analytics.dashboard.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
@@ -3147,6 +3168,12 @@
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
                                 <!-- End of Geo Dashboard Feature -->
+                                <!-- Realtime Operations Feature -->
+                                <feature>
+                                    <id>org.wso2.carbon.device.mgt.remote.session.feature.group</id>
+                                    <version>${carbon.device.mgt.plugin.version}</version>
+                                </feature>
+                                <!-- End of Realtime Operations Feature -->
                             </features>
                         </configuration>
                     </execution>

From 9ad4472a49bd1f80b15b74f292cd5533dc96489e Mon Sep 17 00:00:00 2001
From: warunalakshitha <warudanu@gmail.com>
Date: Sun, 1 Oct 2017 11:04:36 +0530
Subject: [PATCH 2/4] add pom.xml changes

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1c970e40..56624a8e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1517,14 +1517,14 @@
         <carbon.governance.version>4.7.8</carbon.governance.version>
 
         <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>3.0.81</carbon.device.mgt.version>
+        <carbon.device.mgt.version>3.0.93-SNAPSHOT</carbon.device.mgt.version>
         <carbon.device.mgt.version.range>[3.0.0, 4.0.0)</carbon.device.mgt.version.range>
 
         <!-- IOT Device Management -->
         <product.iot.version>${project.version}</product.iot.version>
 
         <!-- Carbon Device Management Plugins-->
-	    <carbon.device.mgt.plugin.version>4.0.62</carbon.device.mgt.plugin.version>
+	    <carbon.device.mgt.plugin.version>4.0.66-SNAPSHOT</carbon.device.mgt.plugin.version>
 
         <!-- API Management -->
         <carbon.api.mgt.version>6.1.95</carbon.api.mgt.version>

From 68c66f20c96a502cbab7982e2fab30de01a1f07c Mon Sep 17 00:00:00 2001
From: warunalakshitha <warudanu@gmail.com>
Date: Tue, 3 Oct 2017 12:26:50 +0530
Subject: [PATCH 3/4] upgrade version

---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1ddf28a3..1df3fa76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1518,7 +1518,7 @@
 
         <!-- Carbon Device Management -->
 
-        <carbon.device.mgt.version>3.0.112</carbon.device.mgt.version>
+        <carbon.device.mgt.version>3.0.129-SNAPSHOT</carbon.device.mgt.version>
 
         <carbon.device.mgt.version.range>[3.0.0, 4.0.0)</carbon.device.mgt.version.range>
 
@@ -1526,7 +1526,7 @@
         <product.iot.version>${project.version}</product.iot.version>
 
         <!-- Carbon Device Management Plugins-->
-	<carbon.device.mgt.plugin.version>4.0.82</carbon.device.mgt.plugin.version>
+	<carbon.device.mgt.plugin.version>4.0.87-SNAPSHOT</carbon.device.mgt.plugin.version>
 
 
         <!-- API Management -->

From fac10f81e5a5f951e5eed52c006c0e00583f1ff8 Mon Sep 17 00:00:00 2001
From: warunalakshitha <warudanu@gmail.com>
Date: Sun, 15 Oct 2017 15:28:24 +0530
Subject: [PATCH 4/4] fix conflicts

---
 modules/p2-profile/iot-core-profile/pom.xml | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml
index 19049281..251faaf4 100644
--- a/modules/p2-profile/iot-core-profile/pom.xml
+++ b/modules/p2-profile/iot-core-profile/pom.xml
@@ -755,19 +755,17 @@
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.iot.geo.dashboard.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
                                 <!-- End of Geo Dashboard feature -->
-<<<<<<< HEAD
+
                                 <!-- Realtime Operations Feature -->
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.device.mgt.remote.session.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
                                 <!-- End of Realtime Operations Feature -->
-=======
 
                                 <!--MQTT Dashboard-->
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt-plugins:org.wso2.carbon.andes.extensions.device.mgt.api.feature:${carbon.device.mgt.plugin.version}
                                 </featureArtifactDef>
->>>>>>> 88f24ec119dafa2172de4b32632aa5efb7973081
                             </featureArtifacts>
                         </configuration>
                     </execution>
@@ -2541,20 +2539,18 @@
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
                                 <!-- End of Geo Dashboard Feature -->
-<<<<<<< HEAD
                                 <!-- Realtime Operations Feature -->
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.remote.session.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
                                 <!-- End of Realtime Operations Feature -->
-=======
+
                             <!--MQTT Dashboard Feature-->
                             <feature>
                                 <id>org.wso2.carbon.andes.extensions.device.mgt.api.feature.group</id>
                                 <version>${carbon.device.mgt.plugin.version}</version>
                             </feature>
->>>>>>> 88f24ec119dafa2172de4b32632aa5efb7973081
                             </features>
                         </configuration>
                     </execution>
@@ -3189,20 +3185,17 @@
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
                                 <!-- End of Geo Dashboard Feature -->
-<<<<<<< HEAD
                                 <!-- Realtime Operations Feature -->
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.remote.session.feature.group</id>
                                     <version>${carbon.device.mgt.plugin.version}</version>
                                 </feature>
                                 <!-- End of Realtime Operations Feature -->
-=======
                             <!--MQTT Dashboard Feature-->
                             <feature>
                                 <id>org.wso2.carbon.andes.extensions.device.mgt.api.feature.group</id>
                                 <version>${carbon.device.mgt.plugin.version}</version>
                             </feature>
->>>>>>> 88f24ec119dafa2172de4b32632aa5efb7973081
                             </features>
                         </configuration>
                     </execution>