Fix merge conflicts

5 years ago · e8aa337d86
parent 43cb9e9ecb
commit e8aa337d86
18 changed files with 31 additions and 31 deletions
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.addons/pom.xml
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.addons/pom.xml
@ -5,12 +5,12 @@
    <parent>
        <artifactId>application-mgt</artifactId>
        <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>3.2.7-SNAPSHOT</version>
+        <version>3.2.9-SNAPSHOT</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>org.wso2.carbon.device.application.mgt.addons</artifactId>
-    <version>3.2.7-SNAPSHOT</version>
+    <version>3.2.9-SNAPSHOT</version>
    <name>WSO2 Carbon - Application Management Add-Ons</name>
    <description>WSO2 Carbon - Application Management Add-Ons</description>
    <url>http://wso2.org</url>
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.api/pom.xml
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.api/pom.xml
@ -28,7 +28,7 @@

    <modelVersion>4.0.0</modelVersion>
    <artifactId>org.wso2.carbon.device.application.mgt.api</artifactId>
-    <version>3.2.7-SNAPSHOT</version>
+    <version>3.2.9-SNAPSHOT</version>
    <packaging>war</packaging>
    <name>WSO2 Carbon - Application Management API</name>
    <description>WSO2 Carbon - Application Management API</description>
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.common/pom.xml
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.common/pom.xml
@ -21,13 +21,13 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>application-mgt</artifactId>
-        <version>3.2.7-SNAPSHOT</version>
+        <version>3.2.9-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>org.wso2.carbon.device.application.mgt.common</artifactId>
-    <version>3.2.7-SNAPSHOT</version>
+    <version>3.2.9-SNAPSHOT</version>
    <packaging>bundle</packaging>
    <name>WSO2 Carbon - Application Management Common</name>
    <description>WSO2 Carbon - Application Management Common</description>
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.core/pom.xml
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.core/pom.xml
@ -21,13 +21,13 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>application-mgt</artifactId>
-        <version>3.2.7-SNAPSHOT</version>
+        <version>3.2.9-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>org.wso2.carbon.device.application.mgt.core</artifactId>
-    <version>3.2.7-SNAPSHOT</version>
+    <version>3.2.9-SNAPSHOT</version>
    <packaging>bundle</packaging>
    <name>WSO2 Carbon - Application Management Core</name>
    <description>WSO2 Carbon - Application Management Core</description>
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.api/pom.xml
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.api/pom.xml
@ -28,7 +28,7 @@

    <modelVersion>4.0.0</modelVersion>
    <artifactId>org.wso2.carbon.device.application.mgt.publisher.api</artifactId>
-    <version>3.2.7-SNAPSHOT</version>
+    <version>3.2.9-SNAPSHOT</version>
    <packaging>war</packaging>
    <name>WSO2 Carbon - Application Management Publisher API</name>
    <description>WSO2 Carbon - Application Management Publisher API</description>
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/pom.xml
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/pom.xml
@ -24,10 +24,10 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>application-mgt</artifactId>
-        <version>3.2.7-SNAPSHOT</version>
+        <version>3.2.9-SNAPSHOT</version>
    </parent>
    <artifactId>org.wso2.carbon.device.application.mgt.publisher.ui</artifactId>
-    <version>3.2.7-SNAPSHOT</version>
+    <version>3.2.9-SNAPSHOT</version>
    <packaging>war</packaging>
    <name>WSO2 Carbon - Application Management Publisher UI Component</name>
    <url>http://wso2.org</url>
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/pom.xml
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/pom.xml
@ -22,13 +22,13 @@
    <parent>
        <artifactId>application-mgt</artifactId>
        <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>3.2.7-SNAPSHOT</version>
+        <version>3.2.9-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>org.wso2.carbon.device.application.mgt.store.api</artifactId>
-    <version>3.2.7-SNAPSHOT</version>
+    <version>3.2.9-SNAPSHOT</version>
    <packaging>war</packaging>
    <name>WSO2 Carbon - Application Management Store API</name>
    <description>WSO2 Carbon - Application Management Store API</description>
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/pom.xml
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/pom.xml
@ -24,10 +24,10 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>application-mgt</artifactId>
-        <version>3.2.7-SNAPSHOT</version>
+        <version>3.2.9-SNAPSHOT</version>
    </parent>
    <artifactId>org.wso2.carbon.device.application.mgt.store.ui</artifactId>
-    <version>3.2.7-SNAPSHOT</version>
+    <version>3.2.9-SNAPSHOT</version>
    <packaging>war</packaging>
    <name>WSO2 Carbon - Application Management Store UI Component</name>
    <url>http://wso2.org</url>
--- a/components/application-mgt/pom.xml
+++ b/components/application-mgt/pom.xml
@ -22,13 +22,13 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>carbon-devicemgt</artifactId>
-        <version>3.2.7-SNAPSHOT</version>
+        <version>3.2.9-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>application-mgt</artifactId>
-    <version>3.2.7-SNAPSHOT</version>
+    <version>3.2.9-SNAPSHOT</version>
    <packaging>pom</packaging>
    <name>WSO2 Carbon - Application Management Component</name>
    <description>WSO2 Carbon - Application Management Component</description>
--- a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/pom.xml
+++ b/components/ui-request-interceptor/io.entgra.ui.request.interceptor/pom.xml
@ -23,13 +23,13 @@
    <parent>
        <artifactId>ui-request-interceptor</artifactId>
        <groupId>io.entgra.devicemgt</groupId>
-        <version>3.2.7-SNAPSHOT</version>
+        <version>3.2.9-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

    <artifactId>io.entgra.ui.request.interceptor</artifactId>

-    <version>3.2.7-SNAPSHOT</version>
+    <version>3.2.9-SNAPSHOT</version>
    <packaging>war</packaging>
    <name>Entgra - Request Handling Proxy Servlet</name>
    <description>Proxy Service for Request Handling in Entgra EMM/IOT Server.</description>
--- a/components/ui-request-interceptor/pom.xml
+++ b/components/ui-request-interceptor/pom.xml
@ -23,7 +23,7 @@
    <parent>
        <artifactId>carbon-devicemgt</artifactId>
        <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>3.2.7-SNAPSHOT</version>
+        <version>3.2.9-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>
--- a/features/application-mgt/org.wso2.carbon.device.application.mgt.api.feature/pom.xml
+++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.api.feature/pom.xml
@ -22,13 +22,13 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>application-mgt-feature</artifactId>
-        <version>3.2.7-SNAPSHOT</version>
+        <version>3.2.9-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>org.wso2.carbon.device.application.mgt.api.feature</artifactId>
-    <version>3.2.7-SNAPSHOT</version>
+    <version>3.2.9-SNAPSHOT</version>
    <packaging>pom</packaging>
    <name>WSO2 Carbon - Application Management API Feature</name>
    <url>http://wso2.org</url>
--- a/features/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui.feature/pom.xml
+++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui.feature/pom.xml
@ -22,13 +22,13 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>application-mgt-feature</artifactId>
-        <version>3.2.7-SNAPSHOT</version>
+        <version>3.2.9-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>org.wso2.carbon.device.application.mgt.publisher.ui.feature</artifactId>
-    <version>3.2.7-SNAPSHOT</version>
+    <version>3.2.9-SNAPSHOT</version>
    <packaging>pom</packaging>
    <name>WSO2 Carbon - Application Management Publisher UI Feature</name>
    <url>http://wso2.org</url>
--- a/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/pom.xml
+++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/pom.xml
@ -22,14 +22,14 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>application-mgt-feature</artifactId>
-        <version>3.2.7-SNAPSHOT</version>
+        <version>3.2.9-SNAPSHOT</version>
        <relativePath>../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>org.wso2.carbon.device.application.mgt.server.feature</artifactId>
    <packaging>pom</packaging>
-    <version>3.2.7-SNAPSHOT</version>
+    <version>3.2.9-SNAPSHOT</version>

    <name>WSO2 Carbon - Application Management Server Feature</name>
    <url>http://wso2.org</url>
--- a/features/application-mgt/org.wso2.carbon.device.application.mgt.store.ui.feature/pom.xml
+++ b/features/application-mgt/org.wso2.carbon.device.application.mgt.store.ui.feature/pom.xml
@ -23,12 +23,12 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>application-mgt-feature</artifactId>
-        <version>3.2.7-SNAPSHOT</version>
+        <version>3.2.9-SNAPSHOT</version>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>org.wso2.carbon.device.application.mgt.store.ui.feature</artifactId>
-    <version>3.2.7-SNAPSHOT</version>
+    <version>3.2.9-SNAPSHOT</version>
    <packaging>pom</packaging>
    <name>WSO2 Carbon - Application Management Store UI Feature</name>
    <url>http://wso2.org</url>
--- a/features/application-mgt/pom.xml
+++ b/features/application-mgt/pom.xml
@ -22,13 +22,13 @@
    <parent>
        <groupId>org.wso2.carbon.devicemgt</groupId>
        <artifactId>carbon-devicemgt</artifactId>
-        <version>3.2.7-SNAPSHOT</version>
+        <version>3.2.9-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>

    <modelVersion>4.0.0</modelVersion>
    <artifactId>application-mgt-feature</artifactId>
-    <version>3.2.7-SNAPSHOT</version>
+    <version>3.2.9-SNAPSHOT</version>
    <packaging>pom</packaging>
    <name>WSO2 Carbon - Application Management Feature</name>
    <url>http://wso2.org</url>
--- a/features/ui-request-interceptor/io.entgra.ui.request.interceptor.feature/pom.xml
+++ b/features/ui-request-interceptor/io.entgra.ui.request.interceptor.feature/pom.xml
@ -23,7 +23,7 @@
    <parent>
        <artifactId>ui-request-interceptor-feature</artifactId>
        <groupId>io.entgra.devicemgt</groupId>
-        <version>3.2.7-SNAPSHOT</version>
+        <version>3.2.9-SNAPSHOT</version>
    </parent>
    <modelVersion>4.0.0</modelVersion>

--- a/features/ui-request-interceptor/pom.xml
+++ b/features/ui-request-interceptor/pom.xml
@ -23,7 +23,7 @@
    <parent>
        <artifactId>carbon-devicemgt</artifactId>
        <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>3.2.7-SNAPSHOT</version>
+        <version>3.2.9-SNAPSHOT</version>
        <relativePath>../../pom.xml</relativePath>
    </parent>
    <modelVersion>4.0.0</modelVersion>