From 2c1b79375d1380c305771d83add49b3676ede0ba Mon Sep 17 00:00:00 2001 From: Eleftheria Stein Date: Tue, 29 Mar 2022 15:33:08 +0200 Subject: [PATCH] Upgrade samples to Spring Boot 2.6.5 This also makes the necessary changes for the Thymeleaf Layout Dialect 3.0 update. Closes gh-1980 --- build.gradle | 2 +- .../src/main/resources/application.yml | 4 ++++ .../src/main/resources/application.properties | 1 + .../src/main/resources/templates/index.html | 2 +- .../src/main/resources/templates/layout.html | 2 +- 5 files changed, 8 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index b60b7f6c..acd90697 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ buildscript { snapshotBuild = version.endsWith('SNAPSHOT') milestoneBuild = !(releaseBuild || snapshotBuild) - springBootVersion = '2.5.6' + springBootVersion = '2.6.5' } repositories { diff --git a/spring-session-samples/spring-session-sample-boot-mongodb-reactive/src/main/resources/application.yml b/spring-session-samples/spring-session-sample-boot-mongodb-reactive/src/main/resources/application.yml index 5ff2265b..8d4b88fe 100644 --- a/spring-session-samples/spring-session-sample-boot-mongodb-reactive/src/main/resources/application.yml +++ b/spring-session-samples/spring-session-sample-boot-mongodb-reactive/src/main/resources/application.yml @@ -2,3 +2,7 @@ logging: level: org.springframework.data.mongodb: DEBUG org.springframework.session: DEBUG +spring: + mongodb: + embedded: + version: 3.0.0 diff --git a/spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/resources/application.properties b/spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/resources/application.properties index 51ab5db5..6266b291 100644 --- a/spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/resources/application.properties +++ b/spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/resources/application.properties @@ -1,3 +1,4 @@ spring.thymeleaf.cache=false spring.template.cache=false spring.data.mongodb.port=0 +spring.mongodb.embedded.version=3.0.0 diff --git a/spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/resources/templates/index.html b/spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/resources/templates/index.html index 4d653a1c..b9051413 100644 --- a/spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/resources/templates/index.html +++ b/spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/resources/templates/index.html @@ -1,4 +1,4 @@ - + Secured Content diff --git a/spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/resources/templates/layout.html b/spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/resources/templates/layout.html index 8f6a961c..e0c8f1db 100644 --- a/spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/resources/templates/layout.html +++ b/spring-session-samples/spring-session-sample-boot-mongodb-traditional/src/main/resources/templates/layout.html @@ -3,7 +3,7 @@ xmlns:th="https://www.thymeleaf.org" xmlns:layout="https://github.com/ultraq/thymeleaf-layout-dialect"> - Spring Session Sample + Spring Session Sample