Skip to content

Commit d28a3ef

Browse files
Update Spock to 2.4-M6. (#9326)
1 parent 893780c commit d28a3ef

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

dd-java-agent/instrumentation/java-concurrent/java-concurrent-21/build.gradle

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,11 @@ tasks.named("check").configure {
4646

4747
dependencies {
4848
testImplementation project(':dd-java-agent:instrumentation:trace-annotation')
49+
50+
// Using Spock 2.4-M6 because it contains fix for deadlock when blocking in mock response generators.
51+
// See: https://github.com/spockframework/spock/pull/1910
52+
testImplementation libs.spock24.core
53+
testImplementation libs.spock24.junit4
4954
}
5055

5156
// Set all compile tasks to use JDK21 but let instrumentation code targets 1.8 compatibility

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ objenesis = { module = "org.objenesis:objenesis", version = "3.3" } # Used by Sp
6868

6969
spock24-core = { module = "org.spockframework:spock-core", version.ref = "spock24" }
7070
spock24-junit4 = { module = "org.spockframework:spock-junit4", version.ref = "spock24" }
71-
spock24-spring = { module = "org.spockframework:spock-spring", version = "spock24" }
71+
spock24-spring = { module = "org.spockframework:spock-spring", version.ref = "spock24" }
7272

7373
groovy = { module = "org.codehaus.groovy:groovy-all", version.ref = "groovy" }
7474
groovy-yaml = { module = "org.codehaus.groovy:groovy-yaml", version.ref = "groovy" }

0 commit comments

Comments
 (0)