From f43ba554d51a97274a8b5598ab1dd4d73ea5b1d0 Mon Sep 17 00:00:00 2001
From: harshanl <harshan@wso2.com>
Date: Thu, 6 Oct 2016 19:44:47 +0530
Subject: [PATCH] EMM-1678:Updated the oauth component versions

---
 .../resources/jaggeryapps/devicemgt/app/conf/config.json    | 2 +-
 .../jaggeryapps/emm-web-agent/app/conf/config.json          | 2 +-
 pom.xml                                                     | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
index 8eb7bfc3c..06417b7e8 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/devicemgt/app/conf/config.json
@@ -19,7 +19,7 @@
             "owner": "admin@carbon.super",
             "dynamicClientAppRegistrationServiceURL": "%https.ip%/dynamic-client-web/register",
             "apiManagerClientAppRegistrationServiceURL": "%https.ip%/api-application-registration/register/tenants",
-            "grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer",
+            "grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer urn:ietf:params:oauth:grant-type:jwt-bearer",
             "tokenScope": "admin",
             "callbackUrl": "%https.ip%/api/device-mgt/v1.0"
         },
diff --git a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/conf/config.json b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/conf/config.json
index 2400b0730..8e2b80c9f 100644
--- a/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/conf/config.json
+++ b/components/mobile-plugins/mobile-base-plugin/org.wso2.carbon.device.mgt.mobile.ui/src/main/resources/jaggeryapps/emm-web-agent/app/conf/config.json
@@ -17,7 +17,7 @@
             "owner": "admin@carbon.super",
             "dynamicClientAppRegistrationServiceURL": "%https.ip%/dynamic-client-web/register",
             "apiManagerClientAppRegistrationServiceURL": "%https.ip%/api-application-registration/register/tenants",
-            "grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer",
+            "grantType": "password refresh_token urn:ietf:params:oauth:grant-type:saml2-bearer urn:ietf:params:oauth:grant-type:jwt-bearer",
             "tokenScope": "admin",
             "callbackUrl": "%https.ip%/api/device-mgt/v1.0"
         },
diff --git a/pom.xml b/pom.xml
index d88b8d24b..d680053cd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1219,10 +1219,10 @@
         <carbon.deployment.version>4.7.0</carbon.deployment.version>
 
         <!-- Carbon Identity -->
-        <carbon.identity.framework.version>5.2.0</carbon.identity.framework.version>
-        <identity.inbound.auth.oauth.version>5.1.2</identity.inbound.auth.oauth.version>
+        <carbon.identity.framework.version>5.2.1</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.0.7, 6.0.0)</carbon.identity.version.range>
+        <carbon.identity.version.range>[5.2.1, 6.0.0)</carbon.identity.version.range>
 
         <!-- Carbon Multi-tenancy -->
         <carbon.multitenancy.version>4.6.0</carbon.multitenancy.version>