Resolve test failures and issues after merging with upstream

components/device-mgt/org.wso2.carbon.device.mgt.api/src/test/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/util/DeviceMgtAPITestHelper.java

@@ -19,7 +19,6 @@ package org.wso2.carbon.device.mgt.jaxrs.service.impl.util;
 
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
-import org.wso2.carbon.device.mgt.common.Feature;
 import org.wso2.carbon.device.mgt.common.device.details.DeviceInfo;
 import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;
 import org.wso2.carbon.device.mgt.common.type.mgt.DeviceTypeMetaDefinition;
@@ -37,7 +36,6 @@ public class DeviceMgtAPITestHelper {
     private static final String DEVICE_TYPE_DESCRIPTION = "Dummy Description";
     public static final String DEVICE_TYPE = "TEST_DEVICE_TYPE";
     public static final String DEVICE_NAME = "TEST_DEVICE";
-    public static final String DEVICE_IDENTIFIER = "12345";
     public final static String OWNER = "admin";
 
     /**
@@ -110,8 +108,6 @@ public class DeviceMgtAPITestHelper {
 
     public static DeviceInfo generateDeviceInfo() {
         DeviceInfo deviceInfo = new DeviceInfo();
-        deviceInfo.setIMEI("IMEI-12345");
-        deviceInfo.setIMSI("IMSI-12344");
         deviceInfo.setDeviceModel("DUMMY_MODEL");
         deviceInfo.setVendor("WSO2");
         deviceInfo.setOsVersion("OREO");

components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml

@@ -87,10 +87,10 @@
         <Enable>false</Enable>
         <ExpiryTime>86400</ExpiryTime>
     </CertificateCacheConfiguration>
-    <GeoLocationConfiguration>
+    <OperationAnalyticsConfiguration>
         <isEnabled>false</isEnabled>
-        <PublishLocationOperationResponse>false</PublishLocationOperationResponse>
+        <PublishOperationResponse>false</PublishOperationResponse>
-    </GeoLocationConfiguration>
+    </OperationAnalyticsConfiguration>
     <DefaultGroupsConfiguration>BYOD,COPE</DefaultGroupsConfiguration>
 </DeviceMgtConfiguration>
 

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

@@ -23,14 +23,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-feature</artifactId>
-        <version>3.0.136-SNAPSHOT</version>
+        <version>3.0.170-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.basics.feature</artifactId>
     <packaging>pom</packaging>
-    <version>3.0.136-SNAPSHOT</version>
     <name>WSO2 Carbon - Device Management Basics Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains the core bundles required for Basic Device Management functionality