From e8aa337d86aa4d4ce2897f6776e020e98ae77cd2 Mon Sep 17 00:00:00 2001
From: lasanthaDLPDS <tcdlpds@gmail.com>
Date: Wed, 17 Jul 2019 18:27:24 +0530
Subject: [PATCH] Fix merge conflicts

---
 .../org.wso2.carbon.device.application.mgt.addons/pom.xml     | 4 ++--
 .../org.wso2.carbon.device.application.mgt.api/pom.xml        | 2 +-
 .../org.wso2.carbon.device.application.mgt.common/pom.xml     | 4 ++--
 .../org.wso2.carbon.device.application.mgt.core/pom.xml       | 4 ++--
 .../pom.xml                                                   | 2 +-
 .../pom.xml                                                   | 4 ++--
 .../org.wso2.carbon.device.application.mgt.store.api/pom.xml  | 4 ++--
 .../org.wso2.carbon.device.application.mgt.store.ui/pom.xml   | 4 ++--
 components/application-mgt/pom.xml                            | 4 ++--
 .../io.entgra.ui.request.interceptor/pom.xml                  | 4 ++--
 components/ui-request-interceptor/pom.xml                     | 2 +-
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 4 ++--
 .../pom.xml                                                   | 4 ++--
 features/application-mgt/pom.xml                              | 4 ++--
 .../io.entgra.ui.request.interceptor.feature/pom.xml          | 2 +-
 features/ui-request-interceptor/pom.xml                       | 2 +-
 18 files changed, 31 insertions(+), 31 deletions(-)

diff --git 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
index 13498219803..163fc9d04a1 100644
--- 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>
diff --git 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
index bb64f492229..14d13661332 100644
--- 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>
diff --git 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
index d19e0a67782..6699a9b31ed 100644
--- 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>
diff --git 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
index 8cbc2a877c4..d3aa277f619 100644
--- 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>
diff --git 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
index 040a78a85d4..eda02c7b019 100644
--- 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>
diff --git 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
index d7d95909964..1bd68c685b1 100644
--- 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>
diff --git 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
index 01c65ff4443..f0e215f944d 100644
--- 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>
diff --git 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
index 882a94e2ae9..7bac04a1713 100644
--- 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>
diff --git a/components/application-mgt/pom.xml b/components/application-mgt/pom.xml
index dd201be3c45..397dfb91f84 100644
--- 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>
diff --git a/components/ui-request-interceptor/io.entgra.ui.request.interceptor/pom.xml b/components/ui-request-interceptor/io.entgra.ui.request.interceptor/pom.xml
index d2cc394427a..e8a54a14356 100644
--- 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>
diff --git a/components/ui-request-interceptor/pom.xml b/components/ui-request-interceptor/pom.xml
index fb0f2f9c8f2..a50c0ab3db0 100644
--- 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>
diff --git 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
index b4d28b08996..36358434f4f 100644
--- 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>
diff --git 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
index 9a50665f55a..f496ecb7549 100644
--- 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>
diff --git 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
index 763879a0abe..39dc1dd73fe 100644
--- 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>
diff --git 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
index 84504bbb77c..4c3df765b7a 100644
--- 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>
diff --git a/features/application-mgt/pom.xml b/features/application-mgt/pom.xml
index 8e87df4cb5c..0365214af15 100644
--- 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>
diff --git 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
index b014dc03927..d959a0cc2a8 100644
--- 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>
 
diff --git a/features/ui-request-interceptor/pom.xml b/features/ui-request-interceptor/pom.xml
index 7adc02f0027..d418ada2a16 100644
--- 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>