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 8.8 #108021

Merged
merged 4 commits into from
Jun 4, 2024
Merged

Conversation

breskeby
Copy link
Contributor

@breskeby breskeby commented Apr 29, 2024

Update Gradle wrapper to 8.8.

Requires nebula-plugins/gradle-ospackage-plugin#443

@breskeby breskeby requested a review from a team as a code owner April 29, 2024 14:12
@elasticsearchmachine elasticsearchmachine added needs:triage Requires assignment of a team area label v8.15.0 labels Apr 29, 2024
@breskeby breskeby self-assigned this Apr 29, 2024
@breskeby breskeby added :Delivery/Build Build or test infrastructure Team:Delivery Meta label for Delivery team and removed needs:triage Requires assignment of a team area label labels Apr 29, 2024
@breskeby breskeby marked this pull request as draft April 29, 2024 14:54
@breskeby breskeby added the :Delivery/Packaging RPM and deb packaging, tar and zip archives, shell and batch scripts label Apr 30, 2024
@breskeby breskeby force-pushed the update-gradle-wrapper-88 branch 4 times, most recently from fce86d2 to 415ab0c Compare May 16, 2024 15:52
import java.nio.file.Path;
import java.nio.file.Paths;

public class HdfsUtils {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Deleted on the way as it turns out unused by now

@breskeby breskeby force-pushed the update-gradle-wrapper-88 branch 4 times, most recently from 3a00cdc to be23b62 Compare May 27, 2024 09:09
@breskeby breskeby removed the :Delivery/Packaging RPM and deb packaging, tar and zip archives, shell and batch scripts label May 31, 2024
Fix incompatibility with 8.8 and our internal api usages

- Update ospackage
- Use jitpack build till PR 443 got merged
- Tweak build logic to avoid deprecation warnings
- Use newer permission api
- Use custom shadowplugin
- Rework ElasticsearchDistribution dependencies resolution
@breskeby breskeby changed the title Update Gradle wrapper to 8.8-rc-1 Update Gradle wrapper to 8.8-rc-2 Jun 2, 2024
@breskeby breskeby changed the title Update Gradle wrapper to 8.8-rc-2 Update Gradle wrapper to 8.8 Jun 2, 2024
@breskeby breskeby marked this pull request as ready for review June 2, 2024 17:26
@elasticsearchmachine
Copy link
Collaborator

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

@@ -38,7 +38,7 @@ maven-model = "org.apache.maven:maven-model:3.6.2"
mockito-core = "org.mockito:mockito-core:1.9.5"
nebula-info = "com.netflix.nebula:gradle-info-plugin:11.3.3"
reflections = "org.reflections:reflections:0.9.12"
shadow-plugin = "com.github.johnrengelman:shadow:8.1.1"
shadow-plugin = "com.github.breskeby:shadow:3b035f2"
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we have a PR open to fix the shadow plugin?

@breskeby breskeby merged commit 8ac3e3d into elastic:main Jun 4, 2024
15 checks passed
@breskeby
Copy link
Contributor Author

breskeby commented Jun 4, 2024

💚 All backports created successfully

Status Branch Result
8.14
7.17

Questions ?

Please refer to the Backport tool documentation

breskeby added a commit to breskeby/elasticsearch that referenced this pull request Jun 17, 2024
Fix incompatibility with 8.8 and our internal api usages

- Update ospackage to a version that contains a fix we provided
- Tweak build logic to avoid deprecation warnings
- Use newer permission api
- Use custom shadowplugin
- Rework ElasticsearchDistribution dependencies resolution
- Update Gradle wrapper to 8.8

(cherry picked from commit 8ac3e3d)

# Conflicts:
#	build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/precommit/DependencyLicensesPrecommitPlugin.java
#	build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/util/HdfsUtils.java
#	build-tools/src/main/java/org/elasticsearch/gradle/DistributionDownloadPlugin.java
#	build-tools/src/main/java/org/elasticsearch/gradle/ElasticsearchDistribution.java
#	distribution/archives/build.gradle
#	distribution/build.gradle
#	distribution/packages/build.gradle
#	gradle/build.versions.toml
#	gradle/verification-metadata.xml
#	server/build.gradle
breskeby added a commit that referenced this pull request Jun 18, 2024
Fix incompatibility with 8.8 and our internal api usages

- Update ospackage to a version that contains a fix we provided
- Tweak build logic to avoid deprecation warnings
- Use newer permission api
- Use custom shadowplugin
- Rework ElasticsearchDistribution dependencies resolution
- Update Gradle wrapper to 8.8
- Fix one more deprecated permission api usage
- Fix DistroTest dependencies
- Fix permissions in package init.d folder
breskeby added a commit to breskeby/elasticsearch that referenced this pull request Jun 21, 2024
Fix incompatibility with 8.8 and our internal api usages

- Update ospackage to a version that contains a fix we provided
- Tweak build logic to avoid deprecation warnings
- Use newer permission api
- Use custom shadowplugin
- Rework ElasticsearchDistribution dependencies resolution
- Update Gradle wrapper to 8.8

(cherry picked from commit 8ac3e3d)

# Conflicts:
#	gradle/verification-metadata.xml
breskeby added a commit that referenced this pull request Jun 24, 2024
(cherry picked from commit 8ac3e3d)

* Add asm 9.7 to verification metadata
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 v8.15.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants