Skip to content

Commit 77fa21c

Browse files
committed
Revert "Fix spock version for JUnit 5.3"
This reverts commit 2f9b1a6.
1 parent 79e6c4b commit 77fa21c

File tree

1 file changed

+4
-3
lines changed
  • dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5

1 file changed

+4
-3
lines changed

dd-java-agent/instrumentation/junit/junit-5.3/spock-junit-5/build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@ configurations.matching({ it.name.startsWith('test') }).configureEach({
4040
})
4141

4242
configurations.matching({ it.name.startsWith('latestDepTest') }).configureEach({
43-
it.resolutionStrategy {
44-
// Force latest stable Spock version (2.3), as 2.4-M7-groovy-3.0 is still in milestone stage and incompatible with JUnit 5 version
45-
force "org.spockframework:spock-core:2.3-groovy-${spockGroovyVersion}"
43+
it.resolutionStrategy.componentSelection.all { ComponentSelection selection ->
44+
if (selection.candidate.group == 'org.spockframework' && selection.candidate.module == 'spock-core' && !selection.candidate.version.endsWith("-groovy-${spockGroovyVersion}")) {
45+
selection.reject('Spock groovy version mismatch')
46+
}
4647
}
4748
})

0 commit comments

Comments
 (0)