Skip to content

[8.14] Ensure correct runtime Java is used when it matches build Java (#110730)#110732

Merged
elasticsearchmachine merged 1 commit intoelastic:8.14from
mark-vieira:backport/8.14/pr-110730
Jul 10, 2024
Merged

[8.14] Ensure correct runtime Java is used when it matches build Java (#110730)#110732
elasticsearchmachine merged 1 commit intoelastic:8.14from
mark-vieira:backport/8.14/pr-110730

Conversation

@mark-vieira
Copy link
Copy Markdown
Contributor

Backports the following commits to 8.14:

…ic#110730)

Ensures that the value provided by the `runtime.java` system property,
or `RUNTIME_JAVA_HOME` environment variable is respected, even when it
is the same as the current `JAVA_HOME`. The previous logic had
`isRuntimeJavaHomeSet` return `false` when the "requested" Java was the
same as the current one. This isn't strictly correct, as the behavior
when Java home is unset is to use the bundled JDK. The result was that
passing `-Druntime.java=17` when the Gradle daemon was also using Java
17 was to execute tests with the bundled JDK, which could be something
entirely different.
@mark-vieira mark-vieira requested a review from a team as a code owner July 10, 2024 20:19
@mark-vieira mark-vieira added :Delivery/Build Build or test infrastructure >non-issue auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) backport Team:Delivery Meta label for Delivery team labels Jul 10, 2024
@elasticsearchmachine elasticsearchmachine merged commit 39b04d2 into elastic:8.14 Jul 10, 2024
@mark-vieira mark-vieira deleted the backport/8.14/pr-110730 branch July 10, 2024 21:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) backport :Delivery/Build Build or test infrastructure >non-issue Team:Delivery Meta label for Delivery team v8.14.4

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants