Authentication compilation fixes for Spring 6

Evolveum · May 22, 2023 · 70aaefb · 70aaefb
1 parent 55fad71
commit 70aaefb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/...veum/midpoint/authentication/impl/configuration/MidpointWebSecurityConfigurerAdapter.java b/...veum/midpoint/authentication/impl/configuration/MidpointWebSecurityConfigurerAdapter.java
@@ -28,6 +28,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.DependsOn;
+import org.springframework.context.annotation.Primary;
 import org.springframework.core.annotation.Order;
 import org.springframework.security.authentication.AuthenticationTrustResolver;
 import org.springframework.security.authentication.AuthenticationTrustResolverImpl;
@@ -201,6 +202,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
     }
 
     @Bean
+    @Primary
     public HttpSecurity httpSecurity() throws Exception {
         AuthenticationManagerBuilder authenticationBuilder = new AuthenticationManagerBuilder(this.objectObjectPostProcessor);
         authenticationBuilder.parentAuthenticationManager(authenticationManager());

diff --git a/.../evolveum/midpoint/authentication/impl/saml/MidpointSaml2LogoutRequestSuccessHandler.java b/.../evolveum/midpoint/authentication/impl/saml/MidpointSaml2LogoutRequestSuccessHandler.java
@@ -8,7 +8,7 @@
 package com.evolveum.midpoint.authentication.impl.saml;
 
 import java.io.IOException;
-import jakarta.servlet.http.ServletException;
+import jakarta.servlet.ServletException;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import com.evolveum.midpoint.authentication.impl.handler.AuditedLogoutHandler;