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

Update Gradle wrapper to 7.3 #80633

Merged
merged 1 commit into from
Nov 10, 2021

Conversation

mark-vieira
Copy link
Contributor

Update to Gradle 7.3, which among other things, includes Java 17 support.

It seems at some point in the 7.3 RC process BuildLayout was changed to now report the root directory as the root of the included build instead of the root of the whole composite. We now have to use some trickery to determine whether the current project is an included build or not. For simplicity I'm just using the heuristic that if this project itself includes builds, it must be the root composite, otherwise, we're an included build so look up a level. To make this consistent and work I had to change build-tools-internal to no longer itself be a composite, which is actually unnecessary. When building build-tools-internal as part of a larger composite the dependencies are substituted as expected.

@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-delivery (Team:Delivery)

@mark-vieira
Copy link
Contributor Author

@breskeby please no rush but can you put some eyes on this? At some point BuildLayout semantics changed which broke the version properties loader stuff.

@breskeby
Copy link
Contributor

I have an open pr with the latest RC before the release open that included a fix too

@breskeby
Copy link
Contributor

Lgtm

@mark-vieira mark-vieira merged commit afbf2fe into elastic:master Nov 10, 2021
@mark-vieira mark-vieira deleted the gradle_7.3_upgrade branch November 10, 2021 21:50
mark-vieira added a commit to mark-vieira/elasticsearch that referenced this pull request Nov 10, 2021
mark-vieira added a commit to mark-vieira/elasticsearch that referenced this pull request Nov 10, 2021
@elasticsearchmachine
Copy link
Collaborator

💚 Backport successful

Status Branch Result
8.0
7.16

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
:Delivery/Build Build or test infrastructure >non-issue Team:Delivery Meta label for Delivery team v7.16.0 v8.0.0-rc1 v8.1.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants