From ec7a0c07cb6a089f3d17d0fe9d66dca021226624 Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Fri, 16 Mar 2018 14:45:28 +0530
Subject: [PATCH 1/5] Update carbon-device-mgt dependencies

---
 pom.xml | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0d7b41fc997..3b3cab51d1a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1871,18 +1871,17 @@
         <axis2-transports.version>1.1.0-wso2v10</axis2-transports.version>
 
         <jboss-transaction-api.version>1.0.0.Final</jboss-transaction-api.version>
-        <carbon.p2.plugin.version>1.5.4</carbon.p2.plugin.version>
 
         <!-- Jaggery -->
-        <jaggery.version>0.12.0</jaggery.version>
-        <jaggery.extensions.version>1.3.0</jaggery.extensions.version>
-        <jaggery.extensions.sso.version>1.3.0</jaggery.extensions.sso.version>
-        <jaggery.extensions.carbon.version>1.3.0</jaggery.extensions.carbon.version>
-        <jaggery.extensions.test.version>1.3.0</jaggery.extensions.test.version>
+        <jaggery.version>0.12.8</jaggery.version>
+        <jaggery.extensions.version>1.5.6</jaggery.extensions.version>
+        <jaggery.extensions.sso.version>1.5.6</jaggery.extensions.sso.version>
+        <jaggery.extensions.carbon.version>1.5.6</jaggery.extensions.carbon.version>
+        <jaggery.extensions.test.version>1.5.6</jaggery.extensions.test.version>
 
         <!-- Testing -->
         <automation.test.framework.version>4.3.1</automation.test.framework.version>
-        <automation.utils.version>4.3.0</automation.utils.version>
+        <automation.utils.version>4.4.2</automation.utils.version>
         <testng.version>6.8</testng.version>
         <test.automation.emm.ui.version>1.1.0</test.automation.emm.ui.version>
         <junit.version>4.8.2</junit.version>
@@ -1903,19 +1902,19 @@
         <carbon.deployment.version>4.7.10</carbon.deployment.version>
 
         <!-- Carbon Identity -->
-        <carbon.identity.framework.version>5.11.139</carbon.identity.framework.version>
-		<carbon.identity.framework.version.range>[5.0.0, 6.0.0)</carbon.identity.framework.version.range>
+        <carbon.identity.framework.version>5.11.148</carbon.identity.framework.version>
+		<carbon.identity.framework.version.range>[5.2.0, 6.0.0)</carbon.identity.framework.version.range>
         <identity.inbound.auth.oauth.version>5.6.53</identity.inbound.auth.oauth.version>
-        <identity.inbound.auth.saml.version>5.4.4</identity.inbound.auth.saml.version>
-		<carbon.identity.jwt.grant.version>1.0.2</carbon.identity.jwt.grant.version>
-		<carbon.identity.jwt.grant.version.range>[1.0.2, 2.0.0)</carbon.identity.jwt.grant.version.range>
+        <identity.inbound.auth.saml.version>5.4.6</identity.inbound.auth.saml.version>
+		<carbon.identity.jwt.grant.version>1.0.10</carbon.identity.jwt.grant.version>
+		<carbon.identity.jwt.grant.version.range>[1.0.10, 2.0.0)</carbon.identity.jwt.grant.version.range>
         <!-- Carbon Identity import version ranges -->
         <carbon.identity.imp.pkg.version>[5.7.0, 6.0.0)</carbon.identity.imp.pkg.version>
         <carbon.identity-inbound-auth-oauth.imp.pkg.version>[5.2.0, 6.0.0)</carbon.identity-inbound-auth-oauth.imp.pkg.version>
         <carbon.identity-user-ws.imp.pkg.version>[5.1.0, 6.0.0)</carbon.identity-user-ws.imp.pkg.version>
 
         <!-- Carbon Multi-tenancy -->
-        <carbon.multitenancy.version>4.6.8</carbon.multitenancy.version>
+        <carbon.multitenancy.version>4.6.11</carbon.multitenancy.version>
 
         <!-- Carbon Governance -->
         <carbon.governance.version>4.7.23</carbon.governance.version>
@@ -1937,15 +1936,15 @@
 	    <commons-lang.wso2.osgi.version.range>[2.6.0,3.0.0)</commons-lang.wso2.osgi.version.range>
 
         <!-- Carbon API Management -->
-        <carbon.api.mgt.version>6.2.146</carbon.api.mgt.version>
+        <carbon.api.mgt.version>6.2.201</carbon.api.mgt.version>
         <carbon.api.mgt.version.range>(6.0.0,7.0.0]</carbon.api.mgt.version.range>
 
         <!-- Carbon Analytics -->
-        <carbon.analytics.common.version>5.1.33</carbon.analytics.common.version>
+        <carbon.analytics.common.version>5.1.37</carbon.analytics.common.version>
         <carbon.analytics.common.version.range>[5.1.3,6.0.0)</carbon.analytics.common.version.range>
-		<carbon.analytics.version>1.3.3</carbon.analytics.version>
+		<carbon.analytics.version>1.3.25</carbon.analytics.version>
 		<carbon.analytics.version.range>[1.3.0,2.0.0)</carbon.analytics.version.range>
-        <carbon.event-processing.version>2.1.10</carbon.event-processing.version>
+        <carbon.event-processing.version>2.1.23</carbon.event-processing.version>
 
         <!-- Carbon Registry -->
         <carbon.registry.version>4.6.28</carbon.registry.version>

From 48a06c048bcb089555078d705e37aa81e9b0edaf Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Fri, 16 Mar 2018 15:13:47 +0530
Subject: [PATCH 2/5] Fix jwt dependency issue

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3b3cab51d1a..2b7f29c103c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1907,7 +1907,7 @@
         <identity.inbound.auth.oauth.version>5.6.53</identity.inbound.auth.oauth.version>
         <identity.inbound.auth.saml.version>5.4.6</identity.inbound.auth.saml.version>
 		<carbon.identity.jwt.grant.version>1.0.10</carbon.identity.jwt.grant.version>
-		<carbon.identity.jwt.grant.version.range>[1.0.10, 2.0.0)</carbon.identity.jwt.grant.version.range>
+		<carbon.identity.jwt.grant.version.range>[1.0.2, 2.0.0)</carbon.identity.jwt.grant.version.range>
         <!-- Carbon Identity import version ranges -->
         <carbon.identity.imp.pkg.version>[5.7.0, 6.0.0)</carbon.identity.imp.pkg.version>
         <carbon.identity-inbound-auth-oauth.imp.pkg.version>[5.2.0, 6.0.0)</carbon.identity-inbound-auth-oauth.imp.pkg.version>

From 703a4cbb12a41dfadce3bdb0e97da22d8c08ea87 Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Fri, 16 Mar 2018 15:37:04 +0530
Subject: [PATCH 3/5] Add further fixes for the jwt-grant dependency issue

---
 .../org.wso2.carbon.device.mgt.oauth.extensions/pom.xml   | 4 ++--
 pom.xml                                                   | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml b/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml
index f4c1e922fa6..72da2513b2b 100644
--- a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml
+++ b/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml
@@ -59,8 +59,8 @@
 			<artifactId>org.wso2.carbon.user.mgt</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.wso2.carbon.identity</groupId>
-			<artifactId>org.wso2.carbon.identity.oauth2.grant.jwt</artifactId>
+            <groupId>org.wso2.carbon.extension.identity.oauth2.grantType.jwt</groupId>
+            <artifactId>org.wso2.carbon.identity.oauth2.grant.jwt</artifactId>
 		</dependency>
     </dependencies>
 
diff --git a/pom.xml b/pom.xml
index 2b7f29c103c..7080823655c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -905,8 +905,8 @@
                 <version>${identity.inbound.auth.oauth.version}</version>
             </dependency>
 			<dependency>
-				<groupId>org.wso2.carbon.identity</groupId>
-				<artifactId>org.wso2.carbon.identity.oauth2.grant.jwt</artifactId>
+                <groupId>org.wso2.carbon.extension.identity.oauth2.grantType.jwt</groupId>
+                <artifactId>org.wso2.carbon.identity.oauth2.grant.jwt</artifactId>
 				<version>${carbon.identity.jwt.grant.version}</version>
 			</dependency>
             <dependency>
@@ -1904,10 +1904,10 @@
         <!-- Carbon Identity -->
         <carbon.identity.framework.version>5.11.148</carbon.identity.framework.version>
 		<carbon.identity.framework.version.range>[5.2.0, 6.0.0)</carbon.identity.framework.version.range>
-        <identity.inbound.auth.oauth.version>5.6.53</identity.inbound.auth.oauth.version>
+        <identity.inbound.auth.oauth.version>5.6.63</identity.inbound.auth.oauth.version>
         <identity.inbound.auth.saml.version>5.4.6</identity.inbound.auth.saml.version>
 		<carbon.identity.jwt.grant.version>1.0.10</carbon.identity.jwt.grant.version>
-		<carbon.identity.jwt.grant.version.range>[1.0.2, 2.0.0)</carbon.identity.jwt.grant.version.range>
+		<carbon.identity.jwt.grant.version.range>[1.0.10, 2.0.0)</carbon.identity.jwt.grant.version.range>
         <!-- Carbon Identity import version ranges -->
         <carbon.identity.imp.pkg.version>[5.7.0, 6.0.0)</carbon.identity.imp.pkg.version>
         <carbon.identity-inbound-auth-oauth.imp.pkg.version>[5.2.0, 6.0.0)</carbon.identity-inbound-auth-oauth.imp.pkg.version>

From f14564339a35a84c0761d515b33bb69b926f0b63 Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Fri, 16 Mar 2018 15:39:57 +0530
Subject: [PATCH 4/5] Fix formatting issues

---
 .../org.wso2.carbon.device.mgt.oauth.extensions/pom.xml       | 4 ++--
 pom.xml                                                       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml b/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml
index 72da2513b2b..5059bfc62ae 100644
--- a/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml
+++ b/components/identity-extensions/org.wso2.carbon.device.mgt.oauth.extensions/pom.xml
@@ -59,8 +59,8 @@
 			<artifactId>org.wso2.carbon.user.mgt</artifactId>
 		</dependency>
 		<dependency>
-            <groupId>org.wso2.carbon.extension.identity.oauth2.grantType.jwt</groupId>
-            <artifactId>org.wso2.carbon.identity.oauth2.grant.jwt</artifactId>
+			<groupId>org.wso2.carbon.extension.identity.oauth2.grantType.jwt</groupId>
+			<artifactId>org.wso2.carbon.identity.oauth2.grant.jwt</artifactId>
 		</dependency>
     </dependencies>
 
diff --git a/pom.xml b/pom.xml
index 7080823655c..6f9e4fa7c76 100644
--- a/pom.xml
+++ b/pom.xml
@@ -907,7 +907,7 @@
 			<dependency>
                 <groupId>org.wso2.carbon.extension.identity.oauth2.grantType.jwt</groupId>
                 <artifactId>org.wso2.carbon.identity.oauth2.grant.jwt</artifactId>
-				<version>${carbon.identity.jwt.grant.version}</version>
+                <version>${carbon.identity.jwt.grant.version}</version>
 			</dependency>
             <dependency>
                 <groupId>org.wso2.carbon.identity.framework</groupId>

From b639845ab2fdb5152afbfc047240f5bfd67dbb6b Mon Sep 17 00:00:00 2001
From: Rasika Perera <info.rasika@gmail.com>
Date: Fri, 16 Mar 2018 15:41:22 +0530
Subject: [PATCH 5/5] Fix formatting issue

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

diff --git a/pom.xml b/pom.xml
index 6f9e4fa7c76..95d376b4082 100644
--- a/pom.xml
+++ b/pom.xml
@@ -904,11 +904,11 @@
                 <artifactId>org.wso2.carbon.identity.oauth.stub</artifactId>
                 <version>${identity.inbound.auth.oauth.version}</version>
             </dependency>
-			<dependency>
+            <dependency>
                 <groupId>org.wso2.carbon.extension.identity.oauth2.grantType.jwt</groupId>
                 <artifactId>org.wso2.carbon.identity.oauth2.grant.jwt</artifactId>
                 <version>${carbon.identity.jwt.grant.version}</version>
-			</dependency>
+            </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.identity.framework</groupId>
                 <artifactId>org.wso2.carbon.identity.application.authentication.framework</artifactId>