Skip to content

Commit

Permalink
Merge pull request #1705 from GoogleContainerTools/update-java-archives
Browse files Browse the repository at this point in the history
Bumping temurin archives to latest stable versions
  • Loading branch information
loosebazooka authored Oct 27, 2024
2 parents 10480a5 + 587f305 commit 94ff934
Show file tree
Hide file tree
Showing 4 changed files with 75 additions and 75 deletions.
74 changes: 37 additions & 37 deletions MODULE.bazel.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions java/testdata/java21_debian12.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -36,4 +36,4 @@ fileExistenceTests:
metadataTest:
envVars:
- key: 'JAVA_VERSION'
value: '21.0.4'
value: '21.0.5'
8 changes: 4 additions & 4 deletions java/testdata/java21_debug_debian12.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -29,4 +29,4 @@ fileExistenceTests:
metadataTest:
envVars:
- key: 'JAVA_VERSION'
value: '21.0.4'
value: '21.0.5'
62 changes: 31 additions & 31 deletions private/repos/java.MODULE.bazel
Original file line number Diff line number Diff line change
@@ -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")

0 comments on commit 94ff934

Please sign in to comment.