Resolve merge conflicts

wso2-extensions · Sep 19, 2023 · 22148d3 · 22148d3
2 parents 34973f8 + 4cdcebe
commit 22148d3
Show file tree

Hide file tree

Showing 14 changed files with 16 additions and 17 deletions.
diff --git a/components/org.wso2.carbon.identity.auth.service/pom.xml b/components/org.wso2.carbon.identity.auth.service/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.auth.rest</groupId>
         <artifactId>identity-carbon-auth-rest</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>1.8.21-SNAPSHOT</version>
+        <version>1.8.22-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/...ce/src/main/java/org/wso2/carbon/identity/auth/service/handler/AuthenticationHandler.java b/...ce/src/main/java/org/wso2/carbon/identity/auth/service/handler/AuthenticationHandler.java
@@ -31,7 +31,6 @@
 import org.wso2.carbon.identity.auth.service.exception.AuthClientException;
 import org.wso2.carbon.identity.auth.service.exception.AuthServerException;
 import org.wso2.carbon.identity.auth.service.exception.AuthenticationFailException;
-import org.wso2.carbon.identity.auth.service.handler.impl.BasicAuthenticationHandler;
 import org.wso2.carbon.identity.auth.service.internal.AuthenticationServiceHolder;
 import org.wso2.carbon.identity.core.bean.context.MessageContext;
 import org.wso2.carbon.identity.core.handler.AbstractIdentityMessageHandler;
@@ -150,7 +149,7 @@ protected void postAuthenticate(MessageContext messageContext, AuthenticationRes
                                     "for organization specific calls.", ex);
                         }
                     }
-                    LOG.error("User id not found for user: " + user.getLoggableUserId());
+                    LOG.error("User id not found for user: " + user.getLoggableMaskedUserId());
                 }
             }
         }

diff --git a/components/org.wso2.carbon.identity.auth.valve/pom.xml b/components/org.wso2.carbon.identity.auth.valve/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.auth.rest</groupId>
         <artifactId>identity-carbon-auth-rest</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>1.8.21-SNAPSHOT</version>
+        <version>1.8.22-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/components/org.wso2.carbon.identity.authz.service/pom.xml b/components/org.wso2.carbon.identity.authz.service/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.auth.rest</groupId>
         <artifactId>identity-carbon-auth-rest</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>1.8.21-SNAPSHOT</version>
+        <version>1.8.22-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/components/org.wso2.carbon.identity.authz.valve/pom.xml b/components/org.wso2.carbon.identity.authz.valve/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.auth.rest</groupId>
         <artifactId>identity-carbon-auth-rest</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>1.8.21-SNAPSHOT</version>
+        <version>1.8.22-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/components/org.wso2.carbon.identity.context.rewrite.valve/pom.xml b/components/org.wso2.carbon.identity.context.rewrite.valve/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.auth.rest</groupId>
         <artifactId>identity-carbon-auth-rest</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>1.8.21-SNAPSHOT</version>
+        <version>1.8.22-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/components/org.wso2.carbon.identity.cors.service/pom.xml b/components/org.wso2.carbon.identity.cors.service/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.auth.rest</groupId>
         <artifactId>identity-carbon-auth-rest</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>1.8.21-SNAPSHOT</version>
+        <version>1.8.22-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/components/org.wso2.carbon.identity.cors.valve/pom.xml b/components/org.wso2.carbon.identity.cors.valve/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.auth.rest</groupId>
         <artifactId>identity-carbon-auth-rest</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>1.8.21-SNAPSHOT</version>
+        <version>1.8.22-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/components/org.wso2.carbon.identity.custom.header.filter/pom.xml b/components/org.wso2.carbon.identity.custom.header.filter/pom.xml
@@ -19,7 +19,7 @@
         <groupId>org.wso2.carbon.identity.auth.rest</groupId>
         <artifactId>identity-carbon-auth-rest</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>1.8.21-SNAPSHOT</version>
+        <version>1.8.22-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/features/org.wso2.carbon.identity.auth.server.feature/pom.xml b/features/org.wso2.carbon.identity.auth.server.feature/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.auth.rest</groupId>
         <artifactId>identity-carbon-auth-rest</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>1.8.21-SNAPSHOT</version>
+        <version>1.8.22-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/features/org.wso2.carbon.identity.authz.server.feature/pom.xml b/features/org.wso2.carbon.identity.authz.server.feature/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.auth.rest</groupId>
         <artifactId>identity-carbon-auth-rest</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>1.8.21-SNAPSHOT</version>
+        <version>1.8.22-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/features/org.wso2.carbon.identity.context.rewrite.server.feature/pom.xml b/features/org.wso2.carbon.identity.context.rewrite.server.feature/pom.xml
@@ -22,7 +22,7 @@
         <groupId>org.wso2.carbon.identity.auth.rest</groupId>
         <artifactId>identity-carbon-auth-rest</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>1.8.21-SNAPSHOT</version>
+        <version>1.8.22-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/features/org.wso2.carbon.identity.cors.server.feature/pom.xml b/features/org.wso2.carbon.identity.cors.server.feature/pom.xml
@@ -20,7 +20,7 @@
         <groupId>org.wso2.carbon.identity.auth.rest</groupId>
         <artifactId>identity-carbon-auth-rest</artifactId>
         <relativePath>../../pom.xml</relativePath>
-        <version>1.8.21-SNAPSHOT</version>
+        <version>1.8.22-SNAPSHOT</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/pom.xml b/pom.xml
@@ -27,7 +27,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.wso2.carbon.identity.auth.rest</groupId>
     <artifactId>identity-carbon-auth-rest</artifactId>
-    <version>1.8.21-SNAPSHOT</version>
+    <version>1.8.22-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>WSO2 Carbon - Auth/Authz Modules</name>
     <description>
@@ -345,10 +345,10 @@
         <org.wso2.carbon.identity.cors.valve.version>${project.version}</org.wso2.carbon.identity.cors.valve.version>
 
         <!--Carbon identity version-->
-        <identity.framework.version>5.25.317-SNAPSHOT</identity.framework.version>
+        <identity.framework.version>5.25.346-SNAPSHOT</identity.framework.version>
         <carbon.identity.package.import.version.range>[5.17.8, 7.0.0)</carbon.identity.package.import.version.range>
 
-        <org.wso2.carbon.identity.oauth.version>6.11.118-SNAPSHOT</org.wso2.carbon.identity.oauth.version>
+        <org.wso2.carbon.identity.oauth.version>6.11.122-SNAPSHOT</org.wso2.carbon.identity.oauth.version>
         <org.wso2.carbon.identity.oauth.import.version.range>[6.2.18, 7.0.0)
         </org.wso2.carbon.identity.oauth.import.version.range>