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 6.5 #57580

Merged
merged 3 commits into from
Jun 4, 2020

Conversation

breskeby
Copy link
Contributor

@breskeby breskeby commented Jun 3, 2020

This updates the elasticsearch build to Gradle 6.5 that was released yesterday

@breskeby breskeby self-assigned this Jun 3, 2020
@breskeby breskeby added :Delivery/Build Build or test infrastructure Team:Core/Infra Meta label for core/infra team v7.7.2 v7.8.1 v7.9.0 v8.0.0 labels Jun 3, 2020
@breskeby breskeby requested review from rjernst and mark-vieira June 3, 2020 06:07
@breskeby
Copy link
Contributor Author

breskeby commented Jun 3, 2020

@elasticmachine test this please

@breskeby breskeby marked this pull request as draft June 3, 2020 07:37
@@ -107,7 +107,7 @@ BuildParams.bwcVersions.forPreviousUnreleased { BwcVersions.UnreleasedVersionInf
task checkoutBwcBranch() {
dependsOn fetchLatest
doLast {
String refspec = System.getProperty("bwc.refspec.${bwcBranch}") ?: System.getProperty("tests.bwc.refspec.${bwcBranch}") ?: "${remote}/${bwcBranch}"
def refspec = System.getProperty("bwc.refspec." + bwcBranch) ?: System.getProperty("tests.bwc.refspec." + bwcBranch) ?: "${remote}/${bwcBranch}"
Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is a result of gradle 6.5 updated groovy to 2.5.11 which results in this failure otherwise: https://gradle-enterprise.elastic.co/s/nv35erntpdz2e/failure

@breskeby
Copy link
Contributor Author

breskeby commented Jun 3, 2020

I've created #57590 for evaluating the new filesystem watching capabilities in gradle

@breskeby breskeby marked this pull request as ready for review June 3, 2020 08:50
@elasticmachine
Copy link
Collaborator

Pinging @elastic/es-core-infra (:Core/Infra/Build)

Copy link
Contributor

@mark-vieira mark-vieira left a comment

Choose a reason for hiding this comment

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

👍 Thanks, Rene.

@breskeby breskeby merged commit a57dd54 into elastic:master Jun 4, 2020
breskeby added a commit that referenced this pull request Jun 4, 2020
* Update Gradle wrapper to 6.5
* Fix groovy incompatibility issue after gradle update
* Fix Gstring String incompatibility
breskeby added a commit that referenced this pull request Jun 4, 2020
* Update Gradle wrapper to 6.5
* Fix groovy incompatibility issue after gradle update
* Fix Gstring String incompatibility
breskeby added a commit that referenced this pull request Jun 4, 2020
* Update Gradle wrapper to 6.5
* Fix groovy incompatibility issue after gradle update
* Fix Gstring String incompatibility
@breskeby breskeby deleted the update/gradle-wrapper-6-5-update branch June 4, 2020 08:35
breskeby added a commit that referenced this pull request Jun 4, 2020
breskeby added a commit that referenced this pull request Jun 4, 2020
breskeby added a commit that referenced this pull request Jun 4, 2020
breskeby added a commit to breskeby/elasticsearch that referenced this pull request Jun 4, 2020
* Update Gradle wrapper to 6.5
* Fix groovy incompatibility issue after gradle update
* Fix Gstring String incompatibility
breskeby added a commit to breskeby/elasticsearch that referenced this pull request Jun 4, 2020
* Update Gradle wrapper to 6.5
* Fix groovy incompatibility issue after gradle update
* Fix Gstring String incompatibility
breskeby added a commit that referenced this pull request Jun 4, 2020
* Update Gradle wrapper to 6.5
* Fix groovy incompatibility issue after gradle update
* Fix Gstring String incompatibility
breskeby added a commit that referenced this pull request Jun 4, 2020
* Update Gradle wrapper to 6.5
* Fix groovy incompatibility issue after gradle update
* Fix Gstring String incompatibility
@mark-vieira
Copy link
Contributor

@breskeby looks like we missed 7.x branch with this one 😄

breskeby added a commit that referenced this pull request Jun 12, 2020
* Update Gradle wrapper to 6.5
* Fix groovy incompatibility issue after gradle update
* Fix Gstring String incompatibility
@breskeby
Copy link
Contributor Author

breskeby commented Jun 12, 2020 via email

@mark-vieira mark-vieira added Team:Delivery Meta label for Delivery team and removed Team:Core/Infra Meta label for core/infra team labels Nov 11, 2020
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 Team:Delivery Meta label for Delivery team v7.7.2 v7.8.1 v7.9.0 v8.0.0-alpha1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants