Skip to content

Backport java 17 build support to 7.17 #1950

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

Merged
merged 4 commits into from
Apr 29, 2022

Conversation

masseyke
Copy link
Member

Backporting support for building on java 17 from #1802 and #1808

masseyke and others added 2 commits February 23, 2022 16:18
This commit adds support for building on java 17, while leaving support for building java 11 untouched.
@masseyke masseyke requested a review from jbaiera April 18, 2022 19:44
@masseyke masseyke changed the title Fix/java 17 support 7.17 Backport java 17 build support to 7.17 Apr 18, 2022
@jbaiera jbaiera added v7.17.4 and removed v7.17.3 labels Apr 18, 2022
@@ -58,6 +58,12 @@ dependencies {
javadocSources(project(":elasticsearch-hadoop-mr"))
}

tasks.named("test").configure {
onlyIf { JavaVersion.current() >= JavaVersion.VERSION_16 }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this just needed to conditionally add the jvmArgs settings or are these tests required to run on JVM 16 and up?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is just for the jvmArgs settings. The tests still run for all versions right?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the onlyIf method marks the task to only run when the condition is true

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wow you're right. I think I think I just messed that one up. I'll also need to fix it on master.

@masseyke masseyke requested a review from jbaiera April 27, 2022 16:03
Copy link
Member

@jbaiera jbaiera left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

@masseyke masseyke merged commit 9308a01 into elastic:7.17 Apr 29, 2022
@masseyke masseyke deleted the fix/java-17-support-7.17 branch April 29, 2022 18:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants