From 528b449064c8043ef5a33fa36639fc5b0ad62a2e Mon Sep 17 00:00:00 2001 From: Distroless Bot Date: Sat, 26 Oct 2024 20:37:14 +0000 Subject: [PATCH] Bumping temurin archives to latest stable versions Signed-off-by: Distroless Bot --- MODULE.bazel.lock | 74 ++++++++++++------------ java/testdata/java21_debian12.yaml | 6 +- java/testdata/java21_debug_debian12.yaml | 8 +-- private/repos/java.MODULE.bazel | 62 ++++++++++---------- 4 files changed, 75 insertions(+), 75 deletions(-) diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 42b704778..ca3224bbe 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -238,7 +238,7 @@ "//private/extensions:java.bzl%java": { "general": { "bzlTransitiveDigest": "xA9/9EmgDlmI4ZuH2MBFL7dcaYOBIX93jKc1bXXdBLc=", - "usagesDigest": "KMqg1LC9zQvNJSVPo7fjq2bCxnkfBVplErf9LyJwF3Y=", + "usagesDigest": "C4+M37uArd47d35ZBaP9GtEASua6uArr553k9Aq30D0=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, "envVariables": {}, @@ -248,13 +248,13 @@ "ruleClassName": "temurin_archive", "attributes": { "urls": [ - "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_x64_linux_hotspot_21.0.4_7.tar.gz" + "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_x64_linux_hotspot_21.0.5_11.tar.gz" ], - "sha256": "51fb4d03a4429c39d397d3a03a779077159317616550e4e71624c9843083e7b9", - "strip_prefix": "jdk-21.0.4+7", + "sha256": "3c654d98404c073b8a7e66bffb27f4ae3e7ede47d13284c132d40a83144bfd8c", + "strip_prefix": "jdk-21.0.5+11", "package_name": "temurin", - "version": "21.0.4+7", - "plain_version": "21.0.4", + "version": "21.0.5+11", + "plain_version": "21.0.5", "architecture": "amd64", "control": "@@//java:control" } @@ -264,13 +264,13 @@ "ruleClassName": "temurin_archive", "attributes": { "urls": [ - "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.4_7.tar.gz" + "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.5_11.tar.gz" ], - "sha256": "d768eecddd7a515711659e02caef8516b7b7177fa34880a56398fd9822593a79", - "strip_prefix": "jdk-21.0.4+7", + "sha256": "6482639ed9fd22aa2e704cc366848b1b3e1586d2bf1213869c43e80bca58fe5c", + "strip_prefix": "jdk-21.0.5+11", "package_name": "temurin", - "version": "21.0.4+7", - "plain_version": "21.0.4", + "version": "21.0.5+11", + "plain_version": "21.0.5", "architecture": "arm64", "control": "@@//java:control" } @@ -280,13 +280,13 @@ "ruleClassName": "temurin_archive", "attributes": { "urls": [ - "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_ppc64le_linux_hotspot_21.0.4_7.tar.gz" + "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_ppc64le_linux_hotspot_21.0.5_11.tar.gz" ], - "sha256": "46cf93653e2b553fb1c91760cfe2ff20999ba358d648d2df69e5948784768440", - "strip_prefix": "jdk-21.0.4+7-jre", + "sha256": "ae9ad61578da420fa7aeb01d3f6909da8a74d54a31bb8ba090a263cfadf221cc", + "strip_prefix": "jdk-21.0.5+11-jre", "package_name": "temurin", - "version": "21.0.4+7", - "plain_version": "21.0.4", + "version": "21.0.5+11", + "plain_version": "21.0.5", "architecture": "ppc64le", "control": "@@//java:control" } @@ -296,13 +296,13 @@ "ruleClassName": "temurin_archive", "attributes": { "urls": [ - "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_x64_linux_hotspot_21.0.4_7.tar.gz" + "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_x64_linux_hotspot_21.0.5_11.tar.gz" ], - "sha256": "d3affbb011ca6c722948f6345d15eba09bded33f9947d4d67e09723e2518c12a", - "strip_prefix": "jdk-21.0.4+7-jre", + "sha256": "553dda64b3b1c3c16f8afe402377ffebe64fb4a1721a46ed426a91fd18185e62", + "strip_prefix": "jdk-21.0.5+11-jre", "package_name": "temurin", - "version": "21.0.4+7", - "plain_version": "21.0.4", + "version": "21.0.5+11", + "plain_version": "21.0.5", "architecture": "amd64", "control": "@@//java:control" } @@ -312,12 +312,12 @@ "ruleClassName": "version_repo", "attributes": { "versions": { - "temurin21_jre_amd64": "21.0.4", - "temurin21_jdk_amd64": "21.0.4", - "temurin21_jre_arm64": "21.0.4", - "temurin21_jdk_arm64": "21.0.4", - "temurin21_jre_ppc64le": "21.0.4", - "temurin21_jdk_ppc64le": "21.0.4" + "temurin21_jre_amd64": "21.0.5", + "temurin21_jdk_amd64": "21.0.5", + "temurin21_jre_arm64": "21.0.5", + "temurin21_jdk_arm64": "21.0.5", + "temurin21_jre_ppc64le": "21.0.5", + "temurin21_jdk_ppc64le": "21.0.5" } } }, @@ -326,13 +326,13 @@ "ruleClassName": "temurin_archive", "attributes": { "urls": [ - "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_aarch64_linux_hotspot_21.0.4_7.tar.gz" + "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_aarch64_linux_hotspot_21.0.5_11.tar.gz" ], - "sha256": "58845ce4275f3ec74fba075597c8216bb201773da036c4703be8b7b7b457355d", - "strip_prefix": "jdk-21.0.4+7-jre", + "sha256": "e4d02c33aeaf8e1148c1c505e129a709c5bc1889e855d4fb4f001b1780db42b4", + "strip_prefix": "jdk-21.0.5+11-jre", "package_name": "temurin", - "version": "21.0.4+7", - "plain_version": "21.0.4", + "version": "21.0.5+11", + "plain_version": "21.0.5", "architecture": "arm64", "control": "@@//java:control" } @@ -342,13 +342,13 @@ "ruleClassName": "temurin_archive", "attributes": { "urls": [ - "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.4_7.tar.gz" + "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.5_11.tar.gz" ], - "sha256": "c208cd0fb90560644a90f928667d2f53bfe408c957a5e36206585ad874427761", - "strip_prefix": "jdk-21.0.4+7", + "sha256": "3c6f4c358facfb6c19d90faf02bfe0fc7512d6b0e80ac18146bbd7e0d01deeef", + "strip_prefix": "jdk-21.0.5+11", "package_name": "temurin", - "version": "21.0.4+7", - "plain_version": "21.0.4", + "version": "21.0.5+11", + "plain_version": "21.0.5", "architecture": "ppc64le", "control": "@@//java:control" } diff --git a/java/testdata/java21_debian12.yaml b/java/testdata/java21_debian12.yaml index de4ad6698..d400e489d 100644 --- a/java/testdata/java21_debian12.yaml +++ b/java/testdata/java21_debian12.yaml @@ -3,11 +3,11 @@ commandTests: - name: java command: "/usr/lib/jvm/temurin21_jre_amd64/bin/java" args: ["-version"] - expectedError: ['openjdk version "21.0.4"'] + expectedError: ['openjdk version "21.0.5"'] - name: java-symlink command: "/usr/bin/java" args: ["-version"] - expectedError: ['openjdk version "21.0.4"'] + expectedError: ['openjdk version "21.0.5"'] fileExistenceTests: - name: certs path: "/etc/ssl/certs/java/cacerts" @@ -36,4 +36,4 @@ fileExistenceTests: metadataTest: envVars: - key: 'JAVA_VERSION' - value: '21.0.4' + value: '21.0.5' diff --git a/java/testdata/java21_debug_debian12.yaml b/java/testdata/java21_debug_debian12.yaml index ca8e8d56a..106f86480 100644 --- a/java/testdata/java21_debug_debian12.yaml +++ b/java/testdata/java21_debug_debian12.yaml @@ -3,15 +3,15 @@ commandTests: - name: java command: "/usr/lib/jvm/temurin21_jdk_amd64/bin/java" args: ["-version"] - expectedError: ['openjdk version "21.0.4"'] + expectedError: ['openjdk version "21.0.5"'] - name: java-symlink command: "/usr/bin/java" args: ["-version"] - expectedError: ['openjdk version "21.0.4"'] + expectedError: ['openjdk version "21.0.5"'] - name: javac command: "/usr/lib/jvm/temurin21_jdk_amd64/bin/javac" args: ["-version"] - expectedOutput: ['javac 21.0.4'] + expectedOutput: ['javac 21.0.5'] fileExistenceTests: - name: certs path: "/etc/ssl/certs/java/cacerts" @@ -29,4 +29,4 @@ fileExistenceTests: metadataTest: envVars: - key: 'JAVA_VERSION' - value: '21.0.4' + value: '21.0.5' diff --git a/private/repos/java.MODULE.bazel b/private/repos/java.MODULE.bazel index 1d43f2985..9cd99b0a4 100644 --- a/private/repos/java.MODULE.bazel +++ b/private/repos/java.MODULE.bazel @@ -1,60 +1,60 @@ "repositories for java" -#VERSION 21.0.4 +#VERSION 21.0.5 java = use_extension("//private/extensions:java.bzl", "java") java.archive( name = "temurin21_jre_amd64", - sha256 = "d3affbb011ca6c722948f6345d15eba09bded33f9947d4d67e09723e2518c12a", - strip_prefix = "jdk-21.0.4+7-jre", - urls = ["https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_x64_linux_hotspot_21.0.4_7.tar.gz"], - version = "21.0.4+7", - plain_version = "21.0.4", + sha256 = "553dda64b3b1c3c16f8afe402377ffebe64fb4a1721a46ed426a91fd18185e62", + strip_prefix = "jdk-21.0.5+11-jre", + urls = ["https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_x64_linux_hotspot_21.0.5_11.tar.gz"], + version = "21.0.5+11", + plain_version = "21.0.5", architecture = "amd64", ) java.archive( name = "temurin21_jdk_amd64", - sha256 = "51fb4d03a4429c39d397d3a03a779077159317616550e4e71624c9843083e7b9", - strip_prefix = "jdk-21.0.4+7", - urls = ["https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_x64_linux_hotspot_21.0.4_7.tar.gz"], - version = "21.0.4+7", - plain_version = "21.0.4", + sha256 = "3c654d98404c073b8a7e66bffb27f4ae3e7ede47d13284c132d40a83144bfd8c", + strip_prefix = "jdk-21.0.5+11", + urls = ["https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_x64_linux_hotspot_21.0.5_11.tar.gz"], + version = "21.0.5+11", + plain_version = "21.0.5", architecture = "amd64", ) java.archive( name = "temurin21_jre_arm64", - sha256 = "58845ce4275f3ec74fba075597c8216bb201773da036c4703be8b7b7b457355d", - strip_prefix = "jdk-21.0.4+7-jre", - urls = ["https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_aarch64_linux_hotspot_21.0.4_7.tar.gz"], - version = "21.0.4+7", - plain_version = "21.0.4", + sha256 = "e4d02c33aeaf8e1148c1c505e129a709c5bc1889e855d4fb4f001b1780db42b4", + strip_prefix = "jdk-21.0.5+11-jre", + urls = ["https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_aarch64_linux_hotspot_21.0.5_11.tar.gz"], + version = "21.0.5+11", + plain_version = "21.0.5", architecture = "arm64", ) java.archive( name = "temurin21_jdk_arm64", - sha256 = "d768eecddd7a515711659e02caef8516b7b7177fa34880a56398fd9822593a79", - strip_prefix = "jdk-21.0.4+7", - urls = ["https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.4_7.tar.gz"], - version = "21.0.4+7", - plain_version = "21.0.4", + sha256 = "6482639ed9fd22aa2e704cc366848b1b3e1586d2bf1213869c43e80bca58fe5c", + strip_prefix = "jdk-21.0.5+11", + urls = ["https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.5_11.tar.gz"], + version = "21.0.5+11", + plain_version = "21.0.5", architecture = "arm64", ) java.archive( name = "temurin21_jre_ppc64le", - sha256 = "46cf93653e2b553fb1c91760cfe2ff20999ba358d648d2df69e5948784768440", - strip_prefix = "jdk-21.0.4+7-jre", - urls = ["https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jre_ppc64le_linux_hotspot_21.0.4_7.tar.gz"], - version = "21.0.4+7", - plain_version = "21.0.4", + sha256 = "ae9ad61578da420fa7aeb01d3f6909da8a74d54a31bb8ba090a263cfadf221cc", + strip_prefix = "jdk-21.0.5+11-jre", + urls = ["https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jre_ppc64le_linux_hotspot_21.0.5_11.tar.gz"], + version = "21.0.5+11", + plain_version = "21.0.5", architecture = "ppc64le", ) java.archive( name = "temurin21_jdk_ppc64le", - sha256 = "c208cd0fb90560644a90f928667d2f53bfe408c957a5e36206585ad874427761", - strip_prefix = "jdk-21.0.4+7", - urls = ["https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.4%2B7/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.4_7.tar.gz"], - version = "21.0.4+7", - plain_version = "21.0.4", + sha256 = "3c6f4c358facfb6c19d90faf02bfe0fc7512d6b0e80ac18146bbd7e0d01deeef", + strip_prefix = "jdk-21.0.5+11", + urls = ["https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.5%2B11/OpenJDK21U-jdk_ppc64le_linux_hotspot_21.0.5_11.tar.gz"], + version = "21.0.5+11", + plain_version = "21.0.5", architecture = "ppc64le", ) use_repo(java, "java_versions", "temurin21_jdk_amd64", "temurin21_jdk_arm64", "temurin21_jdk_ppc64le", "temurin21_jre_amd64", "temurin21_jre_arm64", "temurin21_jre_ppc64le")