fix(Windows): set JDK17 as default JDK (#1773)

jenkinsci · Nov 6, 2023 · f004292 · f004292
1 parent 8cedc06
commit f004292
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -167,7 +167,7 @@ updates:
 # Windows
 
 - package-ecosystem: docker
-  directory: "11/windows/windowsservercore-2019/hotspot"
+  directory: "17/windows/windowsservercore-2019/hotspot"
   schedule:
     interval: weekly
   open-pull-requests-limit: 2

diff --git a/...windowsservercore-2019/hotspot/Dockerfile → ...windowsservercore-2019/hotspot/Dockerfile b/...windowsservercore-2019/hotspot/Dockerfile → ...windowsservercore-2019/hotspot/Dockerfile
@@ -1,5 +1,5 @@
 # escape=`
-ARG JAVA_VERSION=11.0.21_9
+ARG JAVA_VERSION=17.0.8.1_1
 FROM eclipse-temurin:"${JAVA_VERSION}"-jdk-windowsservercore-1809
 # hadolint shell=powershell
 

diff --git a/updatecli/updatecli.d/jdk11.yaml b/updatecli/updatecli.d/jdk11.yaml
@@ -138,15 +138,6 @@ targets:
         keyword: ARG
         matcher: JAVA_VERSION
     scmid: default
-  setJDK11VersionWindows:
-    name: "Bump JDK11 version for Linux images in the Windows Dockerfile"
-    kind: dockerfile
-    spec:
-      file: 11/windows/windowsservercore-2019/hotspot/Dockerfile
-      instruction:
-        keyword: ARG
-        matcher: JAVA_VERSION
-    scmid: default
 
 actions:
   default:

diff --git a/updatecli/updatecli.d/jdk17.yaml b/updatecli/updatecli.d/jdk17.yaml
@@ -126,6 +126,15 @@ targets:
         keyword: ARG
         matcher: JAVA_VERSION
     scmid: default
+  setJDK17VersionWindows:
+    name: "Bump JDK17 version for Linux images in the Windows Dockerfile"
+    kind: dockerfile
+    spec:
+      file: 17/windows/windowsservercore-2019/hotspot/Dockerfile
+      instruction:
+        keyword: ARG
+        matcher: JAVA_VERSION
+    scmid: default
 
 actions:
   default: