Merge remote-tracking branch 'upstream/master'

components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/pages/mdm.page.enrollments.ios.download-agent/download-agent.hbs

@@ -57,9 +57,11 @@ under the License. --}}
             <div class="wr-buttons text-center">
                 <br class="c-both" />
                 <br/>
-                For evaluation purposes, you can skip the installer and proceed with enrollment.
+                For evaluation purposes, you can skip the agent installation and proceed with enrollment.</br>
+                This results unavailability of Operations such as <b>Send Notification, Get Location, Ring and
+                Enterprise Wipe</b>.
                 <br/><br/>
-                <a href="#" class="btn btn-secondary">Skip Agent Installer</a>
+                <a href="/enrollments/ios/login-agent" class="btn btn-secondary">Skip Agent Installer</a>
             </div>
         </div>
     </div>

pom.xml

@@ -1202,7 +1202,7 @@
         <javax.ws.rs.version>1.1.1</javax.ws.rs.version>
 
         <!-- Carbon Device Management -->
-        <carbon.devicemgt.version>1.2.3-SNAPSHOT</carbon.devicemgt.version>
+        <carbon.devicemgt.version>1.2.4</carbon.devicemgt.version>
         <carbon.devicemgt.version.range>[1.1.1, 2.0.0)</carbon.devicemgt.version.range>
 
 
@@ -1219,10 +1219,10 @@
         <carbon.deployment.version>4.7.0</carbon.deployment.version>
 
         <!-- Carbon Identity -->
-        <carbon.identity.framework.version>5.2.1</carbon.identity.framework.version>
+        <carbon.identity.framework.version>5.2.2</carbon.identity.framework.version>
         <identity.inbound.auth.oauth.version>5.1.3</identity.inbound.auth.oauth.version>
         <identity.inbound.auth.saml.version>5.1.1</identity.inbound.auth.saml.version>
-        <carbon.identity.version.range>[5.2.1, 6.0.0)</carbon.identity.version.range>
+        <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>