Skip to content

Commit c355b61

Browse files
authored
Merge pull request #815 from TNO/814-upgrade-ke-to-java-version-21
Update to Java 21
2 parents 6a91aab + 80b9fe4 commit c355b61

7 files changed

Lines changed: 9 additions & 9 deletions

File tree

.github/workflows/docker-image.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
build:
1515
runs-on: ubuntu-latest
1616
steps:
17-
- name: Set up JDK 17
17+
- name: Set up JDK 25
1818
uses: actions/setup-java@v3
1919
with:
20-
java-version: '17'
20+
java-version: '25'
2121
distribution: 'temurin'
2222
- uses: actions/checkout@v4
2323
- name: Set up QEMU

.github/workflows/draft-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
setup:
1717
runs-on: ubuntu-latest
1818
container:
19-
image: maven:3.9.9-eclipse-temurin-17-focal
19+
image: maven:3.9.14-eclipse-temurin-25
2020
options: --user 1001
2121

2222
steps:

.github/workflows/maven.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ env:
2121
jobs:
2222
build:
2323
runs-on: ubuntu-latest
24-
container: maven:3.8.7-eclipse-temurin-17-alpine
24+
container: maven:3.9.14-eclipse-temurin-25
2525

2626
steps:
2727
- uses: actions/checkout@v4

admin-ui/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM eclipse-temurin:21-alpine
1+
FROM eclipse-temurin:25-alpine
22
LABEL org.opencontainers.image.source https://github.com/tno/knowledge-engine
33
LABEL org.opencontainers.image.description="Knowledge Engine: Admin UI"
44
LABEL org.opencontainers.image.licenses=Apache-2.0

knowledge-directory/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM eclipse-temurin:21-alpine
1+
FROM eclipse-temurin:25-alpine
22
LABEL org.opencontainers.image.source https://github.com/tno/knowledge-engine
33
LABEL org.opencontainers.image.description="Knowledge Engine: Knowledge Directory"
44
LABEL org.opencontainers.image.licenses=Apache-2.0

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@
7676
<jersey3-version>3.1.11</jersey3-version>
7777
<jackson-version>2.20.2</jackson-version>
7878
<junit-jupiter-version>6.0.3</junit-jupiter-version>
79-
<maven.compiler.source>17</maven.compiler.source>
80-
<maven.compiler.target>17</maven.compiler.target>
79+
<maven.compiler.source>25</maven.compiler.source>
80+
<maven.compiler.target>25</maven.compiler.target>
8181
<revision>1.4.1-SNAPSHOT</revision>
8282
</properties>
8383

smart-connector-rest-dist/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM eclipse-temurin:21-alpine
1+
FROM eclipse-temurin:25-alpine
22
LABEL org.opencontainers.image.source https://github.com/tno/knowledge-engine
33
LABEL org.opencontainers.image.description="Knowledge Engine: Smart Connector (with HTTP API)"
44
LABEL org.opencontainers.image.licenses=Apache-2.0

0 commit comments

Comments
 (0)