From b1e19ba038d2b055306579128761cf698eac85e7 Mon Sep 17 00:00:00 2001
From: sinthuja <sinthuja@wso2.com>
Date: Thu, 16 Mar 2017 23:49:30 +0530
Subject: [PATCH] Fixing the siddhi extension loading issue.

---
 modules/p2-profile/iot-core-profile/pom.xml | 31 ---------------------
 pom.xml                                     |  6 ++--
 2 files changed, 3 insertions(+), 34 deletions(-)

diff --git a/modules/p2-profile/iot-core-profile/pom.xml b/modules/p2-profile/iot-core-profile/pom.xml
index dff4f564..01cee82c 100644
--- a/modules/p2-profile/iot-core-profile/pom.xml
+++ b/modules/p2-profile/iot-core-profile/pom.xml
@@ -160,9 +160,6 @@
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
-                                <featureArtifactDef>
-                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature:${carbon.device.mgt.version}
-                                </featureArtifactDef>
                                 <featureArtifactDef>
                                     org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature:${carbon.device.mgt.version}
                                 </featureArtifactDef>
@@ -976,10 +973,6 @@
                                     <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
-                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
@@ -1934,10 +1927,6 @@
                                     <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
-                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
@@ -2433,10 +2422,6 @@
                                     <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
-                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
@@ -2646,10 +2631,6 @@
                                     <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
-                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
@@ -3095,10 +3076,6 @@
                                     <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
-                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
@@ -3324,10 +3301,6 @@
                                     <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
-                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
@@ -3754,10 +3727,6 @@
                                     <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
                                 </feature>
-                                <feature>
-                                    <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature.group</id>
-                                    <version>${carbon.device.mgt.version}</version>
-                                </feature>
                                 <feature>
                                     <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature.group</id>
                                     <version>${carbon.device.mgt.version}</version>
diff --git a/pom.xml b/pom.xml
index e6989b48..774912da 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1537,7 +1537,7 @@
 
         <!-- Carbon Device Management -->
 
-        <carbon.device.mgt.version>2.0.23-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.version>2.0.31-SNAPSHOT</carbon.device.mgt.version>
         <carbon.device.mgt.version.range>[2.0.0, 3.0.0)</carbon.device.mgt.version.range>
 
         <!-- IOT Device Management -->
@@ -1545,7 +1545,7 @@
 
         <!-- Carbon Device Management Plugins-->
 
-        <carbon.device.mgt.plugin.version>3.0.13-SNAPSHOT</carbon.device.mgt.plugin.version>
+        <carbon.device.mgt.plugin.version>3.0.15-SNAPSHOT</carbon.device.mgt.plugin.version>
 
         <!-- API Management -->
         <carbon.api.mgt.version>6.1.73-SNAPSHOT</carbon.api.mgt.version>
@@ -1555,7 +1555,7 @@
         <carbon.mediation.version>4.6.10</carbon.mediation.version>
 
         <!-- Carbon Analytics Common (DAS) -->
-        <carbon.analytics.common.version>5.1.5</carbon.analytics.common.version>
+        <carbon.analytics.common.version>5.1.14</carbon.analytics.common.version>
         <carbon.analytics.version>1.3.3</carbon.analytics.version>
         <carbon.analytics.das.version>1.3.5</carbon.analytics.das.version>
         <product.iot.analytics.version>${product.iot.version}</product.iot.analytics.version>