Merge remote-tracking branch 'upstream/master'

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 {

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 {

pom.xml

@@ -144,6 +144,10 @@
                         <groupId>org.wso2.carbon</groupId>
                         <artifactId>org.wso2.carbon.registry.api</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>xerces.wso2</groupId>
+                        <artifactId>xercesImpl</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -522,6 +526,10 @@
                         <groupId>org.apache.bsf</groupId>
                         <artifactId>bsf-all</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>xerces</groupId>
+                        <artifactId>xercesImpl</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
 
@@ -588,6 +596,10 @@
                         <groupId>commons-pool.wso2</groupId>
                         <artifactId>commons-pool</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>xerces.wso2</groupId>
+                        <artifactId>xercesImpl</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
@@ -606,7 +618,7 @@
     <properties>
 
         <!--Carbon kernel versions-->
-        <carbon.kernel.version>4.4.1</carbon.kernel.version>
+        <carbon.kernel.version>4.4.2</carbon.kernel.version>
         <carbon.kernel.version.range>[4.4.0, 4.5.0)</carbon.kernel.version.range>
 
         <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
@@ -647,7 +659,7 @@
         <carbon.api.mgt.version>4.3.0-SNAPSHOT</carbon.api.mgt.version>
 
         <!-- Carbon Deployment -->
-        <carbon.deployment.version>4.4.0</carbon.deployment.version>
+        <carbon.deployment.version>4.6.0</carbon.deployment.version>
 
         <!-- Identity -->
         <carbon.identity.version>5.0.2</carbon.identity.version>