From 374b15d186232d35735a57219668fd34fc246bb0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Teemu=20M=C3=A4kinen?= Date: Thu, 11 Jun 2026 10:12:11 +0300 Subject: [PATCH 1/4] Update jore4-hasura --- jore4-hasura | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jore4-hasura b/jore4-hasura index 953bdac..7ac4312 160000 --- a/jore4-hasura +++ b/jore4-hasura @@ -1 +1 @@ -Subproject commit 953bdacbf8968095b08b66d7536d4a30824dd716 +Subproject commit 7ac4312905c5bd1532538904a95cf29cd581a9a0 From 7294cd87a515f52d90f257b80686c73ef7a1a613 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Teemu=20M=C3=A4kinen?= Date: Thu, 11 Jun 2026 10:12:56 +0300 Subject: [PATCH 2/4] Update Java to 25 and Spring Boot to 4 --- README.md | 2 +- pom.xml | 22 +++++++++++++------ .../api/TimetablesCombineApiTest.kt | 2 +- .../api/TimetablesReplaceApiTest.kt | 2 +- .../api/TimetablesToCombineApiTest.kt | 2 +- .../api/TimetablesToReplaceApiTest.kt | 2 +- 6 files changed, 20 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 733b4c0..782aab0 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ REST API for Jore4 timetables ### Necessary tools - Maven -- JDK17+ +- JDK25+ - Node.js 18.x - Yarn 1.x diff --git a/pom.xml b/pom.xml index 369c12b..7bb2ae3 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 3.5.7 + 4.1.0-RC1 @@ -19,7 +19,7 @@ UTF-8 - 17 + 25 true ${java.version} @@ -280,12 +280,14 @@ ${kotlin.version} - spring + all-open - - - -Xjsr305=strict - + + + + + + @@ -561,6 +563,12 @@ test + + org.springframework.boot + spring-boot-starter-webmvc-test + test + + org.jetbrains.kotlin kotlin-test-junit5 diff --git a/src/test/kotlin/fi/hsl/jore4/timetables/api/TimetablesCombineApiTest.kt b/src/test/kotlin/fi/hsl/jore4/timetables/api/TimetablesCombineApiTest.kt index cee7b8a..59f64ec 100644 --- a/src/test/kotlin/fi/hsl/jore4/timetables/api/TimetablesCombineApiTest.kt +++ b/src/test/kotlin/fi/hsl/jore4/timetables/api/TimetablesCombineApiTest.kt @@ -14,7 +14,7 @@ import io.mockk.verify import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith import org.springframework.beans.factory.annotation.Autowired -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc import org.springframework.boot.test.context.SpringBootTest import org.springframework.http.MediaType import org.springframework.test.context.ActiveProfiles diff --git a/src/test/kotlin/fi/hsl/jore4/timetables/api/TimetablesReplaceApiTest.kt b/src/test/kotlin/fi/hsl/jore4/timetables/api/TimetablesReplaceApiTest.kt index ef8c3af..6f5f17f 100644 --- a/src/test/kotlin/fi/hsl/jore4/timetables/api/TimetablesReplaceApiTest.kt +++ b/src/test/kotlin/fi/hsl/jore4/timetables/api/TimetablesReplaceApiTest.kt @@ -13,7 +13,7 @@ import io.mockk.verify import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith import org.springframework.beans.factory.annotation.Autowired -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc import org.springframework.boot.test.context.SpringBootTest import org.springframework.http.MediaType import org.springframework.test.context.ActiveProfiles diff --git a/src/test/kotlin/fi/hsl/jore4/timetables/api/TimetablesToCombineApiTest.kt b/src/test/kotlin/fi/hsl/jore4/timetables/api/TimetablesToCombineApiTest.kt index 32d0a5b..2187f6d 100644 --- a/src/test/kotlin/fi/hsl/jore4/timetables/api/TimetablesToCombineApiTest.kt +++ b/src/test/kotlin/fi/hsl/jore4/timetables/api/TimetablesToCombineApiTest.kt @@ -10,7 +10,7 @@ import io.mockk.verify import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith import org.springframework.beans.factory.annotation.Autowired -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc import org.springframework.boot.test.context.SpringBootTest import org.springframework.http.MediaType import org.springframework.test.context.ActiveProfiles diff --git a/src/test/kotlin/fi/hsl/jore4/timetables/api/TimetablesToReplaceApiTest.kt b/src/test/kotlin/fi/hsl/jore4/timetables/api/TimetablesToReplaceApiTest.kt index 3923d45..85bf8b7 100644 --- a/src/test/kotlin/fi/hsl/jore4/timetables/api/TimetablesToReplaceApiTest.kt +++ b/src/test/kotlin/fi/hsl/jore4/timetables/api/TimetablesToReplaceApiTest.kt @@ -10,7 +10,7 @@ import io.mockk.verify import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith import org.springframework.beans.factory.annotation.Autowired -import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc +import org.springframework.boot.webmvc.test.autoconfigure.AutoConfigureMockMvc import org.springframework.boot.test.context.SpringBootTest import org.springframework.http.MediaType import org.springframework.test.context.ActiveProfiles From fadbb7fddd8f4b2e7c66e4ce1b02a497540e9384 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Teemu=20M=C3=A4kinen?= Date: Thu, 11 Jun 2026 10:22:52 +0300 Subject: [PATCH 3/4] Update Dockerfile to use Java 25 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 74bd5bf..83245fc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM maven:3-eclipse-temurin-17 AS builder +FROM maven:3-eclipse-temurin-25 AS builder # set up workdir WORKDIR /build From 63773519f3156933658751e081e69af6c63c9bb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Teemu=20M=C3=A4kinen?= Date: Thu, 11 Jun 2026 10:26:57 +0300 Subject: [PATCH 4/4] Update Java version in Github workflows to 25 --- .github/workflows/codeql.yml | 2 +- .github/workflows/run-kotlin-tests.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 674a25d..d4f629c 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -22,4 +22,4 @@ jobs: with: languages: '["actions", "java-kotlin"]' java_build_command: "cp profiles/dev/config.properties profiles/dev/config.runner.properties && mvn clean install -DskipTests" - java_version: "17" + java_version: "25" diff --git a/.github/workflows/run-kotlin-tests.yml b/.github/workflows/run-kotlin-tests.yml index 3110f51..e4c8704 100644 --- a/.github/workflows/run-kotlin-tests.yml +++ b/.github/workflows/run-kotlin-tests.yml @@ -24,10 +24,10 @@ jobs: - name: Start dependencies (blocking until up) run: ./development.sh start:deps - - name: Set up JDK 17 + - name: Set up JDK 25 uses: actions/setup-java@v5 with: - java-version: "17" + java-version: "25" java-package: jdk architecture: x64 distribution: temurin