merging with upstream

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/public/css/styles.css

@@ -56,13 +56,11 @@ hr {
     background-color: #f6f4f4;
 }
 
-.doc-link {
+.doc-link{
-    background: #11375B;
+    background: none;
-    padding: 20px;
+    color: #000;
-    color: white;
+    padding: 10px 0px;
-    margin-top: 0;
 }
-
 .doc-link a {
-    color: white;
+    color: #006eff;
 }

components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android_sense.type-view/type-view.hbs

@@ -20,17 +20,15 @@
     <hr>
 </div>
 
-<div class="col-xs-12 col-sm-4 col-md-4 col-lg-4 padding-top">
+<div class="col-xs-12 col-sm-4 col-md-3 col-lg-3 padding-top">
     <img src="{{@unit.publicUri}}/images/android-sense-icon.png" class="img-responsive">
 </div>
 
 <div class="col-xs-12 col-sm-8 col-md-8 col-lg-8 padding-top">
-    <h4 class="doc-link">Click <a href="https://docs.wso2.com/display/IoTS100/Android+Sense"
+
-                                  target="_blank">[ here ]</a> for latest instructions and
-                         troubleshooting.</h4>
 </div>
 
-<div class="col-xs-12 col-sm-8 col-md-8 col-lg-8 padding-top">
+<div class="col-xs-12 col-sm-8 col-md-9 col-lg-9 padding-top">
     <h3 class="uppercase">What it Does</h3>
     <hr>
     <p class="grey margin-top">Connect an Android device to WSO2 IoT Server and visualize sensor
@@ -41,24 +39,27 @@
     <p class="grey margin-top">You should have an Android Device to get started.</p>
     <ul class="list-unstyled">
         <li class="padding-top-double">
-            <span class="circle">STEP 01</span>
+            <span class="badge">STEP 01</span>
                Go ahead and click [Enroll Device].
         </li>
-        <li class="padding-top-double">
+        <li>
-            <span class="circle">STEP 02</span>
+            <span class="badge">STEP 02</span>
                You can either scan the QR code or directly download Android agent.
         </li>
-        <li class="padding-top-double">
+        <li>
-            <span class="circle">STEP 03</span>
+            <span class="badge">STEP 03</span>
                Install Android agent into your Android Device.
         </li>
-        <li class="padding-top-double"><span class="circle">STEP 04</span>
+        <li><span class="badge">STEP 04</span>
                Proceed to [Prepare] section.
     </ul>
     <br>
     <a href="#" class="download-link btn-operations">
         <i class="fw fw-mobile fw-inverse fw-lg"></i> Enroll Device</a>
     <br/><br/>
+    <p class="doc-link">Click <a href="https://docs.wso2.com/display/IoTS100/Android+Sense"
+                                  target="_blank">[ here ]</a> for latest instructions and
+        troubleshooting.</p>
 
     <div id="device-400-content" class="hide">
         <div class="modal-content">

components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.api/src/main/java/org/wso2/carbon/device/mgt/iot/arduino/service/impl/ArduinoServiceImpl.java

@@ -226,7 +226,8 @@ public class ArduinoServiceImpl implements ArduinoService {
             APIManagementProviderService apiManagementProviderService = APIUtil.getAPIManagementProviderService();
             String[] tags = {ArduinoConstants.DEVICE_TYPE};
             apiApplicationKey = apiManagementProviderService.generateAndRetrieveApplicationKeys(
-                    ArduinoConstants.DEVICE_TYPE, tags, KEY_TYPE, applicationUsername, true);
+                    ArduinoConstants.DEVICE_TYPE, tags, KEY_TYPE, applicationUsername, true,
+                    ArduinoConstants.APIM_APPLICATION_TOKEN_VALIDITY_PERIOD);
         }
         JWTClient jwtClient = APIUtil.getJWTClientManagerService().getJWTClient();
         String scopes = " device_" + deviceId;

components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.api/src/main/java/org/wso2/carbon/device/mgt/iot/arduino/service/impl/constants/ArduinoConstants.java

@@ -25,4 +25,6 @@ public class ArduinoConstants {
     //sensor events summerized table name
     public static final String TEMPERATURE_EVENT_TABLE = "DEVICE_TEMPERATURE_SUMMARY";
 
+    public static final String APIM_APPLICATION_TOKEN_VALIDITY_PERIOD = "3600";
+
 }

components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.arduino.type-view/type-view.hbs

@@ -20,7 +20,7 @@
     <hr>
 </div>
 
-<div class="col-xs-12 col-sm-4 col-md-4 col-lg-4 padding-top">
+<div class="col-xs-12 col-sm-4 col-md-3 col-lg-3 padding-top">
     <img src="{{@unit.publicUri}}/images/ardunio-icon.png" class="img-responsive">
 </div>
 
@@ -28,7 +28,7 @@
 
 </div>
 
-<div class="col-xs-12 col-sm-8 col-md-8 col-lg-8 padding-top">
+<div class="col-xs-12 col-sm-8 col-md-9 col-lg-9 padding-top">
     <h3 class="uppercase">What it Does</h3>
     <hr>
     <p class="grey margin-top">Connect Arduino UNO board to WSO2 IoT Server and visualize sensor

components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.api/src/main/java/org/wso2/carbon/device/mgt/iot/raspberrypi/service/impl/RaspberryPiServiceImpl.java

@@ -210,7 +210,8 @@ public class RaspberryPiServiceImpl implements RaspberryPiService {
             APIManagementProviderService apiManagementProviderService = APIUtil.getAPIManagementProviderService();
             String[] tags = {RaspberrypiConstants.DEVICE_TYPE};
             apiApplicationKey = apiManagementProviderService.generateAndRetrieveApplicationKeys(
-                    RaspberrypiConstants.DEVICE_TYPE, tags, KEY_TYPE, applicationUsername, true);
+                    RaspberrypiConstants.DEVICE_TYPE, tags, KEY_TYPE, applicationUsername, true,
+                    RaspberrypiConstants.APIM_APPLICATION_TOKEN_VALIDITY_PERIOD);
         }
         JWTClient jwtClient = APIUtil.getJWTClientManagerService().getJWTClient();
         String scopes = " device_" + deviceId;

components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.api/src/main/java/org/wso2/carbon/device/mgt/iot/raspberrypi/service/impl/constants/RaspberrypiConstants.java

@@ -31,4 +31,6 @@ public class RaspberrypiConstants {
     //mqtt tranport related constants
     public static final String MQTT_ADAPTER_TOPIC_PROPERTY_NAME = "mqtt.adapter.topic";
 
+    public static final String APIM_APPLICATION_TOKEN_VALIDITY_PERIOD = "3600";
+
 }

components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.raspberrypi.type-view/type-view.hbs

@@ -20,12 +20,12 @@
     <hr>
 </div>
 
-<div class="col-xs-12 col-sm-4 col-md-4 col-lg-4 padding-top">
+<div class="col-xs-12 col-sm-4 col-md-3 col-lg-3 padding-top">
     <img src="{{@unit.publicUri}}/images/respberry-icon.png" class="img-responsive">
 </div>
 
 
-<div class="col-xs-12 col-sm-8 col-md-8 col-lg-8 padding-top">
+<div class="col-xs-12 col-sm-8 col-md-9 col-lg-9 padding-top">
     <h3 class="uppercase">What it Does</h3>
     <hr>
     <p class="grey margin-top">Connect a RaspberryPi to WSO2 IoT Server and manage it.</p>

components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/service/impl/VirtualFireAlarmServiceImpl.java

@@ -309,7 +309,8 @@ public class VirtualFireAlarmServiceImpl implements VirtualFireAlarmService {
             APIManagementProviderService apiManagementProviderService = APIUtil.getAPIManagementProviderService();
             String[] tags = {VirtualFireAlarmConstants.DEVICE_TYPE};
             apiApplicationKey = apiManagementProviderService.generateAndRetrieveApplicationKeys(
-                    VirtualFireAlarmConstants.DEVICE_TYPE, tags, KEY_TYPE, applicationUsername, true);
+                    VirtualFireAlarmConstants.DEVICE_TYPE, tags, KEY_TYPE, applicationUsername, true,
+                    VirtualFireAlarmConstants.APIM_APPLICATION_TOKEN_VALIDITY_PERIOD);
         }
         JWTClient jwtClient = APIUtil.getJWTClientManagerService().getJWTClient();
         String scopes = " device_" + deviceId;

components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.plugin/src/main/java/org/wso2/carbon/device/mgt/iot/virtualfirealarm/plugin/constants/VirtualFireAlarmConstants.java

@@ -83,4 +83,6 @@ public class VirtualFireAlarmConstants {
     public static final String SERVER_NAME = "serverName";
 
     public static final String MQTT_ADAPTER_TOPIC_PROPERTY_NAME = "mqtt.adapter.topic";
+
+    public static final String APIM_APPLICATION_TOKEN_VALIDITY_PERIOD = "3600";
 }

components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/public/css/styles.css

@@ -56,13 +56,11 @@ hr {
     background-color: #f6f4f4;
 }
 
-.doc-link {
+.doc-link{
-    background: #11375B;
+    background: none;
-    padding: 20px;
+    color: #000;
-    color: white;
+    padding: 10px 0px;
-    margin-top: 0;
 }
-
 .doc-link a {
-    color: white;
+    color: #006eff;
 }

components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.virtual_firealarm.type-view/type-view.hbs

@@ -19,15 +19,10 @@
     <h1 class="grey ">Virtual Firealarm</h1>
     <hr>
 </div>
-<div class="col-xs-12 col-sm-4 col-md-4 col-lg-4 padding-top">
+<div class="col-xs-12 col-sm-4 col-md-3 col-lg-3 padding-top">
     <img src="{{@unit.publicUri}}/images/firealarm-icon.png" class="img-responsive">
 </div>
-<div class="col-xs-12 col-sm-8 col-md-8 col-lg-8 padding-top">
+<div class="col-xs-12 col-sm-8 col-md-9 col-lg-9 padding-top">
-    <h4 class="doc-link">Click <a href="https://docs.wso2.com/display/IoTS100/Virtual+Firealarm"
-                                  target="_blank">[ here ]</a> for latest instructions and
-                         troubleshooting.</h4>
-</div>
-<div class="col-xs-12 col-sm-8 col-md-8 col-lg-8 padding-top">
     <h3 class="uppercase">What it Does</h3>
     <hr>
     <p class="grey margin-top">A Virtual Device that mimics the functionality of a real Firealarm.
@@ -40,15 +35,15 @@
     <hr>
     <ul class="list-unstyled">
         <li class="padding-top-double">
-            <span class="circle">STEP 01</span>
+            <span class="badge">STEP 01</span>
                Go ahead and [Download] the Device.
         </li>
-        <li class="padding-top-double">
+        <li>
-            <span class="circle">STEP 02</span>
+            <span class="badge">STEP 02</span>
                Proceed to [Prepare] section.
         </li>
-        <li class="padding-top-double">
+        <li>
-            <span class="circle">STEP 03</span>
+            <span class="badge">STEP 03</span>
                Read [Try Out] section to further experiment with the device.
         </li>
     </ul>
@@ -59,7 +54,9 @@
     </a>
     <a href="#" class="download-link btn-operations">
         <i class="fw fw-download"></i>Download Agent</a>
-
+    <p class="doc-link">Click <a href="https://docs.wso2.com/display/IoTS100/Virtual+Firealarm"
+                                  target="_blank">[ here ]</a> for latest instructions and
+        troubleshooting.</p>
     <div id="download-device-modal-content" class="hide">
         <div class="modal-header">
             <h4 class="pull-left modal-title">

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/type-view.hbs

@@ -5,12 +5,12 @@
     <h1 class="grey ">Android Mobile</h1>
     <hr>
 </div>
-<div class="col-xs-12 col-sm-4 col-md-4 col-lg-4 padding-top">
+<div class="col-xs-12 col-sm-4 col-md-3 col-lg-3 padding-top">
     <img src="{{@unit.publicUri}}/images/android-icon.png" class="img-responsive">
 </div>
 
 
-<div class="col-xs-12 col-sm-8 col-md-8 col-lg-8 padding-top">
+<div class="col-xs-12 col-sm-8 col-md-9 col-lg-9 padding-top">
 
     <h3 class="uppercase">What it Does</h3>
     <hr>

pom.xml

@@ -1241,7 +1241,7 @@
         <carbon.commons.version>4.4.8</carbon.commons.version>
 
         <!-- Carbon Deployment -->
-        <carbon.deployment.version>4.7.0</carbon.deployment.version>
+        <carbon.deployment.version>4.7.2</carbon.deployment.version>
 
         <!-- Carbon Identity -->
         <carbon.identity.framework.version>5.2.2</carbon.identity.framework.version>
@@ -1250,13 +1250,13 @@
         <carbon.identity.version.range>[5.2.2, 6.0.0)</carbon.identity.version.range>
 
         <!-- Carbon Multi-tenancy -->
-        <carbon.multitenancy.version>4.6.0</carbon.multitenancy.version>
+        <carbon.multitenancy.version>4.6.1</carbon.multitenancy.version>
 
         <!-- Carbon Registry -->
-        <carbon.registry.version>4.5.6</carbon.registry.version>
+        <carbon.registry.version>4.5.8</carbon.registry.version>
 
         <!-- Carbon Governance -->
-        <carbon.governance.version>4.6.4</carbon.governance.version>
+        <carbon.governance.version>4.6.5</carbon.governance.version>
 
         <!-- Carbon API Management -->
         <carbon.api.mgt.version>6.0.5</carbon.api.mgt.version>
@@ -1346,7 +1346,7 @@
         <javax.xml.parsers.import.pkg.version>[0.0.0,1.0.0)</javax.xml.parsers.import.pkg.version>
 
         <!-- MB Features -->
-        <carbon.messaging.version>3.1.11</carbon.messaging.version>
+        <carbon.messaging.version>3.1.3</carbon.messaging.version>
 
         <!--Feign Version-->
         <io.github.openfeign.version>9.3.1</io.github.openfeign.version>