Merge branch 'master' of https://github.com/wso2/carbon-device-mgt

README.md

@@ -1,5 +1,7 @@
 # carbon-device-mgt
 
+<a href='https://wso2.org/jenkins/job/platform-builds/job/carbon-device-mgt/'><img src='https://wso2.org/jenkins/job/platform-builds/job/carbon-device-mgt/badge/icon'></a>
+
 WSO2 CONNECTED DEVICE MANAGEMENT COMPONENTS
 
 WSO2 Connected Device Manager (WSO2 CDM) is a comprehensive platform that helps solve mobile computing challenges enterprises face today when dealing with both corporate owned, personally enabled (COPE) devices and employee owned devices as part of a bring your own device (BYOD) program.

components/apimgt-extensions/org.wso2.carbon.apimgt.annotations/pom.xml

@@ -22,13 +22,13 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.apimgt.annotations</artifactId>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - API Management Annotations</name>
     <description>WSO2 Carbon - API Management Custom Annotation Module</description>

components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/pom.xml

@@ -21,12 +21,12 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <artifactId>org.wso2.carbon.apimgt.application.extension.api</artifactId>
     <packaging>war</packaging>
     <name>WSO2 Carbon - API Application Management API</name>

components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/pom.xml

@@ -22,12 +22,12 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <artifactId>org.wso2.carbon.apimgt.application.extension</artifactId>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - API Application Management</name>

components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/pom.xml

@@ -21,13 +21,13 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.apimgt.handlers</artifactId>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - API Security Handler Component</name>
     <description>WSO2 Carbon - API Management Security Handler Module</description>

components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/pom.xml

@@ -13,13 +13,13 @@
 	<parent>
 		<artifactId>apimgt-extensions</artifactId>
 		<groupId>org.wso2.carbon.devicemgt</groupId>
-		<version>2.0.23-SNAPSHOT</version>
+		<version>2.0.26-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>org.wso2.carbon.apimgt.integration.client</artifactId>
-	<version>2.0.23-SNAPSHOT</version>
+	<version>2.0.26-SNAPSHOT</version>
 	<packaging>bundle</packaging>
 	<name>WSO2 Carbon - API Management Integration Client</name>
 	<description>WSO2 Carbon - API Management Integration Client</description>

components/apimgt-extensions/org.wso2.carbon.apimgt.integration.generated.client/pom.xml

@@ -13,13 +13,13 @@
 	<parent>
 		<artifactId>apimgt-extensions</artifactId>
 		<groupId>org.wso2.carbon.devicemgt</groupId>
-		<version>2.0.23-SNAPSHOT</version>
+		<version>2.0.26-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>org.wso2.carbon.apimgt.integration.generated.client</artifactId>
-	<version>2.0.23-SNAPSHOT</version>
+	<version>2.0.26-SNAPSHOT</version>
 	<packaging>bundle</packaging>
 	<name>WSO2 Carbon - API Management Integration Generated Client</name>
 	<description>WSO2 Carbon - API Management Integration Client</description>

components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/pom.xml

@@ -22,13 +22,13 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.apimgt.webapp.publisher</artifactId>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - API Management Webapp Publisher</name>
     <description>WSO2 Carbon - API Management Webapp Publisher</description>

components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/APIPublisherUtil.java

@@ -218,7 +218,7 @@ public class APIPublisherUtil {
             JsonObject httpVerb = new JsonObject();
             httpVerb.add("responses", response);
 
-            httpVerb.addProperty("x-auth-type", "Application%20%26%20Application%20User");
+            httpVerb.addProperty("x-auth-type", uriTemplate.getAuthType());
             httpVerb.addProperty("x-throttling-tier", "Unlimited");
             if (uriTemplate.getScope() != null) {
                 httpVerb.addProperty("x-scope", uriTemplate.getScope().getKey());
@@ -289,5 +289,6 @@ public class APIPublisherUtil {
                 }
             }
         }
+        apiConfig.setUriTemplates(templates);
     }
 }

components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/util/AnnotationProcessor.java

@@ -53,7 +53,7 @@ public class AnnotationProcessor {
 
     private static final Log log = LogFactory.getLog(AnnotationProcessor.class);
 
-    private static final String AUTH_TYPE = "Any";
+    private static final String AUTH_TYPE = "Application & Application User";
     private static final String STRING_ARR = "string_arr";
     private static final String STRING = "string";
     private static final String PACKAGE_ORG_APACHE = "org.apache";

components/apimgt-extensions/pom.xml

@@ -22,13 +22,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>apimgt-extensions</artifactId>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - API Management Extensions Component</name>
     <url>http://wso2.org</url>

components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>certificate-mgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>certificate-mgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml

@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>certificate-mgt</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.certificate.mgt.core</artifactId>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Certificate Management Core</name>
     <description>WSO2 Carbon - Certificate Management Core</description>

components/certificate-mgt/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>certificate-mgt</artifactId>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Certificate Management Component</name>
     <url>http://wso2.org</url>

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/Claimable.java

@@ -0,0 +1,104 @@
+/*
+ *   Copyright (c) 2017, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ *   WSO2 Inc. licenses this file to you under the Apache License,
+ *   Version 2.0 (the "License"); you may not use this file except
+ *   in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing,
+ *   software distributed under the License is distributed on an
+ *   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *   KIND, either express or implied.  See the License for the
+ *   specific language governing permissions and limitations
+ *   under the License.
+ *
+ */
+package org.wso2.carbon.device.mgt.extensions.device.type.deployer.config;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlValue;
+
+
+/**
+ * <p>Java class for DeviceDetails complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="DeviceDetails">
+ *   &lt;simpleContent>
+ *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>string">
+ *       &lt;attribute name="table-id" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/extension>
+ *   &lt;/simpleContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "Claimable", propOrder = {
+    "value"
+})
+public class Claimable {
+
+    @XmlValue
+    protected String value;
+    @XmlAttribute(name = "enabled")
+    protected boolean enabled;
+
+    /**
+     * Gets the value of the value property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the value property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Gets the value of the enabled property.
+     *
+     * @return
+     *     possible object is
+     *     {@link String }
+     *
+     */
+    public boolean isEnabled() {
+        return enabled;
+    }
+
+    /**
+     * Sets the value of the enabled property.
+     * 
+     * @param enabled
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setEnabled(boolean enabled) {
+        this.enabled = enabled;
+    }
+
+}

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/config/DeviceTypeConfiguration.java

@@ -53,6 +53,8 @@ public class DeviceTypeConfiguration {
 
     @XmlElement(name = "DeviceDetails", required = true)
     protected DeviceDetails deviceDetails;
+    @XmlElement(name = "Claimable", required = true)
+    protected Claimable claimable;
     @XmlElement(name = "Features", required = true)
     protected Features features;
     @XmlElement(name = "ProvisioningConfig", required = true)
@@ -131,6 +133,27 @@ public class DeviceTypeConfiguration {
         this.deviceDetails = value;
     }
 
+    /**
+     * Gets the value of the Claimable property.
+     *
+     * @return possible object is
+     * {@link DeviceDetails }
+     */
+    public Claimable getClaimable() {
+        return claimable;
+    }
+
+    /**
+     * Sets the value of the deviceDetails property.
+     *
+     * @param value allowed object is
+     *              {@link DeviceDetails }
+     */
+    public void setClaimable(Claimable value) {
+        this.claimable = value;
+    }
+
+
     /**
      * Gets the value of the policyMonitoring property.
      *

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/main/java/org/wso2/carbon/device/mgt/extensions/device/type/deployer/template/DeviceTypeManager.java

@@ -65,6 +65,7 @@ public class DeviceTypeManager implements DeviceManager {
     private LicenseManager licenseManager;
     private boolean propertiesExist;
     private boolean requiredDeviceTypeAuthorization;
+    private boolean claimable;
 
     private FeatureManager featureManager;
 
@@ -101,8 +102,13 @@ public class DeviceTypeManager implements DeviceManager {
             String msg = "Error occurred while adding default license for " + deviceType + " devices";
             throw new DeviceTypeDeployerFileException(msg, e);
         }
+        claimable = false;
+        if (deviceTypeConfiguration.getClaimable() != null ) {
+            claimable = deviceTypeConfiguration.getClaimable().isEnabled();
+        }
 
         DeviceDetails deviceDetails = deviceTypeConfiguration.getDeviceDetails();
+
         if (deviceDetails != null) {
 
             //Check whether device dao definition exist.
@@ -341,7 +347,7 @@ public class DeviceTypeManager implements DeviceManager {
 
     @Override
     public boolean isClaimable(DeviceIdentifier deviceIdentifier) throws DeviceManagementException {
-        return false;
+        return claimable;
     }
 
     @Override

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/src/test/resources/sample.xml

@@ -36,6 +36,8 @@
         </Feature>
     </Features>
 
+	<Claimable enabled="true"/>
+
     <Sensors table-id="SAMPLE_DEVICE_2">
 		<Sensor code="CPU_Temperature">
 			<Name>temperature sensor fitted</Name>

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/pom.xml

@@ -22,15 +22,15 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm</artifactId>
+    <artifactId>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm</artifactId>
     <packaging>bundle</packaging>
-    <name>WSO2 Carbon - GCM Based Push Notification Provider Implementation</name>
+    <name>WSO2 Carbon - FCM Based Push Notification Provider Implementation</name>
-    <description>WSO2 Carbon - GCM Based Push Notification Provider Implementation</description>
+    <description>WSO2 Carbon - FCM Based Push Notification Provider Implementation</description>
     <url>http://wso2.org</url>
 
     <dependencies>
@@ -128,10 +128,10 @@
                         <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
                         <Bundle-Name>${project.artifactId}</Bundle-Name>
                         <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
-                        <Bundle-Description>GCM Based Push Notification Provider Bundle</Bundle-Description>
+                        <Bundle-Description>FCM Based Push Notification Provider Bundle</Bundle-Description>
                         <Export-Package>
-                            !org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.internal,
+                            !org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.internal,
-                            org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.*
+                            org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.*
                         </Export-Package>
                         <Import-Package>
                             com.google.gson,

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/fcm/FCMBasedPushNotificationProvider.java

@@ -16,24 +16,24 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm;
+package org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm;
 
 import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy;
 import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;
 import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationProvider;
 
-public class GCMBasedPushNotificationProvider implements PushNotificationProvider {
+public class FCMBasedPushNotificationProvider implements PushNotificationProvider {
 
-    private static final String PS_PROVIDER_GCM = "GCM";
+    private static final String PS_PROVIDER_FCM = "FCM";
 
     @Override
     public String getType() {
-        return PS_PROVIDER_GCM;
+        return PS_PROVIDER_FCM;
     }
 
     @Override
     public NotificationStrategy getNotificationStrategy(PushNotificationConfig config) {
-        return new GCMNotificationStrategy(config);
+        return new FCMNotificationStrategy(config);
     }
 
 }

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/fcm/FCMNotificationStrategy.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm;
+package org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm;
 
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
@@ -27,7 +27,7 @@ import org.wso2.carbon.device.mgt.common.push.notification.NotificationContext;
 import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy;
 import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;
 import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationExecutionFailedException;
-import org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.internal.GCMDataHolder;
+import org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.internal.FCMDataHolder;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -35,16 +35,16 @@ import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.List;
 
-public class GCMNotificationStrategy implements NotificationStrategy {
+public class FCMNotificationStrategy implements NotificationStrategy {
 
-    private static final String GCM_TOKEN = "GCM_TOKEN";
+    private static final String FCM_TOKEN = "FCM_TOKEN";
-    private static final String GCM_ENDPOINT = "https://fcm.googleapis.com/fcm/send";
+    private static final String FCM_ENDPOINT = "https://fcm.googleapis.com/fcm/send";
-    private static final String GCM_API_KEY = "gcmAPIKey";
+    private static final String FCM_API_KEY = "fcmAPIKey";
     private static final int TIME_TO_LIVE = 60;
     private static final int HTTP_STATUS_CODE_OK = 200;
     private PushNotificationConfig config;
 
-    public GCMNotificationStrategy(PushNotificationConfig config) {
+    public FCMNotificationStrategy(PushNotificationConfig config) {
         this.config = config;
     }
 
@@ -57,7 +57,7 @@ public class GCMNotificationStrategy implements NotificationStrategy {
     public void execute(NotificationContext ctx) throws PushNotificationExecutionFailedException {
         try {
             Device device =
-                    GCMDataHolder.getInstance().getDeviceManagementProviderService().getDevice(ctx.getDeviceId());
+                    FCMDataHolder.getInstance().getDeviceManagementProviderService().getDevice(ctx.getDeviceId());
             this.sendWakeUpCall(ctx.getOperation().getCode(), device);
         } catch (DeviceManagementException e) {
             throw new PushNotificationExecutionFailedException("Error occurred while retrieving device information", e);
@@ -79,13 +79,13 @@ public class GCMNotificationStrategy implements NotificationStrategy {
     private void sendWakeUpCall(String message,
                                 Device device) throws IOException, PushNotificationExecutionFailedException {
         OutputStream os = null;
-        byte[] bytes = getGCMRequest(message, getGCMToken(device.getProperties())).getBytes();
+        byte[] bytes = getFCMRequest(message, getFCMToken(device.getProperties())).getBytes();
 
         HttpURLConnection conn = null;
         try {
-            conn = (HttpURLConnection) new URL(GCM_ENDPOINT).openConnection();
+            conn = (HttpURLConnection) new URL(FCM_ENDPOINT).openConnection();
             conn.setRequestProperty("Content-Type", "application/json");
-            conn.setRequestProperty("Authorization", "key=" + config.getProperty(GCM_API_KEY));
+            conn.setRequestProperty("Authorization", "key=" + config.getProperty(FCM_API_KEY));
             conn.setRequestMethod("POST");
             conn.setDoOutput(true);
             os = conn.getOutputStream();
@@ -102,35 +102,35 @@ public class GCMNotificationStrategy implements NotificationStrategy {
         }
     }
 
-    private static String getGCMRequest(String message, String registrationId) {
+    private static String getFCMRequest(String message, String registrationId) {
-        JsonObject gcmRequest = new JsonObject();
+        JsonObject fcmRequest = new JsonObject();
-        gcmRequest.addProperty("delay_while_idle", false);
+        fcmRequest.addProperty("delay_while_idle", false);
-        gcmRequest.addProperty("time_to_live", TIME_TO_LIVE);
+        fcmRequest.addProperty("time_to_live", TIME_TO_LIVE);
 
-        //Add message to GCM request
+        //Add message to FCM request
         JsonObject data = new JsonObject();
         if (message != null && !message.isEmpty()) {
             data.addProperty("data", message);
-            gcmRequest.add("data", data);
+            fcmRequest.add("data", data);
         }
 
         //Set device reg-id
         JsonArray regIds = new JsonArray();
         regIds.add(new JsonPrimitive(registrationId));
 
-        gcmRequest.add("registration_ids", regIds);
+        fcmRequest.add("registration_ids", regIds);
-        return gcmRequest.toString();
+        return fcmRequest.toString();
     }
 
-    private static String getGCMToken(List<Device.Property> properties) {
+    private static String getFCMToken(List<Device.Property> properties) {
-        String gcmToken = null;
+        String fcmToken = null;
         for (Device.Property property : properties) {
-            if (GCM_TOKEN.equals(property.getName())) {
+            if (FCM_TOKEN.equals(property.getName())) {
-                gcmToken = property.getValue();
+                fcmToken = property.getValue();
                 break;
             }
         }
-        return gcmToken;
+        return fcmToken;
     }
 
 }

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/fcm/internal/FCMDataHolder.java

@@ -16,16 +16,16 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.internal;
+package org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.internal;
 
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 
-public class GCMDataHolder {
+public class FCMDataHolder {
 
     private DeviceManagementProviderService deviceManagementProviderService;
-    private static GCMDataHolder thisInstance = new GCMDataHolder();
+    private static FCMDataHolder thisInstance = new FCMDataHolder();
 
-    public static GCMDataHolder getInstance() {
+    public static FCMDataHolder getInstance() {
         return thisInstance;
     }
 

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/fcm/internal/FCMPushNotificationServiceComponent.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.internal;
+package org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.internal;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -24,7 +24,7 @@ import org.osgi.service.component.ComponentContext;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 
 /**
- * @scr.component name="org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.internal.GCMPushNotificationServiceComponent" immediate="true"
+ * @scr.component name="org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.internal.FCMPushNotificationServiceComponent" immediate="true"
  * @scr.reference name="carbon.device.mgt.provider"
  * interface="org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService"
  * cardinality="1..1"
@@ -32,23 +32,20 @@ import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
  * bind="setDeviceManagementProviderService"
  * unbind="unsetDeviceManagementProviderService"
  */
-public class GCMPushNotificationServiceComponent {
+public class FCMPushNotificationServiceComponent {
 
-    private static final Log log = LogFactory.getLog(GCMPushNotificationServiceComponent.class);
+    private static final Log log = LogFactory.getLog(FCMPushNotificationServiceComponent.class);
 
     @SuppressWarnings("unused")
     protected void activate(ComponentContext componentContext) {
         try {
-            if (log.isDebugEnabled()) {
-                log.debug("Initializing GCM based push notification provider implementation bundle");
-            }
             //Do nothing
             if (log.isDebugEnabled()) {
-                log.debug("GCM based push notification provider implementation bundle has been successfully " +
+                log.debug("FCM based push notification provider implementation bundle has been successfully " +
                         "initialized");
             }
         } catch (Throwable e) {
-            log.error("Error occurred while initializing GCM based push notification provider " +
+            log.error("Error occurred while initializing FCM based push notification provider " +
                     "implementation bundle", e);
         }
     }
@@ -59,12 +56,12 @@ public class GCMPushNotificationServiceComponent {
 
     protected void setDeviceManagementProviderService(
             DeviceManagementProviderService deviceManagementProviderService) {
-        GCMDataHolder.getInstance().setDeviceManagementProviderService(deviceManagementProviderService);
+        FCMDataHolder.getInstance().setDeviceManagementProviderService(deviceManagementProviderService);
     }
 
     protected void unsetDeviceManagementProviderService(
             DeviceManagementProviderService deviceManagementProviderService) {
-        GCMDataHolder.getInstance().setDeviceManagementProviderService(deviceManagementProviderService);
+        FCMDataHolder.getInstance().setDeviceManagementProviderService(deviceManagementProviderService);
     }
 
 }

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/xmpp/internal/XMPPPushNotificationServiceComponent.java

@@ -25,7 +25,7 @@ import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 import org.wso2.carbon.event.output.adapter.core.OutputEventAdapterService;
 
 /**
- * @scr.component name="org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.internal.XMPPPushNotificationServiceComponent" immediate="true"
+ * @scr.component name="org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.internal.XMPPPushNotificationServiceComponent" immediate="true"
  * @scr.reference name="carbon.device.mgt.provider"
  * interface="org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService"
  * cardinality="1..1"

components/device-mgt-extensions/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>carbon-devicemgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
     <url>http://wso2.org</url>
 
     <modules>
-        <module>org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm</module>
+        <module>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm</module>
         <module>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt</module>
         <module>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp</module>
         <module>org.wso2.carbon.device.mgt.extensions.device.type.deployer</module>

components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>device-mgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/AbstractDeviceDAOImpl.java

@@ -83,7 +83,7 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
         try {
             conn = this.getConnection();
             String sql = "UPDATE DM_DEVICE SET NAME = ?, DESCRIPTION = ?, LAST_UPDATED_TIMESTAMP = ? " +
-                    "WHERE DEVICE_TYPE_ID = (SELECT ID FROM DM_DEVICE_TYPE WHERE NAME = ? AND PROVIDER_TENANT_ID = ?) " +
+                    "WHERE DEVICE_TYPE_ID = (SELECT ID FROM DM_DEVICE_TYPE WHERE NAME = ? AND (PROVIDER_TENANT_ID = ? OR SHARED_WITH_ALL_TENANTS = ?)) " +
                     "AND DEVICE_IDENTIFICATION = ? AND TENANT_ID = ?";
             stmt = conn.prepareStatement(sql, new String[] {"id"});
             stmt.setString(1, device.getName());
@@ -91,8 +91,9 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
             stmt.setTimestamp(3, new Timestamp(new Date().getTime()));
             stmt.setString(4, device.getType());
             stmt.setInt(5, tenantId);
-            stmt.setString(6, device.getDeviceIdentifier());
+            stmt.setBoolean(6, true);
-            stmt.setInt(7, tenantId);
+            stmt.setString(7, device.getDeviceIdentifier());
+            stmt.setInt(8, tenantId);
             rows = stmt.executeUpdate();
             return (rows > 0);
         } catch (SQLException e) {

components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt/org.wso2.carbon.device.mgt.ui/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt/org.wso2.carbon.device.mgt.url.printer/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>device-mgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/email-sender/org.wso2.carbon.email.sender.core/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>email-sender</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/email-sender/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/identity-extensions/dynamic-client-registration/dynamic-client-web-proxy/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dynamic-client-registration</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/identity-extensions/dynamic-client-registration/dynamic-client-web/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dynamic-client-registration</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/identity-extensions/dynamic-client-registration/org.wso2.carbon.dynamic.client.registration/pom.xml

@@ -21,13 +21,13 @@
     <parent>
         <artifactId>dynamic-client-registration</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.dynamic.client.registration</artifactId>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Dynamic client registration service</name>
     <description>WSO2 Carbon - Dynamic Client Registration Service</description>

components/identity-extensions/dynamic-client-registration/org.wso2.carbon.dynamic.client.web.app.registration/pom.xml

@@ -21,13 +21,13 @@
     <parent>
         <artifactId>dynamic-client-registration</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.dynamic.client.web.app.registration</artifactId>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Dynamic client web app registration</name>
     <description>WSO2 Carbon - Dynamic Client Web-app Registration Service</description>

components/identity-extensions/dynamic-client-registration/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>identity-extensions</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>dynamic-client-registration</artifactId>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Dynamic client registration</name>
     <url>http://wso2.org</url>

components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml

@@ -22,13 +22,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>identity-extensions</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.oauth.extensions</artifactId>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - OAuth Extensions</name>
     <url>http://wso2.org</url>

components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>identity-extensions</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/identity-extensions/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>policy-mgt</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>org.wso2.carbon.complex.policy.decision.point</artifactId>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Policy Decision Point</name>
     <description>WSO2 Carbon - Policy Decision Point</description>

components/policy-mgt/org.wso2.carbon.policy.decision.point/pom.xml

@@ -3,14 +3,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>policy-mgt</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>org.wso2.carbon.policy.decision.point</artifactId>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Policy Decision Point</name>
     <description>WSO2 Carbon - Policy Decision Point</description>

components/policy-mgt/org.wso2.carbon.policy.information.point/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>policy-mgt</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>org.wso2.carbon.policy.information.point</artifactId>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Policy Information Point</name>
     <description>WSO2 Carbon - Policy Information Point</description>

components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>policy-mgt</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>org.wso2.carbon.policy.mgt.common</artifactId>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Policy Management Common</name>
     <description>WSO2 Carbon - Policy Management Common</description>

components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>policy-mgt</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>org.wso2.carbon.policy.mgt.core</artifactId>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Policy Management Core</name>
     <description>WSO2 Carbon - Policy Management Core</description>

components/policy-mgt/pom.xml

@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>policy-mgt</artifactId>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Policy Management Component</name>
     <url>http://wso2.org</url>

components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml

@@ -21,14 +21,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>webapp-authenticator-framework</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>org.wso2.carbon.webapp.authenticator.framework</artifactId>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Web Application Authenticator Framework Bundle</name>
     <description>WSO2 Carbon - Web Application Authenticator Framework Bundle</description>

components/webapp-authenticator-framework/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>webapp-authenticator-framework</artifactId>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Webapp Authenticator Framework</name>
     <url>http://wso2.org</url>

features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/pom.xml

@@ -21,14 +21,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>apimgt-extensions-feature</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.apimgt.application.extension.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <name>WSO2 Carbon - API Management Application Extension Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains an implementation of a api application registration, which takes care of subscription

features/apimgt-extensions/org.wso2.carbon.apimgt.handler.server.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>apimgt-extensions-feature</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.apimgt.handler.server.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <name>WSO2 Carbon - Device Management - APIM handler Server Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains the handler for the api authentications

features/apimgt-extensions/org.wso2.carbon.apimgt.integration.client.feature/pom.xml

@@ -21,13 +21,13 @@
 	<parent>
 		<groupId>org.wso2.carbon.devicemgt</groupId>
 		<artifactId>apimgt-extensions-feature</artifactId>
-		<version>2.0.23-SNAPSHOT</version>
+		<version>2.0.26-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>org.wso2.carbon.apimgt.integration.client.feature</artifactId>
-	<version>2.0.23-SNAPSHOT</version>
+	<version>2.0.26-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>WSO2 Carbon - APIM Integration Client Feature</name>
 	<url>http://wso2.org</url>

features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml

@@ -21,14 +21,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>apimgt-extensions-feature</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.apimgt.webapp.publisher.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <name>WSO2 Carbon - API Management Webapp Publisher Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains an implementation of a Tomcat lifecycle listener, which takes care of publishing

features/apimgt-extensions/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>apimgt-extensions-feature</artifactId>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - API Management Extensions Feature</name>
     <url>http://wso2.org</url>

features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>certificate-mgt-feature</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>certificate-mgt-feature</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>certificate-mgt-feature</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.certificate.mgt.server.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <name>WSO2 Carbon - Certificate Management Server Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains the core bundles required for back-end Certificate Management functionality

features/certificate-mgt/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>certificate-mgt-feature</artifactId>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Certificate Management Feature</name>
     <url>http://wso2.org</url>

features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-extensions-feature</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <name>WSO2 Carbon - Device Type Deployer Feature</name>
     <url>http://wso2.org</url>
     <description>WSO2 Carbon - Device Type Deployer Feature</description>

features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml

@@ -22,22 +22,22 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-extensions-feature</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature</artifactId>
+    <artifactId>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
-    <name>WSO2 Carbon - GCM Based Push Notification Provider Feature</name>
+    <name>WSO2 Carbon - FCM Based Push Notification Provider Feature</name>
     <url>http://wso2.org</url>
     <description>WSO2 Carbon - MQTT Based Push Notification Provider Feature</description>
 
     <dependencies>
         <dependency>
             <groupId>org.wso2.carbon.devicemgt</groupId>
-            <artifactId>org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm</artifactId>
+            <artifactId>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm</artifactId>
         </dependency>
     </dependencies>
 
@@ -80,7 +80,7 @@
                             <goal>p2-feature-gen</goal>
                         </goals>
                         <configuration>
-                            <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm</id>
+                            <id>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm</id>
                             <propertiesFile>../../../features/etc/feature.properties</propertiesFile>
                             <adviceFile>
                                 <properties>
@@ -90,7 +90,7 @@
                             </adviceFile>
                             <bundles>
                                 <bundleDef>
-                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm:${carbon.device.mgt.version}
+                                    org.wso2.carbon.devicemgt:org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm:${carbon.device.mgt.version}
                                 </bundleDef>
                             </bundles>
                             <importFeatures>

features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-extensions-feature</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <name>WSO2 Carbon - MQTT Based Push Notification Provider Feature</name>
     <url>http://wso2.org</url>
     <description>WSO2 Carbon - MQTT Based Push Notification Provider Feature</description>

features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-extensions-feature</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <name>WSO2 Carbon - XMPP Based Push Notification Provider Feature</name>
     <url>http://wso2.org</url>
     <description>WSO2 Carbon - XMPP Based Push Notification Provider Feature</description>

features/device-mgt-extensions/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
@@ -34,7 +34,7 @@
 
     <modules>
         <module>org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature</module>
-        <module>org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature</module>
+        <module>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature</module>
         <module>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature</module>
         <module>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature</module>
     </modules>

features/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard.feature/pom.xml

@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-feature</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>org.wso2.carbon.device.mgt.analytics.dashboard.feature</artifactId>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Device Management Dashboard Analytics Feature</name>
     <description>WSO2 Carbon - Device Management Dashboard Analytics Feature</description>

features/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-feature</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.analytics.data.publisher.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <name>WSO2 Carbon - Device Management Server Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains bundles related to device analytics data publisher</description>

features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-feature</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/pom.xml

@@ -4,14 +4,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-feature</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.extensions.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <name>WSO2 Carbon - Device Management Extensions Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains common extensions used by key device management functionalities

features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-feature</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-feature</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.server.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <name>WSO2 Carbon - Device Management Server Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains the core bundles required for Back-end Device Management functionality

features/device-mgt/org.wso2.carbon.device.mgt.server.feature/src/main/resources/conf/cdm-config.xml

@@ -26,7 +26,7 @@
         </DataSourceConfiguration>
     </ManagementRepository>
     <PushNotificationProviders>
-        <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.GCMBasedPushNotificationProvider</Provider>
+        <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.FCMBasedPushNotificationProvider</Provider>
         <!--<Provider>org.wso2.carbon.device.mgt.mobile.impl.ios.apns.APNSBasedPushNotificationProvider</Provider>-->
         <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.MQTTBasedPushNotificationProvider</Provider>
         <Provider>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.XMPPBasedPushNotificationProvider</Provider>

features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-feature</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

features/device-mgt/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

features/dynamic-client-registration/org.wso2.carbon.dynamic.client.registration.server.feature/pom.xml

@@ -23,14 +23,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>dynamic-client-registration-feature</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.dynamic.client.registration.server.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <name>WSO2 Carbon - Dynamic Client Registration Server Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains dynamic client registration features</description>

features/dynamic-client-registration/pom.xml

@@ -23,14 +23,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>dynamic-client-registration-feature</artifactId>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Dynamic Client Registration Feature</name>
     <url>http://wso2.org</url>

features/email-sender/org.wso2.carbon.email.sender.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>email-sender-feature</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.email.sender.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <name>WSO2 Carbon - Email Sender Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains the core bundles required for email sender related functionality

features/email-sender/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>email-sender-feature</artifactId>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Email Sender Feature</name>
     <url>http://wso2.org</url>

features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/pom.xml

@@ -23,14 +23,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>jwt-client-feature</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.jwt.client.extension.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <name>WSO2 Carbon - JWT Client Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains jwt client implementation from which we can get a access token using the jwt

features/jwt-client/pom.xml

@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jwt-client-feature</artifactId>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Dynamic Client Registration Feature</name>
     <url>http://wso2.org</url>

features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml

@@ -23,14 +23,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>oauth-extensions-feature</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.oauth.extensions.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <name>WSO2 Carbon - Device Mgt OAuth Extensions Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains devicemgt related OAuth extensions</description>

features/oauth-extensions/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>oauth-extensions-feature</artifactId>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Device Management OAuth Extensions Feature</name>
     <url>http://wso2.org</url>

features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml

@@ -23,14 +23,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>policy-mgt-feature</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.policy.mgt.server.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <name>WSO2 Carbon - Policy Management Server Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains the core bundles required for Back-end Device Management functionality

features/policy-mgt/pom.xml

@@ -23,14 +23,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>policy-mgt-feature</artifactId>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Policy Management Feature</name>
     <url>http://wso2.org</url>

features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>webapp-authenticator-framework-feature</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.webapp.authenticator.framework.server.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <name>WSO2 Carbon - Webapp Authenticator Framework Server Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains the core bundles required for Back-end Device Management functionality

features/webapp-authenticator-framework/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.23-SNAPSHOT</version>
+        <version>2.0.26-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>webapp-authenticator-framework-feature</artifactId>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Webapp Authenticator Framework Feature</name>
     <url>http://wso2.org</url>

pom.xml

@@ -23,7 +23,7 @@
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>carbon-devicemgt</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.23-SNAPSHOT</version>
+    <version>2.0.26-SNAPSHOT</version>
     <name>WSO2 Carbon - Device Management - Parent</name>
     <url>http://wso2.org</url>
     <description>WSO2 Connected Device Manager Components</description>
@@ -1403,7 +1403,7 @@
             </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt</groupId>
-                <artifactId>org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm</artifactId>
+                <artifactId>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm</artifactId>
                 <version>${carbon.device.mgt.version}</version>
             </dependency>
             <dependency>
@@ -1803,7 +1803,7 @@
         <axiom.wso2.version>1.2.11.wso2v10</axiom.wso2.version>
 
         <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>2.0.23-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.version>2.0.26-SNAPSHOT</carbon.device.mgt.version>
 
         <!-- Carbon Commons -->
         <carbon.commons.version>4.4.8</carbon.commons.version>