[High Priority] Excavator: Update gradle-jdks infrastructure plugins (#3269)

svc-excavator-bot · web-flow · commit 19c61ce623ed · 2025-12-01T14:31:16.000Z
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
     dependencies {
         classpath 'com.palantir.jakartapackagealignment:jakarta-package-alignment:0.6.0'
         classpath 'com.palantir.gradle.jdks:gradle-jdks:0.69.0'
-        classpath 'com.palantir.gradle.jdkslatest:gradle-jdks-latest:0.22.0'
+        classpath 'com.palantir.gradle.jdkslatest:gradle-jdks-latest:0.24.0'
         classpath 'com.palantir.gradle.externalpublish:gradle-external-publish-plugin:1.27.0'
         classpath 'com.palantir.gradle.failure-reports:gradle-failure-reports:1.18.0'
         classpath 'com.palantir.javaformat:gradle-palantir-java-format:2.83.0'
diff --git a/gradle/jdks/17/linux-glibc/aarch64/download-url b/gradle/jdks/17/linux-glibc/aarch64/download-url
@@ -1 +1 @@
-https://corretto.aws/downloads/resources/17.0.16.8.1/amazon-corretto-17.0.16.8.1-linux-aarch64.tar.gz
+https://corretto.aws/downloads/resources/17.0.17.10.1/amazon-corretto-17.0.17.10.1-linux-aarch64.tar.gz
diff --git a/gradle/jdks/17/linux-glibc/aarch64/local-path b/gradle/jdks/17/linux-glibc/aarch64/local-path
@@ -1 +1 @@
-amazon-corretto-17.0.16.8.1-glibc
+amazon-corretto-17.0.17.10.1-glibc
diff --git a/gradle/jdks/17/linux-glibc/x86-64/download-url b/gradle/jdks/17/linux-glibc/x86-64/download-url
@@ -1 +1 @@
-https://corretto.aws/downloads/resources/17.0.16.8.1/amazon-corretto-17.0.16.8.1-linux-x64.tar.gz
+https://corretto.aws/downloads/resources/17.0.17.10.1/amazon-corretto-17.0.17.10.1-linux-x64.tar.gz
diff --git a/gradle/jdks/17/linux-glibc/x86-64/local-path b/gradle/jdks/17/linux-glibc/x86-64/local-path
@@ -1 +1 @@
-amazon-corretto-17.0.16.8.1-glibc
+amazon-corretto-17.0.17.10.1-glibc
diff --git a/gradle/jdks/17/linux-musl/aarch64/download-url b/gradle/jdks/17/linux-musl/aarch64/download-url
@@ -1 +1 @@
-https://corretto.aws/downloads/resources/17.0.16.8.1/amazon-corretto-17.0.16.8.1-alpine-linux-aarch64.tar.gz
+https://corretto.aws/downloads/resources/17.0.17.10.1/amazon-corretto-17.0.17.10.1-alpine-linux-aarch64.tar.gz
diff --git a/gradle/jdks/17/linux-musl/aarch64/local-path b/gradle/jdks/17/linux-musl/aarch64/local-path
@@ -1 +1 @@
-amazon-corretto-17.0.16.8.1-musl
+amazon-corretto-17.0.17.10.1-musl
diff --git a/gradle/jdks/17/linux-musl/x86-64/download-url b/gradle/jdks/17/linux-musl/x86-64/download-url
@@ -1 +1 @@
-https://corretto.aws/downloads/resources/17.0.16.8.1/amazon-corretto-17.0.16.8.1-alpine-linux-x64.tar.gz
+https://corretto.aws/downloads/resources/17.0.17.10.1/amazon-corretto-17.0.17.10.1-alpine-linux-x64.tar.gz
diff --git a/gradle/jdks/17/linux-musl/x86-64/local-path b/gradle/jdks/17/linux-musl/x86-64/local-path
@@ -1 +1 @@
-amazon-corretto-17.0.16.8.1-musl
+amazon-corretto-17.0.17.10.1-musl
diff --git a/gradle/jdks/17/macos/aarch64/download-url b/gradle/jdks/17/macos/aarch64/download-url
@@ -1 +1 @@
-https://corretto.aws/downloads/resources/17.0.16.8.1/amazon-corretto-17.0.16.8.1-macosx-aarch64.tar.gz
+https://corretto.aws/downloads/resources/17.0.17.10.1/amazon-corretto-17.0.17.10.1-macosx-aarch64.tar.gz
diff --git a/gradle/jdks/17/macos/aarch64/local-path b/gradle/jdks/17/macos/aarch64/local-path
@@ -1 +1 @@
-amazon-corretto-17.0.16.8.1
+amazon-corretto-17.0.17.10.1
diff --git a/gradle/jdks/17/macos/x86-64/download-url b/gradle/jdks/17/macos/x86-64/download-url
@@ -1 +1 @@
-https://corretto.aws/downloads/resources/17.0.16.8.1/amazon-corretto-17.0.16.8.1-macosx-x64.tar.gz
+https://corretto.aws/downloads/resources/17.0.17.10.1/amazon-corretto-17.0.17.10.1-macosx-x64.tar.gz
diff --git a/gradle/jdks/17/macos/x86-64/local-path b/gradle/jdks/17/macos/x86-64/local-path
@@ -1 +1 @@
-amazon-corretto-17.0.16.8.1
+amazon-corretto-17.0.17.10.1
diff --git a/gradle/jdks/17/windows/x86-64/download-url b/gradle/jdks/17/windows/x86-64/download-url
@@ -1 +1 @@
-https://corretto.aws/downloads/resources/17.0.16.8.1/amazon-corretto-17.0.16.8.1-windows-x64-jdk.zip
+https://corretto.aws/downloads/resources/17.0.17.10.1/amazon-corretto-17.0.17.10.1-windows-x64-jdk.zip
diff --git a/gradle/jdks/17/windows/x86-64/local-path b/gradle/jdks/17/windows/x86-64/local-path
@@ -1 +1 @@
-amazon-corretto-17.0.16.8.1
+amazon-corretto-17.0.17.10.1
diff --git a/gradle/jdks/21/linux-glibc/aarch64/download-url b/gradle/jdks/21/linux-glibc/aarch64/download-url
@@ -1 +1 @@
-https://corretto.aws/downloads/resources/21.0.8.9.1/amazon-corretto-21.0.8.9.1-linux-aarch64.tar.gz
+https://corretto.aws/downloads/resources/21.0.9.11.1/amazon-corretto-21.0.9.11.1-linux-aarch64.tar.gz
diff --git a/gradle/jdks/21/linux-glibc/aarch64/local-path b/gradle/jdks/21/linux-glibc/aarch64/local-path
@@ -1 +1 @@
-amazon-corretto-21.0.8.9.1-glibc
+amazon-corretto-21.0.9.11.1-glibc
diff --git a/gradle/jdks/21/linux-glibc/x86-64/download-url b/gradle/jdks/21/linux-glibc/x86-64/download-url
@@ -1 +1 @@
-https://corretto.aws/downloads/resources/21.0.8.9.1/amazon-corretto-21.0.8.9.1-linux-x64.tar.gz
+https://corretto.aws/downloads/resources/21.0.9.11.1/amazon-corretto-21.0.9.11.1-linux-x64.tar.gz
diff --git a/gradle/jdks/21/linux-glibc/x86-64/local-path b/gradle/jdks/21/linux-glibc/x86-64/local-path
@@ -1 +1 @@
-amazon-corretto-21.0.8.9.1-glibc
+amazon-corretto-21.0.9.11.1-glibc
diff --git a/gradle/jdks/21/linux-musl/aarch64/download-url b/gradle/jdks/21/linux-musl/aarch64/download-url
@@ -1 +1 @@
-https://corretto.aws/downloads/resources/21.0.8.9.1/amazon-corretto-21.0.8.9.1-alpine-linux-aarch64.tar.gz
+https://corretto.aws/downloads/resources/21.0.9.11.1/amazon-corretto-21.0.9.11.1-alpine-linux-aarch64.tar.gz
diff --git a/gradle/jdks/21/linux-musl/aarch64/local-path b/gradle/jdks/21/linux-musl/aarch64/local-path
@@ -1 +1 @@
-amazon-corretto-21.0.8.9.1-musl
+amazon-corretto-21.0.9.11.1-musl
diff --git a/gradle/jdks/21/linux-musl/x86-64/download-url b/gradle/jdks/21/linux-musl/x86-64/download-url
@@ -1 +1 @@
-https://corretto.aws/downloads/resources/21.0.8.9.1/amazon-corretto-21.0.8.9.1-alpine-linux-x64.tar.gz
+https://corretto.aws/downloads/resources/21.0.9.11.1/amazon-corretto-21.0.9.11.1-alpine-linux-x64.tar.gz
diff --git a/gradle/jdks/21/linux-musl/x86-64/local-path b/gradle/jdks/21/linux-musl/x86-64/local-path
@@ -1 +1 @@
-amazon-corretto-21.0.8.9.1-musl
+amazon-corretto-21.0.9.11.1-musl
diff --git a/gradle/jdks/21/macos/aarch64/download-url b/gradle/jdks/21/macos/aarch64/download-url
@@ -1 +1 @@
-https://corretto.aws/downloads/resources/21.0.8.9.1/amazon-corretto-21.0.8.9.1-macosx-aarch64.tar.gz
+https://corretto.aws/downloads/resources/21.0.9.10.1/amazon-corretto-21.0.9.10.1-macosx-aarch64.tar.gz
diff --git a/gradle/jdks/21/macos/aarch64/local-path b/gradle/jdks/21/macos/aarch64/local-path
@@ -1 +1 @@
-amazon-corretto-21.0.8.9.1
+amazon-corretto-21.0.9.10.1
diff --git a/gradle/jdks/21/macos/x86-64/download-url b/gradle/jdks/21/macos/x86-64/download-url
@@ -1 +1 @@
-https://corretto.aws/downloads/resources/21.0.8.9.1/amazon-corretto-21.0.8.9.1-macosx-x64.tar.gz
+https://corretto.aws/downloads/resources/21.0.9.10.1/amazon-corretto-21.0.9.10.1-macosx-x64.tar.gz
diff --git a/gradle/jdks/21/macos/x86-64/local-path b/gradle/jdks/21/macos/x86-64/local-path
@@ -1 +1 @@
-amazon-corretto-21.0.8.9.1
+amazon-corretto-21.0.9.10.1
diff --git a/gradle/jdks/21/windows/x86-64/download-url b/gradle/jdks/21/windows/x86-64/download-url
@@ -1 +1 @@
-https://corretto.aws/downloads/resources/21.0.8.9.1/amazon-corretto-21.0.8.9.1-windows-x64-jdk.zip
+https://corretto.aws/downloads/resources/21.0.9.10.1/amazon-corretto-21.0.9.10.1-windows-x64-jdk.zip
diff --git a/gradle/jdks/21/windows/x86-64/local-path b/gradle/jdks/21/windows/x86-64/local-path
@@ -1 +1 @@
-amazon-corretto-21.0.8.9.1
+amazon-corretto-21.0.9.10.1
diff --git a/keystores/src/test/java/com/palantir/conjure/java/config/ssl/SslSocketFactoriesConnectionTests.java b/keystores/src/test/java/com/palantir/conjure/java/config/ssl/SslSocketFactoriesConnectionTests.java
@@ -222,9 +222,15 @@ public void testSslWithClientAuthenticationFailsWithoutClientKeyStore() {
         assertThatThrownBy(() -> {
                     runSslConnectionTest(serverConfig, clientConfig, ClientAuth.WITH_CLIENT_AUTH);
                 })
-                .isInstanceOf(RuntimeException.class)
-                .hasCauseInstanceOf(SSLHandshakeException.class)
-                .hasMessageContaining("bad_certificate");
+                .isInstanceOfSatisfying(RuntimeException.class, ex -> {
+                    assertThat(ex.getCause()).isInstanceOfAny(SSLHandshakeException.class);
+                    assertThat(ex.getMessage())
+                            .satisfiesAnyOf(
+                                    message -> assertThat(message).contains("bad_certificate"),
+                                    // Modified from bad_certificate as of https://bugs.openjdk.org/browse/JDK-8311644
+                                    // https://github.com/openjdk/jdk/commit/f62b5789add23adda2634a1cfb80f48b4387be74
+                                    message -> assertThat(message).contains("certificate_required"));
+                });
     }
 
     @Test
@@ -248,7 +254,10 @@ public void testSslWithClientAuthenticationFailsWithoutProperServerTrustStore()
                             .satisfiesAnyOf(
                                     message -> assertThat(message).contains("readHandshakeRecord"),
                                     message -> assertThat(message).contains("certificate_unknown"),
-                                    message -> assertThat(message).contains("bad_certificate"));
+                                    message -> assertThat(message).contains("bad_certificate"),
+                                    // Modified from bad_certificate as of https://bugs.openjdk.org/browse/JDK-8311644
+                                    // https://github.com/openjdk/jdk/commit/f62b5789add23adda2634a1cfb80f48b4387be74
+                                    message -> assertThat(message).contains("certificate_required"));
                 });
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-https://corretto.aws/downloads/resources/17.0.16.8.1/amazon-corretto-17.0.16.8.1-linux-aarch64.tar.gz`
	`1`	`+https://corretto.aws/downloads/resources/17.0.17.10.1/amazon-corretto-17.0.17.10.1-linux-aarch64.tar.gz`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-amazon-corretto-17.0.16.8.1-glibc`
	`1`	`+amazon-corretto-17.0.17.10.1-glibc`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-amazon-corretto-17.0.16.8.1-musl`
	`1`	`+amazon-corretto-17.0.17.10.1-musl`