Big Spring Boot v4 Upgrade

includes Kotlin v2.3, Java 25, Jackson v3

Author: schnapster

.github/workflows/build.yaml

@@ -49,7 +49,7 @@ jobs:
         uses: actions/setup-java@8df1039502a15bceb9433410b1a100fbe190c53b # v4.5.0
         with:
           distribution: "temurin"
-          java-version: 21
+          java-version: 25
 
       - name: Print JDK info
         run: java -Xmx32m --version

build.gradle

@@ -198,10 +198,6 @@ allprojects {
             canBeResolved = false
             canBeConsumed = false
         }
-
-        //we want to go with undertow which supports both webflux and servlets (togglz console is a servlet)
-        implementation.exclude module: "spring-boot-starter-reactor-netty"
-        implementation.exclude module: "spring-boot-starter-tomcat"
     }
 
     configurations.configureEach {
@@ -273,10 +269,6 @@ configurations {
     // fucks with spring boot jar, we dont need it anyways
     // be VERY careful and test the produced jar if ever reenabled
     compile.exclude module: 'opus-java'
-
-    // undertow master race
-    implementation.exclude module: 'spring-boot-starter-reactor-netty'
-    implementation.exclude module: 'spring-boot-starter-tomcat'
 }
 
 ext {
@@ -293,7 +285,7 @@ dependencies {
 
     implementation "ch.qos.logback:logback-classic"
     implementation "io.sentry:sentry-logback"
-    implementation "io.sentry:sentry-spring-boot-starter-jakarta"
+    implementation "io.sentry:sentry-spring-boot-4"
     implementation "io.sentry:sentry-kotlin-extensions"
 
     implementation "org.yaml:snakeyaml"
@@ -303,8 +295,8 @@ dependencies {
     implementation "org.openjdk.nashorn:nashorn-core:$nashornVersion"
 
     implementation "io.lettuce:lettuce-core"
-    implementation(group: "io.netty", name: "netty-transport-native-epoll", classifier: "linux-x86_64")
-    implementation(group: "io.netty", name: "netty-transport-native-kqueue", classifier: "osx-x86_64")
+    implementation "io.netty:netty-transport-native-epoll:linux-x86_64"
+    implementation "io.netty:netty-transport-native-kqueue:osx-x86_64"
 
     implementation "io.prometheus:prometheus-metrics-instrumentation-caffeine"
     implementation "io.prometheus:prometheus-metrics-instrumentation-jvm"
@@ -327,16 +319,21 @@ dependencies {
     implementation "org.togglz:togglz-console:$togglzVersion"
     implementation "org.togglz:togglz-spring-security:$togglzVersion"
 
-    implementation "org.springframework.boot:spring-boot-starter-web"
-    implementation "org.springframework.boot:spring-boot-starter-undertow"
+    implementation "org.springframework.boot:spring-boot-starter-webmvc"
+    implementation "org.springframework.boot:spring-boot-starter-tomcat"
     implementation "org.springframework.boot:spring-boot-starter-jdbc"
+    implementation "org.springframework.boot:spring-boot-starter-jooq"
+    implementation "org.springframework.boot:spring-boot-starter-flyway"
     implementation "org.springframework.boot:spring-boot-starter-security"
     implementation "org.springframework.boot:spring-boot-starter-data-jpa"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
     implementation "org.springframework.boot:spring-boot-starter-actuator"
+    implementation "org.springframework.boot:spring-boot-starter-restclient"
+    implementation "org.springframework.boot:spring-boot-starter-data-redis"
+    implementation "org.springframework.boot:spring-boot-starter-session-data-redis"
     implementation "org.springframework.session:spring-session-data-redis"
     implementation "org.jetbrains.kotlin:kotlin-reflect"
-    implementation "com.fasterxml.jackson.module:jackson-module-kotlin"
+    implementation "tools.jackson.module:jackson-module-kotlin"
     annotationProcessor "org.springframework.boot:spring-boot-configuration-processor"
     compileOnly("org.springframework.boot:spring-boot-devtools")
 
@@ -350,8 +347,9 @@ dependencies {
         exclude module: 'android-json' // json.org clone
     }
     testImplementation "org.springframework.security:spring-security-test"
+    testImplementation "org.springframework.boot:spring-boot-resttestclient"
     testImplementation "org.testcontainers:testcontainers"
-    testImplementation "org.testcontainers:selenium"
+    testImplementation "org.testcontainers:testcontainers-selenium"
     testImplementation "com.codeborne:selenide:$selenideVersion"
     testImplementation "org.awaitility:awaitility"
 

buildscript-gradle.lockfile

@@ -3,11 +3,10 @@
 # This file is expected to be part of source control.
 com.adarshr:gradle-test-logger-plugin:4.0.0=classpath
 com.bmuschko:gradle-docker-plugin:9.4.0=classpath
-com.fasterxml.jackson.core:jackson-annotations:2.19.4=classpath
-com.fasterxml.jackson.core:jackson-core:2.19.4=classpath
-com.fasterxml.jackson.core:jackson-databind:2.19.4=classpath
-com.fasterxml.jackson.module:jackson-module-parameter-names:2.19.4=classpath
-com.fasterxml.jackson:jackson-bom:2.19.4=classpath
+com.fasterxml.jackson.core:jackson-annotations:2.20=classpath
+com.fasterxml.jackson.core:jackson-core:2.19.1=classpath
+com.fasterxml.jackson.core:jackson-databind:2.19.1=classpath
+com.fasterxml.jackson:jackson-bom:2.19.1=classpath
 com.github.ben-manes:gradle-versions-plugin:0.53.0=classpath
 com.google.code.findbugs:jsr305:3.0.2=classpath
 com.google.code.gson:gson:2.13.2=classpath
@@ -22,6 +21,7 @@ com.squareup.okio:okio-jvm:3.6.0=classpath
 com.squareup.okio:okio:3.6.0=classpath
 commons-codec:commons-codec:1.19.0=classpath
 commons-io:commons-io:2.20.0=classpath
+commons-logging:commons-logging:1.3.5=classpath
 gradle.plugin.org.flywaydb:gradle-plugin-publishing:11.20.3=classpath
 gradle.plugin.org.jetbrains.gradle.plugin.idea-ext:gradle-idea-ext:1.4=classpath
 io.github.hakky54:ayza:10.0.2=classpath
@@ -48,39 +48,39 @@ org.flywaydb:flyway-core:11.20.3=classpath
 org.flywaydb:flyway-database-postgresql:11.20.3=classpath
 org.fusesource.jansi:jansi:2.4.0=classpath
 org.jetbrains.gradle.plugin.idea-ext:org.jetbrains.gradle.plugin.idea-ext.gradle.plugin:1.4=classpath
-org.jetbrains.kotlin:abi-tools-api:2.2.10=classpath
-org.jetbrains.kotlin:fus-statistics-gradle-plugin:2.2.10=classpath
-org.jetbrains.kotlin:kotlin-allopen:2.2.10=classpath
+org.jetbrains.kotlin:abi-tools-api:2.3.0=classpath
+org.jetbrains.kotlin:fus-statistics-gradle-plugin:2.3.0=classpath
+org.jetbrains.kotlin:kotlin-allopen:2.3.0=classpath
 org.jetbrains.kotlin:kotlin-bom:2.0.21=classpath
-org.jetbrains.kotlin:kotlin-build-statistics:2.2.10=classpath
-org.jetbrains.kotlin:kotlin-build-tools-api:2.2.10=classpath
-org.jetbrains.kotlin:kotlin-compiler-runner:2.2.10=classpath
-org.jetbrains.kotlin:kotlin-daemon-client:2.2.10=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:2.2.10=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-api:2.2.10=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:2.2.10=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-idea:2.2.10=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin-model:2.2.10=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.10=classpath
-org.jetbrains.kotlin:kotlin-gradle-plugins-bom:2.2.10=classpath
-org.jetbrains.kotlin:kotlin-klib-commonizer-api:2.2.10=classpath
-org.jetbrains.kotlin:kotlin-native-utils:2.2.10=classpath
+org.jetbrains.kotlin:kotlin-build-statistics:2.3.0=classpath
+org.jetbrains.kotlin:kotlin-build-tools-api:2.3.0=classpath
+org.jetbrains.kotlin:kotlin-compiler-runner:2.3.0=classpath
+org.jetbrains.kotlin:kotlin-daemon-client:2.3.0=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:2.3.0=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-api:2.3.0=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:2.3.0=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin-idea:2.3.0=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.0=classpath
+org.jetbrains.kotlin:kotlin-gradle-plugins-bom:2.3.0=classpath
+org.jetbrains.kotlin:kotlin-klib-commonizer-api:2.3.0=classpath
+org.jetbrains.kotlin:kotlin-native-utils:2.3.0=classpath
 org.jetbrains.kotlin:kotlin-reflect:2.0.21=classpath
 org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21=classpath
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21=classpath
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21=classpath
 org.jetbrains.kotlin:kotlin-stdlib:2.0.21=classpath
-org.jetbrains.kotlin:kotlin-tooling-core:2.2.10=classpath
-org.jetbrains.kotlin:kotlin-util-io:2.2.10=classpath
-org.jetbrains.kotlin:kotlin-util-klib-metadata:2.2.10=classpath
-org.jetbrains.kotlin:kotlin-util-klib:2.2.10=classpath
+org.jetbrains.kotlin:kotlin-tooling-core:2.3.0=classpath
+org.jetbrains.kotlin:kotlin-util-io:2.3.0=classpath
+org.jetbrains.kotlin:kotlin-util-klib-metadata:2.3.0=classpath
+org.jetbrains.kotlin:kotlin-util-klib:2.3.0=classpath
 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=classpath
 org.jetbrains:annotations:13.0=classpath
 org.jooq:jooq-codegen-gradle:3.20.11=classpath
 org.jooq:jooq-codegen:3.20.11=classpath
 org.jooq:jooq-meta:3.20.11=classpath
 org.jooq:jooq:3.20.11=classpath
 org.json:json:20240303=classpath
+org.jspecify:jspecify:1.0.0=classpath
 org.reactivestreams:reactive-streams:1.0.3=classpath
 org.siouan.frontend-jdk21:org.siouan.frontend-jdk21.gradle.plugin:10.0.0=classpath
 org.siouan:frontend-jdk21:10.0.0=classpath
@@ -89,10 +89,12 @@ org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:7.2.2.6593=classpath
 org.sonarsource.scanner.lib:sonar-scanner-download-cache:4.0.1.1587=classpath
 org.sonarsource.scanner.lib:sonar-scanner-java-library-batch-interface:4.0.1.1587=classpath
 org.sonarsource.scanner.lib:sonar-scanner-java-library:4.0.1.1587=classpath
-org.springframework.boot:spring-boot-buildpack-platform:3.5.10=classpath
-org.springframework.boot:spring-boot-gradle-plugin:3.5.10=classpath
-org.springframework.boot:spring-boot-loader-tools:3.5.10=classpath
-org.springframework:spring-core:6.2.15=classpath
-org.springframework:spring-jcl:6.2.15=classpath
+org.springframework.boot:spring-boot-buildpack-platform:4.0.2=classpath
+org.springframework.boot:spring-boot-gradle-plugin:4.0.2=classpath
+org.springframework.boot:spring-boot-loader-tools:4.0.2=classpath
+org.springframework:spring-core:7.0.3=classpath
 org.tomlj:tomlj:1.0.0=classpath
+tools.jackson.core:jackson-core:3.0.4=classpath
+tools.jackson.core:jackson-databind:3.0.4=classpath
+tools.jackson:jackson-bom:3.0.4=classpath
 empty=

docker/Dockerfile

@@ -1,4 +1,4 @@
-FROM eclipse-temurin:21-jdk
+FROM eclipse-temurin:25-jdk
 LABEL org.opencontainers.image.authors="napster@npstr.space"
 
 RUN groupadd -g 420 wolfia && \