From 3800b374c80ebd912b8f96327000c95dea998b45 Mon Sep 17 00:00:00 2001
From: JKatzwinkel <JKatzwinkel@users.noreply.github.com>
Date: Fri, 6 Oct 2023 17:26:32 +0000
Subject: [PATCH] upgrade to spring-boot 3.2.0-M3 (including jetty 12)

in order to prevent tests to fail because of @MockMvc calling an uninitialized `WebSocketUpgradeFilter`,
websocket servlet autoconfiguration needs to be excluded from the app autoconfiguration, but
presumably only until spring-boot 3.2.0-M4 arrives.

cf. https://github.com/spring-projects/spring-boot/issues/37660#issuecomment-1744703577
---
 build.gradle                   | 12 ++++--------
 src/main/java/tla/web/App.java |  5 ++++-
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/build.gradle b/build.gradle
index f7914c0b..3554a731 100644
--- a/build.gradle
+++ b/build.gradle
@@ -80,16 +80,13 @@ dependencies {
     implementation 'org.modelmapper:modelmapper:3.1.1'
     implementation 'org.jooq:jool:0.9.15'
 
-    // https://github.com/spring-projects/spring-framework/issues/29435
-    implementation('jakarta.servlet:jakarta.servlet-api:5.0.0')
-    implementation('org.springframework.boot:spring-boot-starter-jetty:3.2.0-M2') {
-        exclude group: 'jakarta.servlet', module: 'jakarta.servlet-api' // until jetty 12
+    implementation('org.springframework.boot:spring-boot-starter-jetty:3.2.0-M3') {
         exclude module: 'jetty-xml'
     }
-    implementation('org.springframework.boot:spring-boot-starter-web:3.2.0-M2') {
+    implementation('org.springframework.boot:spring-boot-starter-web:3.2.0-M3') {
         exclude module: 'spring-boot-starter-tomcat'
     }
-    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf:3.2.0-M2'
+    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf:3.2.0-M3'
     implementation 'nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect:3.3.0'
     implementation 'org.apache.commons:commons-lang3:3.13.0'
 
@@ -99,8 +96,7 @@ dependencies {
         exclude group: 'bouncycastle'
     }
 
-    testImplementation('jakarta.servlet:jakarta.servlet-api:6.0.0')
-    testImplementation 'org.springframework.boot:spring-boot-starter-test:3.2.0-M2'
+    testImplementation 'org.springframework.boot:spring-boot-starter-test:3.2.0-M3'
     testImplementation 'org.junit.jupiter:junit-jupiter-params:5.10.0'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.10.0'
 }
diff --git a/src/main/java/tla/web/App.java b/src/main/java/tla/web/App.java
index 43c45517..b71bc94b 100644
--- a/src/main/java/tla/web/App.java
+++ b/src/main/java/tla/web/App.java
@@ -2,13 +2,16 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.websocket.servlet.WebSocketServletAutoConfiguration;
 import org.springframework.context.ApplicationContext;
 import org.springframework.core.SpringProperties;
 
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-@SpringBootApplication
+// exclusion only necessary until spring boot 3.2.0-M4
+// (cf. https://github.com/spring-projects/spring-boot/issues/37660) ⬇:
+@SpringBootApplication(exclude = WebSocketServletAutoConfiguration.class)
 public class App {
 
     public static void main(String[] args) {