diff --git a/distribution/build.gradle b/distribution/build.gradle index fa6223d30e63b..2b055e63d938d 100644 --- a/distribution/build.gradle +++ b/distribution/build.gradle @@ -629,22 +629,6 @@ subprojects { } } -['archives:windows-zip', - '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. diff --git a/x-pack/plugin/ml/build.gradle b/x-pack/plugin/ml/build.gradle index 6b08ab7e84038..fd63fe2eabb05 100644 --- a/x-pack/plugin/ml/build.gradle +++ b/x-pack/plugin/ml/build.gradle @@ -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 { + dependsOn tasks.named('jar') } tasks.register("extractNativeLicenses", Copy) { diff --git a/x-pack/plugin/security/build.gradle b/x-pack/plugin/security/build.gradle index 450039e2958b1..60b06958a9991 100644 --- a/x-pack/plugin/security/build.gradle +++ b/x-pack/plugin/security/build.gradle @@ -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 { diff --git a/x-pack/rest-resources-zip/build.gradle b/x-pack/rest-resources-zip/build.gradle index 9307b6a8a51d4..ab684c8b0c367 100644 --- a/x-pack/rest-resources-zip/build.gradle +++ b/x-pack/rest-resources-zip/build.gradle @@ -59,6 +59,6 @@ def restResourcesZip = tasks.register('restResourcesZip', Zip) { } } -artifacts { - archives restResourcesZip +tasks.named('assemble').configure { + dependsOn restResourcesZip }