From b0f8c9c5c9d576999a8b8f5a53642199a88f8315 Mon Sep 17 00:00:00 2001
From: Darshana Gunawardana <darshanasbg@users.noreply.github.com>
Date: Sat, 4 Jan 2025 19:11:05 +0530
Subject: [PATCH 1/3] Revert "Revert keystore storage temporarily"

---
 .../distribution/src/repository/resources/conf/default.json    | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/modules/distribution/src/repository/resources/conf/default.json b/modules/distribution/src/repository/resources/conf/default.json
index 085091b2eb1..10423cb234a 100644
--- a/modules/distribution/src/repository/resources/conf/default.json
+++ b/modules/distribution/src/repository/resources/conf/default.json
@@ -68,6 +68,5 @@
 
   "default_management_ui.path": "console",
   "legacy_authz_runtime.enable": false,
-  "management_console_deprecation_banner.enable": true,
-  "data_storage_type.keystores": "registry"
+  "management_console_deprecation_banner.enable": true
 }

From ca162e3f369c56f89d5e58c1fcd02b40be895cb5 Mon Sep 17 00:00:00 2001
From: jenkins-is-staging <jenkins-is-staging@wso2.com>
Date: Wed, 8 Jan 2025 21:20:06 +0000
Subject: [PATCH 2/3] Bump dependencies from
 IS_dependency_updater_github_action/12677716059

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

diff --git a/pom.xml b/pom.xml
index af7a8c199b3..be8d14b93f7 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2356,7 +2356,7 @@
     <properties>
 
         <!--Carbon Identity Framework Version-->
-        <carbon.identity.framework.version>7.7.79</carbon.identity.framework.version>
+        <carbon.identity.framework.version>7.7.84</carbon.identity.framework.version>
         <carbon.identity.framework.version.range>[5.14.67, 8.0.0)</carbon.identity.framework.version.range>
 
         <!--SAML Common Utils Version-->
@@ -2377,7 +2377,7 @@
 
 
         <!-- Identity Inbound Versions   -->
-        <identity.inbound.auth.oauth.version>7.0.207</identity.inbound.auth.oauth.version>
+        <identity.inbound.auth.oauth.version>7.0.210</identity.inbound.auth.oauth.version>
         <identity.inbound.auth.saml.version>5.11.49</identity.inbound.auth.saml.version>
         <identity.inbound.auth.openid.version>5.10.2</identity.inbound.auth.openid.version>
         <identity.inbound.auth.sts.version>5.11.14</identity.inbound.auth.sts.version>
@@ -2439,7 +2439,7 @@
         <identity.oauth2.token.exchange.grant.version>1.1.12</identity.oauth2.token.exchange.grant.version>
 
         <!--SAML Metadata-->
-        <identity.metadata.saml.version>1.8.3</identity.metadata.saml.version>
+        <identity.metadata.saml.version>1.8.4</identity.metadata.saml.version>
 
         <!-- Connector Versions -->
         <authenticator.totp.version>3.3.31</authenticator.totp.version>
@@ -2455,7 +2455,7 @@
         <identity.extension.utils>1.0.21</identity.extension.utils>
         <authenticator.auth.otp.commons.version>1.0.10</authenticator.auth.otp.commons.version>
 
-        <identity.org.mgt.version>1.4.62</identity.org.mgt.version>
+        <identity.org.mgt.version>1.4.65</identity.org.mgt.version>
         <identity.org.mgt.core.version>1.1.19</identity.org.mgt.core.version>
         <identity.organization.login.version>1.1.42</identity.organization.login.version>
         <identity.oauth2.grant.organizationswitch.version>1.1.27</identity.oauth2.grant.organizationswitch.version>
@@ -2468,7 +2468,7 @@
 
         <!-- Identity REST API feature -->
         <identity.api.dispatcher.version>2.0.17</identity.api.dispatcher.version>
-        <identity.server.api.version>1.3.18</identity.server.api.version>
+        <identity.server.api.version>1.3.19</identity.server.api.version>
         <identity.user.api.version>1.3.48</identity.user.api.version>
 
         <identity.agent.sso.version>5.5.9</identity.agent.sso.version>
@@ -2478,9 +2478,9 @@
         <conditional.authentication.functions.version>1.2.70</conditional.authentication.functions.version>
 
         <!-- Identity Portal Versions -->
-        <identity.apps.console.version>2.36.8</identity.apps.console.version>
-        <identity.apps.myaccount.version>2.13.48</identity.apps.myaccount.version>
-        <identity.apps.core.version>2.8.12</identity.apps.core.version>
+        <identity.apps.console.version>2.36.12</identity.apps.console.version>
+        <identity.apps.myaccount.version>2.13.52</identity.apps.myaccount.version>
+        <identity.apps.core.version>2.8.14</identity.apps.core.version>
         <identity.apps.tests.version>1.6.379</identity.apps.tests.version>
 
         <!-- Charon -->

From 5f16b582fb7dfd08a0c2e20025d12e989746ef21 Mon Sep 17 00:00:00 2001
From: Malithi Madara Edirisinghe <malithim@wso2.com>
Date: Thu, 9 Jan 2025 19:00:54 +0530
Subject: [PATCH 3/3] Update framework version

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

diff --git a/pom.xml b/pom.xml
index be8d14b93f7..00370e15743 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2356,7 +2356,7 @@
     <properties>
 
         <!--Carbon Identity Framework Version-->
-        <carbon.identity.framework.version>7.7.84</carbon.identity.framework.version>
+        <carbon.identity.framework.version>7.7.85</carbon.identity.framework.version>
         <carbon.identity.framework.version.range>[5.14.67, 8.0.0)</carbon.identity.framework.version.range>
 
         <!--SAML Common Utils Version-->