From d1a4d8866d55ada6ef64d619a10d66eb6636769f Mon Sep 17 00:00:00 2001
From: Alpar Torok <torokalpar@gmail.com>
Date: Fri, 28 Jun 2019 16:33:24 +0300
Subject: [PATCH] Add missing dependencies so we can build in parallel 
 (#43672)

---
 distribution/build.gradle              | 3 ++-
 x-pack/plugin/sql/sql-cli/build.gradle | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/distribution/build.gradle b/distribution/build.gradle
index 5f269f700b8..13a4b25ab78 100644
--- a/distribution/build.gradle
+++ b/distribution/build.gradle
@@ -117,7 +117,7 @@ task buildTransportModules {
 
 void copyModule(Sync copyTask, Project module) {
   copyTask.configure {
-    dependsOn { module.bundlePlugin }
+    dependsOn "${module.path}:bundlePlugin"
     from({ zipTree(module.bundlePlugin.outputs.files.singleFile) }) {
       includeEmptyDirs false
 
@@ -167,6 +167,7 @@ buildDefaultLog4jConfig.doLast(writeLog4jProperties)
 
 // copy log4j2.properties from modules that have it
 void copyLog4jProperties(Task buildTask, Project module) {
+  buildTask.dependsOn "${module.path}:bundlePlugin"
   buildTask.doFirst {
     FileTree tree = zipTree(module.bundlePlugin.outputs.files.singleFile)
     FileTree filtered = tree.matching {
diff --git a/x-pack/plugin/sql/sql-cli/build.gradle b/x-pack/plugin/sql/sql-cli/build.gradle
index 927d165c2d2..bbd87c055d7 100644
--- a/x-pack/plugin/sql/sql-cli/build.gradle
+++ b/x-pack/plugin/sql/sql-cli/build.gradle
@@ -51,9 +51,9 @@ dependencyLicenses {
  * can be easily shipped around and used.
  */
 jar {
+    dependsOn configurations.runtimeClasspath
     from({
-        configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }
-        configurations.runtime.collect { it.isDirectory() ? it : zipTree(it) }
+        configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) }
     }) {
         // We don't need the META-INF from the things we bundle. For now.
         exclude 'META-INF/*'