From 847433562eba02e251bd362ac563d5bcec059739 Mon Sep 17 00:00:00 2001
From: Eleftheria Stein <eleftheria.kousathana@gmail.com>
Date: Thu, 25 Jun 2020 21:47:59 +0200
Subject: [PATCH] Upgrade samples to Spring Boot 2.3.1.RELEASE

Closes gh-1650
---
 build.gradle                                                    | 2 +-
 .../src/main/java/sample/SessionController.java                 | 2 +-
 .../src/main/resources/templates/{index.html => home.html}      | 0
 .../src/main/java/sample/SessionController.java                 | 2 +-
 .../src/main/resources/templates/{index.html => home.html}      | 0
 .../spring-session-sample-boot-websocket.gradle                 | 1 +
 6 files changed, 4 insertions(+), 3 deletions(-)
 rename spring-session-samples/spring-session-sample-boot-webflux-custom-cookie/src/main/resources/templates/{index.html => home.html} (100%)
 rename spring-session-samples/spring-session-sample-boot-webflux/src/main/resources/templates/{index.html => home.html} (100%)

diff --git a/build.gradle b/build.gradle
index 325b2ef9..63c0c7fb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
 		snapshotBuild = version.endsWith('SNAPSHOT')
 		milestoneBuild = !(releaseBuild || snapshotBuild)
 
-		springBootVersion = '2.2.7.RELEASE'
+		springBootVersion = '2.3.1.RELEASE'
 	}
 
 	repositories {
diff --git a/spring-session-samples/spring-session-sample-boot-webflux-custom-cookie/src/main/java/sample/SessionController.java b/spring-session-samples/spring-session-sample-boot-webflux-custom-cookie/src/main/java/sample/SessionController.java
index c9ac4c35..02da1702 100644
--- a/spring-session-samples/spring-session-sample-boot-webflux-custom-cookie/src/main/java/sample/SessionController.java
+++ b/spring-session-samples/spring-session-sample-boot-webflux-custom-cookie/src/main/java/sample/SessionController.java
@@ -36,7 +36,7 @@ public class SessionController {
 	@GetMapping("/")
 	public String index(Model model, WebSession webSession) {
 		model.addAttribute("webSession", webSession);
-		return "index";
+		return "home";
 	}
 
 }
diff --git a/spring-session-samples/spring-session-sample-boot-webflux-custom-cookie/src/main/resources/templates/index.html b/spring-session-samples/spring-session-sample-boot-webflux-custom-cookie/src/main/resources/templates/home.html
similarity index 100%
rename from spring-session-samples/spring-session-sample-boot-webflux-custom-cookie/src/main/resources/templates/index.html
rename to spring-session-samples/spring-session-sample-boot-webflux-custom-cookie/src/main/resources/templates/home.html
diff --git a/spring-session-samples/spring-session-sample-boot-webflux/src/main/java/sample/SessionController.java b/spring-session-samples/spring-session-sample-boot-webflux/src/main/java/sample/SessionController.java
index d68f1ab0..e36d7b95 100644
--- a/spring-session-samples/spring-session-sample-boot-webflux/src/main/java/sample/SessionController.java
+++ b/spring-session-samples/spring-session-sample-boot-webflux/src/main/java/sample/SessionController.java
@@ -36,7 +36,7 @@ public class SessionController {
 	@GetMapping("/")
 	public String index(Model model, WebSession webSession) {
 		model.addAttribute("webSession", webSession);
-		return "index";
+		return "home";
 	}
 
 	private static final long serialVersionUID = 2878267318695777395L;
diff --git a/spring-session-samples/spring-session-sample-boot-webflux/src/main/resources/templates/index.html b/spring-session-samples/spring-session-sample-boot-webflux/src/main/resources/templates/home.html
similarity index 100%
rename from spring-session-samples/spring-session-sample-boot-webflux/src/main/resources/templates/index.html
rename to spring-session-samples/spring-session-sample-boot-webflux/src/main/resources/templates/home.html
diff --git a/spring-session-samples/spring-session-sample-boot-websocket/spring-session-sample-boot-websocket.gradle b/spring-session-samples/spring-session-sample-boot-websocket/spring-session-sample-boot-websocket.gradle
index ab8580f3..c8af6936 100644
--- a/spring-session-samples/spring-session-sample-boot-websocket/spring-session-sample-boot-websocket.gradle
+++ b/spring-session-samples/spring-session-sample-boot-websocket/spring-session-sample-boot-websocket.gradle
@@ -8,6 +8,7 @@ dependencies {
 	compile "org.springframework.boot:spring-boot-starter-data-jpa"
 	compile "org.springframework.boot:spring-boot-starter-data-redis"
 	compile "org.springframework.boot:spring-boot-starter-websocket"
+	compile "org.springframework.boot:spring-boot-starter-validation"
 	compile "org.springframework.boot:spring-boot-devtools"
 	compile "org.springframework:spring-websocket"
 	compile "org.springframework.security:spring-security-messaging"