From 679a2d333e624d73b5b83096349a88d588fc34f7 Mon Sep 17 00:00:00 2001
From: Asha Sulaiman <165079T@uom.lk>
Date: Wed, 6 Nov 2024 09:13:32 +0530
Subject: [PATCH 1/3] Upgrade identity-oauth-addons version

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

diff --git a/pom.xml b/pom.xml
index 4b65e3236..a3a35b5fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -821,7 +821,7 @@
         <carbon.kernel.version>4.10.24</carbon.kernel.version>
         <carbon.multitenancy.version>4.11.27</carbon.multitenancy.version>
         <org.wso2.carbon.identity.remotefetch.version>0.7.12</org.wso2.carbon.identity.remotefetch.version>
-        <org.wso2.carbon.identity.oauth2.token.handler.clientauth.jwt.version>2.5.17</org.wso2.carbon.identity.oauth2.token.handler.clientauth.jwt.version>
+        <org.wso2.carbon.identity.oauth2.token.handler.clientauth.jwt.version>2.5.18</org.wso2.carbon.identity.oauth2.token.handler.clientauth.jwt.version>
         <org.wso2.carbon.logging.service.version>4.10.12</org.wso2.carbon.logging.service.version>
         <org.wso2.carbon.event.publisher.version>5.2.59</org.wso2.carbon.event.publisher.version>
         <identity.branding.preference.management.version>1.1.16</identity.branding.preference.management.version>

From ec12394a99a772c760743cb860aef23096d5d1b0 Mon Sep 17 00:00:00 2001
From: Asha Sulaiman <165079T@uom.lk>
Date: Wed, 6 Nov 2024 11:06:46 +0530
Subject: [PATCH 2/3] Upgrade framework version

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

diff --git a/pom.xml b/pom.xml
index a3a35b5fd..741a6a867 100644
--- a/pom.xml
+++ b/pom.xml
@@ -809,7 +809,7 @@
         <maven.buildnumber.plugin.version>1.4</maven.buildnumber.plugin.version>
         <org.apache.felix.annotations.version>1.2.4</org.apache.felix.annotations.version>
         <identity.governance.version>1.11.11</identity.governance.version>
-        <carbon.identity.framework.version>7.5.106</carbon.identity.framework.version>
+        <carbon.identity.framework.version>7.5.117</carbon.identity.framework.version>
         <maven.findbugsplugin.version>3.0.5</maven.findbugsplugin.version>
         <findsecbugs-plugin.version>1.12.0</findsecbugs-plugin.version>
         <maven.checkstyleplugin.excludes>**/gen/**/*</maven.checkstyleplugin.excludes>

From b101397f8b2e54f73766e462b7152335d2a3fe16 Mon Sep 17 00:00:00 2001
From: Asha Sulaiman <165079T@uom.lk>
Date: Wed, 6 Nov 2024 15:18:53 +0530
Subject: [PATCH 3/3] Exclude jsr311-api artifact

---
 .../pom.xml                                               | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml
index 7e9fe1471..d5e2a3936 100644
--- a/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml
+++ b/components/org.wso2.carbon.identity.api.server.action.management/org.wso2.carbon.identity.api.server.action.management.v1/pom.xml
@@ -35,7 +35,13 @@
         <dependency>
             <groupId>org.wso2.carbon.identity.framework</groupId>
             <artifactId>org.wso2.carbon.identity.action.management</artifactId>
-            <scope>provided</scope>
+            <scope>provided</scope>            
+            <exclusions>
+                <exclusion>
+                    <groupId>javax.ws.rs</groupId>
+                    <artifactId>jsr311-api</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.jaxrs</groupId>