From 2fe107e39499844ef8649f85761f33bf0c71ad36 Mon Sep 17 00:00:00 2001
From: Joffrey Bion <joffrey.bion@gmail.com>
Date: Thu, 10 Aug 2023 00:54:45 +0200
Subject: [PATCH] Upgrade to Spring 6 and Tyrus 2

Resolves:
https://github.com/joffrey-bion/krossbow/issues/298
---
 autobahn-tests/build.gradle.kts            | 1 +
 gradle/libs.versions.toml                  | 4 ++--
 krossbow-websocket-spring/build.gradle.kts | 4 ++++
 mkdocs.yml                                 | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/autobahn-tests/build.gradle.kts b/autobahn-tests/build.gradle.kts
index b01f52e6a..422b32c22 100644
--- a/autobahn-tests/build.gradle.kts
+++ b/autobahn-tests/build.gradle.kts
@@ -23,6 +23,7 @@ kotlin {
         attributes.attribute(websocketEngineAttribute, "okhttp")
     }
     jvm("jvmSpring") {
+        jvmToolchain(17)
         attributes.attribute(websocketEngineAttribute, "spring")
     }
     jsWithBigTimeouts("jsBuiltin") {
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f47369dbe..863bdfdce 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -35,8 +35,8 @@ nexus-publish-plugin = "1.3.0"
 okhttp = "4.11.0"
 okio = "3.5.0"
 slf4j = "2.0.7"
-spring = "5.3.23"
-tyrus = "1.17"
+spring = "6.0.11"
+tyrus = "2.1.3"
 uuid = "0.8.0"
 vyarus-github-info-plugin = "1.5.0"
 
diff --git a/krossbow-websocket-spring/build.gradle.kts b/krossbow-websocket-spring/build.gradle.kts
index 3ea5ada34..918610642 100644
--- a/krossbow-websocket-spring/build.gradle.kts
+++ b/krossbow-websocket-spring/build.gradle.kts
@@ -5,6 +5,10 @@ plugins {
 
 description = "A Krossbow adapter for Spring's default WebSocket client and SockJS client"
 
+kotlin {
+    jvmToolchain(17)
+}
+
 dependencies {
     api(projects.krossbowWebsocketCore)
 
diff --git a/mkdocs.yml b/mkdocs.yml
index 655282e19..4a4457d18 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -93,7 +93,7 @@ extra:
     ktor: 2.3.1
     kotlinxSerialization: 1.5.1
     moshi: 1.15.0
-    tyrus: 1.17
+    tyrus: 2.1.3
     jetty: 9.4.51.v20230217
 
 copyright: Copyright &copy; 2019 - 2023 Joffrey Bion