From c66557fafd4f90149016fc4c020d1398f0ec7349 Mon Sep 17 00:00:00 2001
From: SujanSanjula96 <sanjulasujan@gmail.com>
Date: Sat, 10 Feb 2024 14:24:32 +0530
Subject: [PATCH 1/3] Fix returning identityProviderMappedUserRoles in
 federated user logins in SAML apps

---
 .../saml/builders/assertion/DefaultSAMLAssertionBuilder.java    | 2 ++
 pom.xml                                                         | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/components/org.wso2.carbon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/builders/assertion/DefaultSAMLAssertionBuilder.java b/components/org.wso2.carbon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/builders/assertion/DefaultSAMLAssertionBuilder.java
index b4849c7d4..caa2dcae7 100644
--- a/components/org.wso2.carbon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/builders/assertion/DefaultSAMLAssertionBuilder.java
+++ b/components/org.wso2.carbon.identity.sso.saml/src/main/java/org/wso2/carbon/identity/sso/saml/builders/assertion/DefaultSAMLAssertionBuilder.java
@@ -55,6 +55,7 @@
 import org.opensaml.core.xml.schema.XSString;
 import org.opensaml.core.xml.schema.impl.XSStringBuilder;
 import org.wso2.carbon.identity.application.authentication.framework.model.AuthenticationContextProperty;
+import org.wso2.carbon.identity.application.authentication.framework.util.FrameworkConstants;
 import org.wso2.carbon.identity.application.common.util.IdentityApplicationConstants;
 import org.wso2.carbon.identity.base.IdentityConstants;
 import org.wso2.carbon.identity.base.IdentityException;
@@ -342,6 +343,7 @@ protected AttributeStatement buildAttributeStatement(Map<String, String> claims)
             userAttributeSeparator = claimSeparator;
         }
         claims.remove(IdentityCoreConstants.MULTI_ATTRIBUTE_SEPARATOR);
+        claims.remove(FrameworkConstants.IDP_MAPPED_USER_ROLES);
 
         AttributeStatement attStmt = new AttributeStatementBuilder().buildObject();
         Iterator<Map.Entry<String, String>> iterator = claims.entrySet().iterator();
diff --git a/pom.xml b/pom.xml
index 7009a0b0e..cb05269d2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -457,7 +457,7 @@
     <properties>
         <carbon.kernel.version>4.9.23</carbon.kernel.version>
         <carbon.kernel.feature.version>4.9.0</carbon.kernel.feature.version>
-        <carbon.identity.framework.version>5.25.507</carbon.identity.framework.version>
+        <carbon.identity.framework.version>7.0.40</carbon.identity.framework.version>
         <carbon.identity.framework.imp.pkg.version.range>[5.25.260, 8.0.0)
         </carbon.identity.framework.imp.pkg.version.range>
         <carbon.identity.organization.management.core.version>1.0.0</carbon.identity.organization.management.core.version>

From 22d362d3b4c8acc8903bb26cbba030ccbc35387f Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Sat, 10 Feb 2024 13:16:04 +0000
Subject: [PATCH 2/3] [WSO2 Release] [Jenkins #424] [Release 5.11.35] prepare
 release v5.11.35

---
 components/org.wso2.carbon.identity.query.saml/pom.xml        | 2 +-
 components/org.wso2.carbon.identity.sso.saml.common/pom.xml   | 2 +-
 components/org.wso2.carbon.identity.sso.saml.stub/pom.xml     | 2 +-
 components/org.wso2.carbon.identity.sso.saml.ui/pom.xml       | 2 +-
 components/org.wso2.carbon.identity.sso.saml/pom.xml          | 2 +-
 .../pom.xml                                                   | 2 +-
 features/org.wso2.carbon.identity.sso.saml.feature/pom.xml    | 2 +-
 .../org.wso2.carbon.identity.sso.saml.server.feature/pom.xml  | 2 +-
 features/org.wso2.carbon.identity.sso.saml.ui.feature/pom.xml | 2 +-
 pom.xml                                                       | 4 ++--
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/components/org.wso2.carbon.identity.query.saml/pom.xml b/components/org.wso2.carbon.identity.query.saml/pom.xml
index 16694ea53..1e9b82142 100644
--- a/components/org.wso2.carbon.identity.query.saml/pom.xml
+++ b/components/org.wso2.carbon.identity.query.saml/pom.xml
@@ -21,7 +21,7 @@
 		<groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId>
 		<artifactId>identity-inbound-auth-saml</artifactId>
 		<relativePath>../../pom.xml</relativePath>
-		<version>5.11.35-SNAPSHOT</version>
+		<version>5.11.35</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>org.wso2.carbon.identity.query.saml</artifactId>
diff --git a/components/org.wso2.carbon.identity.sso.saml.common/pom.xml b/components/org.wso2.carbon.identity.sso.saml.common/pom.xml
index 17ef6f1fa..9c7990143 100644
--- a/components/org.wso2.carbon.identity.sso.saml.common/pom.xml
+++ b/components/org.wso2.carbon.identity.sso.saml.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId>
         <artifactId>identity-inbound-auth-saml</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>5.11.35-SNAPSHOT</version>
+        <version>5.11.35</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.sso.saml.stub/pom.xml b/components/org.wso2.carbon.identity.sso.saml.stub/pom.xml
index 7bfa7b5da..b8dfe8ed8 100644
--- a/components/org.wso2.carbon.identity.sso.saml.stub/pom.xml
+++ b/components/org.wso2.carbon.identity.sso.saml.stub/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId>
         <artifactId>identity-inbound-auth-saml</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>5.11.35-SNAPSHOT</version>
+        <version>5.11.35</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.sso.saml.ui/pom.xml b/components/org.wso2.carbon.identity.sso.saml.ui/pom.xml
index a1e73155d..1f292316e 100644
--- a/components/org.wso2.carbon.identity.sso.saml.ui/pom.xml
+++ b/components/org.wso2.carbon.identity.sso.saml.ui/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId>
         <artifactId>identity-inbound-auth-saml</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>5.11.35-SNAPSHOT</version>
+        <version>5.11.35</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.sso.saml/pom.xml b/components/org.wso2.carbon.identity.sso.saml/pom.xml
index 32e345b07..ef0f120b6 100755
--- a/components/org.wso2.carbon.identity.sso.saml/pom.xml
+++ b/components/org.wso2.carbon.identity.sso.saml/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId>
         <artifactId>identity-inbound-auth-saml</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>5.11.35-SNAPSHOT</version>
+        <version>5.11.35</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.query.saml.server.feature/pom.xml b/features/org.wso2.carbon.identity.query.saml.server.feature/pom.xml
index 78daefb85..e61df5ae9 100644
--- a/features/org.wso2.carbon.identity.query.saml.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.query.saml.server.feature/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId>
         <artifactId>identity-inbound-auth-saml</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>5.11.35-SNAPSHOT</version>
+        <version>5.11.35</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.sso.saml.feature/pom.xml b/features/org.wso2.carbon.identity.sso.saml.feature/pom.xml
index c09274a3e..29c18181a 100644
--- a/features/org.wso2.carbon.identity.sso.saml.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.sso.saml.feature/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId>
         <artifactId>identity-inbound-auth-saml</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>5.11.35-SNAPSHOT</version>
+        <version>5.11.35</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.sso.saml.server.feature/pom.xml b/features/org.wso2.carbon.identity.sso.saml.server.feature/pom.xml
index c0def1b1c..befa3d770 100644
--- a/features/org.wso2.carbon.identity.sso.saml.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.sso.saml.server.feature/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId>
         <artifactId>identity-inbound-auth-saml</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>5.11.35-SNAPSHOT</version>
+        <version>5.11.35</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.sso.saml.ui.feature/pom.xml b/features/org.wso2.carbon.identity.sso.saml.ui.feature/pom.xml
index 050a4b1c5..c0da6c571 100644
--- a/features/org.wso2.carbon.identity.sso.saml.ui.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.sso.saml.ui.feature/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId>
         <artifactId>identity-inbound-auth-saml</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>5.11.35-SNAPSHOT</version>
+        <version>5.11.35</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index cb05269d2..d5db87d6e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
     <groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>identity-inbound-auth-saml</artifactId>
-    <version>5.11.35-SNAPSHOT</version>
+    <version>5.11.35</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon SAML SSO</name>
     <description>
@@ -40,7 +40,7 @@
         <developerConnection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-saml.git
         </developerConnection>
         <connection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-saml.git</connection>
-        <tag>HEAD</tag>
+        <tag>v5.11.35</tag>
     </scm>
 
     <dependencyManagement>

From 18c29ceb35003005cf638882adb82bda39c8495e Mon Sep 17 00:00:00 2001
From: WSO2 Builder <jenkins-bot@wso2.com>
Date: Sat, 10 Feb 2024 13:16:06 +0000
Subject: [PATCH 3/3] [WSO2 Release] [Jenkins #424] [Release 5.11.35] prepare
 for next development iteration

---
 components/org.wso2.carbon.identity.query.saml/pom.xml        | 2 +-
 components/org.wso2.carbon.identity.sso.saml.common/pom.xml   | 2 +-
 components/org.wso2.carbon.identity.sso.saml.stub/pom.xml     | 2 +-
 components/org.wso2.carbon.identity.sso.saml.ui/pom.xml       | 2 +-
 components/org.wso2.carbon.identity.sso.saml/pom.xml          | 2 +-
 .../pom.xml                                                   | 2 +-
 features/org.wso2.carbon.identity.sso.saml.feature/pom.xml    | 2 +-
 .../org.wso2.carbon.identity.sso.saml.server.feature/pom.xml  | 2 +-
 features/org.wso2.carbon.identity.sso.saml.ui.feature/pom.xml | 2 +-
 pom.xml                                                       | 4 ++--
 10 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/components/org.wso2.carbon.identity.query.saml/pom.xml b/components/org.wso2.carbon.identity.query.saml/pom.xml
index 1e9b82142..9fc69fdce 100644
--- a/components/org.wso2.carbon.identity.query.saml/pom.xml
+++ b/components/org.wso2.carbon.identity.query.saml/pom.xml
@@ -21,7 +21,7 @@
 		<groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId>
 		<artifactId>identity-inbound-auth-saml</artifactId>
 		<relativePath>../../pom.xml</relativePath>
-		<version>5.11.35</version>
+		<version>5.11.36-SNAPSHOT</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>org.wso2.carbon.identity.query.saml</artifactId>
diff --git a/components/org.wso2.carbon.identity.sso.saml.common/pom.xml b/components/org.wso2.carbon.identity.sso.saml.common/pom.xml
index 9c7990143..b75560459 100644
--- a/components/org.wso2.carbon.identity.sso.saml.common/pom.xml
+++ b/components/org.wso2.carbon.identity.sso.saml.common/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId>
         <artifactId>identity-inbound-auth-saml</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>5.11.35</version>
+        <version>5.11.36-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.sso.saml.stub/pom.xml b/components/org.wso2.carbon.identity.sso.saml.stub/pom.xml
index b8dfe8ed8..41c1054ec 100644
--- a/components/org.wso2.carbon.identity.sso.saml.stub/pom.xml
+++ b/components/org.wso2.carbon.identity.sso.saml.stub/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId>
         <artifactId>identity-inbound-auth-saml</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>5.11.35</version>
+        <version>5.11.36-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.sso.saml.ui/pom.xml b/components/org.wso2.carbon.identity.sso.saml.ui/pom.xml
index 1f292316e..c6ad77b8d 100644
--- a/components/org.wso2.carbon.identity.sso.saml.ui/pom.xml
+++ b/components/org.wso2.carbon.identity.sso.saml.ui/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId>
         <artifactId>identity-inbound-auth-saml</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>5.11.35</version>
+        <version>5.11.36-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/components/org.wso2.carbon.identity.sso.saml/pom.xml b/components/org.wso2.carbon.identity.sso.saml/pom.xml
index ef0f120b6..7ccd1c34d 100755
--- a/components/org.wso2.carbon.identity.sso.saml/pom.xml
+++ b/components/org.wso2.carbon.identity.sso.saml/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId>
         <artifactId>identity-inbound-auth-saml</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>5.11.35</version>
+        <version>5.11.36-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.query.saml.server.feature/pom.xml b/features/org.wso2.carbon.identity.query.saml.server.feature/pom.xml
index e61df5ae9..b221b20f2 100644
--- a/features/org.wso2.carbon.identity.query.saml.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.query.saml.server.feature/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId>
         <artifactId>identity-inbound-auth-saml</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>5.11.35</version>
+        <version>5.11.36-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.sso.saml.feature/pom.xml b/features/org.wso2.carbon.identity.sso.saml.feature/pom.xml
index 29c18181a..46808533f 100644
--- a/features/org.wso2.carbon.identity.sso.saml.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.sso.saml.feature/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId>
         <artifactId>identity-inbound-auth-saml</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>5.11.35</version>
+        <version>5.11.36-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.sso.saml.server.feature/pom.xml b/features/org.wso2.carbon.identity.sso.saml.server.feature/pom.xml
index befa3d770..aa7d1e791 100644
--- a/features/org.wso2.carbon.identity.sso.saml.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.sso.saml.server.feature/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId>
         <artifactId>identity-inbound-auth-saml</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>5.11.35</version>
+        <version>5.11.36-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/features/org.wso2.carbon.identity.sso.saml.ui.feature/pom.xml b/features/org.wso2.carbon.identity.sso.saml.ui.feature/pom.xml
index c0da6c571..e61d4db9f 100644
--- a/features/org.wso2.carbon.identity.sso.saml.ui.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.sso.saml.ui.feature/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId>
         <artifactId>identity-inbound-auth-saml</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>5.11.35</version>
+        <version>5.11.36-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index d5db87d6e..2bf389185 100644
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
     <groupId>org.wso2.carbon.identity.inbound.auth.saml2</groupId>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>identity-inbound-auth-saml</artifactId>
-    <version>5.11.35</version>
+    <version>5.11.36-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon SAML SSO</name>
     <description>
@@ -40,7 +40,7 @@
         <developerConnection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-saml.git
         </developerConnection>
         <connection>scm:git:https://github.com/wso2-extensions/identity-inbound-auth-saml.git</connection>
-        <tag>v5.11.35</tag>
+        <tag>HEAD</tag>
     </scm>
 
     <dependencyManagement>