Dharmakeerthi Lasantha 1 year ago
commit bc97c6e212

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -25,6 +25,7 @@ CREATE TABLE IF NOT EXISTS DM_GROUP (
OWNER VARCHAR(255) DEFAULT NULL, OWNER VARCHAR(255) DEFAULT NULL,
PARENT_PATH VARCHAR(255) DEFAULT NULL, PARENT_PATH VARCHAR(255) DEFAULT NULL,
TENANT_ID INTEGER DEFAULT 0, TENANT_ID INTEGER DEFAULT 0,
PARENT_GROUP_ID INTEGER DEFAULT 0,
PRIMARY KEY (ID) PRIMARY KEY (ID)
); );

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

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

@ -21,7 +21,7 @@
<parent> <parent>
<artifactId>android-plugin</artifactId> <artifactId>android-plugin</artifactId>
<groupId>io.entgra.device.mgt.plugins</groupId> <groupId>io.entgra.device.mgt.plugins</groupId>
<version>6.0.17-SNAPSHOT</version> <version>6.0.20-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath> <relativePath>../pom.xml</relativePath>
</parent> </parent>
@ -306,7 +306,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.powermock</groupId> <groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId> <artifactId>powermock-api-mockito2</artifactId>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -349,8 +349,4 @@
<artifactId>jackson-core-asl</artifactId> <artifactId>jackson-core-asl</artifactId>
</dependency> </dependency>
</dependencies> </dependencies>
<properties>
<maven.test.skip>true</maven.test.skip>
</properties>
</project> </project>

@ -25,6 +25,7 @@ import org.powermock.api.mockito.PowerMockito;
import org.powermock.core.classloader.annotations.PowerMockIgnore; import org.powermock.core.classloader.annotations.PowerMockIgnore;
import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.testng.PowerMockObjectFactory; import org.powermock.modules.testng.PowerMockObjectFactory;
import org.powermock.modules.testng.PowerMockTestCase;
import org.testng.Assert; import org.testng.Assert;
import org.testng.IObjectFactory; import org.testng.IObjectFactory;
import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeClass;
@ -40,7 +41,7 @@ import javax.ws.rs.core.Response;
@PowerMockIgnore({"javax.ws.rs.*", "org.apache.log4j.*"}) @PowerMockIgnore({"javax.ws.rs.*", "org.apache.log4j.*"})
@PrepareForTest(AndroidAPIUtils.class) @PrepareForTest(AndroidAPIUtils.class)
public class DeviceManagementAdminServiceTests { public class DeviceManagementAdminServiceTests extends PowerMockTestCase {
private DeviceManagementAdminServiceImpl deviceManagementAdminService; private DeviceManagementAdminServiceImpl deviceManagementAdminService;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -23,7 +23,7 @@
<groupId>io.entgra.device.mgt.plugins</groupId> <groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>io.entgra.device.mgt.plugins.parent</artifactId> <artifactId>io.entgra.device.mgt.plugins.parent</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>6.0.17-SNAPSHOT</version> <version>6.0.20-SNAPSHOT</version>
<name>WSO2 Carbon - Device Management Plugins Parent</name> <name>WSO2 Carbon - Device Management Plugins Parent</name>
<url>http://entgra.io</url> <url>http://entgra.io</url>
<description>WSO2 Carbon - Device Management Plugins Parent</description> <description>WSO2 Carbon - Device Management Plugins Parent</description>
@ -865,7 +865,7 @@
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.powermock</groupId> <groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito</artifactId> <artifactId>powermock-api-mockito2</artifactId>
<version>${powermock.version}</version> <version>${powermock.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
@ -953,11 +953,11 @@
<properties> <properties>
<!-- Carbon Device Management --> <!-- Carbon Device Management -->
<io.entgra.device.mgt.core.version>5.0.26-SNAPSHOT</io.entgra.device.mgt.core.version> <io.entgra.device.mgt.core.version>5.0.29-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> <io.entgra.device.mgt.core.version.range>[5.0.0, 6.0.0)</io.entgra.device.mgt.core.version.range>
<!-- Carbon Device Management Plugins --> <!-- Carbon Device Management Plugins -->
<io.entgra.device.mgt.plugins.version>6.0.17-SNAPSHOT</io.entgra.device.mgt.plugins.version> <io.entgra.device.mgt.plugins.version>6.0.20-SNAPSHOT</io.entgra.device.mgt.plugins.version>
<!-- Android Agent Artifact Version--> <!-- Android Agent Artifact Version-->
<android.agent.version>4.0.0</android.agent.version> <android.agent.version>4.0.0</android.agent.version>
@ -1071,7 +1071,7 @@
<ant.contrib.version>1.0b3</ant.contrib.version> <ant.contrib.version>1.0b3</ant.contrib.version>
<commons.dbcp.version>1.4.0.wso2v1</commons.dbcp.version> <commons.dbcp.version>1.4.0.wso2v1</commons.dbcp.version>
<javassist.version>3.12.1.GA</javassist.version> <javassist.version>3.12.1.GA</javassist.version>
<powermock.version>1.7.4</powermock.version> <powermock.version>2.0.2</powermock.version>
<squareup.okhttp3.version>4.6.0</squareup.okhttp3.version> <squareup.okhttp3.version>4.6.0</squareup.okhttp3.version>
<okio.version>1.13.0</okio.version> <okio.version>1.13.0</okio.version>

Loading…
Cancel
Save