Merge branch 'master' of https://github.com/wso2/carbon-device-mgt

components/apimgt-extensions/org.wso2.carbon.apimgt.annotations/pom.xml

@@ -22,13 +22,13 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.apimgt.annotations</artifactId>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - API Management Annotations</name>
     <description>WSO2 Carbon - API Management Custom Annotation Module</description>

components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/pom.xml

@@ -21,12 +21,12 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <artifactId>org.wso2.carbon.apimgt.application.extension.api</artifactId>
     <packaging>war</packaging>
     <name>WSO2 Carbon - API Application Management API</name>

components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/pom.xml

@@ -22,12 +22,12 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <artifactId>org.wso2.carbon.apimgt.application.extension</artifactId>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - API Application Management</name>

components/apimgt-extensions/org.wso2.carbon.apimgt.handlers/pom.xml

@@ -21,13 +21,13 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.apimgt.handlers</artifactId>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - API Security Handler Component</name>
     <description>WSO2 Carbon - API Management Security Handler Module</description>

components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/pom.xml

@@ -22,13 +22,13 @@
     <parent>
         <artifactId>apimgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.apimgt.webapp.publisher</artifactId>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - API Management Webapp Publisher</name>
     <description>WSO2 Carbon - API Management Webapp Publisher</description>

components/apimgt-extensions/pom.xml

@@ -22,13 +22,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>apimgt-extensions</artifactId>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - API Management Extensions Component</name>
     <url>http://wso2.org</url>

components/certificate-mgt/org.wso2.carbon.certificate.mgt.api/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>certificate-mgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>certificate-mgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/pom.xml

@@ -21,13 +21,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>certificate-mgt</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.certificate.mgt.core</artifactId>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Certificate Management Core</name>
     <description>WSO2 Carbon - Certificate Management Core</description>

components/certificate-mgt/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>certificate-mgt</artifactId>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Certificate Management Component</name>
     <url>http://wso2.org</url>

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt-extensions/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>carbon-devicemgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt/org.wso2.carbon.device.mgt.api/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt/org.wso2.carbon.device.mgt.common/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>device-mgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt/org.wso2.carbon.device.mgt.core/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt/org.wso2.carbon.device.mgt.extensions/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt/org.wso2.carbon.device.mgt.ui/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>device-mgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json

@@ -1,5 +1,6 @@
 {
     "appContext": "/devicemgt/",
+    "isCloud": false,
     "httpsURL" : "https://%iot.gateway.host%:%iot.gateway.https.port%",
     "httpURL" : "http://%iot.gateway.host%:%iot.gateway.http.port",
     "wssURL" : "https://%iot.analytics.host%:%iot.analytics.https.port%",

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/batch-provider-api.js

@@ -125,6 +125,13 @@ batchProviders = function () {
             result = connector.getRecordsByRange(loggedInUser, tablename, from, to, 0, limit, null).getMessage();
 
         }
+
+        // error handling ----
+        var resultString = result.toString();
+        if (resultString.contains("Failed to get records from table")) {
+            return null;
+        }
+
         result = JSON.parse(result);
         var data = [];
         for (var i = 0; i < result.length; i++) {

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/modules/business-controllers/device.js

@@ -71,7 +71,7 @@ deviceModule = function () {
         var userName = carbonUser.username + "@" + carbonUser.domain;
 
         var locationDataSet = [];
-        switch(deviceType) {
+        switch (deviceType) {
             case 'android':
                 locationDataSet = batchProvider.getData(userName, deviceId, deviceType);
                 break;
@@ -80,24 +80,24 @@ deviceModule = function () {
                 break;
 
         }
-
-
         var locationData = [];
         var locationTimeData = [];
-        for (var i = 0 ; i < locationDataSet.length; i++) {
+        if (locationDataSet != null) {
-            var gpsReading = {};
-            var gpsReadingTimes = {};
-            gpsReading.lat = locationDataSet[i].latitude;
-            gpsReading.lng = locationDataSet[i].longitude;
-            if (deviceType == "android") {
-                gpsReadingTimes.time = locationDataSet[i].timeStamp;
-            } else {
-                gpsReadingTimes.time = locationDataSet[i].meta_timestamp;
-            }
-            locationData.push(gpsReading);
-            locationTimeData.push(gpsReadingTimes);
-        }
 
+            for (var i = 0; i < locationDataSet.length; i++) {
+                var gpsReading = {};
+                var gpsReadingTimes = {};
+                gpsReading.lat = locationDataSet[i].latitude;
+                gpsReading.lng = locationDataSet[i].longitude;
+                if (deviceType == "android") {
+                    gpsReadingTimes.time = locationDataSet[i].timeStamp;
+                } else {
+                    gpsReadingTimes.time = locationDataSet[i].meta_timestamp;
+                }
+                locationData.push(gpsReading);
+                locationTimeData.push(gpsReadingTimes);
+            }
+        }
         var utility = require('/app/modules/utility.js')["utility"];
         try {
             utility.startTenantFlow(carbonUser);

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.user.create/create.hbs

@@ -127,14 +127,7 @@
                         <p class="page-sub-title">User was added successfully.</p>
                         <p>
                             An invitation mail will be sent to this user to initiate device enrollment.
-                            Below QR code can also be used to enroll a device.
                         </p>
-                        <div class="panel panel-default">
-                            <div id="qr-code-modal" class="hidden" data-enrollment-url="{{enrollmentURL}}"></div>
-                            <div class="panel-body">
-                                <div class="qr-code col-lg-5 col-md-6 col-centered"></div>
-                            </div>
-                        </div>
 
                         <br>Please click <b>"Add Another User"</b>, if you wish to add another user or click
                         <b>"View User List"</b> to complete the process and go back to the user list.

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.cloud.user-menu/user-menu.hbs

@@ -0,0 +1,219 @@
+{{!
+  Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+
+  WSO2 Inc. licenses this file to you under the Apache License,
+  Version 2.0 (the "License"); you may not use this file except
+  in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+}}
+<ul class="nav navbar-right float-remove-xs text-center-xs">
+
+    <li class="visible-inline-block">
+        <a href="#" target="_self" title="kachiex">
+            <span class="icon fw-stack fw-lg">
+                        <i class="fw fw-organization fw-stack-1x" title=" {{@user.domain}}"></i>
+                    </span>
+            <span class="hidden-xs">
+                {{@user.domain}}
+            </span>
+
+        </a>
+    </li>
+
+    <li class="visible-inline-block">
+
+        <a href="#" target="_blank" class="dropdown" data-toggle="dropdown" title="Account">
+
+                    <span class="icon fw-stack fw-lg" style="color: red">
+                        <i class="fw fw-resource fw-stack-1x" title="Account"></i>
+                    </span>
+            <span class="hidden-xs" style="color: red">
+                        Trial – 14 days to upgrade
+                    </span>
+
+            <span class="caret"></span>
+        </a>
+
+        <ul class="dropdown-menu dropdown-menu-right float-remove-xs position-static-xs text-center-xs remove-margin-xs slideInDown"
+            role="menu">
+
+            <li>
+                <a title="Upgrade Now"
+                   href="https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/payment-plans.jag?cloud-type=device_cloud"
+                   target="_self">
+                    <i class="fw fw-export" title="Upgrade Now"></i> Upgrade Now
+                </a>
+            </li>
+
+            <li>
+                <a title="Monetization"
+                   href="https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/monetization-dashboard.jag"
+                   target="_self">
+                    <i class="fa fa-money fa-lg" title="Monetization"></i> Monetization
+                </a>
+            </li>
+
+            <li>
+                <a title="Request Extension"
+                   href="https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/contact-us.jag?cloud-type=device_cloud&amp;request-extension=true"
+                   target="_blank">
+                    <i class="fw fw-mail" title="Request Extension"></i> Request Extension
+                </a>
+            </li>
+
+        </ul>
+    </li>
+
+    <li class="visible-inline-block">
+
+        <a href="#" target="null" class="dropdown" data-toggle="dropdown" title="Configure">
+                    <span class="icon fw-stack fw-lg">
+                        <i class="fw fw-settings fw-stack-1x" title="Configure"></i>
+                    </span>
+            <span class="hidden-xs">
+                        Configure
+                    </span>
+            <span class="caret"></span>
+        </a>
+
+        <ul class="dropdown-menu dropdown-menu-right float-remove-xs position-static-xs text-center-xs remove-margin-xs slideInDown"
+            role="menu">
+
+
+        </ul>
+    </li>
+
+    <li class="visible-inline-block">
+        <a href="https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/contact-us.jag" target="_self" title="Support">
+
+
+                    <span class="icon fw-stack fw-lg" style="color: #ff8c27;">
+                        <i class="fw fw-mail fw-stack-1x" title="Support"></i>
+                    </span>
+            <span class="hidden-xs" style="color: #ff8c27;">
+                        Support
+                    </span>
+
+        </a>
+    </li>
+
+    <li class="visible-inline-block">
+
+        <a href="#" target="null" class="dropdown" data-toggle="dropdown" title="Documentation">
+                    <span class="icon fw-stack fw-lg">
+                        <i class="fw fw-document fw-stack-1x" title="Documentation"></i>
+                    </span>
+            <span class="hidden-xs">
+                        Documentation
+                    </span>
+            <span class="caret"></span>
+        </a>
+
+        <ul class="dropdown-menu dropdown-menu-right float-remove-xs position-static-xs text-center-xs remove-margin-xs slideInDown"
+            role="menu">
+
+            <li>
+                <a title="API Cloud" href="https://docs.wso2.com/display/APICloud/WSO2+API+Cloud+Documentation"
+                   target="_blank">
+                    <i class="fw fw-api" title="API Cloud"></i> API Cloud
+                </a>
+            </li>
+
+            <li>
+                <a title="App Cloud" href="https://docs.wso2.com/display/AppCloud/WSO2+App+Cloud+Documentation"
+                   target="_blank">
+                    <i class="fw fw-application" title="App Cloud"></i> App Cloud
+                </a>
+            </li>
+
+            <li>
+                <a title="App Cloud" href="https://docs.wso2.com/display/AppCloud/WSO2+Device+Cloud+Documentation"
+                   target="_blank">
+                    <i class="fw fw-application" title="App Cloud"></i> Device Cloud
+                </a>
+            </li>
+
+            <li>
+                <a title="API Cloud Walkthrough" href="https://api.clouddev.wso2.com/publisher?interactiveTutorial=true"
+                   target="_self">
+                    <i class="fw fw-document" title="API Cloud Walkthrough"></i> API Cloud Walkthrough
+                </a>
+            </li>
+
+        </ul>
+    </li>
+
+
+    <li class="visible-inline-block">
+        <a title="Mobile App Publisher" href="https://devicemgt.clouddev.wso2.com/publisher" target="_self">
+            <i class="fw fw-user" title="Mobilr App Publisher"></i> App Publisher
+        </a>
+    </li>
+
+    <li class="visible-inline-block">
+        <a title="App Store " href="https://devicemgt.clouddev.wso2.com/store"
+           target="_self">
+            <i class="fw fw-store" title="App Store"></i> App Store
+        </a>
+    </li>
+
+
+    <li class="visible-inline-block">
+        <a href="#" class="dropdown" data-toggle="dropdown" title="user">
+                    <span class="icon fw-stack fw-lg">
+                        <i class="fw fw-circle-outline fw-stack-2x" title="User"></i>
+                        <i class="fw fw-user fw-stack-1x" title="User"></i>
+                    </span>
+        <span class="hidden-xs">
+            {{#if isSuperTenant }}
+                {{@user.username}}</span><span class="caret"></span>
+            {{else}}
+                {{@user.username}}@{{@user.domain}}</span><span class="caret"></span>
+            {{/if}}
+        </a>
+        <ul class="dropdown-menu dropdown-menu-right float-remove-xs position-static-xs text-center-xs remove-margin-xs slideInDown"
+            role="menu">
+
+            <li>
+                <a title="Profile" href="https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/user-profile.jag"
+                   target="_self">
+                    <i class="fw fw-user" title="Profile"></i> Profile
+                </a>
+            </li>
+
+            <li>
+                <a title="Change Password"
+                   href="https://cloudmgt.clouddev.wso2.com/cloudmgt/site/pages/change-password.jag" target="_self">
+                    <i class="fw fw-lock" title="Change Password"></i> Change Password
+                </a>
+            </li>
+
+            <li>
+                <a title="Logout" href="https://api.clouddev.wso2.com/publisher/site/pages/logout.jag" target="_self">
+                    <i class="fw fw-sign-out" title="Logout"></i> Logout
+                </a>
+            </li>
+
+        </ul>
+    </li>
+    <li class="visible-inline-block cloud-menu">
+        <a href="#" id="cloud-menu-popover">
+                    <span class="icon fw-stack fw-lg">
+                        <i class="fw fw-tiles fw-stack-1x" data-toggle="popover" data-placement="bottom"
+                           data-original-title="" title=""></i>
+                    </span>
+            <span class="hidden-xs">
+
+                    </span>
+        </a>
+    </li>
+</ul>

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.cloud.user-menu/user-menu.js

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+function onRequest(context) {
+    var constants = require("/app/modules/constants.js");
+    var user = context.user;
+    var isSuperTenant = false;
+    if (user.tenantId == -1234){
+        isSuperTenant = true;
+    }
+    var viewModal = {};
+    viewModal.isSuperTenant = isSuperTenant;
+    viewModal.USER_SESSION_KEY = session.get(constants["USER_SESSION_KEY"]);
+    return viewModal;
+}

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.cloud.user-menu/user-menu.json

@@ -0,0 +1,3 @@
+{
+    "version": "1.0.0",
+}

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.default.user-menu/user-menu.hbs

@@ -0,0 +1,123 @@
+{{!
+  Copyright (c) 2016, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+
+  WSO2 Inc. licenses this file to you under the Apache License,
+  Version 2.0 (the "License"); you may not use this file except
+  in compliance with the License.
+  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing,
+  software distributed under the License is distributed on an
+  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  KIND, either express or implied. See the License for the
+  specific language governing permissions and limitations
+  under the License.
+}}
+    <ul class="nav navbar-right float-remove-xs text-center-xs">
+        <li class="visible-inline-block">
+            <a href="#" class="dropdown" data-toggle="dropdown">
+                <i class="fw fw-user fw-lg fw-helper fw-helper-inverse fw-helper-circle"></i>
+                <span class="hidden-xs add-padding-left-1x">
+                    {{#if isSuperTenant }}
+                        {{@user.username}}<span class="caret"></span>
+                    {{else}}
+                        {{@user.username}}@{{@user.domain}} <span class="caret"></span>
+                    {{/if}}
+                </span>
+            </a>
+            <ul class="dropdown-menu dropdown-menu-right slideInDown"
+                role="menu">
+                <li>
+                    <a href="javascript:void(0)" id="change-password">Change Password</a>
+                </li>
+                <li>
+                    <!--suppress HtmlUnknownTarget -->
+                    <a href="{{@app.context}}/logout">Sign out</a>
+                </li>
+
+                <div id="change-password-window" class="hide">
+                    <input type="hidden" id="user" value=" {{@user.username}} ">
+                    <div class="modal-header">
+                        <h4 class="pull-left modal-title">
+                <span class="fw-stack">
+                    <i class="fw fw-user fw-stack-2x"></i>
+                    <span class="fw-stack fw-move-right fw-move-bottom">
+                      <i class="fw fw-circle-outline fw-stack-2x"></i>
+                      <i class="fw fw-circle fw-stack-2x fw-stroke text-info"></i>
+                      <i class="fw fw-edit fw-stack-1x fw-inverse"></i>
+                   </span>
+                </span>
+                            Change password is not a option
+                        </h4>
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i
+                                class="fw fw-cancel"></i></button>
+                    </div>
+                    <hr>
+                    <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
+                        <div id="change-password-error-msg" class="alert alert-danger hidden" role="alert">
+                            <i class="icon fw fw-error"></i><span></span>
+                        </div>
+                        <h5>
+                            Type your current password *
+                            <br><br>
+                            <div>
+                                <input id="current-password" type="password" autocomplete="off" class="form-control modal-input"/>
+                            </div>
+                            <br><br>
+                            Type a new password *
+                            <br><br>
+                            <div>
+                                <input id="new-password" type="password" autocomplete="off" class="form-control modal-input"
+                                       placeholder="[ Password should be in minimum 5 characters long and should not include any whitespaces ]"/>
+                            </div>
+                            <br><br>
+                            Reconfirm your new password *
+                            <br><br>
+                            <div>
+                                <input id="retyped-new-password" type="password" autocomplete="off" class="form-control modal-input"/>
+                            </div>
+                            <br><br>
+                        </h5>
+                    </div>
+                    <div class="modal-footer">
+                        <div class="buttons">
+                            <a href="#" id="change-password-yes-link" class="btn-operations">Change</a>
+                            <a href="#" id="change-password-cancel-link" class="btn-operations">Cancel</a>
+                        </div>
+                    </div>
+                </div>
+
+                <div id="change-password-success-content" class="hide">
+                    <div class="modal-header">
+                        <h4 class="pull-left modal-title">
+                <span class="fw-stack fw-move-right fw-move-bottom">
+                    <i class="fw fw-circle fw-stack-2x fw-stroke text-success"></i>
+                    <i class="fw fw-check fw-stack-1x fw-inverse"></i>
+                </span>
+                            Password has been successfully updated
+                        </h4>
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i
+                                class="fw fw-cancel"></i></button>
+                    </div>
+                    <hr>
+                    <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
+                        <h5 class="text-center">
+                            You can now try to login using your new password.
+                        </h5>
+                    </div>
+                    <div class="modal-footer">
+                        <div class="buttons">
+                            <a href="#" id="change-password-success-link" class="btn-operations">Ok</a>
+                        </div>
+                    </div>
+                </div>
+            </ul>
+        </li>
+    </ul>
+
+
+{{#zone "bottomJs"}}
+    {{js "/js/user-menu.js"}}
+{{/zone}}

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.default.user-menu/user-menu.js

@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * WSO2 Inc. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+function onRequest(context) {
+    var constants = require("/app/modules/constants.js");
+    var user = context.user;
+    var isSuperTenant = false;
+    if (user.tenantId == -1234){
+        isSuperTenant = true;
+    }
+    var viewModal = {};
+    viewModal.isSuperTenant = isSuperTenant;
+    viewModal.USER_SESSION_KEY = session.get(constants["USER_SESSION_KEY"]);
+    return viewModal;
+}

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.default.user-menu/user-menu.json

@@ -0,0 +1,3 @@
+{
+    "version": "1.0.0",
+}

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/user-menu.hbs

@@ -15,110 +15,11 @@
   specific language governing permissions and limitations
   under the License.
 }}
+
 {{#zone "userMenu"}}
-    <ul class="nav navbar-right float-remove-xs text-center-xs">
+    {{#if isCloud}}
-        <li class="visible-inline-block">
+        {{unit "cdmf.unit.ui.header.cloud.user-menu"}}
-            <a href="#" class="dropdown" data-toggle="dropdown">
+    {{else}}
-                <i class="fw fw-user fw-lg fw-helper fw-helper-inverse fw-helper-circle"></i>
+        {{unit "cdmf.unit.ui.header.default.user-menu"}}
-                <span class="hidden-xs add-padding-left-1x">
+    {{/if}}
-                    {{#if isSuperTenant }}
-                        {{@user.username}}<span class="caret"></span>
-                    {{else}}
-                        {{@user.username}}@{{@user.domain}}<span class="caret"></span>
-                    {{/if}}
-                </span>
-            </a>
-            <ul class="dropdown-menu dropdown-menu-right slideInDown"
-                role="menu">
-                <li>
-                    <a href="javascript:void(0)" id="change-password">Change password</a>
-                </li>
-                <li>
-                    <!--suppress HtmlUnknownTarget -->
-                    <a href="{{@app.context}}/logout">Sign out</a>
-                </li>
-
-                <div id="change-password-window" class="hide">
-                    <input type="hidden" id="user" value="{{@user.username}}">
-                    <div class="modal-header">
-                        <h4 class="pull-left modal-title">
-                <span class="fw-stack">
-                    <i class="fw fw-user fw-stack-2x"></i>
-                    <span class="fw-stack fw-move-right fw-move-bottom">
-                      <i class="fw fw-circle-outline fw-stack-2x"></i>
-                      <i class="fw fw-circle fw-stack-2x fw-stroke text-info"></i>
-                      <i class="fw fw-edit fw-stack-1x fw-inverse"></i>
-                   </span>
-                </span>
-                            Change password
-                        </h4>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i
-                                class="fw fw-cancel"></i></button>
-                    </div>
-                    <hr>
-                    <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-                        <div id="change-password-error-msg" class="alert alert-danger hidden" role="alert">
-                            <i class="icon fw fw-error"></i><span></span>
-                        </div>
-                        <h5>
-                            Type your current password *
-                            <br><br>
-                            <div>
-                                <input id="current-password" type="password" autocomplete="off" class="form-control modal-input"/>
-                            </div>
-                            <br><br>
-                            Type a new password *
-                            <br><br>
-                            <div>
-                                <input id="new-password" type="password" autocomplete="off" class="form-control modal-input"
-                                       placeholder="[ Password should be in minimum 5 characters long and should not include any whitespaces ]"/>
-                            </div>
-                            <br><br>
-                            Reconfirm your new password *
-                            <br><br>
-                            <div>
-                                <input id="retyped-new-password" type="password" autocomplete="off" class="form-control modal-input"/>
-                            </div>
-                            <br><br>
-                        </h5>
-                    </div>
-                    <div class="modal-footer">
-                        <div class="buttons">
-                            <a href="#" id="change-password-yes-link" class="btn-operations">Change</a>
-                            <a href="#" id="change-password-cancel-link" class="btn-operations">Cancel</a>
-                        </div>
-                    </div>
-                </div>
-
-                <div id="change-password-success-content" class="hide">
-                    <div class="modal-header">
-                        <h4 class="pull-left modal-title">
-                <span class="fw-stack fw-move-right fw-move-bottom">
-                    <i class="fw fw-circle fw-stack-2x fw-stroke text-success"></i>
-                    <i class="fw fw-check fw-stack-1x fw-inverse"></i>
-                </span>
-                            Password has been successfully updated
-                        </h4>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><i
-                                class="fw fw-cancel"></i></button>
-                    </div>
-                    <hr>
-                    <div class="modal-body add-margin-top-2x add-margin-bottom-2x">
-                        <h5 class="text-center">
-                            You can now try to login using your new password.
-                        </h5>
-                    </div>
-                    <div class="modal-footer">
-                        <div class="buttons">
-                            <a href="#" id="change-password-success-link" class="btn-operations">Ok</a>
-                        </div>
-                    </div>
-                </div>
-            </ul>
-        </li>
-    </ul>
-{{/zone}}
-
-{{#zone "bottomJs"}}
-    {{js "/js/user-menu.js"}}
 {{/zone}}

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.header.user-menu/user-menu.js

@@ -17,14 +17,8 @@
  */
 
 function onRequest(context) {
-    var constants = require("/app/modules/constants.js");
+    var mdmProps = require("/app/modules/conf-reader/main.js")["conf"];
-    var user = context.user;
-    var isSuperTenant = false;
-    if (user.tenantId == -1234){
-        isSuperTenant = true;
-    }
     var viewModal = {};
-    viewModal.isSuperTenant = isSuperTenant;
+    viewModal.isCloud = mdmProps["isCloud"];
-    viewModal.USER_SESSION_KEY = session.get(constants["USER_SESSION_KEY"]);
     return viewModal;
 }

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.ui.theme/public/css/custom-desktop.css

@@ -6517,7 +6517,7 @@ select > option:hover {
 }
 
 .header .fw:before {
-  color: #000;
+
 }
 
 /* Adding style for required fields */

components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/uuf-template-app/app/units/uuf.unit.header/header.hbs

@@ -21,6 +21,9 @@
             <div class="pull-left brand">
                 {{defineZone "brand"}}
             </div>
+            <div class="pull-left brand">
+                {{defineZone "cloudMenu"}}
+            </div>
             <div class="pull-right auth">
                 {{defineZone "userMenu"}}
             </div>

components/device-mgt/org.wso2.carbon.device.mgt.url.printer/pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <artifactId>device-mgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/device-mgt/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/email-sender/org.wso2.carbon.email.sender.core/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>email-sender</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/email-sender/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/identity-extensions/dynamic-client-registration/dynamic-client-web-proxy/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dynamic-client-registration</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/identity-extensions/dynamic-client-registration/dynamic-client-web/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>dynamic-client-registration</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/identity-extensions/dynamic-client-registration/org.wso2.carbon.dynamic.client.registration/pom.xml

@@ -21,13 +21,13 @@
     <parent>
         <artifactId>dynamic-client-registration</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.dynamic.client.registration</artifactId>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Dynamic client registration service</name>
     <description>WSO2 Carbon - Dynamic Client Registration Service</description>

components/identity-extensions/dynamic-client-registration/org.wso2.carbon.dynamic.client.web.app.registration/pom.xml

@@ -21,13 +21,13 @@
     <parent>
         <artifactId>dynamic-client-registration</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.dynamic.client.web.app.registration</artifactId>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Dynamic client web app registration</name>
     <description>WSO2 Carbon - Dynamic Client Web-app Registration Service</description>

components/identity-extensions/dynamic-client-registration/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>identity-extensions</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>dynamic-client-registration</artifactId>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Dynamic client registration</name>
     <url>http://wso2.org</url>

components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml

@@ -22,13 +22,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>identity-extensions</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.oauth.extensions</artifactId>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - OAuth Extensions</name>
     <url>http://wso2.org</url>

components/identity-extensions/org.wso2.carbon.identity.authenticator.backend.oauth/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>identity-extensions</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>identity-extensions</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

components/identity-extensions/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

components/policy-mgt/org.wso2.carbon.complex.policy.decision.point/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>policy-mgt</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>org.wso2.carbon.complex.policy.decision.point</artifactId>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Policy Decision Point</name>
     <description>WSO2 Carbon - Policy Decision Point</description>

components/policy-mgt/org.wso2.carbon.policy.decision.point/pom.xml

@@ -3,14 +3,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>policy-mgt</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>org.wso2.carbon.policy.decision.point</artifactId>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Policy Decision Point</name>
     <description>WSO2 Carbon - Policy Decision Point</description>

components/policy-mgt/org.wso2.carbon.policy.information.point/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>policy-mgt</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -11,7 +11,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>org.wso2.carbon.policy.information.point</artifactId>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Policy Information Point</name>
     <description>WSO2 Carbon - Policy Information Point</description>

components/policy-mgt/org.wso2.carbon.policy.mgt.common/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>policy-mgt</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>org.wso2.carbon.policy.mgt.common</artifactId>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Policy Management Common</name>
     <description>WSO2 Carbon - Policy Management Common</description>

components/policy-mgt/org.wso2.carbon.policy.mgt.core/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>policy-mgt</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>org.wso2.carbon.policy.mgt.core</artifactId>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Policy Management Core</name>
     <description>WSO2 Carbon - Policy Management Core</description>

components/policy-mgt/pom.xml

@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>policy-mgt</artifactId>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Policy Management Component</name>
     <url>http://wso2.org</url>

components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/pom.xml

@@ -21,14 +21,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>webapp-authenticator-framework</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>org.wso2.carbon.webapp.authenticator.framework</artifactId>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <packaging>bundle</packaging>
     <name>WSO2 Carbon - Web Application Authenticator Framework Bundle</name>
     <description>WSO2 Carbon - Web Application Authenticator Framework Bundle</description>

components/webapp-authenticator-framework/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>webapp-authenticator-framework</artifactId>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Webapp Authenticator Framework</name>
     <url>http://wso2.org</url>

features/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.feature/pom.xml

@@ -21,14 +21,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>apimgt-extensions-feature</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.apimgt.application.extension.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <name>WSO2 Carbon - API Management Application Extension Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains an implementation of a api application registration, which takes care of subscription

features/apimgt-extensions/org.wso2.carbon.apimgt.handler.server.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>apimgt-extensions-feature</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.apimgt.handler.server.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <name>WSO2 Carbon - Device Management - APIM handler Server Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains the handler for the api authentications

features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml

@@ -21,14 +21,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>apimgt-extensions-feature</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.apimgt.webapp.publisher.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <name>WSO2 Carbon - API Management Webapp Publisher Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains an implementation of a Tomcat lifecycle listener, which takes care of publishing

features/apimgt-extensions/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>apimgt-extensions-feature</artifactId>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - API Management Extensions Feature</name>
     <url>http://wso2.org</url>

features/certificate-mgt/org.wso2.carbon.certificate.mgt.api.feature/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>certificate-mgt-feature</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

features/certificate-mgt/org.wso2.carbon.certificate.mgt.cert.admin.api.feature/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>certificate-mgt-feature</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

features/certificate-mgt/org.wso2.carbon.certificate.mgt.server.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>certificate-mgt-feature</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.certificate.mgt.server.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <name>WSO2 Carbon - Certificate Management Server Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains the core bundles required for back-end Certificate Management functionality

features/certificate-mgt/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>certificate-mgt-feature</artifactId>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Certificate Management Feature</name>
     <url>http://wso2.org</url>

features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-extensions-feature</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.extensions.device.type.deployer.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <name>WSO2 Carbon - Device Type Deployer Feature</name>
     <url>http://wso2.org</url>
     <description>WSO2 Carbon - Device Type Deployer Feature</description>

features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-extensions-feature</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.extensions.push.notification.provider.gcm.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <name>WSO2 Carbon - GCM Based Push Notification Provider Feature</name>
     <url>http://wso2.org</url>
     <description>WSO2 Carbon - MQTT Based Push Notification Provider Feature</description>

features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-extensions-feature</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <name>WSO2 Carbon - MQTT Based Push Notification Provider Feature</name>
     <url>http://wso2.org</url>
     <description>WSO2 Carbon - MQTT Based Push Notification Provider Feature</description>

features/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-extensions-feature</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <name>WSO2 Carbon - XMPP Based Push Notification Provider Feature</name>
     <url>http://wso2.org</url>
     <description>WSO2 Carbon - XMPP Based Push Notification Provider Feature</description>

features/device-mgt-extensions/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

features/device-mgt/org.wso2.carbon.device.mgt.analytics.dashboard.feature/pom.xml

@@ -3,13 +3,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-feature</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>org.wso2.carbon.device.mgt.analytics.dashboard.feature</artifactId>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Device Management Dashboard Analytics Feature</name>
     <description>WSO2 Carbon - Device Management Dashboard Analytics Feature</description>

features/device-mgt/org.wso2.carbon.device.mgt.analytics.data.publisher.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-feature</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.analytics.data.publisher.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <name>WSO2 Carbon - Device Management Server Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains bundles related to device analytics data publisher</description>

features/device-mgt/org.wso2.carbon.device.mgt.api.feature/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-feature</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

features/device-mgt/org.wso2.carbon.device.mgt.extensions.feature/pom.xml

@@ -4,14 +4,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-feature</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.extensions.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <name>WSO2 Carbon - Device Management Extensions Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains common extensions used by key device management functionalities

features/device-mgt/org.wso2.carbon.device.mgt.feature/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-feature</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

features/device-mgt/org.wso2.carbon.device.mgt.server.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-feature</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.server.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <name>WSO2 Carbon - Device Management Server Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains the core bundles required for Back-end Device Management functionality

features/device-mgt/org.wso2.carbon.device.mgt.ui.feature/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>device-mgt-feature</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

features/device-mgt/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 

features/dynamic-client-registration/org.wso2.carbon.dynamic.client.registration.server.feature/pom.xml

@@ -23,14 +23,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>dynamic-client-registration-feature</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.dynamic.client.registration.server.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <name>WSO2 Carbon - Dynamic Client Registration Server Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains dynamic client registration features</description>

features/dynamic-client-registration/pom.xml

@@ -23,14 +23,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>dynamic-client-registration-feature</artifactId>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Dynamic Client Registration Feature</name>
     <url>http://wso2.org</url>

features/email-sender/org.wso2.carbon.email.sender.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>email-sender-feature</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.email.sender.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <name>WSO2 Carbon - Email Sender Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains the core bundles required for email sender related functionality

features/email-sender/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>email-sender-feature</artifactId>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Email Sender Feature</name>
     <url>http://wso2.org</url>

features/jwt-client/org.wso2.carbon.identity.jwt.client.extension.feature/pom.xml

@@ -23,14 +23,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>jwt-client-feature</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.identity.jwt.client.extension.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <name>WSO2 Carbon - JWT Client Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains jwt client implementation from which we can get a access token using the jwt

features/jwt-client/pom.xml

@@ -23,13 +23,13 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>jwt-client-feature</artifactId>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Dynamic Client Registration Feature</name>
     <url>http://wso2.org</url>

features/oauth-extensions/org.wso2.carbon.device.mgt.oauth.extensions.feature/pom.xml

@@ -23,14 +23,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>oauth-extensions-feature</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.device.mgt.oauth.extensions.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <name>WSO2 Carbon - Device Mgt OAuth Extensions Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains devicemgt related OAuth extensions</description>

features/oauth-extensions/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>oauth-extensions-feature</artifactId>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Device Management OAuth Extensions Feature</name>
     <url>http://wso2.org</url>

features/policy-mgt/org.wso2.carbon.policy.mgt.server.feature/pom.xml

@@ -23,14 +23,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>policy-mgt-feature</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.policy.mgt.server.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <name>WSO2 Carbon - Policy Management Server Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains the core bundles required for Back-end Device Management functionality

features/policy-mgt/pom.xml

@@ -23,14 +23,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>policy-mgt-feature</artifactId>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Policy Management Feature</name>
     <url>http://wso2.org</url>

features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>webapp-authenticator-framework-feature</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <artifactId>org.wso2.carbon.webapp.authenticator.framework.server.feature</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <name>WSO2 Carbon - Webapp Authenticator Framework Server Feature</name>
     <url>http://wso2.org</url>
     <description>This feature contains the core bundles required for Back-end Device Management functionality

features/webapp-authenticator-framework/pom.xml

@@ -22,14 +22,14 @@
     <parent>
         <groupId>org.wso2.carbon.devicemgt</groupId>
         <artifactId>carbon-devicemgt</artifactId>
-        <version>2.0.14-SNAPSHOT</version>
+        <version>2.0.16-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>webapp-authenticator-framework-feature</artifactId>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Webapp Authenticator Framework Feature</name>
     <url>http://wso2.org</url>

pom.xml

@@ -23,7 +23,7 @@
     <groupId>org.wso2.carbon.devicemgt</groupId>
     <artifactId>carbon-devicemgt</artifactId>
     <packaging>pom</packaging>
-    <version>2.0.14-SNAPSHOT</version>
+    <version>2.0.16-SNAPSHOT</version>
     <name>WSO2 Carbon - Device Management - Parent</name>
     <url>http://wso2.org</url>
     <description>WSO2 Connected Device Manager Components</description>
@@ -1957,7 +1957,7 @@
         <axiom.wso2.version>1.2.11.wso2v10</axiom.wso2.version>
 
         <!-- Carbon Device Management -->
-        <carbon.device.mgt.version>2.0.14-SNAPSHOT</carbon.device.mgt.version>
+        <carbon.device.mgt.version>2.0.16-SNAPSHOT</carbon.device.mgt.version>
 
         <!-- Carbon Commons -->
         <carbon.commons.version>4.4.8</carbon.commons.version>