From 9a7dbc5e9a946945bbdd379cc27a8a29fe1d8157 Mon Sep 17 00:00:00 2001
From: Cas Donoghue <cas.donoghue@gmail.com>
Date: Tue, 20 Jan 2026 13:48:40 -0800
Subject: [PATCH 1/2] Remove unused gradle tasks (#18526)

* WIP? Remove unused gradle tasks

Starting point for task removal

* add back plugin version task after code review

(cherry picked from commit 28c810d7372e108e3b2e6fa07f74d9a6619a93b2)

# Conflicts:
#	build.gradle
#	ci/ci_docs.sh
---
 build.gradle | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/build.gradle b/build.gradle
index ecbe76eae2d..cc04eb70875 100644
--- a/build.gradle
+++ b/build.gradle
@@ -328,6 +328,29 @@ tasks.register("compileGrammar") {
     }
 }
 
+<<<<<<< HEAD
+=======
+tasks.register("artifactDockerOnly") {
+    description = "Build docker image without OSS"
+    dependsOn dockerBootstrap
+    dependsOn copyJdk
+
+    doLast {
+        rake(projectDir, buildDir, 'artifact:docker_only')
+    }
+}
+
+tasks.register("generatePluginsVersion") {
+    description = "Generate plugins version documentation"
+    dependsOn bootstrap
+    dependsOn installDefaultGems
+
+    doLast {
+        rake(projectDir, buildDir, 'generate_plugins_version')
+    }
+}
+
+>>>>>>> 28c810d7 (Remove unused gradle tasks (#18526))
 tasks.register("artifactDockerObservabilitySRE") {
     dependsOn bootstrap
     inputs.files fileTree("${projectDir}/rakelib")
@@ -372,6 +395,7 @@ tasks.register("assembleTarDistribution") {
   }
 }
 
+<<<<<<< HEAD
 tasks.register("assembleOssTarDistribution") {
   dependsOn bootstrap
   inputs.files fileTree("${projectDir}/rakelib")
@@ -418,6 +442,8 @@ tasks.register("assembleOssZipDistribution") {
   }
 }
 
+=======
+>>>>>>> 28c810d7 (Remove unused gradle tasks (#18526))
 project(":logstash-core") {
   ["rubyTests", "test"].each { tsk ->
     tasks.getByPath(":logstash-core:" + tsk).configure {

From 946c41a8eded7b955d91decf16dc2e2a56037936 Mon Sep 17 00:00:00 2001
From: donoghuc <cas.donoghue@gmail.com>
Date: Tue, 20 Jan 2026 14:14:38 -0800
Subject: [PATCH 2/2] fix merge conflicts

---
 build.gradle | 72 ----------------------------------------------------
 1 file changed, 72 deletions(-)

diff --git a/build.gradle b/build.gradle
index cc04eb70875..a143315f670 100644
--- a/build.gradle
+++ b/build.gradle
@@ -328,29 +328,6 @@ tasks.register("compileGrammar") {
     }
 }
 
-<<<<<<< HEAD
-=======
-tasks.register("artifactDockerOnly") {
-    description = "Build docker image without OSS"
-    dependsOn dockerBootstrap
-    dependsOn copyJdk
-
-    doLast {
-        rake(projectDir, buildDir, 'artifact:docker_only')
-    }
-}
-
-tasks.register("generatePluginsVersion") {
-    description = "Generate plugins version documentation"
-    dependsOn bootstrap
-    dependsOn installDefaultGems
-
-    doLast {
-        rake(projectDir, buildDir, 'generate_plugins_version')
-    }
-}
-
->>>>>>> 28c810d7 (Remove unused gradle tasks (#18526))
 tasks.register("artifactDockerObservabilitySRE") {
     dependsOn bootstrap
     inputs.files fileTree("${projectDir}/rakelib")
@@ -395,55 +372,6 @@ tasks.register("assembleTarDistribution") {
   }
 }
 
-<<<<<<< HEAD
-tasks.register("assembleOssTarDistribution") {
-  dependsOn bootstrap
-  inputs.files fileTree("${projectDir}/rakelib")
-  inputs.files fileTree("${projectDir}/bin")
-  inputs.files fileTree("${projectDir}/config")
-  inputs.files fileTree("${projectDir}/lib")
-  inputs.files fileTree("${projectDir}/logstash-core-plugin-api")
-  inputs.files fileTree("${projectDir}/logstash-core/lib")
-  inputs.files fileTree("${projectDir}/logstash-core/src")
-  doLast {
-      rake(projectDir, buildDir, 'artifact:archives_oss')
-  }
-}
-
-tasks.register("assembleZipDistribution") {
-  dependsOn bootstrap
-  inputs.files fileTree("${projectDir}/rakelib")
-  inputs.files fileTree("${projectDir}/bin")
-  inputs.files fileTree("${projectDir}/config")
-  inputs.files fileTree("${projectDir}/lib")
-  inputs.files fileTree("${projectDir}/logstash-core-plugin-api")
-  inputs.files fileTree("${projectDir}/logstash-core/lib")
-  inputs.files fileTree("${projectDir}/logstash-core/src")
-  inputs.files fileTree("${projectDir}/x-pack")
-  outputs.files file("${buildDir}/logstash-${project.version}.zip")
-  doLast {
-      rake(projectDir, buildDir, 'artifact:archives')
-  }
-}
-
-tasks.register("assembleOssZipDistribution") {
-  dependsOn bootstrap
-  inputs.files fileTree("${projectDir}/rakelib")
-  inputs.files fileTree("${projectDir}/bin")
-  inputs.files fileTree("${projectDir}/config")
-  inputs.files fileTree("${projectDir}/lib")
-  inputs.files fileTree("${projectDir}/logstash-core-plugin-api")
-  inputs.files fileTree("${projectDir}/logstash-core/lib")
-  inputs.files fileTree("${projectDir}/logstash-core/src")
-  outputs.files file("${buildDir}/logstash-${project.version}.zip")
-  doLast {
-      rake(projectDir, buildDir, 'artifact:archives_oss')
-
-  }
-}
-
-=======
->>>>>>> 28c810d7 (Remove unused gradle tasks (#18526))
 project(":logstash-core") {
   ["rubyTests", "test"].each { tsk ->
     tasks.getByPath(":logstash-core:" + tsk).configure {