From b326a2785dc3a69a6d5da1ce8b13e49e937087f1 Mon Sep 17 00:00:00 2001 From: Manuel Fuchs Date: Fri, 19 Jul 2024 13:00:23 +0200 Subject: [PATCH] OpenJDK Q3 2024 Updates (#706) --- buildpacks/jvm/CHANGELOG.md | 12 +++ buildpacks/jvm/openjdk_inventory.toml | 79 ++++++++++++++++++++ buildpacks/jvm/tests/integration/versions.rs | 14 ++-- 3 files changed, 98 insertions(+), 7 deletions(-) diff --git a/buildpacks/jvm/CHANGELOG.md b/buildpacks/jvm/CHANGELOG.md index 07ffe95d..fa9ea091 100644 --- a/buildpacks/jvm/CHANGELOG.md +++ b/buildpacks/jvm/CHANGELOG.md @@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Added + +- Support for new OpenJDK versions: `1.8.0_422`, `11.0.24`, `17.0.12`, `21.0.4`, `22.0.2`. ([#706](https://github.com/heroku/buildpacks-jvm/pull/706)) + +### Changed + +- Default version for **OpenJDK 8** is now `1.8.0_422`. ([#706](https://github.com/heroku/buildpacks-jvm/pull/706)) +- Default version for **OpenJDK 11** is now `11.0.24`. ([#706](https://github.com/heroku/buildpacks-jvm/pull/706)) +- Default version for **OpenJDK 17** is now `17.0.12`. ([#706](https://github.com/heroku/buildpacks-jvm/pull/706)) +- Default version for **OpenJDK 21** is now `21.0.4`. ([#706](https://github.com/heroku/buildpacks-jvm/pull/706)) +- Default version for **OpenJDK 22** is now `22.0.2`. ([#706](https://github.com/heroku/buildpacks-jvm/pull/706)) + ## [6.0.0] - 2024-05-28 ### Added diff --git a/buildpacks/jvm/openjdk_inventory.toml b/buildpacks/jvm/openjdk_inventory.toml index f86f2277..c9994d28 100644 --- a/buildpacks/jvm/openjdk_inventory.toml +++ b/buildpacks/jvm/openjdk_inventory.toml @@ -150,6 +150,22 @@ url = "https://heroku-buildpacks-jvm.s3.us-east-1.amazonaws.com/openjdk/zulu/arm checksum = "sha256:9189e22cdef4d80f74e4415c4ad82ac0669b8ca1a4afad1ba132e2035f29f53c" metadata.distribution = "zulu" +[[artifacts]] +version = "1.8.0_422" +os = "linux" +arch = "amd64" +url = "https://heroku-buildpacks-jvm.s3.us-east-1.amazonaws.com/openjdk/zulu/amd64/1.8.0_422.tar.gz" +checksum = "sha256:847af3b8832f0d756abf48b51a696acfaf1c6e1ed00226fe4582496edaab8cd3" +metadata.distribution = "zulu" + +[[artifacts]] +version = "1.8.0_422" +os = "linux" +arch = "arm64" +url = "https://heroku-buildpacks-jvm.s3.us-east-1.amazonaws.com/openjdk/zulu/arm64/1.8.0_422.tar.gz" +checksum = "sha256:12f51e35f6a5ca89daa75dd4aa1088dbc8be813314132184dc02ba118a6ee9b8" +metadata.distribution = "zulu" + [[artifacts]] version = "11.0.10" os = "linux" @@ -326,6 +342,22 @@ url = "https://heroku-buildpacks-jvm.s3.us-east-1.amazonaws.com/openjdk/zulu/amd checksum = "sha256:e225a197de3cda9772d9554959be072175f90030f0606e9fc06b7df33fa10b23" metadata.distribution = "zulu" +[[artifacts]] +version = "11.0.24" +os = "linux" +arch = "amd64" +url = "https://heroku-buildpacks-jvm.s3.us-east-1.amazonaws.com/openjdk/zulu/amd64/11.0.24.tar.gz" +checksum = "sha256:e4416cc2856be6423d882178e7176426127d01a19ac7641412aa3a6ae3cc3653" +metadata.distribution = "zulu" + +[[artifacts]] +version = "11.0.24" +os = "linux" +arch = "arm64" +url = "https://heroku-buildpacks-jvm.s3.us-east-1.amazonaws.com/openjdk/zulu/arm64/11.0.24.tar.gz" +checksum = "sha256:44cd16ada84abf9d26a0df460f2800a5d374b6f15468e563d1edde3016cb6c7d" +metadata.distribution = "zulu" + [[artifacts]] version = "17.0.0" os = "linux" @@ -366,6 +398,22 @@ url = "https://heroku-buildpacks-jvm.s3.us-east-1.amazonaws.com/openjdk/zulu/arm checksum = "sha256:e406854386e38f35a9529a14d1262f9db082afa3bef331f755943922c2f0f091" metadata.distribution = "zulu" +[[artifacts]] +version = "17.0.12" +os = "linux" +arch = "amd64" +url = "https://heroku-buildpacks-jvm.s3.us-east-1.amazonaws.com/openjdk/zulu/amd64/17.0.12.tar.gz" +checksum = "sha256:3992dd6998436f75f2f18b6f57bdd605068fef220f0a46cb72492b4e0df0a01c" +metadata.distribution = "zulu" + +[[artifacts]] +version = "17.0.12" +os = "linux" +arch = "arm64" +url = "https://heroku-buildpacks-jvm.s3.us-east-1.amazonaws.com/openjdk/zulu/arm64/17.0.12.tar.gz" +checksum = "sha256:fc963bcc05ad355a94a7827262b14bcceed488c1f2368f00cb39bf1e0b6f706d" +metadata.distribution = "zulu" + [[artifacts]] version = "17.0.2" os = "linux" @@ -486,6 +534,21 @@ url = "https://heroku-buildpacks-jvm.s3.us-east-1.amazonaws.com/openjdk/zulu/arm checksum = "sha256:02968e30fb3037a89e89a9d4e56e39918db8e5118893e42bf4c880e9779027dc" metadata.distribution = "zulu" +[[artifacts]] +version = "21.0.4" +os = "linux" +arch = "amd64" +url = "https://heroku-buildpacks-jvm.s3.us-east-1.amazonaws.com/openjdk/zulu/amd64/21.0.4.tar.gz" +checksum = "sha256:39845421c7b055d1087107ee316e48085de33f2d1b16387644e1d524699ac2ed" +metadata.distribution = "zulu" + +[[artifacts]] +version = "21.0.4" +os = "linux" +arch = "arm64" +url = "https://heroku-buildpacks-jvm.s3.us-east-1.amazonaws.com/openjdk/zulu/arm64/21.0.4.tar.gz" +checksum = "sha256:3d553e79e0732f7925e495a232842a8cf3f304d12948558b5496bf5e8ce6b852" +metadata.distribution = "zulu" [[artifacts]] version = "22.0.0" @@ -510,3 +573,19 @@ arch = "arm64" url = "https://heroku-buildpacks-jvm.s3.us-east-1.amazonaws.com/openjdk/zulu/arm64/22.0.1.tar.gz" checksum = "sha256:263f1773515a42d1ae85a4c911530f4af6e4dabe466a386a9698e922c94e950f" metadata.distribution = "zulu" + +[[artifacts]] +version = "22.0.2" +os = "linux" +arch = "amd64" +url = "https://heroku-buildpacks-jvm.s3.us-east-1.amazonaws.com/openjdk/zulu/amd64/22.0.2.tar.gz" +checksum = "sha256:9298919c8dd6f77eec7732752e784e346185574dd51661eb0e7cd7a8ca8ebf30" +metadata.distribution = "zulu" + +[[artifacts]] +version = "22.0.2" +os = "linux" +arch = "arm64" +url = "https://heroku-buildpacks-jvm.s3.us-east-1.amazonaws.com/openjdk/zulu/arm64/22.0.2.tar.gz" +checksum = "sha256:3b782afb494715651bee99214b491be199bc013359df3869f529752c32e6a2ef" +metadata.distribution = "zulu" diff --git a/buildpacks/jvm/tests/integration/versions.rs b/buildpacks/jvm/tests/integration/versions.rs index 4ae6f8d2..1713fca7 100644 --- a/buildpacks/jvm/tests/integration/versions.rs +++ b/buildpacks/jvm/tests/integration/versions.rs @@ -35,7 +35,7 @@ fn openjdk_default() { assert_contains!( context.run_shell_command("java -version").stderr, - "openjdk version \"21.0.3\"" + "openjdk version \"21.0.4\"" ); }, ); @@ -60,7 +60,7 @@ fn openjdk_functions_default() { assert_contains!( context.run_shell_command("java -version").stderr, - "openjdk version \"1.8.0_412\"" + "openjdk version \"1.8.0_422\"" ); }, ); @@ -72,7 +72,7 @@ fn openjdk_8() { TestRunner::default().build(default_build_config("test-apps/java-8-app"), |context| { assert_contains!( context.run_shell_command("java -version").stderr, - "openjdk version \"1.8.0_412\"" + "openjdk version \"1.8.0_422\"" ); }); } @@ -83,7 +83,7 @@ fn openjdk_11() { TestRunner::default().build(default_build_config("test-apps/java-11-app"), |context| { assert_contains!( context.run_shell_command("java -version").stderr, - "openjdk version \"11.0.23\"" + "openjdk version \"11.0.24\"" ); }); } @@ -94,7 +94,7 @@ fn openjdk_17() { TestRunner::default().build(default_build_config("test-apps/java-17-app"), |context| { assert_contains!( context.run_shell_command("java -version").stderr, - "openjdk version \"17.0.11\"" + "openjdk version \"17.0.12\"" ); }); } @@ -105,7 +105,7 @@ fn openjdk_21() { TestRunner::default().build(default_build_config("test-apps/java-21-app"), |context| { assert_contains!( context.run_shell_command("java -version").stderr, - "openjdk version \"21.0.3\"" + "openjdk version \"21.0.4\"" ); }); } @@ -116,7 +116,7 @@ fn openjdk_22() { TestRunner::default().build(default_build_config("test-apps/java-22-app"), |context| { assert_contains!( context.run_shell_command("java -version").stderr, - "openjdk version \"22.0.1\"" + "openjdk version \"22.0.2\"" ); }); }