Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade default JDKs to 21.0.1, 17.0.9, 11.0.21 and 8u392 #599

Merged
merged 1 commit into from
Oct 19, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions buildpacks/jvm/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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_392`. ([#599](https://github.com/heroku/buildpacks-jvm/pull/599))
* Default version for **OpenJDK 11** is now `11.0.21`. ([#599](https://github.com/heroku/buildpacks-jvm/pull/599))
* Default version for **OpenJDK 17** is now `17.0.9`. ([#599](https://github.com/heroku/buildpacks-jvm/pull/599))
* Default version for **OpenJDK 21** is now `21.0.1`. ([#599](https://github.com/heroku/buildpacks-jvm/pull/599))

## [3.2.0] - 2023-09-20

### Added
Expand Down
16 changes: 8 additions & 8 deletions buildpacks/jvm/src/version.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,20 @@ pub(crate) fn normalize_version_string<S: Into<String>>(

let version_string = match user_version_string {
"7" | "1.7" => "1.7.0_352",
"8" | "1.8" => "1.8.0_382",
"8" | "1.8" => "1.8.0_392",
"9" | "1.9" => "9.0.4",
"10" => "10.0.2",
"11" => "11.0.20.1",
"11" => "11.0.21",
"12" => "12.0.2",
"13" => "13.0.14",
"14" => "14.0.2",
"15" => "15.0.10",
"16" => "16.0.2",
"17" => "17.0.8.1",
"17" => "17.0.9",
"18" => "18.0.2.1",
"19" => "19.0.2",
"20" => "20.0.2",
"21" => "21.0.0",
"21" => "21.0.1",
other => other,
};

Expand Down Expand Up @@ -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_382")))
Ok((OpenJDKDistribution::Heroku, String::from("1.8.0_392")))
);

assert_eq!(
normalize_version_string(&stack_id!("heroku-20"), "8"),
Ok((OpenJDKDistribution::Heroku, String::from("1.8.0_382")))
Ok((OpenJDKDistribution::Heroku, String::from("1.8.0_392")))
);

assert_eq!(
normalize_version_string(&stack_id!("heroku-22"), "8"),
Ok((OpenJDKDistribution::AzulZulu, String::from("1.8.0_382")))
Ok((OpenJDKDistribution::AzulZulu, String::from("1.8.0_392")))
);

assert_eq!(
normalize_version_string(&stack_id!("bogus"), "8"),
Ok((OpenJDKDistribution::AzulZulu, String::from("1.8.0_382")))
Ok((OpenJDKDistribution::AzulZulu, String::from("1.8.0_392")))
);
}

Expand Down
4 changes: 2 additions & 2 deletions buildpacks/jvm/tests/integration/versions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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_382-heroku\""
"openjdk version \"1.8.0_392-heroku\""
);
},
)
Expand All @@ -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_382\""
"openjdk version \"1.8.0_392\""
);
},
)
Expand Down