From 3c6aaae684c514c9eec7a1b07ac4e861460e2e99 Mon Sep 17 00:00:00 2001
From: Madhavi Gayathri <madhavi.17@cse.mrt.ac.lk>
Date: Fri, 8 Dec 2023 09:51:10 +0530
Subject: [PATCH 1/3] Add charon-config.xml.j2 to the pack.

---
 modules/distribution/src/assembly/bin.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/modules/distribution/src/assembly/bin.xml b/modules/distribution/src/assembly/bin.xml
index ac1a70c19a4..b7e2d083561 100644
--- a/modules/distribution/src/assembly/bin.xml
+++ b/modules/distribution/src/assembly/bin.xml
@@ -875,6 +875,15 @@
             </source>
             <outputDirectory>wso2is-${pom.version}/repository/conf/identity</outputDirectory>
         </file>
+
+        <file>
+            <source>
+                ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/resources/conf/templates/repository/conf/identity/charon-config.xml.j2
+            </source>
+            <outputDirectory>wso2is-${pom.version}/repository/resources/conf/templates/repository/conf/identity</outputDirectory>
+            <fileMode>644</fileMode>
+        </file>
+
         <file>
             <source>
                 ../p2-profile-gen/target/wso2carbon-core-${carbon.kernel.version}/repository/conf/identity/scim2-schema-extension.config

From 8fed614d35e58ddea0206f48b3e4c0796ed99815 Mon Sep 17 00:00:00 2001
From: Pasindu Yeshan <61885844+PasinduYeshan@users.noreply.github.com>
Date: Wed, 13 Dec 2023 11:39:52 +0530
Subject: [PATCH 2/3] Update pom.xml

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

diff --git a/pom.xml b/pom.xml
index cfcab583057..be74854d945 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2369,7 +2369,7 @@
         <!-- Identity REST API feature -->
         <identity.api.dispatcher.version>2.0.13</identity.api.dispatcher.version>
         <identity.user.api.version>1.3.29</identity.user.api.version>
-        <identity.server.api.version>1.2.140</identity.server.api.version>
+        <identity.server.api.version>1.2.141</identity.server.api.version>
 
         <identity.agent.sso.version>5.5.9</identity.agent.sso.version>
         <identity.tool.samlsso.validator.version>5.5.7</identity.tool.samlsso.validator.version>

From f42057898d0217c68efcbb91a4d24e3b165470c9 Mon Sep 17 00:00:00 2001
From: sahandilshan <sahandilshan222@gmail.com>
Date: Wed, 13 Dec 2023 21:21:35 +0530
Subject: [PATCH 3/3] Bump framework version

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

diff --git a/pom.xml b/pom.xml
index be74854d945..5a7bd6d9ab5 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2253,7 +2253,7 @@
     <properties>
 
         <!--Carbon Identity Framework Version-->
-        <carbon.identity.framework.version>5.25.609</carbon.identity.framework.version>
+        <carbon.identity.framework.version>5.25.614</carbon.identity.framework.version>
         <carbon.identity.framework.version.range>[5.14.67, 6.0.0]</carbon.identity.framework.version.range>
 
         <!--SAML Common Utils Version-->