Merge branch 'master' into master

wso2 · Dec 14, 2023 · 6f7fddc · 6f7fddc
2 parents bdfebbd + 6fa5161
commit 6f7fddc
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git 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

diff --git a/pom.xml b/pom.xml
@@ -2374,7 +2374,8 @@
         <!-- Identity REST API feature -->
         <identity.api.dispatcher.version>2.0.13</identity.api.dispatcher.version>
         <identity.user.api.version>1.3.30</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>