Skip to content

Commit f7e307e

Browse files
authored
Merge pull request #966 from microsoft/fix_task_dependencies
fix jar task dependencies
2 parents 1cf96aa + b2997b8 commit f7e307e

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

collectd/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,10 @@ plugins {
2626
apply from: "$buildScriptsDir/common-java.gradle"
2727

2828
// Since we're building the shadow jar, we have no use in the jar contains only CollectD code.
29-
jar.enabled = false
29+
jar {
30+
dependsOn shadowJar
31+
enabled = false
32+
}
3033

3134
shadowJar {
3235
classifier = ''
@@ -49,6 +52,3 @@ dependencies {
4952
testCompile files(collectDLibPath)
5053
}
5154

52-
// Building the shadow (fat) jar after compiling sources.
53-
shadowJar.dependsOn assemble
54-

distributions/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ apply from: "$buildScriptsDir/common-java.gradle"
2828
archivesBaseName = 'applicationinsights-all'
2929

3030
// Since we're building the shadow jar, we have no use in the jar contains only CollectD code.
31-
jar.enabled = false
31+
jar {
32+
dependsOn shadowJar
33+
enabled = false
34+
}
3235

3336
shadowJar {
3437
classifier = ''
@@ -46,6 +49,3 @@ dependencies {
4649
compile project(':logging:log4j2')
4750
compile project(':logging:logback')
4851
}
49-
50-
// Building the shadow (fat) jar after compiling sources.
51-
shadowJar.dependsOn assemble

0 commit comments

Comments
 (0)