Merge branch 'master' of https://repository.entgra.net/community/device-mgt-core into HEAD

2 years ago · 184716b17a
parent 9a5322845f 458ab34269
commit 184716b17a
120 changed files with 176 additions and 186 deletions
--- a/README.md
+++ b/README.md
@ -2,4 +2,4 @@

 <a href='https://opensource.org/licenses/Apache-2.0'><img src='https://img.shields.io/badge/License-Apache%202.0-blue.svg'></a><br/>

-<a href='#'><img src="https://storage.googleapis.com/cdn-entgra/build-status/device-mgt-core/icon.svg"></a>
+<a href='#'><img src="https://builder.entgra.net/buildStatus/icon?job=device-mgt-core"></a>
--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/pom.xml
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>grafana-mgt</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.common/pom.xml
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.common/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>grafana-mgt</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/pom.xml
+++ b/components/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.core/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>grafana-mgt</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/analytics-mgt/grafana-mgt/pom.xml
+++ b/components/analytics-mgt/grafana-mgt/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>analytics-mgt</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/analytics-mgt/pom.xml
+++ b/components/analytics-mgt/pom.xml
@ -3,7 +3,7 @@
    <parent>
        <artifactId>carbon-devicemgt</artifactId>
        <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/components/apimgt-extensions/org.wso2.carbon.apimgt.annotations/pom.xml
+++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.annotations/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <artifactId>apimgt-extensions</artifactId>
        <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/pom.xml
+++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/pom.xml
@ -21,7 +21,7 @@
    <parent>
        <artifactId>apimgt-extensions</artifactId>
        <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/pom.xml
+++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <artifactId>apimgt-extensions</artifactId>
        <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/apimgt-extensions/org.wso2.carbon.apimgt.keymgt.extension.api/pom.xml
+++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.keymgt.extension.api/pom.xml
@ -3,7 +3,7 @@
    <parent>
        <artifactId>apimgt-extensions</artifactId>
        <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
--- a/components/apimgt-extensions/org.wso2.carbon.apimgt.keymgt.extension/pom.xml
+++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.keymgt.extension/pom.xml
@ -3,7 +3,7 @@
    <parent>
        <artifactId>apimgt-extensions</artifactId>
        <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/pom.xml
+++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <artifactId>apimgt-extensions</artifactId>
        <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/apimgt-extensions/pom.xml
+++ b/components/apimgt-extensions/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>carbon-devicemgt</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/components/application-mgt/io.entgra.application.mgt.addons/pom.xml
+++ b/components/application-mgt/io.entgra.application.mgt.addons/pom.xml
@ -20,7 +20,7 @@
    <parent>
        <artifactId>application-mgt</artifactId>
        <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/application-mgt/io.entgra.application.mgt.api/pom.xml
+++ b/components/application-mgt/io.entgra.application.mgt.api/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <artifactId>application-mgt</artifactId>
        <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/application-mgt/io.entgra.application.mgt.common/pom.xml
+++ b/components/application-mgt/io.entgra.application.mgt.common/pom.xml
@ -21,7 +21,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>application-mgt</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/application-mgt/io.entgra.application.mgt.core/pom.xml
+++ b/components/application-mgt/io.entgra.application.mgt.core/pom.xml
@ -21,7 +21,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>application-mgt</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/GenericApplicationDAOImpl.java
+++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/GenericApplicationDAOImpl.java
@ -31,6 +31,7 @@ import io.entgra.application.mgt.core.util.DAOUtil;
 import io.entgra.application.mgt.core.dao.impl.AbstractDAOImpl;
 import io.entgra.application.mgt.core.exception.ApplicationManagementDAOException;
 import io.entgra.application.mgt.core.exception.UnexpectedServerErrorException;
+import io.entgra.application.mgt.core.util.Constants;

 import java.sql.Connection;
 import java.sql.PreparedStatement;
@ -149,7 +150,7 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
        }
        sql += "WHERE AP_APP.TENANT_ID = ? ";

-        if (StringUtils.isNotEmpty(filter.getAppType())) {
+        if (StringUtils.isNotEmpty(filter.getAppType()) && !Constants.ALL.equalsIgnoreCase(filter.getAppType())) {
            sql += "AND AP_APP.TYPE = ? ";
        }
        if (StringUtils.isNotEmpty(filter.getAppName())) {
@ -204,7 +205,7 @@ public class GenericApplicationDAOImpl extends AbstractDAOImpl implements Applic
            try (PreparedStatement stmt = conn.prepareStatement(sql)) {
                int paramIndex = 1;
                stmt.setInt(paramIndex++, tenantId);
-                if (StringUtils.isNotEmpty(filter.getAppType())) {
+                if (StringUtils.isNotEmpty(filter.getAppType()) && !Constants.ALL.equalsIgnoreCase(filter.getAppType())) {
                    stmt.setString(paramIndex++, filter.getAppType());
                }
                if (StringUtils.isNotEmpty(filter.getAppName())) {
--- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/OracleApplicationDAOImpl.java
+++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/OracleApplicationDAOImpl.java
@ -26,6 +26,7 @@ import io.entgra.application.mgt.common.dto.ApplicationDTO;
 import io.entgra.application.mgt.common.exception.DBConnectionException;
 import io.entgra.application.mgt.core.exception.ApplicationManagementDAOException;
 import io.entgra.application.mgt.core.util.DAOUtil;
+import io.entgra.application.mgt.core.util.Constants;

 import java.sql.Connection;
 import java.sql.PreparedStatement;
@ -94,7 +95,7 @@ public class OracleApplicationDAOImpl extends GenericApplicationDAOImpl {
                || StringUtils.isNotEmpty(filter.getAppReleaseType())) {
            sql += "LEFT JOIN AP_APP_RELEASE ON AP_APP.ID = AP_APP_RELEASE.AP_APP_ID ";
        }
-        if (StringUtils.isNotEmpty(filter.getAppType())) {
+        if (StringUtils.isNotEmpty(filter.getAppType()) && !Constants.ALL.equalsIgnoreCase(filter.getAppType())) {
            sql += "AND AP_APP.TYPE = ? ";
        }
        if (StringUtils.isNotEmpty(filter.getAppName())) {
@ -145,7 +146,7 @@ public class OracleApplicationDAOImpl extends GenericApplicationDAOImpl {
            Connection conn = this.getDBConnection();
            try (PreparedStatement stmt = conn.prepareStatement(sql)) {
                int paramIndex = 1;
-                if (StringUtils.isNotEmpty(filter.getAppType())) {
+                if (StringUtils.isNotEmpty(filter.getAppType()) && !Constants.ALL.equalsIgnoreCase(filter.getAppType())) {
                    stmt.setString(paramIndex++, filter.getAppType());
                }
                if (StringUtils.isNotEmpty(filter.getAppName())) {
--- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/SQLServerApplicationDAOImpl.java
+++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/dao/impl/application/SQLServerApplicationDAOImpl.java
@ -25,6 +25,7 @@ import io.entgra.application.mgt.common.dto.ApplicationDTO;
 import io.entgra.application.mgt.common.exception.DBConnectionException;
 import io.entgra.application.mgt.core.exception.ApplicationManagementDAOException;
 import io.entgra.application.mgt.core.util.DAOUtil;
+import io.entgra.application.mgt.core.util.Constants;

 import java.sql.Connection;
 import java.sql.PreparedStatement;
@ -93,7 +94,7 @@ public class SQLServerApplicationDAOImpl extends GenericApplicationDAOImpl {
                || StringUtils.isNotEmpty(filter.getAppReleaseType())) {
            sql += "LEFT JOIN AP_APP_RELEASE ON AP_APP.ID = AP_APP_RELEASE.AP_APP_ID ";
        }
-        if (StringUtils.isNotEmpty(filter.getAppType())) {
+        if (StringUtils.isNotEmpty(filter.getAppType()) && !Constants.ALL.equalsIgnoreCase(filter.getAppType())) {
            sql += "AND AP_APP.TYPE = ? ";
        }
        if (StringUtils.isNotEmpty(filter.getAppName())) {
@ -144,7 +145,7 @@ public class SQLServerApplicationDAOImpl extends GenericApplicationDAOImpl {
            Connection conn = this.getDBConnection();
            try (PreparedStatement stmt = conn.prepareStatement(sql)) {
                int paramIndex = 1;
-                if (StringUtils.isNotEmpty(filter.getAppType())) {
+                if (StringUtils.isNotEmpty(filter.getAppType()) && !Constants.ALL.equalsIgnoreCase(filter.getAppType())) {
                    stmt.setString(paramIndex++, filter.getAppType());
                }
                if (StringUtils.isNotEmpty(filter.getAppName())) {
--- a/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/impl/ApplicationManagerImpl.java
+++ b/components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/impl/ApplicationManagerImpl.java
@ -2932,7 +2932,7 @@ public class ApplicationManagerImpl implements ApplicationManager {
        if (!StringUtils.isEmpty(appType)) {
            boolean isValidAppType = false;
            for (ApplicationType applicationType : ApplicationType.values()) {
-                if (applicationType.toString().equalsIgnoreCase(appType)) {
+                if (applicationType.toString().equalsIgnoreCase(appType) || Constants.ALL.equalsIgnoreCase(appType)) {
                    isValidAppType = true;
                    break;
                }
--- a/components/application-mgt/io.entgra.application.mgt.publisher.api/pom.xml
+++ b/components/application-mgt/io.entgra.application.mgt.publisher.api/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <artifactId>application-mgt</artifactId>
        <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/admin/ApplicationManagementPublisherAdminAPI.java
+++ b/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/admin/ApplicationManagementPublisherAdminAPI.java
@ -157,12 +157,12 @@ public interface ApplicationManagementPublisherAdminAPI {
            @PathParam("appId") int applicatioId);

    @DELETE
-    @Path("/tags/{tagName}")
+    @Path("/tags")
    @Produces(MediaType.APPLICATION_JSON)
    @ApiOperation(
            consumes = MediaType.APPLICATION_JSON,
            produces = MediaType.APPLICATION_JSON,
-            httpMethod = "GET",
+            httpMethod = "DELETE",
            value = "Delete application tag",
            notes = "This will delete application tag",
            tags = "Application Management",
@ -185,10 +185,10 @@ public interface ApplicationManagementPublisherAdminAPI {
            })
    Response deleteTag(
            @ApiParam(
-                    name = "tagName",
+                    name = "tag-name",
                    value = "Tag Name",
                    required = true)
-            @PathParam("tagName") String tagName
+            @QueryParam("tag-name") String tagName
    );

    @POST
@ -273,7 +273,7 @@ public interface ApplicationManagementPublisherAdminAPI {
    );

    @DELETE
-    @Path("/categories/{categoryName}")
+    @Path("/categories")
    @Produces(MediaType.APPLICATION_JSON)
    @ApiOperation(
            consumes = MediaType.APPLICATION_JSON,
@ -301,10 +301,10 @@ public interface ApplicationManagementPublisherAdminAPI {
            })
    Response deleteCategory(
            @ApiParam(
-                    name = "categoryName",
+                    name = "category-name",
                    value = "Category Name",
                    required = true)
-            @PathParam("categoryName") String categoryName
+            @QueryParam("category-name") String categoryName
    );

    @PUT
--- a/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/impl/admin/ApplicationManagementPublisherAdminAPIImpl.java
+++ b/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/java/io/entgra/application/mgt/publisher/api/services/impl/admin/ApplicationManagementPublisherAdminAPIImpl.java
@ -104,9 +104,9 @@ public class ApplicationManagementPublisherAdminAPIImpl implements ApplicationMa
    @DELETE
    @Override
    @Consumes(MediaType.WILDCARD)
-    @Path("/tags/{tagName}")
+    @Path("/tags")
    public Response deleteTag(
-            @PathParam("tagName") String tagName) {
+            @QueryParam("tag-name") String tagName) {
        ApplicationManager applicationManager = APIUtil.getApplicationManager();
        try {
            applicationManager.deleteTag(tagName);
@ -169,9 +169,9 @@ public class ApplicationManagementPublisherAdminAPIImpl implements ApplicationMa
    @DELETE
    @Override
    @Consumes(MediaType.WILDCARD)
-    @Path("/categories/{categoryName}")
+    @Path("/categories")
    public Response deleteCategory(
-            @PathParam("categoryName") String categoryName) {
+            @QueryParam("category-name") String categoryName) {
        ApplicationManager applicationManager = APIUtil.getApplicationManager();
        try {
            applicationManager.deleteCategory(categoryName);
--- a/components/application-mgt/io.entgra.application.mgt.store.api/pom.xml
+++ b/components/application-mgt/io.entgra.application.mgt.store.api/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <artifactId>application-mgt</artifactId>
        <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/application-mgt/pom.xml
+++ b/components/application-mgt/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>carbon-devicemgt</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/pom.xml
+++ b/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>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/pom.xml
+++ b/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>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml
+++ b/components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml
@ -38,7 +38,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>certificate-mgt</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/certificate-mgt/pom.xml
+++ b/components/certificate-mgt/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>carbon-devicemgt</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/pom.xml
+++ b/components/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager/pom.xml
@ -23,7 +23,7 @@
    <parent>
        <artifactId>device-mgt-extensions</artifactId>
        <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.logger/pom.xml
+++ b/components/device-mgt-extensions/io.entgra.device.mgt.extensions.logger/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <artifactId>device-mgt-extensions</artifactId>
        <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

@ -51,7 +51,7 @@
                        <Bundle-Description>Entgra Logger Bundle</Bundle-Description>
                        <Import-Package>
                            io.entgra.device.mgt.extensions.logger,
-                            org.apache.commons.logging;version="[1.2,2)
+                            org.apache.commons.logging
                        </Import-Package>
                        <Export-Package>
                            io.entgra.device.mgt.extensions.logger.*
--- a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.logger/src/main/java/io/entgra/device/mgt/extensions/logger/spi/EntgraLogger.java
+++ b/components/device-mgt-extensions/io.entgra.device.mgt.extensions.logger/src/main/java/io/entgra/device/mgt/extensions/logger/spi/EntgraLogger.java
@ -24,57 +24,29 @@ import org.apache.commons.logging.Log;

 public interface EntgraLogger extends Log {

-    void info(String message);
+    void info(Object object, LogContext logContext);
+    
+    void info(Object object, Throwable t, LogContext logContext);

-    void info(String message, Throwable t);
+    void debug(Object object, LogContext logContext);

-    void info(String message, LogContext logContext);
+    void debug(Object object, Throwable t, LogContext logContext);

-    void debug(String message);
+    void error(Object object, LogContext logContext);

-    void debug(String message, Throwable t);
+    void error(Object object, Throwable t, LogContext logContext);

-    void debug(String message, LogContext logContext);
+    void fatal(Object object, LogContext logContext);

-    void error(String message);
+    void fatal(Object object, Throwable t, LogContext logContext);

-    void error(String message, Throwable t);
+    void trace(Object object, LogContext logContext);

-    void error(String message, LogContext logContext);
+    void trace(Object object, Throwable t, LogContext logContext);

-    void error(String message, Throwable t, LogContext logContext);
+    void warn(Object object, LogContext logContext);

-    void warn(String message);
-
-    void warn(String message, Throwable t);
-
-    void warn(String message, LogContext logContext);
-
-    void warn(String message, Throwable t, LogContext logContext);
-
-    void trace(String message);
-
-    void trace(String message, Throwable t);
-
-    void trace(String message, LogContext logContext);
-
-    void fatal(String message);
-
-    void fatal(String message, Throwable t);
-
-    void fatal(String message, LogContext logContext);
-
-    boolean isDebugEnabled();
-
-    boolean isErrorEnabled();
-
-    boolean isFatalEnabled();
-
-    boolean isInfoEnabled();
-
-    boolean isTraceEnabled();
-
-    boolean isWarnEnabled();
+    void warn(Object object, Throwable t, LogContext logContext);

    void clearLogContext();

--- a/components/device-mgt-extensions/io.entgra.device.mgt.extensions.stateengine/pom.xml
+++ b/components/device-mgt-extensions/io.entgra.device.mgt.extensions.stateengine/pom.xml
@ -23,7 +23,7 @@
    <parent>
        <artifactId>device-mgt-extensions</artifactId>
        <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/pom.xml
+++ b/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>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.pull.notification/pom.xml
+++ b/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>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/pom.xml
+++ b/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>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http/pom.xml
+++ b/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>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/pom.xml
+++ b/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>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/pom.xml
+++ b/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>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/device-mgt-extensions/pom.xml
+++ b/components/device-mgt-extensions/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <artifactId>carbon-devicemgt</artifactId>
        <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/components/device-mgt/io.entgra.carbon.device.mgt.config.api/pom.xml
+++ b/components/device-mgt/io.entgra.carbon.device.mgt.config.api/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <artifactId>device-mgt</artifactId>
        <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml
+++ b/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>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/RoleManagementServiceImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/RoleManagementServiceImpl.java
@ -54,6 +54,7 @@ import org.wso2.carbon.registry.core.session.UserRegistry;
 import org.wso2.carbon.registry.resource.services.utils.ChangeRolePermissionsUtil;
 import org.wso2.carbon.user.api.*;
 import org.wso2.carbon.user.core.common.AbstractUserStoreManager;
+import org.wso2.carbon.user.core.constants.UserCoreErrorConstants.ErrorMessages;
 import org.wso2.carbon.user.mgt.UserRealmProxy;
 import org.wso2.carbon.user.mgt.common.UIPermissionNode;
 import org.wso2.carbon.user.mgt.common.UserAdminException;
@ -316,21 +317,31 @@ public class RoleManagementServiceImpl implements RoleManagementService {
                    entity("Role '" + roleInfo.getRoleName() + "' has " + "successfully been"
                            + " added").build();
        } catch (UserStoreException e) {
-            String msg = "Error occurred while adding role '" + roleInfo.getRoleName() + "'";
-            log.error(msg, e);
-            return Response.serverError().entity(
-                    new ErrorResponse.ErrorResponseBuilder().setMessage(msg).build()).build();
+            String errorCode = "";
+            String errorMessage = e.getMessage();
+            if (errorMessage != null && !errorMessage.isEmpty() &&
+                    errorMessage.contains(ErrorMessages.ERROR_CODE_ROLE_ALREADY_EXISTS.getCode())) {
+                errorCode = e.getMessage().split("-")[0].trim();
+            }
+            if (ErrorMessages.ERROR_CODE_ROLE_ALREADY_EXISTS.getCode().equals(errorCode)) {
+                String roleName = roleInfo.getRoleName().split("/")[1];
+                String msg = "Role already exists with name " + roleName + ".";
+                log.warn(msg);
+                return Response.status(Response.Status.CONFLICT).entity(msg).build();
+            } else {
+                String msg = "Error occurred while adding role '" + roleInfo.getRoleName() + "'";
+                log.error(msg, e);
+                return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).build();
+            }
        } catch (URISyntaxException e) {
            String msg = "Error occurred while composing the URI at which the information of the newly created role " +
                    "can be retrieved";
            log.error(msg, e);
-            return Response.serverError().entity(
-                    new ErrorResponse.ErrorResponseBuilder().setMessage(msg).build()).build();
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).build();
        } catch (UnsupportedEncodingException e) {
            String msg = "Error occurred while encoding role name";
            log.error(msg, e);
-            return Response.serverError().entity(
-                    new ErrorResponse.ErrorResponseBuilder().setMessage(msg).build()).build();
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).build();
        }
    }

--- a/components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml
+++ b/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>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml
+++ b/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>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/GroupManagementProviderServiceImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/GroupManagementProviderServiceImpl.java
@ -47,6 +47,7 @@ import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.exceptions.DeviceNotFoundException;
 import org.wso2.carbon.device.mgt.common.GroupPaginationRequest;
 import org.wso2.carbon.device.mgt.common.PaginationResult;
+import org.wso2.carbon.device.mgt.common.exceptions.TrackerAlreadyExistException;
 import org.wso2.carbon.device.mgt.common.exceptions.TransactionManagementException;
 import org.wso2.carbon.device.mgt.common.group.mgt.DeviceGroup;
 import org.wso2.carbon.device.mgt.common.group.mgt.DeviceGroupConstants;
@ -140,12 +141,15 @@ public class GroupManagementProviderServiceImpl implements GroupManagementProvid
                if (HttpReportingUtil.isTrackerEnabled()){
                    existingGroup = this.groupDAO.getGroup(deviceGroup.getName(), tenantId);
                    int groupId = existingGroup.getGroupId();
-                    DeviceManagementDataHolder.getInstance().getDeviceAPIClientService()
-                            .addGroup(deviceGroup, groupId, tenantId);
+                    try {
+                        DeviceManagementDataHolder.getInstance().getDeviceAPIClientService()
+                                .addGroup(deviceGroup, groupId, tenantId);
+                    } catch (TrackerAlreadyExistException e) {
+                        throw new GroupAlreadyExistException("Group exist with name " + deviceGroup.getName());
+                    }
+                } else {
+                    throw new GroupAlreadyExistException("Group exist with name " + deviceGroup.getName());
                }
-                // add a group if not exist in traccar starts
-
-                throw new GroupAlreadyExistException("Group exist with name " + deviceGroup.getName());
            }
        } catch (GroupManagementDAOException e) {
            GroupManagementDAOFactory.rollbackTransaction();
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/traccar/api/service/TraccarClientFactory.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/traccar/api/service/TraccarClientFactory.java
@ -648,7 +648,7 @@ public class TraccarClientFactory {
            TrackerManagementDAOFactory.openConnection();
            trackerGroupInfo = trackerDAO.getTrackerGroup(groupId, tenantId);
            if (trackerGroupInfo != null) {
-                String msg = "The group already exit";
+                String msg = "The group already exists in Traccar.";
                log.error(msg);
                throw new TrackerAlreadyExistException(msg);
            }
--- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/traccar/api/service/addons/TraccarClientImpl.java
+++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/traccar/api/service/addons/TraccarClientImpl.java
@ -555,7 +555,7 @@ public class TraccarClientImpl implements TraccarClient {
            TrackerManagementDAOFactory.openConnection();
            trackerGroupInfo = trackerDAO.getTrackerGroup(groupId, tenantId);
            if (trackerGroupInfo != null) {
-                String msg = "The group already exit";
+                String msg = "The group already exists in Traccar.";
                log.error(msg);
                throw new TrackerAlreadyExistException(msg);
            }
--- a/components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml
+++ b/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>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/device-mgt/org.wso2.carbon.device.mgt.url.printer/pom.xml
+++ b/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>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/device-mgt/pom.xml
+++ b/components/device-mgt/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>carbon-devicemgt</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/pom.xml
+++ b/components/heartbeat-management/io.entgra.server.bootup.heartbeat.beacon/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>heartbeat-management</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/heartbeat-management/pom.xml
+++ b/components/heartbeat-management/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>carbon-devicemgt</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml
+++ b/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>identity-extensions</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/pom.xml
+++ b/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>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/identity-extensions/pom.xml
+++ b/components/identity-extensions/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>carbon-devicemgt</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/components/policy-mgt/org.wso2.carbon.policy.decision.point/pom.xml
+++ b/components/policy-mgt/org.wso2.carbon.policy.decision.point/pom.xml
@ -3,7 +3,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>policy-mgt</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/policy-mgt/org.wso2.carbon.policy.information.point/pom.xml
+++ b/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>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml
+++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>policy-mgt</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml
+++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>policy-mgt</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/policy-mgt/pom.xml
+++ b/components/policy-mgt/pom.xml
@ -23,7 +23,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>carbon-devicemgt</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/components/transport-mgt/email-sender/org.wso2.carbon.email.sender.core/pom.xml
+++ b/components/transport-mgt/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>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/transport-mgt/email-sender/pom.xml
+++ b/components/transport-mgt/email-sender/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>transport-mgt</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/transport-mgt/pom.xml
+++ b/components/transport-mgt/pom.xml
@ -3,7 +3,7 @@
    <parent>
        <artifactId>carbon-devicemgt</artifactId>
        <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/pom.xml
+++ b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.api/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>sms-handler</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/pom.xml
+++ b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.common/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>sms-handler</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.core/pom.xml
+++ b/components/transport-mgt/sms-handler/io.entgra.transport.mgt.sms.handler.core/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>sms-handler</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/transport-mgt/sms-handler/pom.xml
+++ b/components/transport-mgt/sms-handler/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>transport-mgt</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/pom.xml
+++ b/components/ui-request-interceptor/io.entgra.ui.request.interceptor/pom.xml
@ -21,7 +21,7 @@
    <parent>
        <artifactId>ui-request-interceptor</artifactId>
        <groupId>io.entgra.devicemgt</groupId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/components/ui-request-interceptor/pom.xml
+++ b/components/ui-request-interceptor/pom.xml
@ -21,7 +21,7 @@
    <parent>
        <artifactId>carbon-devicemgt</artifactId>
        <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml
+++ b/components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml
@ -21,7 +21,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>webapp-authenticator-framework</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/components/webapp-authenticator-framework/pom.xml
+++ b/components/webapp-authenticator-framework/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>carbon-devicemgt</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/features/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api.feature/pom.xml
+++ b/features/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.api.feature/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>grafana-mgt-feature</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/features/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.server.feature/pom.xml
+++ b/features/analytics-mgt/grafana-mgt/io.entgra.analytics.mgt.grafana.proxy.server.feature/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>grafana-mgt-feature</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/features/analytics-mgt/grafana-mgt/pom.xml
+++ b/features/analytics-mgt/grafana-mgt/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>analytics-mgt-feature</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/features/analytics-mgt/pom.xml
+++ b/features/analytics-mgt/pom.xml
@ -3,7 +3,7 @@
    <parent>
        <artifactId>carbon-devicemgt</artifactId>
        <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/pom.xml
+++ b/features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/pom.xml
@ -21,7 +21,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>apimgt-extensions-feature</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/features/apimgt-extensions/org.wso2.carbon.apimgt.keymgt.extension.feature/pom.xml
+++ b/features/apimgt-extensions/org.wso2.carbon.apimgt.keymgt.extension.feature/pom.xml
@ -21,7 +21,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>apimgt-extensions-feature</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml
+++ b/features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml
@ -21,7 +21,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>apimgt-extensions-feature</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/features/apimgt-extensions/pom.xml
+++ b/features/apimgt-extensions/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>carbon-devicemgt</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/features/application-mgt/io.entgra.application.mgt.api.feature/pom.xml
+++ b/features/application-mgt/io.entgra.application.mgt.api.feature/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>application-mgt-feature</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/features/application-mgt/io.entgra.application.mgt.server.feature/pom.xml
+++ b/features/application-mgt/io.entgra.application.mgt.server.feature/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>application-mgt-feature</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/features/application-mgt/pom.xml
+++ b/features/application-mgt/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>carbon-devicemgt</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/pom.xml
+++ b/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>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/pom.xml
+++ b/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>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml
+++ b/features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>certificate-mgt-feature</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/features/certificate-mgt/pom.xml
+++ b/features/certificate-mgt/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>carbon-devicemgt</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/features/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager.feature/pom.xml
+++ b/features/device-mgt-extensions/io.entgra.device.mgt.extensions.defaultrole.manager.feature/pom.xml
@ -23,7 +23,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>device-mgt-extensions-feature</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/features/device-mgt-extensions/io.entgra.device.mgt.extensions.logger.feature/pom.xml
+++ b/features/device-mgt-extensions/io.entgra.device.mgt.extensions.logger.feature/pom.xml
@ -23,7 +23,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>device-mgt-extensions-feature</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/features/device-mgt-extensions/io.entgra.device.mgt.extensions.stateengine.feature/pom.xml
+++ b/features/device-mgt-extensions/io.entgra.device.mgt.extensions.stateengine.feature/pom.xml
@ -23,7 +23,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>device-mgt-extensions-feature</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature/pom.xml
+++ b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>device-mgt-extensions-feature</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml
+++ b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm.feature/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>device-mgt-extensions-feature</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature/pom.xml
+++ b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http.feature/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>device-mgt-extensions-feature</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml
+++ b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>device-mgt-extensions-feature</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml
+++ b/features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>device-mgt-extensions-feature</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/features/device-mgt-extensions/pom.xml
+++ b/features/device-mgt-extensions/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>carbon-devicemgt</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml
+++ b/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>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/pom.xml
+++ b/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>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/pom.xml
+++ b/features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/pom.xml
@ -4,7 +4,7 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>device-mgt-feature</artifactId>
-        <version>5.0.14</version>
+        <version>5.0.15-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/Show More
+++ b/Show More