diff --git a/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManager.java b/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManager.java index 3358511c12..dd71b1c32a 100644 --- a/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManager.java +++ b/components/device-mgt-mdm-android/org.wso2.carbon.device.mgt.mobile.android.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/android/impl/AndroidDeviceManager.java @@ -302,6 +302,11 @@ public class AndroidDeviceManager implements DeviceManager { licenseManager.addLicense(AndroidDeviceManagementService.DEVICE_TYPE_ANDROID, license); } + @Override + public boolean requireDeviceAuthorization() { + return true; + } + @Override public boolean updateDeviceInfo(DeviceIdentifier deviceIdentifier, Device device) throws DeviceManagementException { diff --git a/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/WindowsDeviceManager.java b/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/WindowsDeviceManager.java index 7d8c6def51..adc32d412b 100644 --- a/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/WindowsDeviceManager.java +++ b/components/device-mgt-mdm-windows/org.wso2.carbon.device.mgt.mobile.windows.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/windows/impl/WindowsDeviceManager.java @@ -263,6 +263,11 @@ public class WindowsDeviceManager implements DeviceManager { licenseManager.addLicense(WindowsDeviceManagementService.DEVICE_TYPE_WINDOWS, license); } + @Override + public boolean requireDeviceAuthorization() { + return false; + } + @Override public boolean updateDeviceInfo(DeviceIdentifier deviceIdentifier, Device device) throws DeviceManagementException { diff --git a/pom.xml b/pom.xml index 222a47e7a5..8bcc8b2040 100644 --- a/pom.xml +++ b/pom.xml @@ -144,6 +144,10 @@ org.wso2.carbon org.wso2.carbon.registry.api + + xerces.wso2 + xercesImpl + @@ -522,6 +526,10 @@ org.apache.bsf bsf-all + + xerces + xercesImpl + @@ -588,6 +596,10 @@ commons-pool.wso2 commons-pool + + xerces.wso2 + xercesImpl + @@ -606,7 +618,7 @@ - 4.4.1 + 4.4.2 [4.4.0, 4.5.0) 1.5.4 @@ -647,7 +659,7 @@ 4.3.0-SNAPSHOT - 4.4.0 + 4.6.0 5.0.2