Upgrade Spring Boot to 2.0.0.RELEASE
Closes gh-1007
This commit is contained in:
@@ -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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -67,8 +67,8 @@ public class RememberMeSecurityConfiguration extends WebSecurityConfigurerAdapte
|
|||||||
@Override
|
@Override
|
||||||
@Bean
|
@Bean
|
||||||
public InMemoryUserDetailsManager userDetailsService() {
|
public InMemoryUserDetailsManager userDetailsService() {
|
||||||
return new InMemoryUserDetailsManager(User.withDefaultPasswordEncoder()
|
return new InMemoryUserDetailsManager(User.withUsername("user")
|
||||||
.username("user").password("password").roles("USER").build());
|
.password("{noop}password").roles("USER").build());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Bean
|
@Bean
|
||||||
|
|||||||
@@ -1,2 +1,2 @@
|
|||||||
springBootVersion=2.0.0.RC1
|
springBootVersion=2.0.0.RELEASE
|
||||||
version=2.0.3.BUILD-SNAPSHOT
|
version=2.0.3.BUILD-SNAPSHOT
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ dependencies {
|
|||||||
compile "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect"
|
compile "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect"
|
||||||
compile "org.webjars:bootstrap"
|
compile "org.webjars:bootstrap"
|
||||||
compile "org.webjars:html5shiv"
|
compile "org.webjars:html5shiv"
|
||||||
compile "org.webjars:webjars-locator"
|
compile "org.webjars:webjars-locator-core"
|
||||||
compile "com.maxmind.geoip2:geoip2"
|
compile "com.maxmind.geoip2:geoip2"
|
||||||
compile "org.apache.httpcomponents:httpclient"
|
compile "org.apache.httpcomponents:httpclient"
|
||||||
|
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ dependencies {
|
|||||||
compile "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect"
|
compile "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect"
|
||||||
compile "org.webjars:bootstrap"
|
compile "org.webjars:bootstrap"
|
||||||
compile "org.webjars:html5shiv"
|
compile "org.webjars:html5shiv"
|
||||||
compile "org.webjars:webjars-locator"
|
compile "org.webjars:webjars-locator-core"
|
||||||
compile "com.h2database:h2"
|
compile "com.h2database:h2"
|
||||||
|
|
||||||
testCompile "org.springframework.boot:spring-boot-starter-test"
|
testCompile "org.springframework.boot:spring-boot-starter-test"
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
|
|||||||
@Override
|
@Override
|
||||||
public void configure(WebSecurity web) {
|
public void configure(WebSecurity web) {
|
||||||
web
|
web
|
||||||
.ignoring().antMatchers("/h2-console/**");
|
.ignoring().requestMatchers(PathRequest.toH2Console());
|
||||||
}
|
}
|
||||||
// @formatter:on
|
// @formatter:on
|
||||||
|
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ dependencies {
|
|||||||
compile "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect"
|
compile "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect"
|
||||||
compile "org.webjars:bootstrap"
|
compile "org.webjars:bootstrap"
|
||||||
compile "org.webjars:html5shiv"
|
compile "org.webjars:html5shiv"
|
||||||
compile "org.webjars:webjars-locator"
|
compile "org.webjars:webjars-locator-core"
|
||||||
compile "org.apache.httpcomponents:httpclient"
|
compile "org.apache.httpcomponents:httpclient"
|
||||||
|
|
||||||
testCompile "org.springframework.boot:spring-boot-starter-test"
|
testCompile "org.springframework.boot:spring-boot-starter-test"
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ dependencies {
|
|||||||
compile "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect"
|
compile "nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect"
|
||||||
compile "org.webjars:bootstrap"
|
compile "org.webjars:bootstrap"
|
||||||
compile "org.webjars:html5shiv"
|
compile "org.webjars:html5shiv"
|
||||||
compile "org.webjars:webjars-locator"
|
compile "org.webjars:webjars-locator-core"
|
||||||
|
|
||||||
testCompile "org.springframework.boot:spring-boot-starter-test"
|
testCompile "org.springframework.boot:spring-boot-starter-test"
|
||||||
|
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ dependencies {
|
|||||||
compile "org.webjars:knockout"
|
compile "org.webjars:knockout"
|
||||||
compile "org.webjars:sockjs-client"
|
compile "org.webjars:sockjs-client"
|
||||||
compile "org.webjars:stomp-websocket"
|
compile "org.webjars:stomp-websocket"
|
||||||
compile "org.webjars:webjars-locator"
|
compile "org.webjars:webjars-locator-core"
|
||||||
compile "com.h2database:h2"
|
compile "com.h2database:h2"
|
||||||
|
|
||||||
testCompile "org.springframework.boot:spring-boot-starter-test"
|
testCompile "org.springframework.boot:spring-boot-starter-test"
|
||||||
|
|||||||
@@ -45,7 +45,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter {
|
|||||||
@Override
|
@Override
|
||||||
public void configure(WebSecurity web) {
|
public void configure(WebSecurity web) {
|
||||||
web
|
web
|
||||||
.ignoring().antMatchers("/h2-console/**");
|
.ignoring().requestMatchers(PathRequest.toH2Console());
|
||||||
}
|
}
|
||||||
// @formatter:on
|
// @formatter:on
|
||||||
|
|
||||||
|
|||||||
@@ -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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with 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 {
|
public class SecurityConfig {
|
||||||
@Autowired
|
@Autowired
|
||||||
public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
|
public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
|
||||||
auth.inMemoryAuthentication().withUser(User.withDefaultPasswordEncoder()
|
auth.inMemoryAuthentication().withUser(User.withUsername("user")
|
||||||
.username("user").password("password").roles("USER").build());
|
.password("{noop}password").roles("USER").build());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -43,7 +43,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter {
|
|||||||
|
|
||||||
@Autowired
|
@Autowired
|
||||||
public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
|
public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
|
||||||
auth.inMemoryAuthentication().withUser(User.withDefaultPasswordEncoder()
|
auth.inMemoryAuthentication().withUser(User.withUsername("user")
|
||||||
.username("user").password("password").roles("USER").build());
|
.password("{noop}password").roles("USER").build());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with 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 {
|
public class SecurityConfig {
|
||||||
@Autowired
|
@Autowired
|
||||||
public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
|
public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
|
||||||
auth.inMemoryAuthentication().withUser(User.withDefaultPasswordEncoder()
|
auth.inMemoryAuthentication().withUser(User.withUsername("user")
|
||||||
.username("user").password("password").roles("USER").build());
|
.password("{noop}password").roles("USER").build());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user