Skip to content

[Gradle] Avoid usage of archives configuration #133526

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.

Sign up for GitHub

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
Aug 26, 2025
Merged

[Gradle] Avoid usage of archives configuration #133526

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d037395
[Gradle] Avoid usage of archives configuration
breskeby Aug 15, 2025
eaba69d
Remove unused wiring in distribution project
breskeby Aug 26, 2025
5e21e7c
Merge branch 'main' into remove-deprecated-gradle-api
breskeby Aug 26, 2025
1f945bf
minor tweak
breskeby Aug 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 0 additions & 16 deletions distribution/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,22 +629,6 @@ subprojects {
}
}

['archives:windows-zip',
Copy link
Contributor Author

Choose a reason for hiding this comment

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

We don't use it and its basically just some rewiring of configurations adding nothing but clutter to the build that can be avoided.

'archives:darwin-tar',
'archives:darwin-aarch64-tar',
'archives:linux-aarch64-tar',
'archives:linux-tar',
'archives:integ-test-zip',
'packages:rpm', 'packages:deb',
'packages:aarch64-rpm', 'packages:aarch64-deb',
].forEach { subName ->
Project subproject = project("${project.path}:${subName}")
Configuration configuration = configurations.create(subproject.name)
dependencies {
"${configuration.name}" project(path: subproject.path, configuration:'default')
}
}

// This artifact makes it possible for other projects to pull
// in the final log4j2.properties configuration, as it appears in the
// archive distribution.
Expand Down
6 changes: 3 additions & 3 deletions x-pack/plugin/ml/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,9 @@ def mlCppVersion(){
(project.version + "-SNAPSHOT") : project.version;
}

artifacts {
// normal es plugins do not publish the jar but we need to since users need it for extensions
archives tasks.named("jar")

tasks.named('assemble').configure {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

buildReleaseArtifacts relies on the assemble task. archives has been deprecated. see gradle/gradle#34001

dependsOn tasks.named('jar')
}

tasks.register("extractNativeLicenses", Copy) {
Expand Down
5 changes: 3 additions & 2 deletions x-pack/plugin/security/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,10 @@ tasks.named("processTestResources").configure {
from(project(xpackModule('core')).file('src/test/resources'))
}

artifacts {

tasks.named('assemble').configure {
// normal es plugins do not publish the jar but we need to since users need it for extensions
archives tasks.named("jar")
dependsOn tasks.named('jar')
}

tasks.named("dependencyLicenses").configure {
Expand Down
4 changes: 2 additions & 2 deletions x-pack/rest-resources-zip/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,6 @@ def restResourcesZip = tasks.register('restResourcesZip', Zip) {
}
}

artifacts {
archives restResourcesZip
tasks.named('assemble').configure {
dependsOn restResourcesZip
}