diff --git a/buildpacks/jvm/CHANGELOG.md b/buildpacks/jvm/CHANGELOG.md index edcb9c0c..a2d56df6 100644 --- a/buildpacks/jvm/CHANGELOG.md +++ b/buildpacks/jvm/CHANGELOG.md @@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed + +* Default version for **OpenJDK 8** is now `1.8.0_412`. ([#657](https://github.com/heroku/buildpacks-jvm/pull/657)) +* Default version for **OpenJDK 11** is now `11.0.23`. ([#657](https://github.com/heroku/buildpacks-jvm/pull/657)) +* Default version for **OpenJDK 17** is now `17.0.11`.([#657](https://github.com/heroku/buildpacks-jvm/pull/657)) +* Default version for **OpenJDK 21** is now `21.0.3`. ([#657](https://github.com/heroku/buildpacks-jvm/pull/657)) + ## [4.1.0] - 2024-01-23 ### Changed diff --git a/buildpacks/jvm/src/version.rs b/buildpacks/jvm/src/version.rs index e392e0cf..aee2e268 100644 --- a/buildpacks/jvm/src/version.rs +++ b/buildpacks/jvm/src/version.rs @@ -16,20 +16,20 @@ pub(crate) fn normalize_version_string>( let version_string = match user_version_string { "7" | "1.7" => "1.7.0_352", - "8" | "1.8" => "1.8.0_402", + "8" | "1.8" => "1.8.0_412", "9" | "1.9" => "9.0.4", "10" => "10.0.2", - "11" => "11.0.22", + "11" => "11.0.23", "12" => "12.0.2", "13" => "13.0.14", "14" => "14.0.2", "15" => "15.0.10", "16" => "16.0.2", - "17" => "17.0.10", + "17" => "17.0.11", "18" => "18.0.2.1", "19" => "19.0.2", "20" => "20.0.2", - "21" => "21.0.2", + "21" => "21.0.3", other => other, }; @@ -87,22 +87,22 @@ mod tests { fn normalize_version_string_stack_specific_distribution() { assert_eq!( normalize_version_string(&stack_id!("heroku-18"), "8"), - Ok((OpenJDKDistribution::Heroku, String::from("1.8.0_402"))) + Ok((OpenJDKDistribution::Heroku, String::from("1.8.0_412"))) ); assert_eq!( normalize_version_string(&stack_id!("heroku-20"), "8"), - Ok((OpenJDKDistribution::Heroku, String::from("1.8.0_402"))) + Ok((OpenJDKDistribution::Heroku, String::from("1.8.0_412"))) ); assert_eq!( normalize_version_string(&stack_id!("heroku-22"), "8"), - Ok((OpenJDKDistribution::AzulZulu, String::from("1.8.0_402"))) + Ok((OpenJDKDistribution::AzulZulu, String::from("1.8.0_412"))) ); assert_eq!( normalize_version_string(&stack_id!("bogus"), "8"), - Ok((OpenJDKDistribution::AzulZulu, String::from("1.8.0_402"))) + Ok((OpenJDKDistribution::AzulZulu, String::from("1.8.0_412"))) ); } diff --git a/buildpacks/jvm/tests/integration/versions.rs b/buildpacks/jvm/tests/integration/versions.rs index fd14f5a7..bd50add9 100644 --- a/buildpacks/jvm/tests/integration/versions.rs +++ b/buildpacks/jvm/tests/integration/versions.rs @@ -8,7 +8,7 @@ fn test_openjdk_8_distribution_heroku_20() { |context| { assert_contains!( context.run_shell_command("java -version").stderr, - "openjdk version \"1.8.0_402-heroku\"" + "openjdk version \"1.8.0_412-heroku\"" ); }, ); @@ -22,7 +22,7 @@ fn test_openjdk_8_distribution_heroku_22() { |context| { assert_contains!( context.run_shell_command("java -version").stderr, - "openjdk version \"1.8.0_402\"" + "openjdk version \"1.8.0_412\"" ); }, );