From 824efc8db3d636c2d1e752410886f5ecfcbfc24b Mon Sep 17 00:00:00 2001
From: pasant9 <pasan96tennakoon@gmail.com>
Date: Tue, 26 Mar 2024 10:25:41 +0530
Subject: [PATCH 1/4] Update bat file support for jdk21

---
 .../product/src/main/startup-scripts/api-manager.bat | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/distribution/product/src/main/startup-scripts/api-manager.bat b/modules/distribution/product/src/main/startup-scripts/api-manager.bat
index 931cddda71..18b5ea0610 100755
--- a/modules/distribution/product/src/main/startup-scripts/api-manager.bat
+++ b/modules/distribution/product/src/main/startup-scripts/api-manager.bat
@@ -169,19 +169,19 @@ rem find the version of the jdk
 
 set CMD=RUN %*
 
-:checkJdk17
+:checkJdk21
 PATH %PATH%;%JAVA_HOME%\bin\
 for /f tokens^=2-5^ delims^=.-_^" %%j in ('java -fullversion 2^>^&1') do set "JAVA_VERSION=%%j%%k"
 if %JAVA_VERSION% LSS 110 goto unknownJdk
-if %JAVA_VERSION% GTR 170 goto unknownJdk
-goto jdk17
+if %JAVA_VERSION% GTR 210 goto unknownJdk
+goto jdk21
 
 :unknownJdk
 echo Starting WSO2 Carbon (in unsupported JDK)
-echo [ERROR] CARBON is supported only between JDK 11 and JDK 17
-goto jdk17
+echo [ERROR] CARBON is supported only between JDK 11 and JDK 21
+goto jdk21
 
-:jdk17
+:jdk21
 goto runServer
 
 rem ----------------- Execute The Requested Command ----------------------------

From 93e2009af8f0c8a72b4bd316baf562549f4aed71 Mon Sep 17 00:00:00 2001
From: RakhithaRR <rakhitharr@live.com>
Date: Wed, 27 Mar 2024 14:38:31 +0530
Subject: [PATCH 2/4] Update IS connector version

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

diff --git a/pom.xml b/pom.xml
index 7b780d3742..3e75ba63dc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1473,7 +1473,7 @@
 
         <!-- WSDL4J dependencies -->
         <wsdl4j.version>1.6.3.wso2v3</wsdl4j.version>
-        <wso2is.km.version>1.7.6</wso2is.km.version>
+        <wso2is.km.version>1.7.7</wso2is.km.version>
         <wso2is7.km.version>2.0.0</wso2is7.km.version>
         <okta.keymanager.feature.version>3.2.1</okta.keymanager.feature.version>
         <azure.keymanager.feature.version>1.0.8</azure.keymanager.feature.version>

From d69c1d5eaee14be3bfd4fc1d40b34ae3baf17610 Mon Sep 17 00:00:00 2001
From: senthuran16 <senthuranrc16@gmail.com>
Date: Wed, 27 Mar 2024 18:59:32 +0530
Subject: [PATCH 3/4] Bump IS7 KM Version to 2.0.1 and Charon3 version to
 4.0.19

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

diff --git a/pom.xml b/pom.xml
index 7b780d3742..2f356bae6e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1474,7 +1474,7 @@
         <!-- WSDL4J dependencies -->
         <wsdl4j.version>1.6.3.wso2v3</wsdl4j.version>
         <wso2is.km.version>1.7.6</wso2is.km.version>
-        <wso2is7.km.version>2.0.0</wso2is7.km.version>
+        <wso2is7.km.version>2.0.1</wso2is7.km.version>
         <okta.keymanager.feature.version>3.2.1</okta.keymanager.feature.version>
         <azure.keymanager.feature.version>1.0.8</azure.keymanager.feature.version>
         <keycloak.keymanager.feature.version>2.1.1</keycloak.keymanager.feature.version>
@@ -1484,7 +1484,7 @@
         <apim.analytics.publisher.version>1.2.18</apim.analytics.publisher.version>
         <disruptor.orbit.version>3.4.2.wso2v1</disruptor.orbit.version>
         <wss4j.version>1.6.0-wso2v7</wss4j.version>
-        <charon3.version>4.0.18</charon3.version>
+        <charon3.version>4.0.19</charon3.version>
 
         <!-- Service Catalog Client Dependencies -->
         <com.squareup.okhttp3.version>4.9.0</com.squareup.okhttp3.version>

From 75160b5f1803ec997ab93f6d4fa7bc89e5d50d85 Mon Sep 17 00:00:00 2001
From: senthuran16 <senthuranrc16@gmail.com>
Date: Wed, 27 Mar 2024 18:59:32 +0530
Subject: [PATCH 4/4] Bump IS7 KM Version to 2.0.1 and Charon3 version to
 4.0.19

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

diff --git a/pom.xml b/pom.xml
index 3e75ba63dc..ca4da25031 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1474,7 +1474,7 @@
         <!-- WSDL4J dependencies -->
         <wsdl4j.version>1.6.3.wso2v3</wsdl4j.version>
         <wso2is.km.version>1.7.7</wso2is.km.version>
-        <wso2is7.km.version>2.0.0</wso2is7.km.version>
+        <wso2is7.km.version>2.0.1</wso2is7.km.version>
         <okta.keymanager.feature.version>3.2.1</okta.keymanager.feature.version>
         <azure.keymanager.feature.version>1.0.8</azure.keymanager.feature.version>
         <keycloak.keymanager.feature.version>2.1.1</keycloak.keymanager.feature.version>
@@ -1484,7 +1484,7 @@
         <apim.analytics.publisher.version>1.2.18</apim.analytics.publisher.version>
         <disruptor.orbit.version>3.4.2.wso2v1</disruptor.orbit.version>
         <wss4j.version>1.6.0-wso2v7</wss4j.version>
-        <charon3.version>4.0.18</charon3.version>
+        <charon3.version>4.0.19</charon3.version>
 
         <!-- Service Catalog Client Dependencies -->
         <com.squareup.okhttp3.version>4.9.0</com.squareup.okhttp3.version>