From 81e47a7a981459bbd42e5da6727dc91a21fd88a6 Mon Sep 17 00:00:00 2001
From: Luna Stadler <lu@papill0n.org>
Date: Wed, 17 Jan 2024 20:40:28 +0100
Subject: [PATCH] Update Docker image to Java 17 (#1689)

---
 .github/workflows/main.yaml                               | 4 ++--
 .github/workflows/release.yml                             | 8 ++++----
 ci/tasks/update-versions.js                               | 2 +-
 docker-bake.hcl                                           | 2 +-
 pom.xml                                                   | 4 ++--
 server/README.adoc                                        | 6 +++---
 server/ops/docker/{jdk11-jammy => jdk17-jammy}/Dockerfile | 2 +-
 7 files changed, 14 insertions(+), 14 deletions(-)
 rename server/ops/docker/{jdk11-jammy => jdk17-jammy}/Dockerfile (99%)

diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index 14b9d7261..e96340101 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -189,10 +189,10 @@ jobs:
     - name: Install GraphViz
       run: sudo apt-get install graphviz -y
 
-    - name: Set up JDK 11
+    - name: Set up JDK 17
       uses: actions/setup-java@v4
       with:
-        java-version: 11
+        java-version: 17
         distribution: temurin
 
     - name: Build Java server
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index a5e5a7b81..8420b5d6e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -12,10 +12,10 @@ jobs:
       - uses: actions/checkout@v4
       - name: Install GraphViz
         run: sudo apt-get install graphviz -y
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 17
           distribution: temurin
       - name: Build Java server
         run: make buildServer
@@ -38,10 +38,10 @@ jobs:
       - uses: actions/checkout@v4
       - name: Install GraphViz
         run: sudo apt-get install graphviz -y
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 17
           distribution: temurin
       - name: Build Java server
         run: make buildServer
diff --git a/ci/tasks/update-versions.js b/ci/tasks/update-versions.js
index f9906cc71..21b87da97 100755
--- a/ci/tasks/update-versions.js
+++ b/ci/tasks/update-versions.js
@@ -142,7 +142,7 @@ try {
     diagramLibraryVersions.diagramsnet = [...diagramsnetVersionFound][0].groups.version
   }
 
-  const dockerfileContent = await fs.readFile(ospath.join(rootDir, 'server', 'ops', 'docker', 'jdk11-jammy', 'Dockerfile'), 'utf8')
+  const dockerfileContent = await fs.readFile(ospath.join(rootDir, 'server', 'ops', 'docker', 'jdk17-jammy', 'Dockerfile'), 'utf8')
   for (const line of dockerfileContent.split('\n')) {
     const d2VersionFound = line.match(/^ARG D2_VERSION="(?<version>.+)"$/)
     if (d2VersionFound) {
diff --git a/docker-bake.hcl b/docker-bake.hcl
index 5b6c8e355..87fa43729 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -25,7 +25,7 @@ target "kroki" {
     bytefield = "./bytefield"
     tikz = "./tikz"
   }
-  dockerfile = "ops/docker/jdk11-jammy/Dockerfile"
+  dockerfile = "ops/docker/jdk17-jammy/Dockerfile"
   tags = ["yuzutech/kroki:${TAG}"]
   inherits = ["oci-labels"]
   labels = {
diff --git a/pom.xml b/pom.xml
index 39e43fb40..251d1ead0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,8 +19,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.12.1</version>
         <configuration>
-          <source>8</source>
-          <target>8</target>
+          <source>11</source>
+          <target>11</target>
         </configuration>
       </plugin>
       <plugin>
diff --git a/server/README.adoc b/server/README.adoc
index 4983a66b1..035b1d4ea 100644
--- a/server/README.adoc
+++ b/server/README.adoc
@@ -14,7 +14,7 @@ When a new version is available, we need to :
 
 . update the fork
 . run the following workflow: https://github.com/yuzutech/ditaa-mini/actions/workflows/native-image-on-demand.yml
-. update the argument variable `ARG DITAA_VERSION="x.y.z"` in `server/ops/docker/jdk11-jammy/Dockerfile`
+. update the argument variable `ARG DITAA_VERSION="x.y.z"` in `server/ops/docker/jdk17-jammy/Dockerfile`
 
 === PlantUML
 
@@ -24,7 +24,7 @@ When a new version is available, we need to:
 
 . update the fork
 . run the following workflow: https://github.com/yuzutech/plantuml/actions/workflows/native-image-on-demand.yml
-. update the argument variable `ARG PLANTUML_VERSION="x.y.z"` in `server/ops/docker/jdk11-jammy/Dockerfile`
+. update the argument variable `ARG PLANTUML_VERSION="x.y.z"` in `server/ops/docker/jdk17-jammy/Dockerfile`
 
 === UMLet
 
@@ -34,4 +34,4 @@ When a new version is available, we need to:
 
 . update the fork
 . run the following workflow: https://github.com/yuzutech/umlet/actions/workflows/release.yml
-. update the argument variable `ARG UMLET_VERSION="x.y.z"` in `server/ops/docker/jdk11-jammy/Dockerfile`
+. update the argument variable `ARG UMLET_VERSION="x.y.z"` in `server/ops/docker/jdk17-jammy/Dockerfile`
diff --git a/server/ops/docker/jdk11-jammy/Dockerfile b/server/ops/docker/jdk17-jammy/Dockerfile
similarity index 99%
rename from server/ops/docker/jdk11-jammy/Dockerfile
rename to server/ops/docker/jdk17-jammy/Dockerfile
index 4afe1ad65..487a3dcc4 100644
--- a/server/ops/docker/jdk11-jammy/Dockerfile
+++ b/server/ops/docker/jdk17-jammy/Dockerfile
@@ -232,7 +232,7 @@ RUN SVGBOB_VERSION=`cat Cargo.toml | grep "svgbob_cli =" | sed -r 's/.*"([^"]+)"
 # use a pre-built image to reduce build time
 
 ## yuzutech/kroki
-FROM eclipse-temurin:11.0.20.1_1-jre-jammy
+FROM eclipse-temurin:17.0.9_9-jre-jammy
 
 ARG D2_VERSION="0.6.3"
 ARG PLANTUML_VERSION="1.2023.13"