From 5578765bf00eeea8bc8c1d3547fab8edbf32bd10 Mon Sep 17 00:00:00 2001 From: Barry Nouwt Date: Fri, 27 Mar 2026 11:07:25 +0100 Subject: [PATCH 1/2] Update to Java 21 --- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 9d603f1d..c484ed14 100644 --- a/pom.xml +++ b/pom.xml @@ -77,8 +77,8 @@ 3.1.11 2.20.2 6.0.3 - 17 - 17 + 21 + 21 1.4.1-SNAPSHOT From 80b9fe4a0adb9ad16f2c789deb100bd3a23a699d Mon Sep 17 00:00:00 2001 From: Barry Nouwt Date: Mon, 30 Mar 2026 17:40:32 +0200 Subject: [PATCH 2/2] Update various files to Java 25 --- .github/workflows/docker-image.yml | 4 ++-- .github/workflows/draft-release.yml | 2 +- .github/workflows/maven.yml | 2 +- admin-ui/Dockerfile | 2 +- knowledge-directory/Dockerfile | 2 +- pom.xml | 4 ++-- smart-connector-rest-dist/Dockerfile | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index b65da824..ec84749f 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -14,10 +14,10 @@ jobs: build: runs-on: ubuntu-latest steps: - - name: Set up JDK 17 + - name: Set up JDK 25 uses: actions/setup-java@v3 with: - java-version: '17' + java-version: '25' distribution: 'temurin' - uses: actions/checkout@v4 - name: Set up QEMU diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml index 4e5bcecc..227241b4 100644 --- a/.github/workflows/draft-release.yml +++ b/.github/workflows/draft-release.yml @@ -16,7 +16,7 @@ jobs: setup: runs-on: ubuntu-latest container: - image: maven:3.9.9-eclipse-temurin-17-focal + image: maven:3.9.14-eclipse-temurin-25 options: --user 1001 steps: diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 170a9c74..15495980 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -21,7 +21,7 @@ env: jobs: build: runs-on: ubuntu-latest - container: maven:3.8.7-eclipse-temurin-17-alpine + container: maven:3.9.14-eclipse-temurin-25 steps: - uses: actions/checkout@v4 diff --git a/admin-ui/Dockerfile b/admin-ui/Dockerfile index 4caf4843..2fea2258 100644 --- a/admin-ui/Dockerfile +++ b/admin-ui/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:21-alpine +FROM eclipse-temurin:25-alpine LABEL org.opencontainers.image.source https://github.com/tno/knowledge-engine LABEL org.opencontainers.image.description="Knowledge Engine: Admin UI" LABEL org.opencontainers.image.licenses=Apache-2.0 diff --git a/knowledge-directory/Dockerfile b/knowledge-directory/Dockerfile index b507e577..29f86b2a 100644 --- a/knowledge-directory/Dockerfile +++ b/knowledge-directory/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:21-alpine +FROM eclipse-temurin:25-alpine LABEL org.opencontainers.image.source https://github.com/tno/knowledge-engine LABEL org.opencontainers.image.description="Knowledge Engine: Knowledge Directory" LABEL org.opencontainers.image.licenses=Apache-2.0 diff --git a/pom.xml b/pom.xml index c484ed14..5dcd83bd 100644 --- a/pom.xml +++ b/pom.xml @@ -77,8 +77,8 @@ 3.1.11 2.20.2 6.0.3 - 21 - 21 + 25 + 25 1.4.1-SNAPSHOT diff --git a/smart-connector-rest-dist/Dockerfile b/smart-connector-rest-dist/Dockerfile index bca11501..38fe314d 100644 --- a/smart-connector-rest-dist/Dockerfile +++ b/smart-connector-rest-dist/Dockerfile @@ -1,4 +1,4 @@ -FROM eclipse-temurin:21-alpine +FROM eclipse-temurin:25-alpine LABEL org.opencontainers.image.source https://github.com/tno/knowledge-engine LABEL org.opencontainers.image.description="Knowledge Engine: Smart Connector (with HTTP API)" LABEL org.opencontainers.image.licenses=Apache-2.0