From 309757603d2aaadb9c384581fc92fca3566db076 Mon Sep 17 00:00:00 2001
From: lasantha <tcdlpds@gmail.com>
Date: Wed, 14 Mar 2018 19:48:40 +0530
Subject: [PATCH 1/2] Bump the APIM and carbon Kernel vrsions

---
 pom.xml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index cc07cc85..2916eb1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1503,14 +1503,14 @@
         <carbon.deployment.version>4.7.15</carbon.deployment.version>
 
         <!-- Carbon Identity -->
-        <carbon.identity.framework.version>5.11.139</carbon.identity.framework.version>
+        <carbon.identity.framework.version>5.11.144</carbon.identity.framework.version>
         <carbon.identity.framework.version.range>[5.2.0, 6.0.0)
         </carbon.identity.framework.version.range>
         <identity.local.auth.basicauth.version>5.3.7</identity.local.auth.basicauth.version>
         <identity.inbound.auth.openid.version>5.2.5</identity.inbound.auth.openid.version>
         <identity.inbound.auth.saml.version>5.4.4</identity.inbound.auth.saml.version>
         <identity.carbon.auth.saml2.version>5.2.5</identity.carbon.auth.saml2.version>
-        <identity.inbound.auth.oauth.version>5.6.53</identity.inbound.auth.oauth.version>
+        <identity.inbound.auth.oauth.version>5.6.60</identity.inbound.auth.oauth.version>
         <identity.carbon.auth.mutual.ssl.version>5.1.3</identity.carbon.auth.mutual.ssl.version>
         <identity.user.ws.version>5.1.8</identity.user.ws.version>
         <identity.outbound.auth.requestpath.basicauth.version>5.1.5</identity.outbound.auth.requestpath.basicauth.version>
@@ -1539,7 +1539,7 @@
         <carbon.governance.version>4.7.23</carbon.governance.version>
 
         <!-- Carbon Device Management-->
-        <carbon.device.mgt.version>3.1.5</carbon.device.mgt.version>
+        <carbon.device.mgt.version>3.1.9</carbon.device.mgt.version>
         <carbon.device.mgt.version.range>[3.1.0, 4.0.0)</carbon.device.mgt.version.range>
 
         <!-- IOT Device Management -->
@@ -1549,7 +1549,7 @@
         <carbon.device.mgt.plugin.version>4.1.1</carbon.device.mgt.plugin.version>
 
         <!-- API Management -->
-        <carbon.api.mgt.version>6.2.170</carbon.api.mgt.version>
+        <carbon.api.mgt.version>6.2.190</carbon.api.mgt.version>
         <carbon.api.mgt.version.range>(6.0.0,7.0.0]</carbon.api.mgt.version.range>
 
         <!-- Carbon Mediation -->

From 706f118bd37a12ee19108116ad201cab19f1c8f3 Mon Sep 17 00:00:00 2001
From: geethkokila <geeth@wso2.com>
Date: Wed, 14 Mar 2018 20:02:09 +0530
Subject: [PATCH 2/2] Update the scope validator

---
 modules/distribution/src/core/conf/identity/identity.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/distribution/src/core/conf/identity/identity.xml b/modules/distribution/src/core/conf/identity/identity.xml
index b0417def..8622318a 100644
--- a/modules/distribution/src/core/conf/identity/identity.xml
+++ b/modules/distribution/src/core/conf/identity/identity.xml
@@ -252,8 +252,7 @@
 
         <!-- Scope validators list. The validators registered here wil be executed during token validation. -->
         <ScopeValidators>
-            <ScopeValidator class="org.wso2.carbon.identity.oauth2.validators.JDBCScopeValidator" />
-            <ScopeValidator class="org.wso2.carbon.identity.oauth2.validators.XACMLScopeValidator"/>
+            <ScopeValidator class="org.wso2.carbon.device.mgt.oauth.extensions.handlers.ScopeValidationHandler"/>
         </ScopeValidators>
 
         <!-- Scope handlers list. The handlers registered here will be executed at the scope validation phase while