Merge pull request #858 from lasanthaDLPDS/master

Fixing Version Conflicts
7 years ago · 494bedcc6e
parent 8f635c9e7c 214eaba7e5
commit 494bedcc6e
2 changed files with 2 additions and 2 deletions
--- a/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.v09.api/pom.xml
+++ b/components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.v09.api/pom.xml
@ -23,7 +23,7 @@
    <parent>
        <artifactId>android-plugin</artifactId>
        <groupId>org.wso2.carbon.devicemgt-plugins</groupId>
-        <version>4.0.102-SNAPSHOT</version>
+        <version>4.0.105-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

--- a/pom.xml
+++ b/pom.xml
@ -1215,7 +1215,7 @@
        <javax.ws.rs.version>1.1.1</javax.ws.rs.version>

        <!-- Carbon Device Management -->
-        <carbon.devicemgt.version>3.0.185-SNAPSHOT</carbon.devicemgt.version>
+        <carbon.devicemgt.version>3.0.189</carbon.devicemgt.version>
        <carbon.devicemgt.version.range>[3.0.0, 4.0.0)</carbon.devicemgt.version.range>

        <!-- Carbon App Management -->