Merge branch 'apim420' of https://repository.entgra.net/community/device-mgt-plugins into apim420

1 year ago · bc97c6e212
parent 48a26be6a0 c7fc49b63b
commit bc97c6e212
46 changed files with 52 additions and 54 deletions
--- a/components/device-types/pom.xml
+++ b/components/device-types/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
        <artifactId>io.entgra.device.mgt.plugins.parent</artifactId>
-        <version>6.0.17-SNAPSHOT</version>
+        <version>6.0.20-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

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

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

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

--- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.extension/pom.xml
@ -20,7 +20,7 @@
    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
        <artifactId>cdmf-transport-adapters</artifactId>
-		<version>6.0.17-SNAPSHOT</version>
+		<version>6.0.20-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.http/pom.xml
@ -20,7 +20,7 @@
    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
        <artifactId>cdmf-transport-adapters</artifactId>
-        <version>6.0.17-SNAPSHOT</version>
+        <version>6.0.20-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

--- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.mqtt/pom.xml
@ -20,7 +20,7 @@
    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
        <artifactId>cdmf-transport-adapters</artifactId>
-        <version>6.0.17-SNAPSHOT</version>
+        <version>6.0.20-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.thrift/pom.xml
@ -21,7 +21,7 @@
 	<parent>
 		<groupId>io.entgra.device.mgt.plugins</groupId>
 		<artifactId>cdmf-transport-adapters</artifactId>
-		<version>6.0.17-SNAPSHOT</version>
+		<version>6.0.20-SNAPSHOT</version>
 		<relativePath>../../pom.xml</relativePath>
 	</parent>

--- a/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/input/io.entgra.device.mgt.plugins.input.adapter.xmpp/pom.xml
@ -20,7 +20,7 @@
    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
        <artifactId>cdmf-transport-adapters</artifactId>
-        <version>6.0.17-SNAPSHOT</version>
+        <version>6.0.20-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.http/pom.xml
@ -20,7 +20,7 @@
    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
        <artifactId>cdmf-transport-adapters</artifactId>
-        <version>6.0.17-SNAPSHOT</version>
+        <version>6.0.20-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.mqtt/pom.xml
@ -20,7 +20,7 @@
    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
        <artifactId>cdmf-transport-adapters</artifactId>
-        <version>6.0.17-SNAPSHOT</version>
+        <version>6.0.20-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml
+++ b/components/extensions/cdmf-transport-adapters/output/io.entgra.device.mgt.plugins.output.adapter.websocket.endpoint/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
        <artifactId>cdmf-transport-adapters</artifactId>
-        <version>6.0.17-SNAPSHOT</version>
+        <version>6.0.20-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

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

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

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

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

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

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

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

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

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

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

--- a/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/resources/sql/h2.sql
+++ b/components/extensions/siddhi-extensions/io.entgra.device.mgt.plugins.extension.siddhi.device/src/test/resources/sql/h2.sql
@ -25,6 +25,7 @@ CREATE TABLE IF NOT EXISTS DM_GROUP (
  OWNER               VARCHAR(255)  DEFAULT NULL,
  PARENT_PATH VARCHAR(255) DEFAULT NULL,
  TENANT_ID           INTEGER      DEFAULT 0,
+  PARENT_GROUP_ID     INTEGER      DEFAULT 0,
  PRIMARY KEY (ID)
 );

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

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

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

@ -306,7 +306,7 @@
        </dependency>
        <dependency>
            <groupId>org.powermock</groupId>
-            <artifactId>powermock-api-mockito</artifactId>
+            <artifactId>powermock-api-mockito2</artifactId>
            <scope>test</scope>
        </dependency>
        <dependency>
@ -349,8 +349,4 @@
            <artifactId>jackson-core-asl</artifactId>
        </dependency>
    </dependencies>
-
-    <properties>
-        <maven.test.skip>true</maven.test.skip>
-    </properties>
 </project>
--- a/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/DeviceManagementAdminServiceTests.java
+++ b/components/mobile-plugins/android-plugin/io.entgra.device.mgt.plugins.mobile.android.api/src/test/java/io/entgra/device/mgt/plugins/mobile/android/api/DeviceManagementAdminServiceTests.java
@ -25,6 +25,7 @@ import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.testng.PowerMockObjectFactory;
+import org.powermock.modules.testng.PowerMockTestCase;
 import org.testng.Assert;
 import org.testng.IObjectFactory;
 import org.testng.annotations.BeforeClass;
@ -40,7 +41,7 @@ import javax.ws.rs.core.Response;

@PowerMockIgnore({"javax.ws.rs.*", "org.apache.log4j.*"})
@PrepareForTest(AndroidAPIUtils.class)
-public class DeviceManagementAdminServiceTests {
+public class DeviceManagementAdminServiceTests extends PowerMockTestCase {

    private DeviceManagementAdminServiceImpl deviceManagementAdminService;

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

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

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

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

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

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

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

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

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

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

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

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

--- a/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml
+++ b/features/extensions-feature/io.entgra.device.mgt.plugins.extension.siddhi.execution.json.feature/pom.xml
@ -22,7 +22,7 @@
    <parent>
        <groupId>io.entgra.device.mgt.plugins</groupId>
        <artifactId>extensions-feature</artifactId>
-        <version>6.0.17-SNAPSHOT</version>
+        <version>6.0.20-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

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

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

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

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

--- a/pom.xml
+++ b/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.17-SNAPSHOT</version>
+    <version>6.0.20-SNAPSHOT</version>
    <name>WSO2 Carbon - Device Management Plugins Parent</name>
    <url>http://entgra.io</url>
    <description>WSO2 Carbon - Device Management Plugins Parent</description>
@ -865,7 +865,7 @@
            </dependency>
            <dependency>
                <groupId>org.powermock</groupId>
-                <artifactId>powermock-api-mockito</artifactId>
+                <artifactId>powermock-api-mockito2</artifactId>
                <version>${powermock.version}</version>
                <scope>test</scope>
            </dependency>
@ -953,11 +953,11 @@
    <properties>

        <!-- 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>

        <!-- 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.version>4.0.0</android.agent.version>
@ -1071,7 +1071,7 @@
        <ant.contrib.version>1.0b3</ant.contrib.version>
        <commons.dbcp.version>1.4.0.wso2v1</commons.dbcp.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>
        <okio.version>1.13.0</okio.version>