From ac026e23fe8f911df09e5564ba4596a98704eb29 Mon Sep 17 00:00:00 2001 From: Rafael Dominguez <5624449+raphaelDL@users.noreply.github.com> Date: Tue, 13 Nov 2018 16:52:30 -0600 Subject: [PATCH] Updated Spring Boot version from 2.1.0.M4 to 2.1.0.RELEASE --- .../asciidoc/_hello-includes/secure-the-application-boot.asc | 2 +- docs/guides/src/docs/asciidoc/helloworld-boot.asc | 2 +- gradle.properties | 2 +- .../helloworld/spring-security-samples-boot-helloworld.gradle | 2 +- samples/boot/helloworld/src/main/resources/templates/index.html | 2 +- .../spring-security-samples-boot-oauth2login-webflux.gradle | 2 +- .../oauth2login/spring-security-samples-boot-oauth2login.gradle | 2 +- .../boot/oauth2login/src/main/resources/templates/index.html | 2 +- .../spring-security-samples-boot-oauth2webclient-webflux.gradle | 2 +- .../src/main/resources/templates/index.html | 2 +- .../spring-security-samples-boot-oauth2webclient.gradle | 2 +- .../oauth2webclient/src/main/resources/templates/index.html | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/docs/guides/src/docs/asciidoc/_hello-includes/secure-the-application-boot.asc b/docs/guides/src/docs/asciidoc/_hello-includes/secure-the-application-boot.asc index d6e27d82a3..17ebbab416 100644 --- a/docs/guides/src/docs/asciidoc/_hello-includes/secure-the-application-boot.asc +++ b/docs/guides/src/docs/asciidoc/_hello-includes/secure-the-application-boot.asc @@ -26,7 +26,7 @@ In order to use Spring Security you must add the necessary dependencies. For the org.thymeleaf.extras - thymeleaf-extras-springsecurity4 <1> + thymeleaf-extras-springsecurity5 <1> 2.1.2.RELEASE diff --git a/docs/guides/src/docs/asciidoc/helloworld-boot.asc b/docs/guides/src/docs/asciidoc/helloworld-boot.asc index 33619ddb26..d8f726efd9 100644 --- a/docs/guides/src/docs/asciidoc/helloworld-boot.asc +++ b/docs/guides/src/docs/asciidoc/helloworld-boot.asc @@ -32,7 +32,7 @@ Now that we have authenticated, let's update the application to display the user [source,html] ---- - + Hello Spring Security diff --git a/gradle.properties b/gradle.properties index c031bb3ea0..72b3ef1983 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ gaeVersion=1.9.66 -springBootVersion=2.1.0.M4 +springBootVersion=2.1.0.RELEASE version=5.2.0.BUILD-SNAPSHOT diff --git a/samples/boot/helloworld/spring-security-samples-boot-helloworld.gradle b/samples/boot/helloworld/spring-security-samples-boot-helloworld.gradle index 3c7c1cc043..edb99c261c 100644 --- a/samples/boot/helloworld/spring-security-samples-boot-helloworld.gradle +++ b/samples/boot/helloworld/spring-security-samples-boot-helloworld.gradle @@ -7,7 +7,7 @@ dependencies { compile project(':spring-security-web') compile 'org.springframework.boot:spring-boot-starter-thymeleaf' compile 'org.springframework.boot:spring-boot-starter-web' - compile 'org.thymeleaf.extras:thymeleaf-extras-springsecurity4' + compile 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5' testCompile project(':spring-security-test') testCompile 'org.springframework.boot:spring-boot-starter-test' diff --git a/samples/boot/helloworld/src/main/resources/templates/index.html b/samples/boot/helloworld/src/main/resources/templates/index.html index cf6b234bb9..a395cd0623 100644 --- a/samples/boot/helloworld/src/main/resources/templates/index.html +++ b/samples/boot/helloworld/src/main/resources/templates/index.html @@ -1,5 +1,5 @@ - + Hello Spring Security diff --git a/samples/boot/oauth2login-webflux/spring-security-samples-boot-oauth2login-webflux.gradle b/samples/boot/oauth2login-webflux/spring-security-samples-boot-oauth2login-webflux.gradle index 88e6d285d8..d0540b7580 100644 --- a/samples/boot/oauth2login-webflux/spring-security-samples-boot-oauth2login-webflux.gradle +++ b/samples/boot/oauth2login-webflux/spring-security-samples-boot-oauth2login-webflux.gradle @@ -8,7 +8,7 @@ dependencies { compile project(':spring-security-oauth2-jose') compile 'org.springframework.boot:spring-boot-starter-thymeleaf' compile 'org.springframework.boot:spring-boot-starter-webflux' - compile 'org.thymeleaf.extras:thymeleaf-extras-springsecurity4' + compile 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5' testCompile project(':spring-security-test') testCompile 'net.sourceforge.htmlunit:htmlunit' diff --git a/samples/boot/oauth2login/spring-security-samples-boot-oauth2login.gradle b/samples/boot/oauth2login/spring-security-samples-boot-oauth2login.gradle index 01bce8a118..65a4d050fd 100644 --- a/samples/boot/oauth2login/spring-security-samples-boot-oauth2login.gradle +++ b/samples/boot/oauth2login/spring-security-samples-boot-oauth2login.gradle @@ -8,7 +8,7 @@ dependencies { compile project(':spring-security-oauth2-jose') compile 'org.springframework.boot:spring-boot-starter-thymeleaf' compile 'org.springframework.boot:spring-boot-starter-web' - compile 'org.thymeleaf.extras:thymeleaf-extras-springsecurity4' + compile 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5' testCompile project(':spring-security-test') testCompile 'net.sourceforge.htmlunit:htmlunit' diff --git a/samples/boot/oauth2login/src/main/resources/templates/index.html b/samples/boot/oauth2login/src/main/resources/templates/index.html index c5a54504d8..f34527dc7c 100644 --- a/samples/boot/oauth2login/src/main/resources/templates/index.html +++ b/samples/boot/oauth2login/src/main/resources/templates/index.html @@ -1,5 +1,5 @@ - + Spring Security - OAuth 2.0 Login diff --git a/samples/boot/oauth2webclient-webflux/spring-security-samples-boot-oauth2webclient-webflux.gradle b/samples/boot/oauth2webclient-webflux/spring-security-samples-boot-oauth2webclient-webflux.gradle index fd5ba979d9..afc00ff28d 100644 --- a/samples/boot/oauth2webclient-webflux/spring-security-samples-boot-oauth2webclient-webflux.gradle +++ b/samples/boot/oauth2webclient-webflux/spring-security-samples-boot-oauth2webclient-webflux.gradle @@ -6,7 +6,7 @@ dependencies { compile project(':spring-security-oauth2-jose') compile 'org.springframework.boot:spring-boot-starter-thymeleaf' compile 'org.springframework.boot:spring-boot-starter-webflux' - compile 'org.thymeleaf.extras:thymeleaf-extras-springsecurity4' + compile 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5' compile 'io.projectreactor.netty:reactor-netty' testCompile project(':spring-security-test') diff --git a/samples/boot/oauth2webclient-webflux/src/main/resources/templates/index.html b/samples/boot/oauth2webclient-webflux/src/main/resources/templates/index.html index 73eb0fb928..8617f1775b 100644 --- a/samples/boot/oauth2webclient-webflux/src/main/resources/templates/index.html +++ b/samples/boot/oauth2webclient-webflux/src/main/resources/templates/index.html @@ -1,5 +1,5 @@ - + OAuth2 WebClient Showcase diff --git a/samples/boot/oauth2webclient/spring-security-samples-boot-oauth2webclient.gradle b/samples/boot/oauth2webclient/spring-security-samples-boot-oauth2webclient.gradle index b5ad5e1850..677feab2d8 100644 --- a/samples/boot/oauth2webclient/spring-security-samples-boot-oauth2webclient.gradle +++ b/samples/boot/oauth2webclient/spring-security-samples-boot-oauth2webclient.gradle @@ -9,7 +9,7 @@ dependencies { compile 'org.springframework:spring-webflux' compile 'org.springframework.boot:spring-boot-starter-thymeleaf' compile 'org.springframework.boot:spring-boot-starter-web' - compile 'org.thymeleaf.extras:thymeleaf-extras-springsecurity4' + compile 'org.thymeleaf.extras:thymeleaf-extras-springsecurity5' compile 'io.projectreactor.netty:reactor-netty' testCompile project(':spring-security-test') diff --git a/samples/boot/oauth2webclient/src/main/resources/templates/index.html b/samples/boot/oauth2webclient/src/main/resources/templates/index.html index 49eea0a6bc..a32fa48a2f 100644 --- a/samples/boot/oauth2webclient/src/main/resources/templates/index.html +++ b/samples/boot/oauth2webclient/src/main/resources/templates/index.html @@ -1,5 +1,5 @@ - + OAuth2 WebClient Showcase