From e8aa337d86aa4d4ce2897f6776e020e98ae77cd2 Mon Sep 17 00:00:00 2001 From: lasanthaDLPDS 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 1349821980..163fc9d04a 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 @@ application-mgt org.wso2.carbon.devicemgt - 3.2.7-SNAPSHOT + 3.2.9-SNAPSHOT 4.0.0 org.wso2.carbon.device.application.mgt.addons - 3.2.7-SNAPSHOT + 3.2.9-SNAPSHOT WSO2 Carbon - Application Management Add-Ons WSO2 Carbon - Application Management Add-Ons http://wso2.org 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 bb64f49222..14d1366133 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 @@ 4.0.0 org.wso2.carbon.device.application.mgt.api - 3.2.7-SNAPSHOT + 3.2.9-SNAPSHOT war WSO2 Carbon - Application Management API WSO2 Carbon - Application Management API 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 d19e0a6778..6699a9b31e 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 @@ org.wso2.carbon.devicemgt application-mgt - 3.2.7-SNAPSHOT + 3.2.9-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.device.application.mgt.common - 3.2.7-SNAPSHOT + 3.2.9-SNAPSHOT bundle WSO2 Carbon - Application Management Common WSO2 Carbon - Application Management Common 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 8cbc2a877c..d3aa277f61 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 @@ org.wso2.carbon.devicemgt application-mgt - 3.2.7-SNAPSHOT + 3.2.9-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.device.application.mgt.core - 3.2.7-SNAPSHOT + 3.2.9-SNAPSHOT bundle WSO2 Carbon - Application Management Core WSO2 Carbon - Application Management Core 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 040a78a85d..eda02c7b01 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 @@ 4.0.0 org.wso2.carbon.device.application.mgt.publisher.api - 3.2.7-SNAPSHOT + 3.2.9-SNAPSHOT war WSO2 Carbon - Application Management Publisher API WSO2 Carbon - Application Management Publisher API 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 d7d9590996..1bd68c685b 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 @@ org.wso2.carbon.devicemgt application-mgt - 3.2.7-SNAPSHOT + 3.2.9-SNAPSHOT org.wso2.carbon.device.application.mgt.publisher.ui - 3.2.7-SNAPSHOT + 3.2.9-SNAPSHOT war WSO2 Carbon - Application Management Publisher UI Component http://wso2.org 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 01c65ff444..f0e215f944 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 @@ application-mgt org.wso2.carbon.devicemgt - 3.2.7-SNAPSHOT + 3.2.9-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.device.application.mgt.store.api - 3.2.7-SNAPSHOT + 3.2.9-SNAPSHOT war WSO2 Carbon - Application Management Store API WSO2 Carbon - Application Management Store API 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 882a94e2ae..7bac04a171 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 @@ org.wso2.carbon.devicemgt application-mgt - 3.2.7-SNAPSHOT + 3.2.9-SNAPSHOT org.wso2.carbon.device.application.mgt.store.ui - 3.2.7-SNAPSHOT + 3.2.9-SNAPSHOT war WSO2 Carbon - Application Management Store UI Component http://wso2.org diff --git a/components/application-mgt/pom.xml b/components/application-mgt/pom.xml index dd201be3c4..397dfb91f8 100644 --- a/components/application-mgt/pom.xml +++ b/components/application-mgt/pom.xml @@ -22,13 +22,13 @@ org.wso2.carbon.devicemgt carbon-devicemgt - 3.2.7-SNAPSHOT + 3.2.9-SNAPSHOT ../../pom.xml 4.0.0 application-mgt - 3.2.7-SNAPSHOT + 3.2.9-SNAPSHOT pom WSO2 Carbon - Application Management Component WSO2 Carbon - Application Management Component 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 d2cc394427..e8a54a1435 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 @@ ui-request-interceptor io.entgra.devicemgt - 3.2.7-SNAPSHOT + 3.2.9-SNAPSHOT 4.0.0 io.entgra.ui.request.interceptor - 3.2.7-SNAPSHOT + 3.2.9-SNAPSHOT war Entgra - Request Handling Proxy Servlet Proxy Service for Request Handling in Entgra EMM/IOT Server. diff --git a/components/ui-request-interceptor/pom.xml b/components/ui-request-interceptor/pom.xml index fb0f2f9c8f..a50c0ab3db 100644 --- a/components/ui-request-interceptor/pom.xml +++ b/components/ui-request-interceptor/pom.xml @@ -23,7 +23,7 @@ carbon-devicemgt org.wso2.carbon.devicemgt - 3.2.7-SNAPSHOT + 3.2.9-SNAPSHOT ../../pom.xml 4.0.0 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 b4d28b0899..36358434f4 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 @@ org.wso2.carbon.devicemgt application-mgt-feature - 3.2.7-SNAPSHOT + 3.2.9-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.device.application.mgt.api.feature - 3.2.7-SNAPSHOT + 3.2.9-SNAPSHOT pom WSO2 Carbon - Application Management API Feature http://wso2.org 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 9a50665f55..f496ecb754 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 @@ org.wso2.carbon.devicemgt application-mgt-feature - 3.2.7-SNAPSHOT + 3.2.9-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.device.application.mgt.publisher.ui.feature - 3.2.7-SNAPSHOT + 3.2.9-SNAPSHOT pom WSO2 Carbon - Application Management Publisher UI Feature http://wso2.org 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 763879a0ab..39dc1dd73f 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 @@ org.wso2.carbon.devicemgt application-mgt-feature - 3.2.7-SNAPSHOT + 3.2.9-SNAPSHOT ../pom.xml 4.0.0 org.wso2.carbon.device.application.mgt.server.feature pom - 3.2.7-SNAPSHOT + 3.2.9-SNAPSHOT WSO2 Carbon - Application Management Server Feature http://wso2.org 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 84504bbb77..4c3df765b7 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 @@ org.wso2.carbon.devicemgt application-mgt-feature - 3.2.7-SNAPSHOT + 3.2.9-SNAPSHOT 4.0.0 org.wso2.carbon.device.application.mgt.store.ui.feature - 3.2.7-SNAPSHOT + 3.2.9-SNAPSHOT pom WSO2 Carbon - Application Management Store UI Feature http://wso2.org diff --git a/features/application-mgt/pom.xml b/features/application-mgt/pom.xml index 8e87df4cb5..0365214af1 100644 --- a/features/application-mgt/pom.xml +++ b/features/application-mgt/pom.xml @@ -22,13 +22,13 @@ org.wso2.carbon.devicemgt carbon-devicemgt - 3.2.7-SNAPSHOT + 3.2.9-SNAPSHOT ../../pom.xml 4.0.0 application-mgt-feature - 3.2.7-SNAPSHOT + 3.2.9-SNAPSHOT pom WSO2 Carbon - Application Management Feature http://wso2.org 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 b014dc0392..d959a0cc2a 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 @@ ui-request-interceptor-feature io.entgra.devicemgt - 3.2.7-SNAPSHOT + 3.2.9-SNAPSHOT 4.0.0 diff --git a/features/ui-request-interceptor/pom.xml b/features/ui-request-interceptor/pom.xml index 7adc02f002..d418ada2a1 100644 --- a/features/ui-request-interceptor/pom.xml +++ b/features/ui-request-interceptor/pom.xml @@ -23,7 +23,7 @@ carbon-devicemgt org.wso2.carbon.devicemgt - 3.2.7-SNAPSHOT + 3.2.9-SNAPSHOT ../../pom.xml 4.0.0