Merge remote-tracking branch 'upstream/master'

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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.apimgt.annotations</artifactId>
-    <version>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <version>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <version>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.apimgt.handlers</artifactId>
-    <version>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+		<version>3.0.129-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>org.wso2.carbon.apimgt.integration.client</artifactId>
-	<version>3.0.127-SNAPSHOT</version>
+	<version>3.0.129-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>3.0.127-SNAPSHOT</version>
+		<version>3.0.129-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>org.wso2.carbon.apimgt.integration.generated.client</artifactId>
-	<version>3.0.127-SNAPSHOT</version>
+	<version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.apimgt.webapp.publisher</artifactId>
-    <version>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - API Management Webapp Publisher</name>
     <description>WSO2 Carbon - API Management Webapp Publisher</description>

components/apimgt-extensions/pom.xml

@@ -22,13 +22,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>apimgt-extensions</artifactId>
-    <version>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.certificate.mgt.core</artifactId>
-    <version>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>certificate-mgt</artifactId>
-    <version>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

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

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

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

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

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

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

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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/pom.xml

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

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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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

@@ -122,7 +122,14 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
                     "e.DATE_OF_ENROLMENT, e.ID AS ENROLMENT_ID FROM DM_ENROLMENT e, (SELECT d.ID, d.DESCRIPTION, d.NAME, " +
                     "t.NAME AS DEVICE_TYPE, d.DEVICE_IDENTIFICATION FROM DM_DEVICE d, DM_DEVICE_TYPE t WHERE " +
                     "t.NAME = ? AND t.ID = d.DEVICE_TYPE_ID AND d.DEVICE_IDENTIFICATION = ? AND d.TENANT_ID = ?) d1 WHERE d1.ID = e.DEVICE_ID " +
-                    "AND TENANT_ID = ? ORDER BY e.DATE_OF_LAST_UPDATE DESC";
+                    "AND TENANT_ID = ? ORDER BY e.DATE_OF_LAST_UPDATE DESC, e.STATUS ASC";
+            // Status adeed as an orderby clause to fix a bug : when an existing device is
+            // re-enrolled, earlier enrollment is marked as removed and a new enrollment is added.
+            // However, both enrollments share the same time stamp. When retrieving the device
+            // due to same timestamp, enrollment information is incorrect, intermittently. Hence
+            // status also should be taken into consideration when ordering. This should not present a
+            // problem for other status transitions, as there would be an intermediary removed
+            // state in between.
             stmt = conn.prepareStatement(sql);
             stmt.setString(1, deviceIdentifier.getType());
             stmt.setString(2, deviceIdentifier.getId());

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

@@ -118,6 +118,8 @@ public class ConfigOperationDAOImpl extends GenericOperationDAOImpl {
                 bais = new ByteArrayInputStream(operationDetails);
                 ois = new ObjectInputStream(bais);
                 configOperation = (ConfigOperation) ois.readObject();
+                configOperation.setId(rs.getInt("OPERATION_ID"));
+                configOperation.setEnabled(rs.getBoolean("ENABLED"));
             }
         } catch (IOException e) {
             throw new OperationManagementDAOException("IO Error occurred while de serialize the policy operation " +

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderService.java

@@ -481,8 +481,6 @@ public interface DeviceManagementProviderService {
      */
     PlatformConfiguration getConfiguration(String deviceType) throws DeviceManagementException;
 
-    void updateDeviceEnrolmentInfo(Device device, EnrolmentInfo.Status active) throws DeviceManagementException;
-
     /**
      * This method is used to check whether the device is enrolled with the give user.
      *

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java

@@ -1741,6 +1741,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
             if (requireDeviceInfo) {
                 this.getAllDeviceInfo(userDevices);
             }
+            devices.addAll(userDevices);
         }
         return devices;
     }
@@ -1890,41 +1891,6 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
         return result;
     }
 
-    @Override
-    public void updateDeviceEnrolmentInfo(Device device, EnrolmentInfo.Status status) throws DeviceManagementException {
-        try {
-            if (device == null || status == null) {
-                String msg = "Received incomplete data for updateDeviceEnrolmentInfo";
-                log.error(msg);
-                throw new DeviceManagementException(msg);
-            }
-            if (log.isDebugEnabled()) {
-                log.debug("Updating enrolment for device: " + device.getId() + " of type '" + device.getType() + "'");
-            }
-            DeviceManagementDAOFactory.beginTransaction();
-            device.getEnrolmentInfo().setDateOfLastUpdate(new Date().getTime());
-            device.getEnrolmentInfo().setStatus(status);
-            deviceDAO.updateDevice(device, this.getTenantId());
-            DeviceManagementDAOFactory.commitTransaction();
-        } catch (DeviceManagementDAOException e) {
-            DeviceManagementDAOFactory.rollbackTransaction();
-            String msg = "Error occurred while updating device enrolment status for " + device.getDeviceIdentifier() +
-                    " of type " + device.getType();
-            log.error(msg, e);
-            throw new DeviceManagementException(msg, e);
-        } catch (TransactionManagementException e) {
-            String msg = "Error occurred while initiating transaction";
-            log.error(msg, e);
-            throw new DeviceManagementException(msg, e);
-        } catch (Exception e) {
-            String msg = "Error occurred in updateDeviceEnrolmentInfo";
-            log.error(msg, e);
-            throw new DeviceManagementException(msg, e);
-        } finally {
-            DeviceManagementDAOFactory.closeConnection();
-        }
-    }
-
     @Override
     public void registerDeviceManagementService(DeviceManagementService deviceManagementService) {
         if (log.isDebugEnabled()) {

components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/common/TestDataHolder.java

@@ -20,6 +20,7 @@ import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
 import org.wso2.carbon.device.mgt.common.PaginationRequest;
 import org.wso2.carbon.device.mgt.common.app.mgt.Application;
+import org.wso2.carbon.device.mgt.common.device.details.DeviceInfo;
 import org.wso2.carbon.device.mgt.common.group.mgt.DeviceGroup;
 import org.wso2.carbon.device.mgt.common.notification.mgt.Notification;
 import org.wso2.carbon.device.mgt.common.notification.mgt.Notification;
@@ -55,6 +56,28 @@ public class TestDataHolder {
         return device;
     }
 
+    public static DeviceInfo generateDummyDeviceInfo() {
+        DeviceInfo deviceInfo = new DeviceInfo();
+        deviceInfo.setIMEI("IMEI-12345");
+        deviceInfo.setIMSI("IMSI-12344");
+        deviceInfo.setDeviceModel("DUMMY_MODEL");
+        deviceInfo.setVendor("Google");
+        deviceInfo.setOsVersion("Oreo");
+        deviceInfo.setOsBuildDate("24-05-2017");
+        deviceInfo.setBatteryLevel(25.0);
+        deviceInfo.setInternalTotalMemory(1.5);
+        deviceInfo.setInternalAvailableMemory(2.5);
+        deviceInfo.setExternalTotalMemory(16.76);
+        deviceInfo.setExternalAvailableMemory(4.56);
+        deviceInfo.setConnectionType("CON_TYPE");
+        deviceInfo.setSsid("SSID");
+        deviceInfo.setCpuUsage(23.5);
+        deviceInfo.setTotalRAMMemory(1.5);
+        deviceInfo.setAvailableRAMMemory(2.33);
+        deviceInfo.setPluggedIn(true);
+        return deviceInfo;
+    }
+
     public static Notification getNotification(int notificationId, String status, String deviceId,
                                                String description, String deviceName, int operationId,
                                                String deviceType) {

components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/operation/OperationManagementTests.java

@@ -25,6 +25,7 @@ import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
 import org.wso2.carbon.device.mgt.common.InvalidDeviceException;
 import org.wso2.carbon.device.mgt.common.PaginationRequest;
 import org.wso2.carbon.device.mgt.common.PaginationResult;
@@ -50,6 +51,7 @@ import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
@@ -72,6 +74,7 @@ public class OperationManagementTests extends BaseDeviceManagementTest {
 
     private List<DeviceIdentifier> deviceIds = new ArrayList<>();
     private OperationManager operationMgtService;
+    private DeviceManagementProviderService deviceMgmtProvider;
     private Activity commandActivity;
     private long commandActivityBeforeUpdatedTimestamp;
 
@@ -94,6 +97,7 @@ public class OperationManagementTests extends BaseDeviceManagementTest {
                 throw new Exception("Incorrect device with ID - " + device.getDeviceIdentifier() + " returned!");
             }
         }
+        this.deviceMgmtProvider = DeviceManagementDataHolder.getInstance().getDeviceManagementProvider();
         NotificationStrategy notificationStrategy = new TestNotificationStrategy();
         this.operationMgtService = new OperationManagerImpl(DEVICE_TYPE, notificationStrategy);
     }
@@ -555,8 +559,98 @@ public class OperationManagementTests extends BaseDeviceManagementTest {
             expectedExceptions = IllegalArgumentException.class)
     public void getOperationByActivityIdAndDeviceInvalidActivityId() throws DeviceManagementException,
             OperationManagementException {
-        this.operationMgtService.getOperationByActivityIdAndDevice(DeviceManagementConstants.OperationAttributes.ACTIVITY + 0,
+        this.operationMgtService.getOperationByActivityIdAndDevice(
+                DeviceManagementConstants.OperationAttributes.ACTIVITY + 0,
                 new DeviceIdentifier(INVALID_DEVICE, DEVICE_TYPE));
     }
 
+    @Test(dependsOnMethods = "getOperationByActivityIdAndDeviceInvalidActivityId")
+    public void getPendingOperationsInactiveEnrollment() throws DeviceManagementException,
+            OperationManagementException {
+        changeStatus(EnrolmentInfo.Status.INACTIVE);
+        List operations = this.operationMgtService.getPendingOperations(this.deviceIds.get(1));
+        Assert.assertTrue(operations != null);
+        Assert.assertEquals(operations.size(), 4);
+        changeStatus(EnrolmentInfo.Status.ACTIVE);
+    }
+
+    private void changeStatus(EnrolmentInfo.Status status) throws DeviceManagementException,
+            OperationManagementException {
+        Device device = this.deviceMgmtProvider.getDevice(this.deviceIds.get(1));
+        Assert.assertTrue(device != null);
+        Assert.assertEquals(device.getType(), DEVICE_TYPE);
+        Assert.assertTrue(device.getEnrolmentInfo() != null);
+        device.getEnrolmentInfo().setStatus(status);
+        boolean modified = this.deviceMgmtProvider.changeDeviceStatus(this.deviceIds.get(1), status);
+        Assert.assertTrue(modified);
+        device = this.deviceMgmtProvider.getDevice(this.deviceIds.get(1));
+        Assert.assertEquals(device.getEnrolmentInfo().getStatus(), status);
+    }
+
+    @Test(dependsOnMethods = "getPendingOperationsInactiveEnrollment")
+    public void getNextPendingOperationInactiveEnrollment() throws DeviceManagementException,
+            OperationManagementException {
+        changeStatus(EnrolmentInfo.Status.INACTIVE);
+        Operation operation = this.operationMgtService.getNextPendingOperation(this.deviceIds.get(1));
+        Assert.assertTrue(operation != null);
+        changeStatus(EnrolmentInfo.Status.ACTIVE);
+    }
+
+    @Test(dependsOnMethods = "getNextPendingOperationInactiveEnrollment")
+    public void getNextPendingOperationForAllOperations() throws DeviceManagementException,
+            OperationManagementException {
+        for (int i = 0; i < 4; i++) {
+            Operation operation = this.operationMgtService.getNextPendingOperation(this.deviceIds.get(1));
+            operation.setStatus(Operation.Status.COMPLETED);
+            this.operationMgtService.updateOperation(deviceIds.get(1), operation);
+        }
+        Assert.assertTrue(this.operationMgtService.getNextPendingOperation(this.deviceIds.get(1)) == null);
+    }
+
+    @Test(dependsOnMethods = "getNextPendingOperationForAllOperations")
+    public void getOperationByDeviceAndOperationIdForAllOperations() throws DeviceManagementException,
+            OperationManagementException {
+        for (int i = 1; i <= 4; i++) {
+            Operation operation = this.operationMgtService.getOperationByDeviceAndOperationId(this.deviceIds.get(1), i);
+            Assert.assertEquals(operation.getStatus(), Operation.Status.COMPLETED);
+        }
+    }
+
+    @Test(dependsOnMethods = "getOperationByDeviceAndOperationIdForAllOperations")
+    public void getOperationForAllOperations() throws DeviceManagementException,
+            OperationManagementException {
+        for (int i = 1; i <= 4; i++) {
+            Operation operation = this.operationMgtService.getOperation(i);
+            Assert.assertTrue(operation != null);
+        }
+    }
+
+    @Test(dependsOnMethods = "getOperationForAllOperations")
+    public void addCustomPolicyOperation() throws OperationManagementException, InvalidDeviceException {
+        this.addCustomOperation(Operation.Type.POLICY, DeviceManagementConstants.AuthorizationSkippedOperationCodes.
+                POLICY_OPERATION_CODE);
+    }
+
+    @Test(dependsOnMethods = "getOperationForAllOperations")
+    public void addCustomMonitorOperation() throws OperationManagementException, InvalidDeviceException {
+        this.addCustomOperation(Operation.Type.COMMAND, DeviceManagementConstants.AuthorizationSkippedOperationCodes.
+                MONITOR_OPERATION_CODE);
+    }
+
+    @Test(dependsOnMethods = "getOperationForAllOperations")
+    public void addCustomPolicyRevokeOperation() throws OperationManagementException, InvalidDeviceException {
+        this.addCustomOperation(Operation.Type.POLICY, DeviceManagementConstants.AuthorizationSkippedOperationCodes.
+                POLICY_REVOKE_OPERATION_CODE);
+    }
+
+    private void addCustomOperation(Operation.Type type, String operationCode) throws OperationManagementException, InvalidDeviceException {
+        Operation operation = new Operation();
+        operation.setCode(operationCode);
+        operation.setType(type);
+        Activity activity = this.operationMgtService.addOperation(operation, Collections.singletonList(this.deviceIds.get(2)));
+        Assert.assertEquals(activity.getActivityStatus().size(), 1);
+        for (ActivityStatus status : activity.getActivityStatus()) {
+            Assert.assertEquals(status.getStatus(), ActivityStatus.Status.PENDING);
+        }
+    }
 }

components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceTest.java

@@ -23,11 +23,16 @@ import org.testng.annotations.Test;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
+import org.wso2.carbon.device.mgt.common.TransactionManagementException;
 import org.wso2.carbon.device.mgt.core.TestDeviceManagementService;
 import org.wso2.carbon.device.mgt.core.authorization.DeviceAccessAuthorizationServiceImpl;
 import org.wso2.carbon.device.mgt.core.common.BaseDeviceManagementTest;
 import org.wso2.carbon.device.mgt.core.common.TestDataHolder;
 import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager;
+import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOFactory;
+import org.wso2.carbon.device.mgt.core.device.details.mgt.dao.DeviceDetailsDAO;
+import org.wso2.carbon.device.mgt.core.device.details.mgt.dao.DeviceDetailsMgtDAOException;
 import org.wso2.carbon.device.mgt.core.dto.DeviceType;
 import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder;
 import org.wso2.carbon.device.mgt.core.internal.DeviceManagementServiceComponent;
@@ -40,6 +45,8 @@ import org.wso2.carbon.user.core.service.RealmService;
 import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
 
 import java.io.InputStream;
+import java.util.Calendar;
+import java.util.Date;
 import java.util.List;
 
 public class DeviceManagementProviderServiceTest extends BaseDeviceManagementTest {
@@ -47,7 +54,7 @@ public class DeviceManagementProviderServiceTest extends BaseDeviceManagementTes
     private static final Log log = LogFactory.getLog(DeviceManagementProviderServiceTest.class);
     private DeviceManagementProviderService providerService;
     private static final String DEVICE_TYPE = "RANDOM_DEVICE_TYPE";
-    private static final String DEVICE_TYPE_2 = "RANDOM_DEVICE_TYPE";
+    private DeviceDetailsDAO deviceDetailsDAO = DeviceManagementDAOFactory.getDeviceDetailsDAO();
 
     DeviceManagementProviderService deviceMgtService;
 
@@ -65,7 +72,6 @@ public class DeviceManagementProviderServiceTest extends BaseDeviceManagementTes
         DeviceManagementDataHolder.getInstance().setDeviceTaskManagerService(null);
         deviceMgtService.registerDeviceType(new TestDeviceManagementService(DEVICE_TYPE,
                 MultitenantConstants.SUPER_TENANT_DOMAIN_NAME));
-
     }
 
     private RegistryService getRegistryService() throws RegistryException {
@@ -170,39 +176,39 @@ public class DeviceManagementProviderServiceTest extends BaseDeviceManagementTes
         }
     }
 
-//    @Test(dependsOnMethods = {"testReEnrollmentofSameDeviceUnderSameUser"})
-//    public void testReEnrollmentofSameDeviceWithOtherUser() {
-//
-//        EnrolmentInfo enrolmentInfo = new EnrolmentInfo();
-//        enrolmentInfo.setDateOfEnrolment(new Date().getTime());
-//        enrolmentInfo.setDateOfLastUpdate(new Date().getTime());
-//        enrolmentInfo.setOwner("user1");
-//        enrolmentInfo.setOwnership(EnrolmentInfo.OwnerShip.BYOD);
-//        enrolmentInfo.setStatus(EnrolmentInfo.Status.CREATED);
-//
-//        Device alternateDevice = TestDataHolder.generateDummyDeviceData("12345", DEVICE_TYPE,
-//                enrolmentInfo);
-//
-//        try {
-//            Device retrievedDevice1 = deviceMgtService.getDevice(new DeviceIdentifier("12345", DEVICE_TYPE));
-//
-//            deviceMgtService.enrollDevice(alternateDevice);
-//            Device retrievedDevice2 = deviceMgtService.getDevice(new DeviceIdentifier(alternateDevice
-//                    .getDeviceIdentifier(), alternateDevice.getType()));
-//
-//            log.info(retrievedDevice1.getEnrolmentInfo().getOwner());
-//            log.info(retrievedDevice2.getEnrolmentInfo().getOwner());
-//
-//            Assert.assertFalse(retrievedDevice1.getEnrolmentInfo().getOwner().equalsIgnoreCase
-//                    (retrievedDevice2.getEnrolmentInfo().getOwner()));
-//        } catch (DeviceManagementException e) {
-//            String msg = "Error Occured while enrolling device";
-//            Assert.fail(msg, e);
-//        }
-//    }
-
-
     @Test(dependsOnMethods = {"testReEnrollmentofSameDeviceUnderSameUser"})
+    public void testReEnrollmentofSameDeviceWithOtherUser() {
+
+        EnrolmentInfo enrolmentInfo = new EnrolmentInfo();
+        enrolmentInfo.setDateOfEnrolment(new Date().getTime());
+        enrolmentInfo.setDateOfLastUpdate(new Date().getTime());
+        enrolmentInfo.setOwner("user1");
+        enrolmentInfo.setOwnership(EnrolmentInfo.OwnerShip.BYOD);
+        enrolmentInfo.setStatus(EnrolmentInfo.Status.CREATED);
+
+        Device alternateDevice = TestDataHolder.generateDummyDeviceData("12345", DEVICE_TYPE,
+                enrolmentInfo);
+
+        try {
+            Device retrievedDevice1 = deviceMgtService.getDevice(new DeviceIdentifier("12345", DEVICE_TYPE));
+
+            deviceMgtService.enrollDevice(alternateDevice);
+            Device retrievedDevice2 = deviceMgtService.getDevice(new DeviceIdentifier(alternateDevice
+                    .getDeviceIdentifier(), alternateDevice.getType()));
+
+            log.info(retrievedDevice1.getEnrolmentInfo().getOwner());
+            log.info(retrievedDevice2.getEnrolmentInfo().getOwner());
+
+            Assert.assertFalse(retrievedDevice1.getEnrolmentInfo().getOwner().equalsIgnoreCase
+                    (retrievedDevice2.getEnrolmentInfo().getOwner()));
+        } catch (DeviceManagementException e) {
+            String msg = "Error Occured while enrolling device";
+            Assert.fail(msg, e);
+        }
+    }
+
+
+    @Test(dependsOnMethods = {"testReEnrollmentofSameDeviceWithOtherUser"})
     public void testDisenrollment() {
         Device device = TestDataHolder.generateDummyDeviceData(DEVICE_TYPE);
         try {
@@ -320,5 +326,114 @@ public class DeviceManagementProviderServiceTest extends BaseDeviceManagementTes
         }
     }
 
+    @Test(dependsOnMethods = {"testSuccessfulDeviceEnrollment"})
+    public void testGetDevice() {
+        try {
+            Device device = deviceMgtService.getDevice(new DeviceIdentifier("12345",DEVICE_TYPE));
+            Assert.assertTrue(device.getDeviceIdentifier().equalsIgnoreCase("12345"));
+        } catch (DeviceManagementException e) {
+            String msg = "Error occurred while updating the device status";
+            Assert.fail(msg, e);
+        }
+    }
+
+
+    @Test(dependsOnMethods = {"testSuccessfulDeviceEnrollment"})
+    public void testGetDeviceWithInfo() {
+        try {
+            Device device = deviceMgtService.getDevice(new DeviceIdentifier("12345", DEVICE_TYPE)
+                    , true);
+            Assert.assertTrue(device.getDeviceInfo() != null);
+        } catch (DeviceManagementException e) {
+            String msg = "Error occurred while updating the device status";
+            Assert.fail(msg, e);
+        }
+    }
+
+    @Test(dependsOnMethods = {"testSuccessfulDeviceEnrollment"})
+    public void testGetDeviceWithOutInfo() {
+        try {
+            Device device = deviceMgtService.getDevice(new DeviceIdentifier("12345", DEVICE_TYPE)
+                    , false);
+            Assert.assertTrue(device.getDeviceInfo() == null);
+        } catch (DeviceManagementException e) {
+            String msg = "Error occurred while updating the device status";
+            Assert.fail(msg, e);
+        }
+    }
+
+    @Test(dependsOnMethods = {"testSuccessfulDeviceEnrollment"})
+    public void testGetAllDevicesOfRole() {
+        try {
+            List<Device> devices = deviceMgtService.getAllDevicesOfRole("admin");
+            Assert.assertTrue(devices.size() > 0);
+        } catch (DeviceManagementException e) {
+            String msg = "Error occurred while updating the device status";
+            Assert.fail(msg, e);
+        }
+    }
+
+    @Test(dependsOnMethods = {"testSuccessfulDeviceEnrollment"})
+    public void testDeviceByOwner() {
+        try {
+            Device device = deviceMgtService.getDevice(new DeviceIdentifier("12345",
+                    DEVICE_TYPE), "admin", true);
+            Assert.assertTrue(device != null);
+        } catch (DeviceManagementException e) {
+            String msg = "Error occurred while updating the device status";
+            Assert.fail(msg, e);
+        }
+    }
+
+    @Test(dependsOnMethods = {"testSuccessfulDeviceEnrollment"})
+    public void testDeviceByDate() {
+        try {
+            Device initialDevice = deviceMgtService.getDevice(new DeviceIdentifier("12345",
+                    DEVICE_TYPE));
+
+            DeviceManagementDAOFactory.beginTransaction();
+
+            //Device details table will be reffered when looking for last updated time
+            //This dao entry is to mimic a device info operation
+            deviceDetailsDAO.addDeviceInformation(initialDevice.getId(), TestDataHolder
+                    .generateDummyDeviceInfo());
+        } catch (DeviceManagementException e) {
+            e.printStackTrace();
+        } catch (TransactionManagementException e) {
+            e.printStackTrace();
+        } catch (DeviceDetailsMgtDAOException e) {
+            e.printStackTrace();
+        } finally {
+            DeviceManagementDAOFactory.closeConnection();
+        }
+
+        try {
+            Device device = deviceMgtService.getDevice(new DeviceIdentifier("12345",
+                    DEVICE_TYPE), yesterday());
+            Assert.assertTrue(device != null);
+        } catch (DeviceManagementException e) {
+            String msg = "Error occurred while updating the device status";
+            Assert.fail(msg, e);
+        }
+    }
+
+    @Test(dependsOnMethods = {"testDeviceByDate"})
+    public void testDeviceByDateAndOwner() {
+        try {
+            Device device = deviceMgtService.getDevice(new DeviceIdentifier("12345",
+                    DEVICE_TYPE), "admin", yesterday(), true);
+            Assert.assertTrue(device != null);
+        } catch (DeviceManagementException e) {
+            String msg = "Error occurred while updating the device status";
+            Assert.fail(msg, e);
+        }
+    }
+
+    private Date yesterday() {
+        final Calendar cal = Calendar.getInstance();
+        cal.add(Calendar.DATE, -1);
+        return cal.getTime();
+    }
+
 
 }

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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.oauth.extensions</artifactId>
-    <version>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>policy-mgt</artifactId>
-    <version>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Policy Management Component</name>
     <url>http://wso2.org</url>

components/test-coverage/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>carbon-devicemgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>webapp-authenticator-framework</artifactId>
-    <version>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+		<version>3.0.129-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>org.wso2.carbon.apimgt.integration.client.feature</artifactId>
-	<version>3.0.127-SNAPSHOT</version>
+	<version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>apimgt-extensions-feature</artifactId>
-    <version>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>certificate-mgt-feature</artifactId>
-    <version>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-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,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-extensions-feature</artifactId>
-        <version>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-SNAPSHOT</version>
     <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>

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

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-extensions-feature</artifactId>
-        <version>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-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.mqtt.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-extensions-feature</artifactId>
-        <version>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>org.wso2.carbon.device.mgt.analytics.dashboard.feature</artifactId>
-    <version>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-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.ui.feature/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-feature</artifactId>
-        <version>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.email.sender.feature</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>email-sender-feature</artifactId>
-    <version>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jwt-client-feature</artifactId>
-    <version>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - JWT Client Extension 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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>oauth-extensions-feature</artifactId>
-    <version>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>policy-mgt-feature</artifactId>
-    <version>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+        <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-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>3.0.127-SNAPSHOT</version>
+    <version>3.0.129-SNAPSHOT</version>
     <name>WSO2 Carbon - Device Management - Parent</name>
     <url>http://wso2.org</url>
     <description>WSO2 Connected Device Manager Components</description>
@@ -1851,7 +1851,7 @@
         <axiom.wso2.version>1.2.11.wso2v10</axiom.wso2.version>
 
         <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>3.0.127-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.version>3.0.129-SNAPSHOT</carbon.device.mgt.version>
 
         <!-- Carbon Commons -->
         <carbon.commons.version>4.4.8</carbon.commons.version>