Merge branch 'master' of https://gitlab.com/entgra/carbon-device-mgt into entgra-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.apimgt.annotations</artifactId>
-    <version>3.2.3-SNAPSHOT</version>
+    <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <version>3.2.3-SNAPSHOT</version>
+    <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <version>3.2.3-SNAPSHOT</version>
+    <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.apimgt.handlers</artifactId>
-    <version>3.2.3-SNAPSHOT</version>
+    <version>3.2.5-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.handlers/src/main/java/org/wso2/carbon/apimgt/handlers/AuthenticationHandler.java

@@ -94,11 +94,7 @@ public class AuthenticationHandler extends AbstractHandler {
                 if (log.isDebugEnabled()) {
                     log.debug("Verify Cert:\n" + mdmSignature);
                 }
-                String deviceType = this.getDeviceType(messageContext.getTo().getAddress().trim());
+                URI certVerifyUrl = new URI(iotServerConfiguration.getVerificationEndpoint() + "ios");
-                if (deviceType == null) {
-                    return false;
-                }
-                URI certVerifyUrl = new URI(iotServerConfiguration.getVerificationEndpoint() + deviceType);
                 Map<String, String> certVerifyHeaders = this.setHeaders(this.restInvoker);
 
                 Certificate certificate = new Certificate();

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.2.3-SNAPSHOT</version>
+		<version>3.2.5-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>org.wso2.carbon.apimgt.integration.client</artifactId>
-	<version>3.2.3-SNAPSHOT</version>
+	<version>3.2.5-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.2.3-SNAPSHOT</version>
+		<version>3.2.5-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>org.wso2.carbon.apimgt.integration.generated.client</artifactId>
-	<version>3.2.3-SNAPSHOT</version>
+	<version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.apimgt.webapp.publisher</artifactId>
-    <version>3.2.3-SNAPSHOT</version>
+    <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>apimgt-extensions</artifactId>
-    <version>3.2.3-SNAPSHOT</version>
+    <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

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

@@ -24,7 +24,7 @@
     <parent>
         <artifactId>certificate-mgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>3.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.certificate.mgt.core</artifactId>
-    <version>3.2.3-SNAPSHOT</version>
+    <version>3.2.5-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Certificate Management Core</name>
     <description>WSO2 Carbon - Certificate Management Core</description>

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

@@ -24,7 +24,7 @@
     <parent>
         <artifactId>certificate-mgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>3.2.3-SNAPSHOT</version>
+        <version>3.2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/certificate-mgt/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>3.2.3-SNAPSHOT</version>
+        <version>3.2.5-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>certificate-mgt</artifactId>
-    <version>3.2.3-SNAPSHOT</version>
+    <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

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

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>device-mgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>3.2.3-SNAPSHOT</version>
+        <version>3.2.5-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/UserManagementService.java

@@ -48,6 +48,7 @@ import io.swagger.annotations.ResponseHeader;
 import org.apache.axis2.transport.http.HTTPConstants;
 import org.wso2.carbon.apimgt.annotations.api.Scopes;
 import org.wso2.carbon.apimgt.annotations.api.Scope;
+import org.wso2.carbon.device.mgt.jaxrs.beans.ActivityList;
 import org.wso2.carbon.device.mgt.jaxrs.beans.BasicUserInfo;
 import org.wso2.carbon.device.mgt.jaxrs.beans.BasicUserInfoList;
 import org.wso2.carbon.device.mgt.jaxrs.beans.Credential;
@@ -155,6 +156,12 @@ import java.util.List;
                         description = "Sending Enrollment Invitations to Users",
                         key = "perm:users:send-invitation",
                         permissions = {"/device-mgt/users/manage"}
+                ),
+                @Scope(
+                        name = "Get activities",
+                        description = "Get activities",
+                        key = "perm:get-activity",
+                        permissions = {"/device-mgt/devices/owning-device/view"}
                 )
         }
 )
@@ -924,4 +931,80 @@ public interface UserManagementService {
     @POST
     @Path("/validate")
     Response validateUser(Credential credential);
+
+    @GET
+    @Path("/device/activities")
+    @ApiOperation(
+            produces = MediaType.APPLICATION_JSON,
+            httpMethod = "GET",
+            value = "Getting Activity Details",
+            notes = "Get the details of the operations/activities executed by the server on the devices registered" +
+                    " with WSO2 EMM, during a defined time period.",
+            tags = "Activity Info Provider",
+            extensions = {
+                    @Extension(properties = {
+                            @ExtensionProperty(name = Constants.SCOPE, value = "perm:get-activity")
+                    })
+            }
+    )
+    @ApiResponses(value = {
+            @ApiResponse(
+                    code = 200,
+                    message = "OK. \n Successfully fetched the activity details.",
+                    response = ActivityList.class,
+                    responseHeaders = {
+                            @ResponseHeader(
+                                    name = "Content-Type",
+                                    description = "The content type of the body"),
+                            @ResponseHeader(
+                                    name = "ETag",
+                                    description = "Entity Tag of the response resource.\n" +
+                                            "Used by caches, or in conditional requests."),
+                            @ResponseHeader(
+                                    name = "Last-Modified",
+                                    description = "Date and time the resource was last modified.\n" +
+                                            "Used by caches, or in conditional requests."),
+                    }),
+            @ApiResponse(
+                    code = 304,
+                    message = "Not Modified. \n Empty body because the client already has the latest version of the" +
+                            " requested resource.\n"),
+            @ApiResponse(
+                    code = 401,
+                    message = "Unauthorized. \n Unauthorized request."),
+            @ApiResponse(
+                    code = 404,
+                    message = "Not Found. \n No activities found.",
+                    response = ErrorResponse.class),
+            @ApiResponse(
+                    code = 406,
+                    message = "Not Acceptable.\n The requested media type is not supported"),
+            @ApiResponse(
+                    code = 500,
+                    message = "Internal Server Error. \n Server error occurred while fetching the activity data.",
+                    response = ErrorResponse.class)
+    })
+    Response getActivities(
+            @ApiParam(
+                    name = "since",
+                    value = "Checks if the requested variant was created since the specified date-time.\n" +
+                            "Provide the value in the following format: EEE, d MMM yyyy HH:mm:ss Z.\n" +
+                            "Example: Mon, 05 Jan 2014 15:10:00 +0200")
+            @QueryParam("since") String since,
+            @ApiParam(
+                    name = "offset",
+                    value = "The starting pagination index for the complete list of qualified items.",
+                    defaultValue = "0")
+            @QueryParam("offset") int offset,
+            @ApiParam(
+                    name = "limit",
+                    value = "Provide how many activity details you require from the starting pagination index/offset.",
+                    defaultValue = "5")
+            @QueryParam("limit") int limit,
+            @ApiParam(
+                    name = "If-Modified-Since",
+                    value = "Checks if the requested variant was modified, since the specified date-time\n." +
+                            "Provide the value in the following format: EEE, d MMM yyyy HH:mm:ss Z\n." +
+                            "Example: Mon, 05 Jan 2014 15:10:00 +0200")
+            @HeaderParam("If-Modified-Since") String ifModifiedSince);
 }

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/DeviceManagementAdminService.java

@@ -32,6 +32,7 @@ import io.swagger.annotations.ResponseHeader;
 import org.wso2.carbon.apimgt.annotations.api.Scope;
 import org.wso2.carbon.apimgt.annotations.api.Scopes;
 import org.wso2.carbon.device.mgt.common.Device;
+import org.wso2.carbon.device.mgt.jaxrs.beans.DeviceList;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
 import org.wso2.carbon.device.mgt.jaxrs.util.Constants;
 
@@ -39,6 +40,7 @@ import javax.validation.constraints.Size;
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
+import java.util.List;
 
 @SwaggerDefinition(
         info = @Info(
@@ -68,6 +70,12 @@ import javax.ws.rs.core.Response;
                         description = "Getting Details of a Device",
                         key = "perm:admin:devices:view",
                         permissions = {"/device-mgt/devices/owning-device/view"}
+                ),
+                @Scope(
+                        name = "Update the Device Owner",
+                        description = "Update the ownership of the device",
+                        key = "perm:admin:devices:update-enrollment",
+                        permissions = {"/device-mgt/admin/devices/update-enrollment"}
                 )
         }
 )
@@ -167,4 +175,54 @@ public interface DeviceManagementAdminService {
                     required = false,
                     defaultValue = "5")
             @QueryParam("limit") int limit);
+
+    @PUT
+    @Path("/device-owner")
+    @ApiOperation(
+            produces = MediaType.APPLICATION_JSON,
+            httpMethod = "PUT",
+            value = "Update the device owner",
+            notes = "Update enrollment owner for given device Identifiers.",
+            tags = "Device Management",
+            extensions = {
+                    @Extension(properties = {
+                            @ExtensionProperty(name = Constants.SCOPE, value = "perm:admin:devices:update-enrollment")
+                    })
+            }
+    )
+    @ApiResponses(value = {
+            @ApiResponse(code = 200, message = "OK. \n Successfully update the owner of devices.",
+                    response = DeviceList.class,
+                    responseHeaders = {
+                            @ResponseHeader(
+                                    name = "Content-Type",
+                                    description = "The content type of the body"),
+                            @ResponseHeader(
+                                    name = "ETag",
+                                    description = "Entity Tag of the response resource.\n" +
+                                            "Used by caches, or in conditional requests."),
+                            @ResponseHeader(
+                                    name = "Last-Modified",
+                                    description = "Date and time the resource was last modified.\n" +
+                                            "Used by caches, or in conditional requests."),
+                    }),
+            @ApiResponse(
+                    code = 400,
+                    message = "The incoming request has more than one selection criteria defined via the query parameters.",
+                    response = ErrorResponse.class),
+            @ApiResponse(
+                    code = 500,
+                    message = "Internal Server Error. \n Server error occurred while fetching the device list.",
+                    response = ErrorResponse.class)
+    }) Response updateEnrollOwner(
+            @ApiParam(
+                    name = "Device Owner",
+                    value = "The username that is going to use for the new device owner of given devices.",
+                    required = true)
+            @QueryParam("owner") String owner,
+            @ApiParam(
+                    name = "Device Identifiers",
+                    value = "List of device identifiers.",
+                    required = true)
+                    List<String> deviceIdentifiers);
 }

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/UserManagementServiceImpl.java

@@ -39,12 +39,16 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.http.HttpStatus;
 import org.eclipse.wst.common.uriresolver.internal.util.URIEncoder;
+import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationManagementException;
+import org.wso2.carbon.device.mgt.common.operation.mgt.Activity;
+import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
 import org.wso2.carbon.device.mgt.core.DeviceManagementConstants;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 import org.wso2.carbon.device.mgt.core.service.EmailMetaInfo;
+import org.wso2.carbon.device.mgt.jaxrs.beans.ActivityList;
 import org.wso2.carbon.device.mgt.jaxrs.beans.BasicUserInfo;
 import org.wso2.carbon.device.mgt.jaxrs.beans.BasicUserInfoList;
 import org.wso2.carbon.device.mgt.jaxrs.beans.BasicUserInfoWrapper;
@@ -88,8 +92,11 @@ import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.security.SecureRandom;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -793,8 +800,96 @@ public class UserManagementServiceImpl implements UserManagementService {
         } catch (UserStoreException e) {
             String msg = "Error occurred while retrieving user store to validate user";
             log.error(msg, e);
-            return Response.serverError().entity(
+            return Response.serverError().entity(new ErrorResponse.ErrorResponseBuilder().setMessage(msg).build())
-                    new ErrorResponse.ErrorResponseBuilder().setMessage(msg).build()).build();
+                    .build();
+        }
+    }
+
+    @GET
+    @Override
+    @Path("/device/activities")
+    public Response getActivities(
+            @QueryParam("since") String since,
+            @QueryParam("offset") int offset,
+            @QueryParam("limit") int limit,
+            @HeaderParam("If-Modified-Since") String ifModifiedSince) {
+        long ifModifiedSinceTimestamp;
+        long sinceTimestamp;
+        long timestamp = 0;
+        boolean isIfModifiedSinceSet = false;
+        String initiatedBy;
+        if (log.isDebugEnabled()) {
+            log.debug("getActivities since: " + since + " , offset: " + offset + " ,limit: " + limit + " ,"
+                    + "ifModifiedSince: " + ifModifiedSince);
+        }
+        RequestValidationUtil.validatePaginationParameters(offset, limit);
+        if (ifModifiedSince != null && !ifModifiedSince.isEmpty()) {
+            Date ifSinceDate;
+            SimpleDateFormat format = new SimpleDateFormat(Constants.DEFAULT_SIMPLE_DATE_FORMAT);
+            try {
+                ifSinceDate = format.parse(ifModifiedSince);
+            } catch (ParseException e) {
+                return Response.status(400).entity(new ErrorResponse.ErrorResponseBuilder()
+                        .setMessage("Invalid date string is provided in 'If-Modified-Since' header").build()).build();
+            }
+            ifModifiedSinceTimestamp = ifSinceDate.getTime();
+            isIfModifiedSinceSet = true;
+            timestamp = ifModifiedSinceTimestamp / 1000;
+        } else if (since != null && !since.isEmpty()) {
+            Date sinceDate;
+            SimpleDateFormat format = new SimpleDateFormat(Constants.DEFAULT_SIMPLE_DATE_FORMAT);
+            try {
+                sinceDate = format.parse(since);
+            } catch (ParseException e) {
+                return Response.status(400).entity(new ErrorResponse.ErrorResponseBuilder()
+                        .setMessage("Invalid date string is provided in 'since' filter").build()).build();
+            }
+            sinceTimestamp = sinceDate.getTime();
+            timestamp = sinceTimestamp / 1000;
+        }
+
+        if (timestamp == 0) {
+            //If timestamp is not sent by the user, a default value is set, that is equal to current time-12 hours.
+            long time = System.currentTimeMillis() / 1000;
+            timestamp = time - 42300;
+        }
+        if (log.isDebugEnabled()) {
+            log.debug("getActivities final timestamp " + timestamp);
+        }
+
+        List<Activity> activities;
+        int count;
+        ActivityList activityList = new ActivityList();
+        DeviceManagementProviderService dmService;
+
+        initiatedBy = PrivilegedCarbonContext.getThreadLocalCarbonContext().getUsername();
+        try {
+            if (log.isDebugEnabled()) {
+                log.debug("Calling database to get activities.");
+            }
+            dmService = DeviceMgtAPIUtils.getDeviceManagementService();
+            activities = dmService.getActivitiesUpdatedAfterByUser(timestamp, initiatedBy, limit, offset);
+            if (log.isDebugEnabled()) {
+                log.debug("Calling database to get activity count with timestamp and user.");
+            }
+            count = dmService.getActivityCountUpdatedAfterByUser(timestamp, initiatedBy);
+            if (log.isDebugEnabled()) {
+                log.debug("Activity count: " + count);
+            }
+
+            activityList.setList(activities);
+            activityList.setCount(count);
+            if ((activities == null || activities.isEmpty()) && isIfModifiedSinceSet) {
+                return Response.notModified().build();
+            }
+            return Response.ok().entity(activityList).build();
+        } catch (OperationManagementException e) {
+            String msg =
+                    "Error Response occurred while fetching the activities updated after given time stamp for the user "
+                            + initiatedBy + ".";
+            log.error(msg, e);
+            return Response.serverError().entity(new ErrorResponse.ErrorResponseBuilder().setMessage(msg).build())
+                    .build();
         }
     }
 

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/DeviceManagementAdminServiceImpl.java

@@ -20,18 +20,23 @@ package org.wso2.carbon.device.mgt.jaxrs.service.impl.admin;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.apache.solr.common.StringUtils;
+import org.wso2.carbon.apimgt.integration.generated.client.publisher.StringUtil;
 import org.wso2.carbon.base.MultitenantConstants;
 import org.wso2.carbon.context.CarbonContext;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.InvalidDeviceException;
 import org.wso2.carbon.device.mgt.common.PaginationRequest;
+import org.wso2.carbon.device.mgt.common.UserNotFoundException;
 import org.wso2.carbon.device.mgt.jaxrs.beans.DeviceList;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
 import org.wso2.carbon.device.mgt.jaxrs.service.api.admin.DeviceManagementAdminService;
 import org.wso2.carbon.device.mgt.jaxrs.service.impl.util.RequestValidationUtil;
 import org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtAPIUtils;
 
+import javax.validation.constraints.Past;
 import javax.validation.constraints.Size;
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
@@ -87,4 +92,32 @@ public class DeviceManagementAdminServiceImpl implements DeviceManagementAdminSe
         }
     }
 
+    @PUT
+    @Override
+    @Path("/device-owner")
+    public Response updateEnrollOwner(
+            @QueryParam("owner") String owner,
+            List<String> deviceIdentifiers){
+        try {
+            if (DeviceMgtAPIUtils.getDeviceManagementService().updateEnrollment(owner, deviceIdentifiers)){
+                String msg = "Device owner is updated successfully.";
+                return Response.status(Response.Status.OK).entity(msg).build();
+            }
+            String msg = "Device owner updating is failed.";
+            log.error(msg);
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).build();
+        } catch(InvalidDeviceException e){
+            String msg = "Invalid device identifiers are found with the request.";
+            log.error(msg);
+            return Response.status(Response.Status.BAD_REQUEST).entity(msg).build();
+        }catch (DeviceManagementException e) {
+            String msg = "Error occurred when updating device owners.";
+            log.error(msg);
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).build();
+        } catch (UserNotFoundException e) {
+            String msg = "Couldn't found the owner in user store to update the owner of devices.";
+            log.error(msg);
+            return Response.status(Response.Status.BAD_REQUEST).entity(msg).build();
+        }
+    }
 }

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/util/Constants.java

@@ -30,6 +30,7 @@ public class Constants {
     public static final String DEFAULT_STREAM_VERSION = "1.0.0";
 	public static final String SCOPE = "scope";
 	public static final String JDBC_USERSTOREMANAGER = "org.wso2.carbon.user.core.jdbc.JDBCUserStoreManager";
+	public static final String DEFAULT_SIMPLE_DATE_FORMAT = "EEE, d MMM yyyy HH:mm:ss Z";
 	public static final int DEFAULT_PAGE_LIMIT = 50;
 
 

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

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/UserNotFoundException.java

@@ -0,0 +1,44 @@
+package org.wso2.carbon.device.mgt.common;
+/*
+ * Copyright (c) 2019, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
+ *
+ * Entgra (Pvt) Ltd. 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.
+ */
+
+public class UserNotFoundException extends Exception {
+
+    private static final long serialVersionUID = -5705727414452641634L;
+
+    public UserNotFoundException(String msg, Exception nestedEx) {
+        super(msg, nestedEx);
+    }
+
+    public UserNotFoundException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public UserNotFoundException(String msg) {
+        super(msg);
+    }
+
+    public UserNotFoundException() {
+        super();
+    }
+
+    public UserNotFoundException(Throwable cause) {
+        super(cause);
+    }
+
+}

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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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/DeviceDAO.java

@@ -426,5 +426,16 @@ public interface DeviceDAO {
      */
     List<GeoCluster> findGeoClusters(String deviceType, GeoCoordinate southWest, GeoCoordinate northEast,
                                      int geohashLength,int tenantId) throws DeviceManagementDAOException;
+
+    /***
+     * This method is used to identify whether given device ids are exist or not.
+     *
+     * @param deviceIdentifiers List of device identifiers.
+     * @param tenantId tenant id.
+     * @return returns list of device ids that matches with device identifiers.
+     * @throws DeviceManagementDAOException throws {@link DeviceManagementDAOException} if connections establishment
+     * fails.
+     */
+    List<Device> getDevicesByIdentifiers(List<String> deviceIdentifiers, int tenantId) throws DeviceManagementDAOException;
 }
 

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

@@ -18,6 +18,7 @@
  */
 package org.wso2.carbon.device.mgt.core.dao;
 
+import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
 import org.wso2.carbon.device.mgt.common.EnrolmentInfo.Status;
 
@@ -50,4 +51,16 @@ public interface EnrollmentDAO {
     List<EnrolmentInfo> getEnrollmentsOfUser(int deviceId, String user, int tenantId) throws
                                                                                              DeviceManagementDAOException;
 
+    /***
+     *This method is used to update the owner of the enrollment for given set of devices to given user.
+     *
+     * @param devices List of devices.
+     * @param owner Username of the new device owner.
+     * @param tenantId tenant id.
+     * @return either (1) true, if device owner updating is succeed or false.
+     * @throws DeviceManagementDAOException if an error occurs when updating device owner.
+     */
+    boolean updateOwnerOfEnrollment(List<Device> devices, String owner, int tenantId)
+            throws DeviceManagementDAOException;
+
 }

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

@@ -40,6 +40,7 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
+import java.util.StringJoiner;
 
 public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
 
@@ -1245,4 +1246,53 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
         }
         return geoClusters;
     }
+
+    @Override
+    public List<Device> getDevicesByIdentifiers(List<String> deviceIdentifiers, int tenantId)
+            throws DeviceManagementDAOException {
+        try {
+            Connection conn = this.getConnection();
+            int index = 1;
+            int counter = 0;
+            List<Device> devices = new ArrayList<>();
+
+            StringJoiner joiner = new StringJoiner(",",
+                    "SELECT "
+                            + "d1.ID AS DEVICE_ID, d1.DESCRIPTION, d1.NAME AS DEVICE_NAME, d1.DEVICE_TYPE, "
+                            + "d1.DEVICE_IDENTIFICATION, e.OWNER, e.OWNERSHIP, e.STATUS, e.DATE_OF_LAST_UPDATE, "
+                            + "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.ID = d.DEVICE_TYPE_ID AND d.DEVICE_IDENTIFICATION IN (",
+                    ") AND d.TENANT_ID = ?) d1 "
+                            + "WHERE d1.ID = e.DEVICE_ID AND TENANT_ID = ? "
+                            + "ORDER BY e.DATE_OF_LAST_UPDATE DESC, e.STATUS ASC");
+            while (counter < deviceIdentifiers.size()) {
+                joiner.add("?");
+                counter++;
+            }
+            String query = joiner.toString();
+            try (PreparedStatement ps = conn.prepareStatement(query)) {
+                for (String identifier : deviceIdentifiers) {
+                    ps.setObject(index++, identifier);
+                }
+                ps.setInt(index++, tenantId);
+                ps.setInt(index, tenantId);
+                try (ResultSet rs = ps.executeQuery()) {
+                    if (rs.next()) {
+                        Device device = DeviceManagementDAOUtil.loadDevice(rs);
+                        devices.add(device);
+                    }
+                }
+            }
+            return devices;
+        } catch (SQLException e) {
+            throw new DeviceManagementDAOException("Error occurred while obtaining the DB connection when adding tags",
+                    e);
+        }
+    }
+
 }

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

@@ -18,6 +18,7 @@
  */
 package org.wso2.carbon.device.mgt.core.dao.impl;
 
+import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
 import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOException;
 import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOFactory;
@@ -28,6 +29,7 @@ import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.sql.Statement;
 import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Date;
@@ -361,6 +363,44 @@ public class EnrollmentDAOImpl implements EnrollmentDAO {
         }
     }
 
+    @Override
+    public boolean updateOwnerOfEnrollment(List<Device> devices, String owner, int tenantId)
+            throws DeviceManagementDAOException {
+        try {
+            Connection conn = this.getConnection();
+            boolean updateStatus = true;
+            String sql = "UPDATE DM_ENROLMENT SET OWNER = ? WHERE ID = ? AND TENANT_ID = ?";
+            try (PreparedStatement ps = conn.prepareStatement(sql)) {
+                if (conn.getMetaData().supportsBatchUpdates()) {
+                    for (Device device : devices) {
+                        ps.setString(1, owner);
+                        ps.setInt(2, device.getId());
+                        ps.setInt(3, tenantId);
+                        ps.addBatch();
+                    }
+                    for (int i : ps.executeBatch()) {
+                        if (i == 0 || i == Statement.SUCCESS_NO_INFO || i == Statement.EXECUTE_FAILED) {
+                            updateStatus = false;
+                        }
+                    }
+                } else {
+                    for (Device device : devices) {
+                        ps.setString(1, owner);
+                        ps.setInt(2, device.getId());
+                        ps.setInt(3, tenantId);
+                        if (ps.executeUpdate() == 0) {
+                            updateStatus = false;
+                        }
+                    }
+                }
+            }
+            return updateStatus;
+        } catch (SQLException e) {
+            throw new DeviceManagementDAOException("Error occurred while obtaining the DB connection when adding tags",
+                    e);
+        }
+    }
+
     private Connection getConnection() throws SQLException {
         return DeviceManagementDAOFactory.getConnection();
     }

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

@@ -17,7 +17,17 @@
  */
 package org.wso2.carbon.device.mgt.core.service;
 
-import org.wso2.carbon.device.mgt.common.*;
+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.FeatureManager;
+import org.wso2.carbon.device.mgt.common.InvalidDeviceException;
+import org.wso2.carbon.device.mgt.common.MonitoringOperation;
+import org.wso2.carbon.device.mgt.common.OperationMonitoringTaskConfig;
+import org.wso2.carbon.device.mgt.common.PaginationRequest;
+import org.wso2.carbon.device.mgt.common.PaginationResult;
+import org.wso2.carbon.device.mgt.common.UserNotFoundException;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationManagementException;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
 import org.wso2.carbon.device.mgt.common.license.mgt.License;
@@ -657,4 +667,7 @@ public interface DeviceManagementProviderService {
     List<String> getDeviceIdentifiersByStatus(String deviceType, String deviceStatus) throws DeviceManagementException;
 
     boolean bulkUpdateDeviceStatus(String deviceType, List<String> deviceList, String status) throws DeviceManagementException;
+
+    boolean updateEnrollment(String owner, List<String> deviceIdentifiers)
+            throws DeviceManagementException, UserNotFoundException, InvalidDeviceException;
 }

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

@@ -49,6 +49,7 @@ import org.wso2.carbon.device.mgt.common.OperationMonitoringTaskConfig;
 import org.wso2.carbon.device.mgt.common.PaginationRequest;
 import org.wso2.carbon.device.mgt.common.PaginationResult;
 import org.wso2.carbon.device.mgt.common.TransactionManagementException;
+import org.wso2.carbon.device.mgt.common.UserNotFoundException;
 import org.wso2.carbon.device.mgt.common.app.mgt.Application;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationManagementException;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
@@ -2809,7 +2810,8 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
             success = deviceDAO.setEnrolmentStatusInBulk(deviceType, status, tenantId, deviceList);
             DeviceManagementDAOFactory.commitTransaction();
         } catch (DeviceManagementDAOException e) {
-            String msg = "Error occurred in while updating status of devices :" +deviceType + " status : " + deviceList.toString();
+            String msg = "Error occurred in while updating status of devices :" + deviceType + " status : " + deviceList
+                    .toString();
             log.error(msg, e);
             throw new DeviceManagementException(msg, e);
         } catch (SQLException e) {
@@ -2822,6 +2824,66 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
         return success;
     }
 
+    public boolean updateEnrollment(String owner, List<String> deviceIdentifiers)
+            throws DeviceManagementException, UserNotFoundException, InvalidDeviceException {
+
+            int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
+            List<Device> existingDevices;
+            owner = validateOwner(owner, tenantId);
+            try {
+                DeviceManagementDAOFactory.beginTransaction();
+                existingDevices = deviceDAO.getDevicesByIdentifiers(deviceIdentifiers, tenantId);
+                if (existingDevices.size() != deviceIdentifiers.size()) {
+                    for (Device device : existingDevices) {
+                        deviceIdentifiers.remove(device.getDeviceIdentifier());
+                    }
+                    String msg =
+                            "Couldn't find device ids for requested all device identifiers. Therefore payload should "
+                                    + "contains device identifiers which are not in the system. Invalid device "
+                                    + "identifiers are " + deviceIdentifiers.toString();
+                    log.error(msg);
+                    throw new InvalidDeviceException(msg);
+                }
+                if (enrollmentDAO.updateOwnerOfEnrollment(existingDevices, owner, tenantId)) {
+                    DeviceManagementDAOFactory.commitTransaction();
+                    return true;
+                }
+                DeviceManagementDAOFactory.rollbackTransaction();
+                return false;
+            } catch (TransactionManagementException e) {
+                String msg = "Error occurred while initiating transaction";
+                log.error(msg, e);
+                throw new DeviceManagementException(msg, e);
+            } catch (DeviceManagementDAOException e) {
+                String msg = "Error occurred either verifying existence of device ids or updating owner of the device.";
+                log.error(msg);
+                throw new DeviceManagementException(msg, e);
+            } finally {
+                DeviceManagementDAOFactory.closeConnection();
+            }
+    }
+
+    private String validateOwner(String owner, int tenantId) throws UserNotFoundException, DeviceManagementException {
+        try {
+            if (StringUtils.isEmpty(owner)) {
+                owner = PrivilegedCarbonContext.getThreadLocalCarbonContext().getUsername();
+            } else {
+                boolean isUserExisit = DeviceManagementDataHolder.getInstance().getRealmService()
+                        .getTenantUserRealm(tenantId).getUserStoreManager().isExistingUser(owner);
+                if (!isUserExisit) {
+                    String msg = "Owner does not exist in the user storage. Owner: " + owner;
+                    log.error(msg);
+                    throw new UserNotFoundException(msg);
+                }
+            }
+            return owner;
+        } catch (UserStoreException e) {
+            String msg = "Error occurred when checking whether owner is exist or not. Owner: " + owner;
+            log.error(msg);
+            throw new DeviceManagementException(msg, e);
+        }
+    }
+
     private void extractDeviceLocationToUpdate(Device device) {
         List<Device.Property> properties = device.getProperties();
         if (properties != null) {

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

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.cookie-policy/cookie-policy.hbs

@@ -26,14 +26,14 @@
 
             <div class="panel-body">
                 <h3>About Entgra IoT Server</h3>
-                <p>Entgra IoT Server 3.4.0 is a complete solution that enables device manufacturers and enterprises to
+                <p>Entgra IoT Server 3.5.0 is a complete solution that enables device manufacturers and enterprises to
                    connect and manage their devices, build apps, manage events, secure devices and data, and visualize
                    sensor data in a scalable manner.</p>
                 <p>It also offers a complete and secure Enterprise Mobility Management (EMM/MDM) solution that aims to
                    address mobile computing challenges faced by enterprises today. Supporting iOS, Android, and Windows
                    devices, it helps organizations deal with both Corporate Owned, Personally Enabled (COPE) and
                    employee-owned devices with the Bring Your Own Device (BYOD) concept.</p>
-                <p>Entgra IoT Server 3.4.0 comes with advanced analytics, enabling users to analyze speed, proximity, and
+                <p>Entgra IoT Server 3.5.0 comes with advanced analytics, enabling users to analyze speed, proximity, and
                    geo-fencing information of devices including details of those in motion and stationary state.</p>
                 </p>
                 <h2>Cookie Policy</h2>
@@ -45,12 +45,12 @@
                    apps remember things about you. Other technologies, including Web storage and identifiers associated
                    with your device, may be used for similar purposes. In this policy, we use the term “cookies” to
                    discuss all of these technologies.</p>
-                <h3>How does Entgra IoT Server 3.4.0 process cookies?</h3>
+                <h3>How does Entgra IoT Server 3.5.0 process cookies?</h3>
-                <p>Entgra IoT Server 3.4.0 uses cookies to store and retrieve information on your browser. This
+                <p>Entgra IoT Server 3.5.0 uses cookies to store and retrieve information on your browser. This
                    information is used to provide a better user experience. Some cookies serve the purpose of allowing a
                    user to log in to the system, maintain sessions, and keep track of activities within the login
                    session.</p>
-                <p>Some cookies in Entgra IoT Server 3.4.0 are used to personally identify you. However, the cookie
+                <p>Some cookies in Entgra IoT Server 3.5.0 are used to personally identify you. However, the cookie
                    lifetime ends once your session ends, i.e., after you log-out, or after the session expiry time has
                    elapsed.</p>
                 <p>Some cookies are simply used to give you a more personalised web experience, and these cannot be used
@@ -58,42 +58,42 @@
                 <p>This Cookie Policy is part of the IoT Server <a href="{{@app.context}}/privacy-policy">Privacy Policy.</a>
                 </p>
                 <h3>What does Entgra IoT Server 3.0.0 use cookies for?</h3>
-                <p>Cookies are used for two purposes in Entgra IoT Server 3.4.0.</p>
+                <p>Cookies are used for two purposes in Entgra IoT Server 3.5.0.</p>
                 <ol>
                     <li>To identify you and provide security</li>
                     <li>To provide a satisfying user experience.</li>
                 </ol>
 
                 <h4><u>Preferences</u></h4>
-                <p>Entgra IoT Server 3.4.0 uses cookies to remember your settings and preferences and to auto-fill the
+                <p>Entgra IoT Server 3.5.0 uses cookies to remember your settings and preferences and to auto-fill the
                    fields to make your interactions with the site easier.</p>
                 <p>These cookies can not be used to personally identify you.</p>
 
                 <h4><u>Security</u></h4>
                 <ol>
-                    <li>Entgra IoT Server 3.4.0 uses selected cookies to identify and prevent security risks. For example,
+                    <li>Entgra IoT Server 3.5.0 uses selected cookies to identify and prevent security risks. For example,
-                        Entgra IoT Server 3.4.0 may use cookies to store your session information to prevent others from
+                        Entgra IoT Server 3.5.0 may use cookies to store your session information to prevent others from
                         changing your password without your username and password.
                     </li>
-                    <li>Entgra IoT Server 3.4.0 uses session cookie to maintain your active session.</li>
+                    <li>Entgra IoT Server 3.5.0 uses session cookie to maintain your active session.</li>
-                    <li>Entgra IoT Server 3.4.0 may use a temporary cookie when performing multi-factor authentication and
+                    <li>Entgra IoT Server 3.5.0 may use a temporary cookie when performing multi-factor authentication and
                         federated authentication.
                     </li>
-                    <li>Entgra IoT Server 3.4.0 may use permanent cookies to detect the devices you have logged in
+                    <li>Entgra IoT Server 3.5.0 may use permanent cookies to detect the devices you have logged in
                         previously. This is to to calculate the <b>risk level</b> associated with your current login
                         attempt. Using these cookies protects you and your account from possible attacks.
                     </li>
                 </ol>
                 <h4><u>Performance</u></h4>
-                <p>Entgra IoT Server 3.4.0 may use cookies to allow <b>Remember Me</b> functionalities.</p>
+                <p>Entgra IoT Server 3.5.0 may use cookies to allow <b>Remember Me</b> functionalities.</p>
                 <h4><u>Analytics</u></h4>
-                <p>Entgra IoT Server 3.4.0 as a product does not use cookies for analytical purposes.</p>
+                <p>Entgra IoT Server 3.5.0 as a product does not use cookies for analytical purposes.</p>
                 <h4><u>Third party cookies</u></h4>
-                <p>Using Entgra IoT Server 3.4.0 may cause third-party cookie to be set in your browser. Entgra IoT Server
+                <p>Using Entgra IoT Server 3.5.0 may cause third-party cookie to be set in your browser. Entgra IoT Server
-                   3.4.0 has no control over how any of them operate. The third-party cookies that maybe set
+                   3.5.0 has no control over how any of them operate. The third-party cookies that maybe set
                    include:</p>
                 <ol>
-                    <li>Any social login sites. For example, third-party cookies may be set when Entgra IoT Server 3.4.0
+                    <li>Any social login sites. For example, third-party cookies may be set when Entgra IoT Server 3.5.0
                         is configured to use “social” or “federated” login, and you opt to login with your “Social
                         Account”.
                     </li>
@@ -101,11 +101,11 @@
                 </ol>
                 <p>Entgra strongly advises you to refer the respective cookie policies of such sites carefully as Entgra has
                    no knowledge or use on these cookies.</p>
-                <h3>What type of cookies does Entgra IoT Server 3.4.0 use?</h3>
+                <h3>What type of cookies does Entgra IoT Server 3.5.0 use?</h3>
-                <p>Entgra IoT Server 3.4.0 uses persistent cookies and session cookies. A persistent cookie helps Entgra IS
+                <p>Entgra IoT Server 3.5.0 uses persistent cookies and session cookies. A persistent cookie helps Entgra IS
-                   3.4.0 to recognize you as an existing user so that it is easier to return to Entgra or interact with
+                   3.5.0 to recognize you as an existing user so that it is easier to return to Entgra or interact with
-                   Entgra IS 3.4.0 without signing in again. After you sign in, a persistent cookie stays in your browser
+                   Entgra IS 3.5.0 without signing in again. After you sign in, a persistent cookie stays in your browser
-                   and will be read by Entgra IoT Server 3.4.0 when you return to Entgra IoT Server 3.4.0.</p>
+                   and will be read by Entgra IoT Server 3.5.0 when you return to Entgra IoT Server 3.5.0.</p>
                 <p>A session cookie is a cookie that is erased when the user closes the Web browser. The session cookie
                    is stored in temporarily and is not retained after the browser is closed. Session cookies do not
                    collect information from the user’s computer.</p>
@@ -114,9 +114,9 @@
                    for websites to set cookies, you may worsen your overall user experience since it will no longer be
                    personalized to you. It may also stop you from saving customized settings like login information.
                    Most likely, disabling cookies will make it unable for you to use authentication and authorization
-                   functionalities offered by Entgra IoT Server 3.4.0.</p>
+                   functionalities offered by Entgra IoT Server 3.5.0.</p>
                 <p>If you have any questions or concerns regarding the use of cookies, please contact the entity or
-                   individuals (or their data protection officer, if applicable) running this Entgra IoT Server 3.4.0
+                   individuals (or their data protection officer, if applicable) running this Entgra IoT Server 3.5.0
                    instance.</p>
                 <h3>What are the cookies used?</h3>
                 <table class="table table-striped table-bordered">
@@ -150,17 +150,17 @@
                     </tbody>
                 </table>
                 <h3>Disclaimer</h3>
-                <p>This cookie policy is only for illustrative purposes of the product Entgra IoT Server 3.4.0. The
+                <p>This cookie policy is only for illustrative purposes of the product Entgra IoT Server 3.5.0. The
                    content in the policy is technically correct at the time of the product shipment. The
-                   entity,organization or individual that runs this Entgra IoT Server 3.4.0 instance has full authority
+                   entity,organization or individual that runs this Entgra IoT Server 3.5.0 instance has full authority
                    and responsibility with regard to the effective Cookie Policy. Entgra, its employees, partners, and
                    affiliates do not have access to and do not require, store, process or control any of the data,
-                   including personal data contained in Entgra IoT Server 3.4.0. All data, including personal data is
+                   including personal data contained in Entgra IoT Server 3.5.0. All data, including personal data is
-                   controlled and processed by the entity, organization or individual running Entgra IoT Server 3.4.0.
+                   controlled and processed by the entity, organization or individual running Entgra IoT Server 3.5.0.
                    Entgra, its employees partners and affiliates are not a data processor or a data controller within the
                    meaning of any data privacy regulations. Entgra does not provide any warranties or undertake any
                    responsibility or liability in connection with the lawfulness or the manner and purposes for which
-                   Entgra IoT Server 3.4.0 is used by such entities, organizations or persons.</p>
+                   Entgra IoT Server 3.5.0 is used by such entities, organizations or persons.</p>
             </div>
         </div>
     </div>

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.privacy-policy/privacy-policy.hbs

@@ -36,18 +36,18 @@
                 <p>Entgra IoT Server comes with advanced analytics, enabling users to analyze speed, proximity, and
                    geo-fencing information of devices including details of those in motion and stationary state.</p>
                 <h3>Privacy Policy</h3>
-                <p>This policy describes how Entgra IoT Server 3.4.0 captures your personal information, the purposes of
+                <p>This policy describes how Entgra IoT Server 3.5.0 captures your personal information, the purposes of
                    collection, and information about the retention of your personal information.
                 <p>Please note that this policy is for reference only, and is applicable for the software as a product.
                    Entgra and its developers have no access to the information held within Entgra IoT Server
-                   3.4.0.Please see the Disclaimer section for more information. Entities, organisations or individuals
+                   3.5.0.Please see the Disclaimer section for more information. Entities, organisations or individuals
-                   controlling the use and administration of Entgra IoT Server 3.4.0 should create their own privacy
+                   controlling the use and administration of Entgra IoT Server 3.5.0 should create their own privacy
                    policies setting out the manner in which data is controlled or processed by the respective entity,
                    organisation or individual.
                 <h3>What is personal information?</h3>
-                <p>Entgra IoT Server 3.4.0 considers anything related to you and by which you may be identified as your
+                <p>Entgra IoT Server 3.5.0 considers anything related to you and by which you may be identified as your
                    personal information.</p>
-                <p><b>Signing in to Entgra IoT Server 3.4.0</b></p>
+                <p><b>Signing in to Entgra IoT Server 3.5.0</b></p>
                 <ol>
                     <li>Your user name (except in cases where the user name created by your employer is under
                         contract)
@@ -55,7 +55,7 @@
                     <li>IP address used to log in</li>
                     <li>Email address</li>
                 </ol>
-                <p><b>Enrolling a device with Entgra IoT Server 3.4.0</b></p>
+                <p><b>Enrolling a device with Entgra IoT Server 3.5.0</b></p>
                 <ul>
                     <li>Your device ID (e.g., phone or tablet), mobile number, IMEI number, and IMSI number</li>
                     <li>Your device’s location</li>
@@ -64,7 +64,7 @@
                         memory usage
                     </li>
                 </ul>
-                <p>However, Entgra IoT Server 3.4.0 also collects the following information that is not considered
+                <p>However, Entgra IoT Server 3.5.0 also collects the following information that is not considered
                    personal information, but is used only for <b>statistical</b> purposes. The reason for this is that
                    this information can not be used to track you.
                 <ul>
@@ -74,17 +74,17 @@
                     <li>Operating system and generic browser information</li>
                 </ul>
                 <h3>Collection of personal information</h3>
-                <p>Entgra IoT Server 3.4.0 collects your information only to serve your access requirements. For example:
+                <p>Entgra IoT Server 3.5.0 collects your information only to serve your access requirements. For example:
                 <ul>
-                    <li>Entgra IoT Server 3.4.0 uses your IP address to detect any suspicious login attempts to your
+                    <li>Entgra IoT Server 3.5.0 uses your IP address to detect any suspicious login attempts to your
                         account.
-                    <li>Entgra IoT Server 3.4.0 uses attributes like your first name, last name, etc., to provide a rich
+                    <li>Entgra IoT Server 3.5.0 uses attributes like your first name, last name, etc., to provide a rich
                         and personalized user experience.
-                    <li>Entgra IoT Server 3.4.0 uses your security questions and answers only to allow account recovery.
+                    <li>Entgra IoT Server 3.5.0 uses your security questions and answers only to allow account recovery.
                     </li>
                 </ul>
                 <h4><u>Tracking Technologies</u></h4>
-                <p>Entgra IoT Server 3.4.0 collects your information by:</p>
+                <p>Entgra IoT Server 3.5.0 collects your information by:</p>
                 <ul>
                     <li>Collecting information from the user profile page where you enter your personal data.</li>
                     <li>Tracking your IP address with HTTP request, HTTP headers, and TCP/IP.</li>
@@ -95,15 +95,15 @@
                     </li>
                 </ul>
                 <h3>Use of personal information</h3>
-                <p>Entgra IoT Server 3.4.0 will only use your personal information for the purposes for which it was
+                <p>Entgra IoT Server 3.5.0 will only use your personal information for the purposes for which it was
                    collected (or for a use identified as consistent with that purpose).</p>
-                <p>Entgra IoT Server 3.4.0 uses your personal information only for the following purposes.</p>
+                <p>Entgra IoT Server 3.5.0 uses your personal information only for the following purposes.</p>
                 <ul>
-                    <li>To provide you with a personalized user experience. Entgra IoT Server 3.4.0 uses your name and
+                    <li>To provide you with a personalized user experience. Entgra IoT Server 3.5.0 uses your name and
                         uploaded profile pictures for this purpose.
                     </li>
                     <li>To protect your account from unauthorized access or potential hacking attempts. Entgra IoT Server
-                        3.4.0 uses HTTP or TCP/IP Headers for this purpose.
+                        3.5.0 uses HTTP or TCP/IP Headers for this purpose.
                     </li>
                     <li>
                         <p>This includes:</p>
@@ -114,10 +114,10 @@
                         </ol>
                     </li>
                     <li>Derive statistical data for analytical purposes on system performance improvements. Entgra IoT
-                        Server 3.4.0 will not keep any personal information after statistical calculations. Therefore,
+                        Server 3.5.0 will not keep any personal information after statistical calculations. Therefore,
                         the statistical report has no means of identifying an individual person.
                     </li>
-                    <li>Entgra IoT Server 3.4.0 may use:</li>
+                    <li>Entgra IoT Server 3.5.0 may use:</li>
                     <li>
                         <ol>
                             <li>IP Address to derive geographic information</li>
@@ -126,28 +126,28 @@
                     </li>
                 </ul>
                 <h3>Disclosure of personal information</h3>
-                <p>Entgra IoT Server 3.4.0 only discloses personal information to the relevant applications (also known as
+                <p>Entgra IoT Server 3.5.0 only discloses personal information to the relevant applications (also known as
-                   “Service Providers”) that are registered with Entgra IoT Server 3.4.0. These applications are
+                   “Service Providers”) that are registered with Entgra IoT Server 3.5.0. These applications are
                    registered by the identity administrator of your entity or organization. Personal information is
                    disclosed only for the purposes for which it was collected (or for a use identified as consistent
                    with that purpose) as controlled by such Service Providers, unless you have consented otherwise or
                    where it is required by law.</p>
                 <h4>Legal process</h4>
-                <p>Please note that the organisation, entity or individual running Entgra IoT Server 3.4.0 may be
+                <p>Please note that the organisation, entity or individual running Entgra IoT Server 3.5.0 may be
                    compelled to disclose your personal information with or without your consent when it is required by
                    law following due and lawful process.</p>
                 <h3>Storage of personal information</h3>
                 <h4><u>Where your personal information is stored</u></h4>
-                <p>Entgra IoT Server 3.4.0 stores your personal information in secured databases. Entgra IoT Server 3.4.0
+                <p>Entgra IoT Server 3.5.0 stores your personal information in secured databases. Entgra IoT Server 3.5.0
                    exercises proper industry accepted security measures to protect the database where your personal
-                   information is held.Entgra IoT Server 3.4.0 as a product does not transfer or share your data with any
+                   information is held.Entgra IoT Server 3.5.0 as a product does not transfer or share your data with any
                    third parties or locations.</p>
-                <p>Entgra IoT Server 3.4.0 may use encryption to keep your personal data with an added level of
+                <p>Entgra IoT Server 3.5.0 may use encryption to keep your personal data with an added level of
                    security.</p>
                 <h4><u>How long your personal information is retained</u></h4>
-                <p>Entgra IoT Server 3.4.0 retains your personal data as long as you are an active user of our system. You
+                <p>Entgra IoT Server 3.5.0 retains your personal data as long as you are an active user of our system. You
                    can update your personal data at any time using the given self-care user portals.</p>
-                <p>Entgra IoT Server 3.4.0 may keep hashed secrets to provide you with an added level of security. This
+                <p>Entgra IoT Server 3.5.0 may keep hashed secrets to provide you with an added level of security. This
                    includes:</p>
                 <ul>
                     <li>Current password</li>
@@ -157,15 +157,15 @@
                 <p>You can request the administrator to delete your account. The administrator is the administrator of
                    the tenant you are registered under, or the super-administrator if you do not use the tenant
                    feature.</p>
-                <p>Additionally, you can request to anonymize all traces of your activities that Entgra IoT Server 3.4.0
+                <p>Additionally, you can request to anonymize all traces of your activities that Entgra IoT Server 3.5.0
                    may have retained in logs, databases or analytical storage.</p>
                 <h3>More information</h3>
                 <h4><u>Changes to this policy</u></h4>
-                <p>Upgraded versions of Entgra IoT Server 3.4.0 may contain changes to this policy. Revisions to this
+                <p>Upgraded versions of Entgra IoT Server 3.5.0 may contain changes to this policy. Revisions to this
                    policy will be packaged within such upgrades and would only apply to users who choose to use upgraded
                    versions.</p>
                 <h4><u>Your choices</u></h4>
-                <p>If you are already have an user account within Entgra IoT Server 3.4.0 ; you have the right to
+                <p>If you are already have an user account within Entgra IoT Server 3.5.0 ; you have the right to
                    deactivate your account if you find that this privacy policy is unacceptable to you.</p>
                 <p>If you do not have an account and you do not agree with our privacy policy, you can chose not to
                    create one.</p>
@@ -174,19 +174,19 @@
                 <p><a href="https://entgra.io/contact/">https://entgra.io.com/contact/</a></p>
                 <h3>Disclaimer</h3>
                 <p>Entgra, its employees, partners, and affiliates do not have access to and do not require, store,
-                   process or control any of the data, including personal data contained in Entgra IoT Server 3.4.0. All
+                   process or control any of the data, including personal data contained in Entgra IoT Server 3.5.0. All
                    data, including personal data is controlled and processed by the entity or individual running Entgra
-                   IoT Server 3.4.0. Entgra, its employees partners and affiliates are not a data processor or a data
+                   IoT Server 3.5.0. Entgra, its employees partners and affiliates are not a data processor or a data
                    controller within the meaning of any data privacy regulations. Entgra does not provide any warranties
                    or undertake any responsibility or liability in connection with the lawfulness or the manner and
-                   purposes for which Entgra IoT Server 3.4.0 is used by such entities or persons.</p>
+                   purposes for which Entgra IoT Server 3.5.0 is used by such entities or persons.</p>
                 <p>This privacy policy is for the informational purposes of the entity or persons running Entgra IoT
-                   Server 3.4.0 and sets out the processes and functionality contained within Entgra IoT Server 3.4.0
+                   Server 3.5.0 and sets out the processes and functionality contained within Entgra IoT Server 3.5.0
                    regarding personal data protection. It is the responsibility of entities and persons running Entgra IoT
-                   Server 3.4.0 to create and administer its own rules and processes governing users’ personal data,
+                   Server 3.5.0 to create and administer its own rules and processes governing users’ personal data,
                    Please note that the creation of such rules and processes may change the use, storage and disclosure
                    policies contained herein. Therefore users should consult the entity or persons running Entgra IoT
-                   Server 3.4.0 for its own privacy policy for details governing users’ personal data.</p>
+                   Server 3.5.0 for its own privacy policy for details governing users’ personal data.</p>
             </div>
         </div>
     </div>

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.footer/footer.hbs

@@ -17,7 +17,7 @@
 }}
 {{#zone "footer"}}
     <p>
-        <span class="hidden-xs">Entgra IoT Server{{#unless isCloud}} 3.4.0{{/unless}}</span>
+        <span class="hidden-xs">Entgra IoT Server{{#unless isCloud}} 3.5.0{{/unless}}</span>
         <span class="visible-xs-inline">Entgra IoT Server{{#unless isCloud}} 3.5.0{{/unless}}</span> | &copy; <script>document.write(new Date().getFullYear());</script>,
         <a href="https://www.entgra.io/" target="_blank">Entgra</a>. All Rights Reserved.
     </p>

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.theme/public/css/theme-wso2.css

@@ -7353,7 +7353,7 @@ body.inverse .fade-edge:after {
   height: 100%;
   overflow-y: auto;
   background: #FFFFFF;
-  color: #ffffff;
+  color: rgba(0,0,0, 0.65);
   -webkit-transition: all 0.5s ease;
   -o-transition: all 0.5s ease;
   transition: all 0.5s ease;

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

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

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

components/device-mgt/org.wso2.carbon.device.mgt.v09.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/UserManagementService.java

@@ -25,8 +25,6 @@ import io.swagger.annotations.ExtensionProperty;
 import io.swagger.annotations.Extension;
 import io.swagger.annotations.Tag;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.AuthorizationScope;
-import io.swagger.annotations.Authorization;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
@@ -35,6 +33,7 @@ import io.swagger.annotations.ResponseHeader;
 import org.apache.axis2.transport.http.HTTPConstants;
 import org.wso2.carbon.apimgt.annotations.api.Scopes;
 import org.wso2.carbon.apimgt.annotations.api.Scope;
+import org.wso2.carbon.device.mgt.jaxrs.beans.ActivityList;
 import org.wso2.carbon.device.mgt.jaxrs.beans.BasicUserInfo;
 import org.wso2.carbon.device.mgt.jaxrs.beans.BasicUserInfoList;
 import org.wso2.carbon.device.mgt.jaxrs.beans.EnrollmentInvitation;
@@ -806,4 +805,80 @@ public interface UserManagementService {
                     value = "List of email address of recipients",
                     required = true)
             @Valid EnrollmentInvitation enrollmentInvitation);
+
+    @GET
+    @Path("/device/activities")
+    @ApiOperation(
+            produces = MediaType.APPLICATION_JSON,
+            httpMethod = "GET",
+            value = "Getting Activity Details",
+            notes = "Get the details of the operations/activities executed by the server on the devices registered" +
+                    " with WSO2 EMM, during a defined time period.",
+            tags = "Activity Info Provider",
+            extensions = {
+                    @Extension(properties = {
+                            @ExtensionProperty(name = Constants.SCOPE, value = "perm:get-activity")
+                    })
+            }
+    )
+    @ApiResponses(value = {
+            @ApiResponse(
+                    code = 200,
+                    message = "OK. \n Successfully fetched the activity details.",
+                    response = ActivityList.class,
+                    responseHeaders = {
+                            @ResponseHeader(
+                                    name = "Content-Type",
+                                    description = "The content type of the body"),
+                            @ResponseHeader(
+                                    name = "ETag",
+                                    description = "Entity Tag of the response resource.\n" +
+                                            "Used by caches, or in conditional requests."),
+                            @ResponseHeader(
+                                    name = "Last-Modified",
+                                    description = "Date and time the resource was last modified.\n" +
+                                            "Used by caches, or in conditional requests."),
+                    }),
+            @ApiResponse(
+                    code = 304,
+                    message = "Not Modified. \n Empty body because the client already has the latest version of the" +
+                            " requested resource.\n"),
+            @ApiResponse(
+                    code = 401,
+                    message = "Unauthorized. \n Unauthorized request."),
+            @ApiResponse(
+                    code = 404,
+                    message = "Not Found. \n No activities found.",
+                    response = ErrorResponse.class),
+            @ApiResponse(
+                    code = 406,
+                    message = "Not Acceptable.\n The requested media type is not supported"),
+            @ApiResponse(
+                    code = 500,
+                    message = "Internal Server Error. \n Server error occurred while fetching the activity data.",
+                    response = ErrorResponse.class)
+    })
+    Response getActivities(
+            @ApiParam(
+                    name = "since",
+                    value = "Checks if the requested variant was created since the specified date-time.\n" +
+                            "Provide the value in the following format: EEE, d MMM yyyy HH:mm:ss Z.\n" +
+                            "Example: Mon, 05 Jan 2014 15:10:00 +0200")
+            @QueryParam("since") String since,
+            @ApiParam(
+                    name = "offset",
+                    value = "The starting pagination index for the complete list of qualified items.",
+                    defaultValue = "0")
+            @QueryParam("offset") int offset,
+            @ApiParam(
+                    name = "limit",
+                    value = "Provide how many activity details you require from the starting pagination index/offset.",
+                    defaultValue = "5")
+            @QueryParam("limit") int limit,
+            @ApiParam(
+                    name = "If-Modified-Since",
+                    value = "Checks if the requested variant was modified, since the specified date-time\n." +
+                            "Provide the value in the following format: EEE, d MMM yyyy HH:mm:ss Z\n." +
+                            "Example: Mon, 05 Jan 2014 15:10:00 +0200")
+            @HeaderParam("If-Modified-Since") String ifModifiedSince);
 }

components/device-mgt/org.wso2.carbon.device.mgt.v09.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/admin/DeviceManagementAdminService.java

@@ -33,6 +33,7 @@ import io.swagger.annotations.ResponseHeader;
 import org.wso2.carbon.apimgt.annotations.api.Scope;
 import org.wso2.carbon.apimgt.annotations.api.Scopes;
 import org.wso2.carbon.device.mgt.common.Device;
+import org.wso2.carbon.device.mgt.jaxrs.beans.DeviceList;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
 import org.wso2.carbon.device.mgt.jaxrs.util.Constants;
 
@@ -40,6 +41,7 @@ import javax.validation.constraints.Size;
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
+import java.util.List;
 
 @SwaggerDefinition(
         info = @Info(
@@ -168,4 +170,54 @@ public interface DeviceManagementAdminService {
                     required = false,
                     defaultValue = "5")
             @QueryParam("limit") int limit);
+
+    @PUT
+    @Path("/device-owner")
+    @ApiOperation(
+            produces = MediaType.APPLICATION_JSON,
+            httpMethod = "PUT",
+            value = "Update the device owner",
+            notes = "Update enrollment owner for given device Identifiers.",
+            tags = "Device Management",
+            extensions = {
+                    @Extension(properties = {
+                            @ExtensionProperty(name = Constants.SCOPE, value = "perm:admin:devices:update-enrollment")
+                    })
+            }
+    )
+    @ApiResponses(value = {
+            @ApiResponse(code = 200, message = "OK. \n Successfully update the owner of devices.",
+                    response = DeviceList.class,
+                    responseHeaders = {
+                            @ResponseHeader(
+                                    name = "Content-Type",
+                                    description = "The content type of the body"),
+                            @ResponseHeader(
+                                    name = "ETag",
+                                    description = "Entity Tag of the response resource.\n" +
+                                            "Used by caches, or in conditional requests."),
+                            @ResponseHeader(
+                                    name = "Last-Modified",
+                                    description = "Date and time the resource was last modified.\n" +
+                                            "Used by caches, or in conditional requests."),
+                    }),
+            @ApiResponse(
+                    code = 400,
+                    message = "The incoming request has more than one selection criteria defined via the query parameters.",
+                    response = ErrorResponse.class),
+            @ApiResponse(
+                    code = 500,
+                    message = "Internal Server Error. \n Server error occurred while fetching the device list.",
+                    response = ErrorResponse.class)
+    }) Response updateEnrollOwner(
+            @ApiParam(
+                    name = "Device Owner",
+                    value = "The username that is going to use for the new device owner of given devices.",
+                    required = true)
+            @QueryParam("owner") String owner,
+            @ApiParam(
+                    name = "Device Identifiers",
+                    value = "List of device identifiers.",
+                    required = true)
+            List<String> deviceIdentifiers);
 }

components/device-mgt/org.wso2.carbon.device.mgt.v09.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/UserManagementServiceImpl.java

@@ -23,12 +23,16 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.eclipse.wst.common.uriresolver.internal.util.URIEncoder;
+import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationManagementException;
+import org.wso2.carbon.device.mgt.common.operation.mgt.Activity;
+import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
 import org.wso2.carbon.device.mgt.core.DeviceManagementConstants;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 import org.wso2.carbon.device.mgt.core.service.EmailMetaInfo;
+import org.wso2.carbon.device.mgt.jaxrs.beans.ActivityList;
 import org.wso2.carbon.device.mgt.jaxrs.beans.BasicUserInfo;
 import org.wso2.carbon.device.mgt.jaxrs.beans.BasicUserInfoList;
 import org.wso2.carbon.device.mgt.jaxrs.beans.BasicUserInfoWrapper;
@@ -67,8 +71,11 @@ import java.io.UnsupportedEncodingException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.security.SecureRandom;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -635,6 +642,94 @@ public class UserManagementServiceImpl implements UserManagementService {
         return Response.status(Response.Status.OK).entity("Invitation mails have been sent.").build();
     }
 
+    @GET
+    @Override
+    @Path("/device/activities")
+    public Response getActivities(
+            @QueryParam("since") String since,
+            @QueryParam("offset") int offset,
+            @QueryParam("limit") int limit,
+            @HeaderParam("If-Modified-Since") String ifModifiedSince) {
+        long ifModifiedSinceTimestamp;
+        long sinceTimestamp;
+        long timestamp = 0;
+        boolean isIfModifiedSinceSet = false;
+        String initiatedBy;
+        if (log.isDebugEnabled()) {
+            log.debug("getActivities since: " + since + " , offset: " + offset + " ,limit: " + limit + " ,"
+                    + "ifModifiedSince: " + ifModifiedSince);
+        }
+        RequestValidationUtil.validatePaginationParameters(offset, limit);
+        if (ifModifiedSince != null && !ifModifiedSince.isEmpty()) {
+            Date ifSinceDate;
+            SimpleDateFormat format = new SimpleDateFormat(Constants.DEFAULT_SIMPLE_DATE_FORMAT);
+            try {
+                ifSinceDate = format.parse(ifModifiedSince);
+            } catch (ParseException e) {
+                return Response.status(400).entity(new ErrorResponse.ErrorResponseBuilder()
+                        .setMessage("Invalid date string is provided in 'If-Modified-Since' header").build()).build();
+            }
+            ifModifiedSinceTimestamp = ifSinceDate.getTime();
+            isIfModifiedSinceSet = true;
+            timestamp = ifModifiedSinceTimestamp / 1000;
+        } else if (since != null && !since.isEmpty()) {
+            Date sinceDate;
+            SimpleDateFormat format = new SimpleDateFormat(Constants.DEFAULT_SIMPLE_DATE_FORMAT);
+            try {
+                sinceDate = format.parse(since);
+            } catch (ParseException e) {
+                return Response.status(400).entity(new ErrorResponse.ErrorResponseBuilder()
+                        .setMessage("Invalid date string is provided in 'since' filter").build()).build();
+            }
+            sinceTimestamp = sinceDate.getTime();
+            timestamp = sinceTimestamp / 1000;
+        }
+
+        if (timestamp == 0) {
+            //If timestamp is not sent by the user, a default value is set, that is equal to current time-12 hours.
+            long time = System.currentTimeMillis() / 1000;
+            timestamp = time - 42300;
+        }
+        if (log.isDebugEnabled()) {
+            log.debug("getActivities final timestamp " + timestamp);
+        }
+
+        List<Activity> activities;
+        int count;
+        ActivityList activityList = new ActivityList();
+        DeviceManagementProviderService dmService;
+
+        initiatedBy = PrivilegedCarbonContext.getThreadLocalCarbonContext().getUsername();
+        try {
+            if (log.isDebugEnabled()) {
+                log.debug("Calling database to get activities.");
+            }
+            dmService = DeviceMgtAPIUtils.getDeviceManagementService();
+            activities = dmService.getActivitiesUpdatedAfterByUser(timestamp, initiatedBy, limit, offset);
+            if (log.isDebugEnabled()) {
+                log.debug("Calling database to get activity count with timestamp and user.");
+            }
+            count = dmService.getActivityCountUpdatedAfterByUser(timestamp, initiatedBy);
+            if (log.isDebugEnabled()) {
+                log.debug("Activity count: " + count);
+            }
+
+            activityList.setList(activities);
+            activityList.setCount(count);
+            if ((activities == null || activities.isEmpty()) && isIfModifiedSinceSet) {
+                return Response.notModified().build();
+            }
+            return Response.ok().entity(activityList).build();
+        } catch (OperationManagementException e) {
+            String msg =
+                    "Error Response occurred while fetching the activities updated after given time stamp for the user "
+                            + initiatedBy + ".";
+            log.error(msg, e);
+            return Response.serverError().entity(new ErrorResponse.ErrorResponseBuilder().setMessage(msg).build())
+                    .build();
+        }
+    }
+
     private Map<String, String> buildDefaultUserClaims(String firstName, String lastName, String emailAddress) {
         Map<String, String> defaultUserClaims = new HashMap<>();
         defaultUserClaims.put(Constants.USER_CLAIM_FIRST_NAME, firstName);

components/device-mgt/org.wso2.carbon.device.mgt.v09.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/admin/DeviceManagementAdminServiceImpl.java

@@ -26,7 +26,9 @@ import org.wso2.carbon.context.CarbonContext;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.InvalidDeviceException;
 import org.wso2.carbon.device.mgt.common.PaginationRequest;
+import org.wso2.carbon.device.mgt.common.UserNotFoundException;
 import org.wso2.carbon.device.mgt.jaxrs.beans.DeviceList;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
 import org.wso2.carbon.device.mgt.jaxrs.service.api.admin.DeviceManagementAdminService;
@@ -88,4 +90,32 @@ public class DeviceManagementAdminServiceImpl implements DeviceManagementAdminSe
         }
     }
 
+    @PUT
+    @Override
+    @Path("/device-owner")
+    public Response updateEnrollOwner(
+            @QueryParam("owner") String owner,
+            List<String> deviceIdentifiers){
+        try {
+            if (DeviceMgtAPIUtils.getDeviceManagementService().updateEnrollment(owner, deviceIdentifiers)){
+                String msg = "Device owner is updated successfully.";
+                return Response.status(Response.Status.OK).entity(msg).build();
+            }
+            String msg = "Device owner updating is failed.";
+            log.error(msg);
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).build();
+        } catch(InvalidDeviceException e){
+            String msg = "Invalid device identifiers are found with the request.";
+            log.error(msg);
+            return Response.status(Response.Status.BAD_REQUEST).entity(msg).build();
+        }catch (DeviceManagementException e) {
+            String msg = "Error occurred when updating the device owner.";
+            log.error(msg);
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).build();
+        } catch (UserNotFoundException e) {
+            String msg = "Couldn't found the owner in user store to update the owner of devices.";
+            log.error(msg);
+            return Response.status(Response.Status.BAD_REQUEST).entity(msg).build();
+        }
+    }
 }

components/device-mgt/org.wso2.carbon.device.mgt.v09.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/util/Constants.java

@@ -30,6 +30,7 @@ public class Constants {
     public static final String DEFAULT_STREAM_VERSION = "1.0.0";
 	public static final String SCOPE = "scope";
 	public static final String JDBC_USERSTOREMANAGER = "org.wso2.carbon.user.core.jdbc.JDBCUserStoreManager";
+	public static final String DEFAULT_SIMPLE_DATE_FORMAT = "EEE, d MMM yyyy HH:mm:ss Z";
 	public static final int DEFAULT_PAGE_LIMIT = 50;
 
 

components/device-mgt/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>3.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.oauth.extensions</artifactId>
-    <version>3.2.3-SNAPSHOT</version>
+    <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+    <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+    <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+    <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+    <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+    <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>policy-mgt</artifactId>
-    <version>3.2.3-SNAPSHOT</version>
+    <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+    <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+    <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+    <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+    <version>3.2.5-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.2.3-SNAPSHOT</version>
+		<version>3.2.5-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>org.wso2.carbon.apimgt.integration.client.feature</artifactId>
-	<version>3.2.3-SNAPSHOT</version>
+	<version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+    <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+    <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+    <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+    <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+    <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+    <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+    <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+    <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+    <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

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

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-feature</artifactId>
-        <version>3.2.3-SNAPSHOT</version>
+        <version>3.2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.analytics.feature</artifactId>
     <packaging>pom</packaging>
-    <version>3.2.3-SNAPSHOT</version>
+    <version>3.2.5-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 and ws proxy</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.2.3-SNAPSHOT</version>
+        <version>3.2.5-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

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

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-feature</artifactId>
-        <version>3.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+    <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+    <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+    <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+    <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+    <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jwt-client-feature</artifactId>
-    <version>3.2.3-SNAPSHOT</version>
+    <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+    <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+    <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+    <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+    <version>3.2.5-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.2.3-SNAPSHOT</version>
+        <version>3.2.5-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.2.3-SNAPSHOT</version>
+    <version>3.2.5-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