Merge pull request #966 from microsoft/fix_task_dependencies

fix jar task dependencies
microsoft · Jul 8, 2019 · f7e307e · f7e307e
2 parents 1cf96aa + b2997b8
commit f7e307e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git 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
@@ -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