Merge branch 'master' into master

dm-improvements
commit ae617f8fae

@ -22,7 +22,7 @@
<parent>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>io.entgra.device.mgt.plugins.parent</artifactId>
<version>6.0.20-SNAPSHOT</version>
<version>6.0.21-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.20-SNAPSHOT</version>
<version>6.0.21-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.20-SNAPSHOT</version>
<version>6.0.21-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.20-SNAPSHOT</version>
<version>6.0.21-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.20-SNAPSHOT</version>
<version>6.0.21-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.20-SNAPSHOT</version>
<version>6.0.21-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.20-SNAPSHOT</version>
<version>6.0.21-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.20-SNAPSHOT</version>
<version>6.0.21-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.20-SNAPSHOT</version>
<version>6.0.21-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.20-SNAPSHOT</version>
<version>6.0.21-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.20-SNAPSHOT</version>
<version>6.0.21-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.20-SNAPSHOT</version>
<version>6.0.21-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.20-SNAPSHOT</version>
<version>6.0.21-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.20-SNAPSHOT</version>
<version>6.0.21-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.20-SNAPSHOT</version>
<version>6.0.21-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.20-SNAPSHOT</version>
<version>6.0.21-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.20-SNAPSHOT</version>
<version>6.0.21-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.20-SNAPSHOT</version>
<version>6.0.21-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.20-SNAPSHOT</version>
<version>6.0.21-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.20-SNAPSHOT</version>
<version>6.0.21-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.20-SNAPSHOT</version>
<version>6.0.21-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

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

@ -20,7 +20,7 @@
<parent>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>siddhi-extensions</artifactId>
<version>6.0.20-SNAPSHOT</version>
<version>6.0.21-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.20-SNAPSHOT</version>
<version>6.0.21-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.20-SNAPSHOT</version>
<version>6.0.21-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.20-SNAPSHOT</version>
<version>6.0.21-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.20-SNAPSHOT</version>
<version>6.0.21-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.20-SNAPSHOT</version>
<version>6.0.21-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.20-SNAPSHOT</version>
<version>6.0.21-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.20-SNAPSHOT</version>
<version>6.0.21-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.20-SNAPSHOT</version>
<version>6.0.21-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.20-SNAPSHOT</version>
<version>6.0.21-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.20-SNAPSHOT</version>
<version>6.0.21-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.20-SNAPSHOT</version>
<version>6.0.21-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.20-SNAPSHOT</version>
<version>6.0.21-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.20-SNAPSHOT</version>
<version>6.0.21-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

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

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

@ -3,7 +3,7 @@
<parent>
<groupId>io.entgra.device.mgt.plugins</groupId>
<artifactId>extensions-feature</artifactId>
<version>6.0.20-SNAPSHOT</version>
<version>6.0.21-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.20-SNAPSHOT</version>
<version>6.0.21-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.20-SNAPSHOT</version>
<version>6.0.21-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.20-SNAPSHOT</version>
<version>6.0.21-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.20-SNAPSHOT</version>
<version>6.0.21-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.20-SNAPSHOT</version>
<version>6.0.21-SNAPSHOT</version>
<name>WSO2 Carbon - Device Management Plugins Parent</name>
<url>http://wso2.org</url>
<description>WSO2 Carbon - Device Management Plugins Parent</description>
@ -1166,11 +1166,11 @@
<properties>
<!-- Carbon Device Management -->
<io.entgra.device.mgt.core.version>5.0.29-SNAPSHOT</io.entgra.device.mgt.core.version>
<io.entgra.device.mgt.core.version>5.0.29</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.20-SNAPSHOT</io.entgra.device.mgt.plugins.version>
<io.entgra.device.mgt.plugins.version>6.0.21-SNAPSHOT</io.entgra.device.mgt.plugins.version>
<!-- Android Agent Artifact Version-->
<android.agent.version>4.0.0</android.agent.version>

Loading…
Cancel
Save