mirror of
https://repository.entgra.net/community/device-mgt-plugins.git
synced 2025-09-16 23:42:15 +00:00
Sync with master branch (
This commit is contained in:
parent
7d5607637b
commit
d75345e017
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>io.entgra.device.mgt.plugins</groupId>
|
||||
<artifactId>io.entgra.device.mgt.plugins.parent</artifactId>
|
||||
<version>6.0.30-SNAPSHOT</version>
|
||||
<version>6.1.1-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.30-SNAPSHOT</version>
|
||||
<version>6.1.1-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.30-SNAPSHOT</version>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>io.entgra.device.mgt.plugins</groupId>
|
||||
<artifactId>device-types</artifactId>
|
||||
<version>6.0.30-SNAPSHOT</version>
|
||||
<version>6.1.1-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.30-SNAPSHOT</version>
|
||||
<version>6.1.1-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.30-SNAPSHOT</version>
|
||||
<version>6.1.1-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.30-SNAPSHOT</version>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<groupId>io.entgra.device.mgt.plugins</groupId>
|
||||
<artifactId>cdmf-transport-adapters</artifactId>
|
||||
<version>6.0.30-SNAPSHOT</version>
|
||||
<version>6.1.1-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.30-SNAPSHOT</version>
|
||||
<version>6.1.1-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.30-SNAPSHOT</version>
|
||||
<version>6.1.1-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.30-SNAPSHOT</version>
|
||||
<version>6.1.1-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>cdmf-transport-adapters</artifactId>
|
||||
<version>6.0.30-SNAPSHOT</version>
|
||||
<version>6.1.1-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.30-SNAPSHOT</version>
|
||||
<version>6.1.1-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.30-SNAPSHOT</version>
|
||||
<version>6.1.1-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.30-SNAPSHOT</version>
|
||||
<version>6.1.1-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.30-SNAPSHOT</version>
|
||||
<version>6.1.1-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.30-SNAPSHOT</version>
|
||||
<version>6.1.1-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.30-SNAPSHOT</version>
|
||||
<version>6.1.1-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.30-SNAPSHOT</version>
|
||||
<version>6.1.1-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.30-SNAPSHOT</version>
|
||||
<version>6.1.1-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.30-SNAPSHOT</version>
|
||||
<version>6.1.1-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.30-SNAPSHOT</version>
|
||||
<version>6.1.1-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.30-SNAPSHOT</version>
|
||||
<version>6.1.1-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.30-SNAPSHOT</version>
|
||||
<version>6.1.1-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.30-SNAPSHOT</version>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -38,14 +38,19 @@ import io.entgra.device.mgt.core.device.mgt.common.pull.notification.PullNotific
|
||||
import io.entgra.device.mgt.core.device.mgt.common.push.notification.NotificationStrategy;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.spi.DeviceManagementService;
|
||||
import io.entgra.device.mgt.core.device.mgt.common.type.mgt.DeviceStatus;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dao.DeviceManagementDAOException;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dto.DeviceDetailsDTO;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dto.DeviceType;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dto.DeviceTypeVersion;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dto.OperationDTO;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.dto.OwnerWithDeviceDTO;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.service.DeviceManagementProviderService;
|
||||
import io.entgra.device.mgt.core.device.mgt.core.service.EmailMetaInfo;
|
||||
import io.entgra.device.mgt.plugins.mobile.android.api.utils.TestUtils;
|
||||
import org.apache.commons.collections.map.SingletonMap;
|
||||
|
||||
import java.sql.Timestamp;
|
||||
import java.util.Collections;
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
@ -881,4 +886,24 @@ public class DeviceManagementProviderServiceMock implements DeviceManagementProv
|
||||
public void deleteDeviceDataByTenantDomain(String s) throws DeviceManagementException {
|
||||
throw new UnsupportedOperationException("Not implemented");
|
||||
}
|
||||
|
||||
@Override
|
||||
public OwnerWithDeviceDTO getOwnersWithDeviceIds(String s) throws DeviceManagementDAOException {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public OwnerWithDeviceDTO getOwnerWithDeviceByDeviceId(int i) throws DeviceManagementDAOException {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<DeviceDetailsDTO> getDevicesByTenantId(int i) throws DeviceManagementDAOException {
|
||||
return Collections.emptyList();
|
||||
}
|
||||
|
||||
@Override
|
||||
public OperationDTO getOperationDetailsById(int i) throws OperationManagementException {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
<parent>
|
||||
<artifactId>android-plugin</artifactId>
|
||||
<groupId>io.entgra.device.mgt.plugins</groupId>
|
||||
<version>6.0.30-SNAPSHOT</version>
|
||||
<version>6.1.1-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.30-SNAPSHOT</version>
|
||||
<version>6.1.1-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.30-SNAPSHOT</version>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<relativePath>../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@
|
||||
<parent>
|
||||
<groupId>io.entgra.device.mgt.plugins</groupId>
|
||||
<artifactId>mobile-plugins</artifactId>
|
||||
<version>6.0.30-SNAPSHOT</version>
|
||||
<version>6.1.1-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.30-SNAPSHOT</version>
|
||||
<version>6.1.1-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.30-SNAPSHOT</version>
|
||||
<version>6.1.1-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.30-SNAPSHOT</version>
|
||||
<version>6.1.1-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.30-SNAPSHOT</version>
|
||||
<version>6.1.1-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.30-SNAPSHOT</version>
|
||||
<version>6.1.1-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.30-SNAPSHOT</version>
|
||||
<version>6.1.1-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.30-SNAPSHOT</version>
|
||||
<version>6.1.1-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.30-SNAPSHOT</version>
|
||||
<version>6.1.1-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.30-SNAPSHOT</version>
|
||||
<version>6.1.1-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.30-SNAPSHOT</version>
|
||||
<version>6.1.1-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.30-SNAPSHOT</version>
|
||||
<version>6.1.1-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.30-SNAPSHOT</version>
|
||||
<version>6.1.1-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.30-SNAPSHOT</version>
|
||||
<version>6.1.1-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.30-SNAPSHOT</version>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<relativePath>../../pom.xml</relativePath>
|
||||
</parent>
|
||||
|
||||
|
||||
6
pom.xml
6
pom.xml
@ -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.30-SNAPSHOT</version>
|
||||
<version>6.1.1-SNAPSHOT</version>
|
||||
<name>WSO2 Carbon - Device Management Plugins Parent</name>
|
||||
<url>http://entgra.io</url>
|
||||
<description>WSO2 Carbon - Device Management Plugins Parent</description>
|
||||
@ -964,11 +964,11 @@
|
||||
<properties>
|
||||
|
||||
<!-- Carbon Device Management -->
|
||||
<io.entgra.device.mgt.core.version>5.0.42-SNAPSHOT</io.entgra.device.mgt.core.version>
|
||||
<io.entgra.device.mgt.core.version>5.1.1-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.30-SNAPSHOT</io.entgra.device.mgt.plugins.version>
|
||||
<io.entgra.device.mgt.plugins.version>6.1.1-SNAPSHOT</io.entgra.device.mgt.plugins.version>
|
||||
|
||||
<!-- Android Agent Artifact Version-->
|
||||
<android.agent.version>4.0.0</android.agent.version>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user