From 7912253f22d9ca3dba7e0a42ca2e8ad78b92c034 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= <91831478+lemeurherve@users.noreply.github.com> Date: Wed, 11 Oct 2023 22:06:49 +0200 Subject: [PATCH 1/4] feat(Windows): add Java 21 --- build-windows.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/build-windows.yaml b/build-windows.yaml index 794a14d40..77bf66281 100644 --- a/build-windows.yaml +++ b/build-windows.yaml @@ -21,3 +21,14 @@ services: VERSION: ${REMOTING_VERSION} WINDOWS_VERSION_TAG: ${WINDOWS_VERSION_TAG} TOOLS_WINDOWS_VERSION: ${TOOLS_WINDOWS_VERSION} + jdk21: + image: jdk21-${WINDOWS_FLAVOR}-${WINDOWS_VERSION_TAG} + build: + context: ./ + dockerfile: ./windows/${WINDOWS_FLAVOR}/Dockerfile + args: + JAVA_HOME: "C:/openjdk-21" + JAVA_VERSION: 21 + VERSION: ${REMOTING_VERSION} + WINDOWS_VERSION_TAG: ${WINDOWS_VERSION_TAG} + TOOLS_WINDOWS_VERSION: ${TOOLS_WINDOWS_VERSION} From 515652fd36a51345c675d0ed52faf107f21eff38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= <91831478+lemeurherve@users.noreply.github.com> Date: Wed, 11 Oct 2023 22:50:45 +0200 Subject: [PATCH 2/4] Use complete version --- build-windows.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-windows.yaml b/build-windows.yaml index 77bf66281..fda335190 100644 --- a/build-windows.yaml +++ b/build-windows.yaml @@ -28,7 +28,7 @@ services: dockerfile: ./windows/${WINDOWS_FLAVOR}/Dockerfile args: JAVA_HOME: "C:/openjdk-21" - JAVA_VERSION: 21 + JAVA_VERSION: 21_35 VERSION: ${REMOTING_VERSION} WINDOWS_VERSION_TAG: ${WINDOWS_VERSION_TAG} TOOLS_WINDOWS_VERSION: ${TOOLS_WINDOWS_VERSION} From 24cf97a9b13789ad7ce0dd686a1fceb8e64bbd75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= Date: Wed, 11 Oct 2023 22:55:28 +0200 Subject: [PATCH 3/4] add quotes around JAVA_VERSION value --- build-windows.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-windows.yaml b/build-windows.yaml index fda335190..0052cfdc2 100644 --- a/build-windows.yaml +++ b/build-windows.yaml @@ -28,7 +28,7 @@ services: dockerfile: ./windows/${WINDOWS_FLAVOR}/Dockerfile args: JAVA_HOME: "C:/openjdk-21" - JAVA_VERSION: 21_35 + JAVA_VERSION: "21_35" VERSION: ${REMOTING_VERSION} WINDOWS_VERSION_TAG: ${WINDOWS_VERSION_TAG} TOOLS_WINDOWS_VERSION: ${TOOLS_WINDOWS_VERSION} From a492405dfb3992bcdf79f69eacb55439b7982f2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= Date: Wed, 11 Oct 2023 23:02:06 +0200 Subject: [PATCH 4/4] add quotes around other JAVA_VERSION values for consistency --- build-windows.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-windows.yaml b/build-windows.yaml index 0052cfdc2..c849fce1c 100644 --- a/build-windows.yaml +++ b/build-windows.yaml @@ -6,7 +6,7 @@ services: dockerfile: ./windows/${WINDOWS_FLAVOR}/Dockerfile args: JAVA_HOME: "C:/openjdk-11" - JAVA_VERSION: 11.0.20.1_1 + JAVA_VERSION: "11.0.20.1_1" VERSION: ${REMOTING_VERSION} WINDOWS_VERSION_TAG: ${WINDOWS_VERSION_TAG} TOOLS_WINDOWS_VERSION: ${TOOLS_WINDOWS_VERSION} @@ -17,7 +17,7 @@ services: dockerfile: ./windows/${WINDOWS_FLAVOR}/Dockerfile args: JAVA_HOME: "C:/openjdk-17" - JAVA_VERSION: 17.0.8.1_1 + JAVA_VERSION: "17.0.8.1_1" VERSION: ${REMOTING_VERSION} WINDOWS_VERSION_TAG: ${WINDOWS_VERSION_TAG} TOOLS_WINDOWS_VERSION: ${TOOLS_WINDOWS_VERSION}