From 9316b66b4562175c7ad80a03f1be4219b39da375 Mon Sep 17 00:00:00 2001 From: "jeanphi.baconnais" Date: Tue, 5 Nov 2024 22:56:56 +0000 Subject: [PATCH 1/6] =?UTF-8?q?=E2=9C=A8=20Add=20Java=2023?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- chunks/lang-java/chunk.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/chunks/lang-java/chunk.yaml b/chunks/lang-java/chunk.yaml index ca9742ef0..6f3780d6e 100644 --- a/chunks/lang-java/chunk.yaml +++ b/chunks/lang-java/chunk.yaml @@ -8,3 +8,6 @@ variants: - name: "21" args: JAVA_VERSION: 21.0.5.fx-zulu + - name: "23" + args: + JAVA_VERSION: 23.0.1.fx-zulu From 21541d4d54b42e5dd3c6a31a11496d3d3a183a4c Mon Sep 17 00:00:00 2001 From: "jeanphi.baconnais" Date: Wed, 6 Nov 2024 10:51:38 +0000 Subject: [PATCH 2/6] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20dazzle=20file?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dazzle.yaml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dazzle.yaml b/dazzle.yaml index 2b9ed0067..6db27ac5b 100644 --- a/dazzle.yaml +++ b/dazzle.yaml @@ -11,7 +11,7 @@ combiner: chunks: - lang-c - lang-go:1.23 - - lang-java:11 + - lang-java:23 - lang-node:22 - tool-brew - name: c @@ -36,7 +36,7 @@ combiner: - lang-c - lang-clojure - lang-go:1.23 - - lang-java:11 + - lang-java:23 - lang-node:22 - lang-python:3.12 - lang-ruby:3.2 @@ -196,6 +196,11 @@ combiner: - base chunks: - lang-java:21 + - name: java-23 + ref: + - base + chunks: + - lang-java:23 - name: yugabytedb ref: - base @@ -203,7 +208,7 @@ combiner: - lang-c - lang-clojure - lang-go:1.23 - - lang-java:11 + - lang-java:13 - lang-node:22 - lang-ruby:3.2 - lang-rust:1 @@ -218,7 +223,7 @@ combiner: - lang-c - lang-clojure - lang-go:1.23 - - lang-java:11 + - lang-java:23 - lang-node:22 - lang-ruby:3.2 - lang-rust:1 From cc093e1e236aab314c388a10cd6e0c7ab6e1eaf6 Mon Sep 17 00:00:00 2001 From: "jeanphi.baconnais" Date: Wed, 6 Nov 2024 13:53:02 +0000 Subject: [PATCH 3/6] :wrench: Fix CI adding java 23 --- tests/lang-java.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/lang-java.yaml b/tests/lang-java.yaml index 8ae788a0e..79e208b9f 100644 --- a/tests/lang-java.yaml +++ b/tests/lang-java.yaml @@ -6,7 +6,8 @@ - stderr.indexOf("OpenJDK") != -1 - stderr.indexOf("11.0.") != -1 || stderr.indexOf("17.0.") != -1 || - stderr.indexOf("21.0.") != -1 + stderr.indexOf("21.0.") != -1 || + stderr.indexOf("23.0.") != -1 - desc: it should have a functioning java 17 installed entrypoint: [env, GITPOD_REPO_ROOT=/workspace, bash, -ci] command: [sdk default java 17.0.13.fx-zulu && java -version && mvn -v] From 80af5c15d78e0baf576e835de337251685b6d047 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Tron=C3=AD=C4=8Dek?= Date: Mon, 11 Nov 2024 13:30:05 +0000 Subject: [PATCH 4/6] Revert defaulting to Java 23 --- dazzle.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dazzle.yaml b/dazzle.yaml index 6db27ac5b..d23fd6881 100644 --- a/dazzle.yaml +++ b/dazzle.yaml @@ -11,7 +11,7 @@ combiner: chunks: - lang-c - lang-go:1.23 - - lang-java:23 + - lang-java:11 - lang-node:22 - tool-brew - name: c @@ -36,7 +36,7 @@ combiner: - lang-c - lang-clojure - lang-go:1.23 - - lang-java:23 + - lang-java:11 - lang-node:22 - lang-python:3.12 - lang-ruby:3.2 @@ -208,7 +208,7 @@ combiner: - lang-c - lang-clojure - lang-go:1.23 - - lang-java:13 + - lang-java:11 - lang-node:22 - lang-ruby:3.2 - lang-rust:1 @@ -223,7 +223,7 @@ combiner: - lang-c - lang-clojure - lang-go:1.23 - - lang-java:23 + - lang-java:11 - lang-node:22 - lang-ruby:3.2 - lang-rust:1 From 4a350cdd770f4f2cd31a223b96dfc7618f6231d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Tron=C3=AD=C4=8Dek?= Date: Mon, 11 Nov 2024 13:31:23 +0000 Subject: [PATCH 5/6] Sync new image and add to README --- .github/promote-images.yml | 1 + .github/sync-containers.yml | 1 + README.md | 1 + 3 files changed, 3 insertions(+) diff --git a/.github/promote-images.yml b/.github/promote-images.yml index 2bfd85c92..a72673da3 100644 --- a/.github/promote-images.yml +++ b/.github/promote-images.yml @@ -38,6 +38,7 @@ workspace-java-11: "TIMESTAMP_TAG" workspace-java-17: "TIMESTAMP_TAG" workspace-java-21: "TIMESTAMP_TAG" + workspace-java-23: "TIMESTAMP_TAG" workspace-yugabytedb: "TIMESTAMP_TAG" workspace-yugabytedb-preview: "TIMESTAMP_TAG" workspace-gitpod-dev: "TIMESTAMP_TAG" diff --git a/.github/sync-containers.yml b/.github/sync-containers.yml index a32420814..8c2e81e0c 100644 --- a/.github/sync-containers.yml +++ b/.github/sync-containers.yml @@ -35,6 +35,7 @@ sync: - java-11 - java-17 - java-21 + - java-23 - yugabytedb - yugabytedb-preview - gitpod-dev diff --git a/README.md b/README.md index 10968cf7b..c1513bdda 100644 --- a/README.md +++ b/README.md @@ -52,6 +52,7 @@ Each contains a set of chunks: a common base and a language / tool. Every image - [`gitpod/workspace-java-11`](https://hub.docker.com/r/gitpod/workspace-java-11) ✅ - [`gitpod/workspace-java-17`](https://hub.docker.com/r/gitpod/workspace-java-17) ✅ - [`gitpod/workspace-java-21`](https://hub.docker.com/r/gitpod/workspace-java-21) ✅ +- [`gitpod/workspace-java-21`](https://hub.docker.com/r/gitpod/workspace-java-23) ✅ - [`gitpod/workspace-node`](https://hub.docker.com/r/gitpod/workspace-node) ✅ - [`gitpod/workspace-node-lts`](https://hub.docker.com/r/gitpod/workspace-node-lts) ✅ - [`gitpod/workspace-node-18`](https://hub.docker.com/r/gitpod/workspace-node-18) ✅ From 7d978ef97802aebce90ad6af056b144929be8802 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Tron=C3=AD=C4=8Dek?= Date: Mon, 11 Nov 2024 13:32:10 +0000 Subject: [PATCH 6/6] Update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0b347a6a8..6a4bdcb9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ A curated, chronologically ordered list of notable changes in [Gitpod's default workspace images](https://hub.docker.com/u/gitpod). +## 2024-11-11 + +- Introduce `workspace-java-23` + ## 2024-10-31 🎃 - Bump the `workspace-node-lts` image to Node `22.11.0`