diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/authorization/DeviceAccessAuthorizationServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/authorization/DeviceAccessAuthorizationServiceImpl.java index 4707bcdd4c9..4c2e57d8bda 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/authorization/DeviceAccessAuthorizationServiceImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/authorization/DeviceAccessAuthorizationServiceImpl.java @@ -47,7 +47,7 @@ import java.util.Map; */ public class DeviceAccessAuthorizationServiceImpl implements DeviceAccessAuthorizationService { - private final static String EMM_ADMIN_PERMISSION = "/device-mgt/admin-device-access"; + private final static String CDM_ADMIN_PERMISSION = "/device-mgt/admin"; private static Log log = LogFactory.getLog(DeviceAccessAuthorizationServiceImpl.class); public DeviceAccessAuthorizationServiceImpl() { @@ -221,7 +221,7 @@ public class DeviceAccessAuthorizationServiceImpl implements DeviceAccessAuthori if (userRealm != null && userRealm.getAuthorizationManager() != null) { return userRealm.getAuthorizationManager() .isUserAuthorized(removeTenantDomain(username), - PermissionUtils.getAbsolutePermissionPath(EMM_ADMIN_PERMISSION), + PermissionUtils.getAbsolutePermissionPath(CDM_ADMIN_PERMISSION), PermissionMethod.UI_EXECUTE); } return false; @@ -249,7 +249,7 @@ public class DeviceAccessAuthorizationServiceImpl implements DeviceAccessAuthori private boolean addAdminPermissionToRegistry() throws PermissionManagementException { Permission permission = new Permission(); - permission.setPath(PermissionUtils.getAbsolutePermissionPath(EMM_ADMIN_PERMISSION)); + permission.setPath(PermissionUtils.getAbsolutePermissionPath(CDM_ADMIN_PERMISSION)); return PermissionUtils.putPermission(permission); } diff --git a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml index e54f7542e17..78609ac5d0b 100644 --- a/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml +++ b/features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml @@ -121,9 +121,6 @@ org.wso2.carbon.identity:org.wso2.carbon.identity.oauth.stub:${carbon.identity.version} - - org.apache.axiom.om - org.wso2.carbon.core.server:${carbon.kernel.version} diff --git a/pom.xml b/pom.xml index f120f6e7c95..2a3502cd887 100644 --- a/pom.xml +++ b/pom.xml @@ -1672,7 +1672,7 @@ 6.1.1 - 4.4.5 + 4.4.3 [4.4.0, 5.0.0) 1.5.4 1.3 @@ -1715,7 +1715,7 @@ 4.6.0 - 5.0.9-SNAPSHOT + 5.0.7 4.5.0 @@ -1732,7 +1732,7 @@ 1.1.0-SNAPSHOT - 4.5.2 + 4.4.8 1.4.0.wso2v1 2.4.0.wso2v1 2.6.0.wso2v1 @@ -1746,8 +1746,8 @@ [5.0.11,6.0.0) - 4.5.2 - [4.5.2, 5.0.0) + 4.4.8 + [4.4.8, 5.0.0) 2.7.16