From edc8a7efff1d34dfc034152989e59b1c864caafa Mon Sep 17 00:00:00 2001 From: Vedran Pavic Date: Thu, 8 Mar 2018 12:23:56 +0100 Subject: [PATCH] Upgrade Spring Boot to 2.0.0.RELEASE Closes gh-1007 --- .../java/docs/security/RememberMeSecurityConfiguration.java | 6 +++--- gradle.properties | 2 +- .../spring-session-sample-boot-findbyusername.gradle | 2 +- samples/boot/jdbc/spring-session-sample-boot-jdbc.gradle | 2 +- .../jdbc/src/main/java/sample/config/SecurityConfig.java | 2 +- .../redis-json/spring-session-sample-boot-redis-json.gradle | 2 +- samples/boot/redis/spring-session-sample-boot-redis.gradle | 2 +- .../websocket/spring-session-sample-boot-websocket.gradle | 2 +- .../src/main/java/sample/config/WebSecurityConfig.java | 2 +- .../hazelcast/src/main/java/sample/SecurityConfig.java | 6 +++--- .../rest/src/main/java/sample/SecurityConfig.java | 6 +++--- .../security/src/main/java/sample/SecurityConfig.java | 6 +++--- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/src/test/java/docs/security/RememberMeSecurityConfiguration.java b/docs/src/test/java/docs/security/RememberMeSecurityConfiguration.java index 98032547..3fd33327 100644 --- a/docs/src/test/java/docs/security/RememberMeSecurityConfiguration.java +++ b/docs/src/test/java/docs/security/RememberMeSecurityConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2017 the original author or authors. + * Copyright 2014-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -67,8 +67,8 @@ public class RememberMeSecurityConfiguration extends WebSecurityConfigurerAdapte @Override @Bean public InMemoryUserDetailsManager userDetailsService() { - return new InMemoryUserDetailsManager(User.withDefaultPasswordEncoder() - .username("user").password("password").roles("USER").build()); + return new InMemoryUserDetailsManager(User.withUsername("user") + .password("{noop}password").roles("USER").build()); } @Bean diff --git a/gradle.properties b/gradle.properties index f5f5b607..feafd55f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ -springBootVersion=2.0.0.RC1 +springBootVersion=2.0.0.RELEASE version=2.0.3.BUILD-SNAPSHOT diff --git a/samples/boot/findbyusername/spring-session-sample-boot-findbyusername.gradle b/samples/boot/findbyusername/spring-session-sample-boot-findbyusername.gradle index 8bbcbddf..d95d5085 100644 --- a/samples/boot/findbyusername/spring-session-sample-boot-findbyusername.gradle +++ b/samples/boot/findbyusername/spring-session-sample-boot-findbyusername.gradle @@ -10,7 +10,7 @@ dependencies { compile "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect" compile "org.webjars:bootstrap" compile "org.webjars:html5shiv" - compile "org.webjars:webjars-locator" + compile "org.webjars:webjars-locator-core" compile "com.maxmind.geoip2:geoip2" compile "org.apache.httpcomponents:httpclient" diff --git a/samples/boot/jdbc/spring-session-sample-boot-jdbc.gradle b/samples/boot/jdbc/spring-session-sample-boot-jdbc.gradle index e8828118..e07f0313 100644 --- a/samples/boot/jdbc/spring-session-sample-boot-jdbc.gradle +++ b/samples/boot/jdbc/spring-session-sample-boot-jdbc.gradle @@ -9,7 +9,7 @@ dependencies { compile "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect" compile "org.webjars:bootstrap" compile "org.webjars:html5shiv" - compile "org.webjars:webjars-locator" + compile "org.webjars:webjars-locator-core" compile "com.h2database:h2" testCompile "org.springframework.boot:spring-boot-starter-test" diff --git a/samples/boot/jdbc/src/main/java/sample/config/SecurityConfig.java b/samples/boot/jdbc/src/main/java/sample/config/SecurityConfig.java index 49cd79ba..66bd7778 100644 --- a/samples/boot/jdbc/src/main/java/sample/config/SecurityConfig.java +++ b/samples/boot/jdbc/src/main/java/sample/config/SecurityConfig.java @@ -35,7 +35,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { @Override public void configure(WebSecurity web) { web - .ignoring().antMatchers("/h2-console/**"); + .ignoring().requestMatchers(PathRequest.toH2Console()); } // @formatter:on diff --git a/samples/boot/redis-json/spring-session-sample-boot-redis-json.gradle b/samples/boot/redis-json/spring-session-sample-boot-redis-json.gradle index 66e32611..f0515bec 100644 --- a/samples/boot/redis-json/spring-session-sample-boot-redis-json.gradle +++ b/samples/boot/redis-json/spring-session-sample-boot-redis-json.gradle @@ -10,7 +10,7 @@ dependencies { compile "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect" compile "org.webjars:bootstrap" compile "org.webjars:html5shiv" - compile "org.webjars:webjars-locator" + compile "org.webjars:webjars-locator-core" compile "org.apache.httpcomponents:httpclient" testCompile "org.springframework.boot:spring-boot-starter-test" diff --git a/samples/boot/redis/spring-session-sample-boot-redis.gradle b/samples/boot/redis/spring-session-sample-boot-redis.gradle index d5845dcf..76f97632 100644 --- a/samples/boot/redis/spring-session-sample-boot-redis.gradle +++ b/samples/boot/redis/spring-session-sample-boot-redis.gradle @@ -10,7 +10,7 @@ dependencies { compile "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect" compile "org.webjars:bootstrap" compile "org.webjars:html5shiv" - compile "org.webjars:webjars-locator" + compile "org.webjars:webjars-locator-core" testCompile "org.springframework.boot:spring-boot-starter-test" diff --git a/samples/boot/websocket/spring-session-sample-boot-websocket.gradle b/samples/boot/websocket/spring-session-sample-boot-websocket.gradle index 6d590685..9ca93f5c 100644 --- a/samples/boot/websocket/spring-session-sample-boot-websocket.gradle +++ b/samples/boot/websocket/spring-session-sample-boot-websocket.gradle @@ -18,7 +18,7 @@ dependencies { compile "org.webjars:knockout" compile "org.webjars:sockjs-client" compile "org.webjars:stomp-websocket" - compile "org.webjars:webjars-locator" + compile "org.webjars:webjars-locator-core" compile "com.h2database:h2" testCompile "org.springframework.boot:spring-boot-starter-test" diff --git a/samples/boot/websocket/src/main/java/sample/config/WebSecurityConfig.java b/samples/boot/websocket/src/main/java/sample/config/WebSecurityConfig.java index 6704a572..11602ae9 100644 --- a/samples/boot/websocket/src/main/java/sample/config/WebSecurityConfig.java +++ b/samples/boot/websocket/src/main/java/sample/config/WebSecurityConfig.java @@ -45,7 +45,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { @Override public void configure(WebSecurity web) { web - .ignoring().antMatchers("/h2-console/**"); + .ignoring().requestMatchers(PathRequest.toH2Console()); } // @formatter:on diff --git a/samples/javaconfig/hazelcast/src/main/java/sample/SecurityConfig.java b/samples/javaconfig/hazelcast/src/main/java/sample/SecurityConfig.java index 6bec4e1a..09e6d575 100644 --- a/samples/javaconfig/hazelcast/src/main/java/sample/SecurityConfig.java +++ b/samples/javaconfig/hazelcast/src/main/java/sample/SecurityConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2016 the original author or authors. + * Copyright 2014-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,7 +28,7 @@ import org.springframework.security.core.userdetails.User; public class SecurityConfig { @Autowired public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { - auth.inMemoryAuthentication().withUser(User.withDefaultPasswordEncoder() - .username("user").password("password").roles("USER").build()); + auth.inMemoryAuthentication().withUser(User.withUsername("user") + .password("{noop}password").roles("USER").build()); } } diff --git a/samples/javaconfig/rest/src/main/java/sample/SecurityConfig.java b/samples/javaconfig/rest/src/main/java/sample/SecurityConfig.java index 14a388b1..05eee0d0 100644 --- a/samples/javaconfig/rest/src/main/java/sample/SecurityConfig.java +++ b/samples/javaconfig/rest/src/main/java/sample/SecurityConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2016 the original author or authors. + * Copyright 2014-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -43,7 +43,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { @Autowired public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { - auth.inMemoryAuthentication().withUser(User.withDefaultPasswordEncoder() - .username("user").password("password").roles("USER").build()); + auth.inMemoryAuthentication().withUser(User.withUsername("user") + .password("{noop}password").roles("USER").build()); } } diff --git a/samples/javaconfig/security/src/main/java/sample/SecurityConfig.java b/samples/javaconfig/security/src/main/java/sample/SecurityConfig.java index 6bec4e1a..09e6d575 100644 --- a/samples/javaconfig/security/src/main/java/sample/SecurityConfig.java +++ b/samples/javaconfig/security/src/main/java/sample/SecurityConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2014-2016 the original author or authors. + * Copyright 2014-2018 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -28,7 +28,7 @@ import org.springframework.security.core.userdetails.User; public class SecurityConfig { @Autowired public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception { - auth.inMemoryAuthentication().withUser(User.withDefaultPasswordEncoder() - .username("user").password("password").roles("USER").build()); + auth.inMemoryAuthentication().withUser(User.withUsername("user") + .password("{noop}password").roles("USER").build()); } }