Sync with master

master
Lasantha Dharmakeerthi 11 months ago
commit 28bfcb3371

@ -22,7 +22,7 @@
<parent>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>io.entgra.device.mgt.plugins.parent</artifactId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

@ -23,7 +23,7 @@
<parent>
<artifactId>virtual-fire-alarm-plugin</artifactId>
<groupId>io.entgra.device.mgt.plugins</groupId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@ -21,7 +21,7 @@
<parent>
<artifactId>virtual-fire-alarm-plugin</artifactId>
<groupId>io.entgra.device.mgt.plugins</groupId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@ -230,7 +230,7 @@ public class VirtualFireAlarmServiceImpl implements VirtualFireAlarmService {
apiApplicationKey = apiManagementProviderService.generateAndRetrieveApplicationKeys(
VirtualFireAlarmConstants.DEVICE_TYPE, tags, KEY_TYPE, applicationUsername, true,
VirtualFireAlarmConstants.APIM_APPLICATION_TOKEN_VALIDITY_PERIOD);
VirtualFireAlarmConstants.APIM_APPLICATION_TOKEN_VALIDITY_PERIOD, null);
} finally {
PrivilegedCarbonContext.endTenantFlow();
}

@ -22,7 +22,7 @@
<parent>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>device-types</artifactId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@ -20,7 +20,7 @@
<parent>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>cdmf-transport-adapters</artifactId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -20,7 +20,7 @@
<parent>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>cdmf-transport-adapters</artifactId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

@ -20,7 +20,7 @@
<parent>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>cdmf-transport-adapters</artifactId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -136,7 +136,7 @@ public class MQTTAdapterListener implements MqttCallback, Runnable {
String applicationName = MQTTEventAdapterConstants.APPLICATION_NAME_PREFIX
+ mqttBrokerConnectionConfiguration.getAdapterName();
DCRResponse dcrResponse = keyMgtService.dynamicClientRegistration(applicationName, username,
"client_credentials", null, new String[]{"device_management"}, false, Integer.MAX_VALUE);
"client_credentials", null, new String[]{"device_management"}, false, Integer.MAX_VALUE, password);
String accessToken = getToken(dcrResponse.getClientId(), dcrResponse.getClientSecret());
connectionOptions.setUserName(accessToken.substring(0, 18));
connectionOptions.setPassword(accessToken.substring(19).toCharArray());

@ -21,7 +21,7 @@
<parent>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>cdmf-transport-adapters</artifactId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

@ -20,7 +20,7 @@
<parent>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>cdmf-transport-adapters</artifactId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -20,7 +20,7 @@
<parent>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>cdmf-transport-adapters</artifactId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -20,7 +20,7 @@
<parent>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>cdmf-transport-adapters</artifactId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -151,7 +151,7 @@ public class MQTTAdapterPublisher {
String applicationName = MQTTEventAdapterConstants.APPLICATION_NAME_PREFIX
+ mqttBrokerConnectionConfiguration.getAdapterName();
DCRResponse dcrResponse = keyMgtService.dynamicClientRegistration(applicationName, username,
"client_credentials", null, new String[]{"device_management"}, false, Integer.MAX_VALUE);
"client_credentials", null, new String[]{"device_management"}, false, Integer.MAX_VALUE, password);
return getToken(dcrResponse.getClientId(), dcrResponse.getClientSecret());
// connectionOptions.setUserName(accessToken.substring(0, 18));
// connectionOptions.setPassword(accessToken.substring(19).toCharArray());

@ -22,7 +22,7 @@
<parent>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>cdmf-transport-adapters</artifactId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

@ -21,7 +21,7 @@
<parent>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>cdmf-transport-adapters</artifactId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

@ -20,7 +20,7 @@
<parent>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>cdmf-transport-adapters</artifactId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

@ -22,7 +22,7 @@
<parent>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>extensions</artifactId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@ -21,7 +21,7 @@
<parent>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>emqx-extensions</artifactId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@ -21,7 +21,7 @@
<parent>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>emqx-extensions</artifactId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@ -22,7 +22,7 @@
<parent>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>extensions</artifactId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@ -22,7 +22,7 @@
<parent>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>io.entgra.device.mgt.plugins.parent</artifactId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

@ -22,7 +22,7 @@
<parent>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>pull-notification-listeners</artifactId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@ -22,7 +22,7 @@
<parent>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>extensions</artifactId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@ -22,7 +22,7 @@
<parent>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>siddhi-extensions</artifactId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@ -27,6 +27,7 @@ import io.entgra.device.mgt.core.device.mgt.common.policy.mgt.PolicyMonitoringMa
import io.entgra.device.mgt.core.device.mgt.common.pull.notification.PullNotificationSubscriber;
import io.entgra.device.mgt.core.device.mgt.common.push.notification.PushNotificationConfig;
import io.entgra.device.mgt.core.device.mgt.common.spi.DeviceManagementService;
import io.entgra.device.mgt.core.device.mgt.common.type.mgt.DeviceTypeMetaDefinition;
import io.entgra.device.mgt.core.device.mgt.common.type.mgt.DeviceTypePlatformDetails;
import java.util.ArrayList;
@ -132,4 +133,9 @@ public class TestDeviceManagementService implements DeviceManagementService {
public License getLicenseConfig() {
return null;
}
@Override
public DeviceTypeMetaDefinition getDeviceTypeMetaDefinition() {
return null;
}
}

@ -22,7 +22,7 @@
<parent>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>siddhi-extensions</artifactId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@ -22,7 +22,7 @@
<parent>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>extensions</artifactId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@ -21,7 +21,7 @@
<parent>
<artifactId>android-plugin</artifactId>
<groupId>io.entgra.device.mgt.plugins</groupId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@ -50,6 +50,7 @@ import io.entgra.device.mgt.core.device.mgt.common.geo.service.GeoQuery;
import io.entgra.device.mgt.core.device.mgt.common.invitation.mgt.DeviceEnrollmentInvitationDetails;
import io.entgra.device.mgt.core.device.mgt.common.license.mgt.License;
import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Activity;
import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.DeviceActivity;
import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.Operation;
import io.entgra.device.mgt.core.device.mgt.common.operation.mgt.OperationManagementException;
import io.entgra.device.mgt.core.device.mgt.common.policy.mgt.PolicyMonitoringManager;
@ -833,6 +834,16 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
return 0;
}
@Override
public List<DeviceActivity> getDeviceActivities(ActivityPaginationRequest activityPaginationRequest) throws OperationManagementException {
return null;
}
@Override
public int getDeviceActivitiesCount(ActivityPaginationRequest activityPaginationRequest) throws OperationManagementException {
return 0;
}
@Override
public License getLicenseConfig(String s) throws DeviceManagementException { return null; }
@ -848,7 +859,7 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
}
@Override
public void saveApplicationIcon(String s, String s1, String s2, int i) throws DeviceManagementException {
public void saveApplicationIcon(String s, String s1, String s2) throws DeviceManagementException {
}
@ -866,4 +877,9 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
public List<Application> getInstalledApplicationsOnDevice(Device device, int i, int i1) throws DeviceManagementException {
return null;
}
@Override
public List<Application> getInstalledApplicationsOnDevice(Device device) throws DeviceManagementException {
return null;
}
}

@ -21,7 +21,7 @@
<parent>
<artifactId>android-plugin</artifactId>
<groupId>io.entgra.device.mgt.plugins</groupId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@ -23,7 +23,7 @@
<parent>
<artifactId>android-plugin</artifactId>
<groupId>io.entgra.device.mgt.plugins</groupId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@ -22,7 +22,7 @@
<parent>
<artifactId>android-plugin</artifactId>
<groupId>io.entgra.device.mgt.plugins</groupId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@ -38,6 +38,7 @@ import io.entgra.device.mgt.core.device.mgt.common.policy.mgt.PolicyMonitoringMa
import io.entgra.device.mgt.core.device.mgt.common.pull.notification.PullNotificationSubscriber;
import io.entgra.device.mgt.core.device.mgt.common.push.notification.PushNotificationConfig;
import io.entgra.device.mgt.core.device.mgt.common.spi.DeviceManagementService;
import io.entgra.device.mgt.core.device.mgt.common.type.mgt.DeviceTypeMetaDefinition;
import io.entgra.device.mgt.core.device.mgt.common.type.mgt.DeviceTypePlatformDetails;
import io.entgra.device.mgt.plugins.mobile.android.internal.AndroidDeviceManagementDataHolder;
@ -157,6 +158,11 @@ public class AndroidDeviceManagementService implements DeviceManagementService {
@Override
public License getLicenseConfig() { return null; }
@Override
public DeviceTypeMetaDefinition getDeviceTypeMetaDefinition() {
return null;
}
private String getConfigProperty(List<ConfigurationEntry> configs, String propertyName) {
for (ConfigurationEntry entry : configs) {
if (propertyName.equals(entry.getName())) {

@ -22,7 +22,7 @@
<parent>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>mobile-plugins</artifactId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@ -22,7 +22,7 @@
<parent>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>io.entgra.device.mgt.plugins.parent</artifactId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

@ -23,7 +23,7 @@
<parent>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>analytics-feature</artifactId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@ -22,7 +22,7 @@
<parent>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>io.entgra.device.mgt.plugins.parent</artifactId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

@ -22,7 +22,7 @@
<parent>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>io.entgra.device.mgt.plugins.parent</artifactId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

@ -23,7 +23,7 @@
<parent>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>virtual-fire-alarm-plugin-feature</artifactId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@ -22,7 +22,7 @@
<parent>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>device-types-feature</artifactId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@ -23,7 +23,7 @@
<parent>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>extensions-feature</artifactId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@ -22,7 +22,7 @@
<parent>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>extensions-feature</artifactId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@ -22,7 +22,7 @@
<parent>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>extensions-feature</artifactId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@ -21,7 +21,7 @@
<parent>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>extensions-feature</artifactId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>

@ -22,7 +22,7 @@
<parent>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>io.entgra.device.mgt.plugins.parent</artifactId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

@ -22,7 +22,7 @@
<parent>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>android-plugin-feature</artifactId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@ -22,7 +22,7 @@
<parent>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>mobile-plugins-feature</artifactId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

@ -22,7 +22,7 @@
<parent>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>io.entgra.device.mgt.plugins.parent</artifactId>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>

@ -23,7 +23,7 @@
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>io.entgra.device.mgt.plugins.parent</artifactId>
<packaging>pom</packaging>
<version>6.0.22-SNAPSHOT</version>
<version>6.0.25-SNAPSHOT</version>
<name>WSO2 Carbon - Device Management Plugins Parent</name>
<url>http://entgra.io</url>
<description>WSO2 Carbon - Device Management Plugins Parent</description>
@ -953,11 +953,11 @@
<properties>
<!-- Carbon Device Management -->
<io.entgra.device.mgt.core.version>5.0.31-SNAPSHOT</io.entgra.device.mgt.core.version>
<io.entgra.device.mgt.core.version>5.0.35-SNAPSHOT</io.entgra.device.mgt.core.version>
<io.entgra.device.mgt.core.version.range>[5.0.0, 6.0.0)</io.entgra.device.mgt.core.version.range>
<!-- Carbon Device Management Plugins -->
<io.entgra.device.mgt.plugins.version>6.0.22-SNAPSHOT</io.entgra.device.mgt.plugins.version>
<io.entgra.device.mgt.plugins.version>6.0.25-SNAPSHOT</io.entgra.device.mgt.plugins.version>
<!-- Android Agent Artifact Version-->
<android.agent.version>4.0.0</android.agent.version>

Loading…
Cancel
Save