@@ -53,14 +53,17 @@ subprojects { Project subProj ->
5353 subProj. tasks. withType(Javadoc ). configureEach { enabled = false }
5454
5555 subProj. afterEvaluate {
56+ if (! plugins. hasPlugin(" java" )) {
57+ return
58+ }
5659 String jdkCompile = null
5760 if (project. hasProperty(' minJavaVersionForTests' ) && project. getProperty(' minJavaVersionForTests' ) != JavaVersion . VERSION_1_8 ) {
5861 def version = JavaVersion . toVersion(project. getProperty(' minJavaVersionForTests' ))
5962 def name = " java$version . majorVersion "
6063 jdkCompile = " main_${ name} Implementation"
6164 }
6265 configurations. muzzleBootstrap {
63- exclude group : ' org.snakeyaml' , module : ' snakeyaml-engine' // we vendor this in the agent jar
66+ exclude group : ' org.snakeyaml' , module : ' snakeyaml-engine' // we vendor this in the agent jar
6467 }
6568 dependencies {
6669 // Apply common dependencies for instrumentation.
@@ -122,10 +125,12 @@ subprojects { Project subProj ->
122125 }
123126
124127 def path = subProj. getPath()
125- // don't include the redis RequestImpl stub
126- if (! path. equals(' :dd-java-agent:instrumentation:vertx-redis-client-3.9:stubs' )) {
127- parent_project. dependencies {
128- implementation project(path)
128+ subProj. plugins. withId(" java" ) {
129+ if (! path. equals(' :dd-java-agent:instrumentation:vertx-redis-client-3.9:stubs' )) {
130+ // don't include the redis RequestImpl stub
131+ parent_project. dependencies {
132+ implementation project(path)
133+ }
129134 }
130135 }
131136}
@@ -137,7 +142,7 @@ dependencies {
137142 implementation project(' :dd-java-agent:agent-builder' )
138143}
139144
140- if (project. gradle. startParameter. taskNames. any {it. endsWith(" generateMuzzleReport" )}) {
145+ if (project. gradle. startParameter. taskNames. any { it. endsWith(" generateMuzzleReport" ) }) {
141146 apply plugin : ' muzzle'
142147 task(" muzzleInstrumentationReport" ) {
143148 dependsOn(project. getAllTasks(true ). values(). flatten(). findAll { it. name. endsWith(" generateMuzzleReport" ) })
0 commit comments