From 068d1b5dedadfe49f885ea11ec7203b33ddf4925 Mon Sep 17 00:00:00 2001
From: Joffrey Bion <joffrey.bion@gmail.com>
Date: Sun, 30 Apr 2023 02:00:26 +0200
Subject: Upgrade to Spring Boot 3.0

---
 gradle/libs.versions.toml                          | 26 +++++++---------------
 sw-server/build.gradle.kts                         |  3 ++-
 .../config/AnonymousUsersHandshakeHandler.kt       |  2 +-
 3 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 69ed05b9..c489e60a 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -2,36 +2,26 @@
 
 [versions]
 
+javax-annotation-api="1.3.2"
 kotlinx-coroutines = "1.6.4"
 kotlinx-serialization = "1.5.0"
 krossbow = "5.1.0"
-logback-classic = "1.2.11"
-##           ⬆ = "1.3.0" # requires SLF4J 2, which requires Spring Boot 3.0.0 (not there yet)
-##           ⬆ = "1.3.1" # requires SLF4J 2, which requires Spring Boot 3.0.0 (not there yet)
-##           ⬆ = "1.3.2" # requires SLF4J 2, which requires Spring Boot 3.0.0 (not there yet)
-##           ⬆ = "1.3.3" # requires SLF4J 2, which requires Spring Boot 3.0.0 (not there yet)
-##           ⬆ = "1.3.4" # requires SLF4J 2, which requires Spring Boot 3.0.0 (not there yet)
-##           ⬆ = "1.4.0" # requires SLF4J 2, which requires Spring Boot 3.0.0 (not there yet)
-##           ⬆ = "1.4.1" # requires SLF4J 2, which requires Spring Boot 3.0.0 (not there yet)
-##           ⬆ = "1.4.2" # requires SLF4J 2, which requires Spring Boot 3.0.0 (not there yet)
-##           ⬆ = "1.4.3" # requires SLF4J 2, which requires Spring Boot 3.0.0 (not there yet)
-##           ⬆ = "1.4.4" # requires SLF4J 2, which requires Spring Boot 3.0.0 (not there yet)
-loki-logback-appender = "1.3.2"
-micrometer-registry-prometheus = "1.9.5"
-slf4j = "1.7.36"
-## ⬆ = "2.0.0" # Wait for Spring Boot 3.0.0
-## ⬆ = "2.0.1" # Wait for Spring Boot 3.0.0
-## ⬆ = "2.0.2" # Wait for Spring Boot 3.0.0
-## ⬆ = "2.0.3" # Wait for Spring Boot 3.0.0
+logback-classic = "1.4.7"
+loki-logback-appender = "1.4.0"
+micrometer-registry-prometheus = "1.10.6"
+slf4j = "2.0.7"
 
 # See https://github.com/JetBrains/kotlin-wrappers
 kotlin-wrappers = "1.0.0-pre.488"
+##           ⬆ = "1.0.0-pre.545"
 
 kotlin-blueprintjs-core = "4.15.0-8"
 kotlin-blueprintjs-icons = "4.13.0-8"
 
 [libraries]
 
+javax-annotation-api = { module = "javax.annotation:javax.annotation-api", version.ref = "javax-annotation-api" }
+
 kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
 kotlinx-coroutines-reactor = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-reactor", version.ref = "kotlinx-coroutines" }
 kotlinx-serialization-core = { module = "org.jetbrains.kotlinx:kotlinx-serialization-core", version.ref = "kotlinx-serialization" }
diff --git a/sw-server/build.gradle.kts b/sw-server/build.gradle.kts
index 9897a4c8..b71a4526 100644
--- a/sw-server/build.gradle.kts
+++ b/sw-server/build.gradle.kts
@@ -2,7 +2,7 @@ plugins {
     kotlin("jvm")
     kotlin("plugin.spring")
     kotlin("plugin.serialization")
-    id("org.springframework.boot") version "2.7.5"
+    id("org.springframework.boot") version "3.0.6"
 }
 
 apply(plugin = "io.spring.dependency-management")
@@ -21,6 +21,7 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-security")
     // required by spring security when using websockets
     implementation("org.springframework.security:spring-security-messaging")
+    implementation(libs.javax.annotation.api)
 
     // logging
     implementation(libs.logback.classic)
diff --git a/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/config/AnonymousUsersHandshakeHandler.kt b/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/config/AnonymousUsersHandshakeHandler.kt
index 06b46d17..a50c5574 100644
--- a/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/config/AnonymousUsersHandshakeHandler.kt
+++ b/sw-server/src/main/kotlin/org/luxons/sevenwonders/server/config/AnonymousUsersHandshakeHandler.kt
@@ -17,7 +17,7 @@ internal class AnonymousUsersHandshakeHandler : DefaultHandshakeHandler() {
         request: ServerHttpRequest,
         wsHandler: WebSocketHandler,
         attributes: Map<String, Any>,
-    ): Principal? {
+    ): Principal {
         var p = super.determineUser(request, wsHandler, attributes)
         if (p == null) {
             p = UsernamePasswordAuthenticationToken("player" + playerId++, null)
-- 
cgit