Upgrade samples to Spring Boot 2.7.0-M3

eleftherias · eleftherias · commit 8d2276341f49 · 2022-03-30T15:23:49.000+02:00
This also makes the necessary changes for the Thymeleaf Layout Dialect 3.0 update. Closes gh-2046
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
 		snapshotBuild = version.endsWith('SNAPSHOT')
 		milestoneBuild = !(releaseBuild || snapshotBuild)
 
-		springBootVersion = '2.5.6'
+		springBootVersion = '2.7.0-M3'
 	}
 
 	repositories {
diff --git a/spring-session-samples/gradle/dependency-management.gradle b/spring-session-samples/gradle/dependency-management.gradle
@@ -9,7 +9,7 @@ dependencyManagement {
 		dependency 'javax.servlet.jsp.jstl:javax.servlet.jsp.jstl-api:1.2.2'
 		dependency 'javax.servlet.jsp:javax.servlet.jsp-api:2.3.3'
 		dependency 'org.apache.taglibs:taglibs-standard-jstlel:1.2.5'
-		dependency 'org.seleniumhq.selenium:htmlunit-driver:2.52.0'
+		dependency 'org.seleniumhq.selenium:htmlunit-driver:3.56.0'
 		dependency 'org.slf4j:jcl-over-slf4j:1.7.33'
 		dependency 'org.slf4j:log4j-over-slf4j:1.7.33'
 		dependency 'org.webjars:bootstrap:2.3.2'
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
@@ -2,3 +2,7 @@ logging:
   level:
     org.springframework.data.mongodb: DEBUG
     org.springframework.session: DEBUG
+spring:
+  mongodb:
+    embedded:
+      version: 3.4.3
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
@@ -1,3 +1,4 @@
 spring.thymeleaf.cache=false
 spring.template.cache=false
 spring.data.mongodb.port=0
+spring.mongodb.embedded.version=3.4.3
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
@@ -1,4 +1,4 @@
-<html xmlns:layout="https://github.com/ultraq/thymeleaf-layout-dialect" layout:decorator="layout">
+<html xmlns:layout="https://github.com/ultraq/thymeleaf-layout-dialect" layout:decorate="layout">
 <head>
 	<title>Secured Content</title>
 </head>
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
@@ -3,7 +3,7 @@
 			xmlns:th="https://www.thymeleaf.org"
 			xmlns:layout="https://github.com/ultraq/thymeleaf-layout-dialect">
 	<head>
-		<title layout:title-pattern="$DECORATOR_TITLE - $CONTENT_TITLE">Spring Session Sample</title>
+		<title layout:title-pattern="$LAYOUT_TITLE - $CONTENT_TITLE">Spring Session Sample</title>
 		<link rel="icon" type="image/x-icon" th:href="@{/resources/img/favicon.ico}" href="../static/img/favicon.ico"/>
 		<link th:href="@{/webjars/bootstrap/css/bootstrap.min.css}" href="/webjars/bootstrap/css/bootstrap.min.css" rel="stylesheet"></link>
 		<style type="text/css">

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ buildscript {`
`4`	`4`	`snapshotBuild = version.endsWith('SNAPSHOT')`
`5`	`5`	`milestoneBuild = !(releaseBuild \|\| snapshotBuild)`
`6`	`6`
`7`		`- springBootVersion = '2.5.6'`
	`7`	`+ springBootVersion = '2.7.0-M3'`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`repositories {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<html xmlns:layout="https://github.com/ultraq/thymeleaf-layout-dialect" layout:decorator="layout">`
	`1`	`+<html xmlns:layout="https://github.com/ultraq/thymeleaf-layout-dialect" layout:decorate="layout">`
`2`	`2`	`<head>`
`3`	`3`	`<title>Secured Content</title>`
`4`	`4`	`</head>`