Merge branch '2.5.x' into 2.6.x

pull/30129/head
Madhura Bhave 3 years ago
commit 27bf068091

@ -24,7 +24,7 @@ import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
class MyDatasourceConfiguration { public class MyDatasourceConfiguration {
@Bean @Bean
@ConfigurationProperties("app.datasource.second") @ConfigurationProperties("app.datasource.second")

@ -22,7 +22,7 @@ import org.springframework.security.config.annotation.web.builders.HttpSecurity;
import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.SecurityFilterChain;
@Configuration(proxyBeanMethods = false) @Configuration(proxyBeanMethods = false)
class MySecurityConfiguration { public class MySecurityConfiguration {
@Bean @Bean
public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {

Loading…
Cancel
Save