diff --git a/components/device-types/pom.xml b/components/device-types/pom.xml index bf55f5c86..95dea0b73 100644 --- a/components/device-types/pom.xml +++ b/components/device-types/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../../pom.xml diff --git 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 index 640dcec48..186b3656d 100644 --- 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 @@ virtual-fire-alarm-plugin io.entgra.device.mgt.plugins - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../pom.xml diff --git 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 index 70020be71..90ceeb1d0 100644 --- 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 @@ virtual-fire-alarm-plugin io.entgra.device.mgt.plugins - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../pom.xml diff --git a/components/device-types/virtual-fire-alarm-plugin/pom.xml b/components/device-types/virtual-fire-alarm-plugin/pom.xml index c4242f4e4..30788fb54 100644 --- a/components/device-types/virtual-fire-alarm-plugin/pom.xml +++ b/components/device-types/virtual-fire-alarm-plugin/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins device-types - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../pom.xml diff --git 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 index 0ee49feb9..e4946ebb5 100644 --- 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 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../../pom.xml 4.0.0 diff --git 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 index 489faf46e..325f16281 100644 --- 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 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../../pom.xml diff --git 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 index 4044f649b..f935c0c7b 100644 --- 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 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../../pom.xml 4.0.0 diff --git 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 index 42788807f..21cc73b28 100644 --- 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 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../../pom.xml diff --git 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 index 3be8da46f..64f5d7fb4 100644 --- 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 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../../pom.xml 4.0.0 diff --git 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 index a0e9e91be..fdfb7de66 100644 --- 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 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../../pom.xml 4.0.0 diff --git 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 index 8ab721f14..2677f402a 100644 --- 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 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../../pom.xml 4.0.0 diff --git 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 index 260152181..49b5c377f 100644 --- 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 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../../pom.xml diff --git 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 index a883cdf10..01c3cb0f2 100644 --- 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 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../../pom.xml diff --git 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 index 0f475b5bd..55e277b34 100644 --- 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 @@ io.entgra.device.mgt.plugins cdmf-transport-adapters - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../../pom.xml diff --git a/components/extensions/cdmf-transport-adapters/pom.xml b/components/extensions/cdmf-transport-adapters/pom.xml index 06399132c..0ae5917cb 100644 --- a/components/extensions/cdmf-transport-adapters/pom.xml +++ b/components/extensions/cdmf-transport-adapters/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins extensions - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../pom.xml diff --git 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 index 215a7c89d..58052f086 100644 --- 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 @@ io.entgra.device.mgt.plugins emqx-extensions - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../pom.xml diff --git 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 index cd1d86fdb..53ab7b6bb 100644 --- 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 @@ io.entgra.device.mgt.plugins emqx-extensions - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../pom.xml diff --git a/components/extensions/emqx-extensions/pom.xml b/components/extensions/emqx-extensions/pom.xml index 56b4ec066..bf07f73b1 100644 --- a/components/extensions/emqx-extensions/pom.xml +++ b/components/extensions/emqx-extensions/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins extensions - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../pom.xml diff --git a/components/extensions/pom.xml b/components/extensions/pom.xml index 837f9ce74..e5ba3db4e 100644 --- a/components/extensions/pom.xml +++ b/components/extensions/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../../pom.xml diff --git 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 index da43920e1..89ac02c33 100644 --- 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 @@ io.entgra.device.mgt.plugins pull-notification-listeners - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../pom.xml diff --git a/components/extensions/pull-notification-listeners/pom.xml b/components/extensions/pull-notification-listeners/pom.xml index 1706fb826..a8cae473d 100644 --- a/components/extensions/pull-notification-listeners/pom.xml +++ b/components/extensions/pull-notification-listeners/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins extensions - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../pom.xml diff --git 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 index 2306a1d4b..b308689cb 100644 --- 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 @@ io.entgra.device.mgt.plugins siddhi-extensions - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../pom.xml diff --git 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 index df3277920..15ffa6960 100644 --- 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) ); diff --git 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 index 08b5f5af1..1b90ebbff 100644 --- 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 @@ io.entgra.device.mgt.plugins siddhi-extensions - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../pom.xml diff --git a/components/extensions/siddhi-extensions/pom.xml b/components/extensions/siddhi-extensions/pom.xml index 90a8061c9..d81598415 100644 --- a/components/extensions/siddhi-extensions/pom.xml +++ b/components/extensions/siddhi-extensions/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins extensions - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../pom.xml diff --git 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 index bc64543e5..0309c0c3a 100644 --- 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 @@ android-plugin io.entgra.device.mgt.plugins - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../pom.xml @@ -306,7 +306,7 @@ org.powermock - powermock-api-mockito + powermock-api-mockito2 test @@ -349,8 +349,4 @@ jackson-core-asl - - - true - diff --git 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 index 1b5bc301e..f38864b0e 100644 --- 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; diff --git 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 index 1f0734e74..a8879f230 100644 --- 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 @@ android-plugin io.entgra.device.mgt.plugins - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../pom.xml diff --git 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 index 7abe60dfd..89e26bb54 100644 --- 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 @@ android-plugin io.entgra.device.mgt.plugins - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../pom.xml diff --git 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 index b429480ef..227232618 100644 --- 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 @@ android-plugin io.entgra.device.mgt.plugins - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../pom.xml diff --git a/components/mobile-plugins/android-plugin/pom.xml b/components/mobile-plugins/android-plugin/pom.xml index c1bee1ccd..0230e5d08 100644 --- a/components/mobile-plugins/android-plugin/pom.xml +++ b/components/mobile-plugins/android-plugin/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins mobile-plugins - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../pom.xml diff --git a/components/mobile-plugins/pom.xml b/components/mobile-plugins/pom.xml index 980b1143b..e30fed9f7 100644 --- a/components/mobile-plugins/pom.xml +++ b/components/mobile-plugins/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../../pom.xml diff --git 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 index 8a7bb7f08..a0cae4782 100644 --- 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 @@ io.entgra.device.mgt.plugins analytics-feature - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../pom.xml diff --git a/features/analytics-feature/pom.xml b/features/analytics-feature/pom.xml index 24aa0f77d..076e63e59 100644 --- a/features/analytics-feature/pom.xml +++ b/features/analytics-feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../../pom.xml diff --git a/features/device-types-feature/pom.xml b/features/device-types-feature/pom.xml index 9fda109c8..aafc51f4e 100644 --- a/features/device-types-feature/pom.xml +++ b/features/device-types-feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../../pom.xml diff --git 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 index 861fa3664..87fcb9589 100644 --- 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 @@ io.entgra.device.mgt.plugins virtual-fire-alarm-plugin-feature - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../pom.xml diff --git a/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml b/features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml index 2ff188647..8329053ef 100644 --- 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 @@ io.entgra.device.mgt.plugins device-types-feature - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../pom.xml diff --git 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 index 8466ce46d..477b4bf73 100644 --- 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 @@ io.entgra.device.mgt.plugins extensions-feature - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../pom.xml diff --git 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 index 9bc6c076e..38a382e5e 100644 --- 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 @@ io.entgra.device.mgt.plugins extensions-feature - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../pom.xml diff --git 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 index a86de94f3..789f0a5f1 100644 --- 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 @@ io.entgra.device.mgt.plugins extensions-feature - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../pom.xml diff --git 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 index 7c5e195df..c62c5178a 100644 --- 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 @@ io.entgra.device.mgt.plugins extensions-feature - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../pom.xml 4.0.0 diff --git a/features/extensions-feature/pom.xml b/features/extensions-feature/pom.xml index 6116f500d..16eeae063 100644 --- a/features/extensions-feature/pom.xml +++ b/features/extensions-feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../../pom.xml diff --git 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 index f566f8077..a70b4e97d 100644 --- 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 @@ io.entgra.device.mgt.plugins android-plugin-feature - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../pom.xml diff --git a/features/mobile-plugins-feature/android-plugin-feature/pom.xml b/features/mobile-plugins-feature/android-plugin-feature/pom.xml index e2163581a..2371fc3b5 100644 --- a/features/mobile-plugins-feature/android-plugin-feature/pom.xml +++ b/features/mobile-plugins-feature/android-plugin-feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins mobile-plugins-feature - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../pom.xml diff --git a/features/mobile-plugins-feature/pom.xml b/features/mobile-plugins-feature/pom.xml index c6c2521a0..1b5cf5add 100644 --- a/features/mobile-plugins-feature/pom.xml +++ b/features/mobile-plugins-feature/pom.xml @@ -22,7 +22,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT ../../pom.xml diff --git a/pom.xml b/pom.xml index c89775a74..12400ba15 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ io.entgra.device.mgt.plugins io.entgra.device.mgt.plugins.parent pom - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT WSO2 Carbon - Device Management Plugins Parent http://entgra.io WSO2 Carbon - Device Management Plugins Parent @@ -865,7 +865,7 @@ org.powermock - powermock-api-mockito + powermock-api-mockito2 ${powermock.version} test @@ -953,11 +953,11 @@ - 5.0.26-SNAPSHOT + 5.0.29-SNAPSHOT [5.0.0, 6.0.0) - 6.0.17-SNAPSHOT + 6.0.20-SNAPSHOT 4.0.0 @@ -1071,7 +1071,7 @@ 1.0b3 1.4.0.wso2v1 3.12.1.GA - 1.7.4 + 2.0.2 4.6.0 1.13.0