From b2997b8c8e4ff85a8911f757f225886f30fe9398 Mon Sep 17 00:00:00 2001
From: littleaj <1690572+littleaj@users.noreply.github.com>
Date: Mon, 8 Jul 2019 14:21:32 -0700
Subject: [PATCH] fix jar task dependencies

---
 collectd/build.gradle      | 8 ++++----
 distributions/build.gradle | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/collectd/build.gradle b/collectd/build.gradle
index 82da41675a8..ccdcb12a73f 100644
--- a/collectd/build.gradle
+++ b/collectd/build.gradle
@@ -26,7 +26,10 @@ plugins {
 apply from: "$buildScriptsDir/common-java.gradle"
 
 // Since we're building the shadow jar, we have no use in the jar contains only CollectD code.
-jar.enabled = false
+jar {
+    dependsOn shadowJar
+    enabled = false
+}
 
 shadowJar {
     classifier = ''
@@ -49,6 +52,3 @@ dependencies {
     testCompile files(collectDLibPath)
 }
 
-// Building the shadow (fat) jar after compiling sources.
-shadowJar.dependsOn assemble
-
diff --git a/distributions/build.gradle b/distributions/build.gradle
index edd1480d955..a1049107063 100644
--- a/distributions/build.gradle
+++ b/distributions/build.gradle
@@ -28,7 +28,10 @@ apply from: "$buildScriptsDir/common-java.gradle"
 archivesBaseName = 'applicationinsights-all'
 
 // Since we're building the shadow jar, we have no use in the jar contains only CollectD code.
-jar.enabled = false
+jar {
+    dependsOn shadowJar
+    enabled = false
+}
 
 shadowJar {
     classifier = ''
@@ -46,6 +49,3 @@ dependencies {
     compile project(':logging:log4j2')
     compile project(':logging:logback')
 }
-
-// Building the shadow (fat) jar after compiling sources.
-shadowJar.dependsOn assemble