From d037395baa228a0c1a7314941d4aeaa5fed09903 Mon Sep 17 00:00:00 2001
From: Rene Groeschke <rene@elastic.co>
Date: Fri, 15 Aug 2025 18:22:21 +0200
Subject: [PATCH 1/3] [Gradle] Avoid usage of archives configuration

This will be deprecated in later Gradle versions
---
 x-pack/plugin/ml/build.gradle          | 6 +++---
 x-pack/plugin/security/build.gradle    | 6 +++---
 x-pack/rest-resources-zip/build.gradle | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

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..dcd05d7a94260 100644
--- a/x-pack/plugin/security/build.gradle
+++ b/x-pack/plugin/security/build.gradle
@@ -174,9 +174,9 @@ tasks.named("processTestResources").configure {
   from(project(xpackModule('core')).file('src/test/resources'))
 }
 
-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') {
+  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
 }

From eaba69d10eca1b85661bd857104fadd62422a7a0 Mon Sep 17 00:00:00 2001
From: Rene Groeschke <rene@elastic.co>
Date: Tue, 26 Aug 2025 10:30:30 +0200
Subject: [PATCH 2/3] Remove unused wiring in distribution project

---
 distribution/build.gradle | 16 ----------------
 1 file changed, 16 deletions(-)

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.

From 1f945bfeb38c40d34689ac7e3d2eb6e4ae149e1b Mon Sep 17 00:00:00 2001
From: Rene Groeschke <rene@elastic.co>
Date: Tue, 26 Aug 2025 12:46:59 +0200
Subject: [PATCH 3/3] minor tweak

---
 x-pack/plugin/security/build.gradle | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugin/security/build.gradle b/x-pack/plugin/security/build.gradle
index dcd05d7a94260..60b06958a9991 100644
--- a/x-pack/plugin/security/build.gradle
+++ b/x-pack/plugin/security/build.gradle
@@ -175,7 +175,8 @@ tasks.named("processTestResources").configure {
 }
 
 
-tasks.named('assemble') {
+tasks.named('assemble').configure {
+  // normal es plugins do not publish the jar but we need to since users need it for extensions
   dependsOn tasks.named('jar')
 }