Skip to content

Commit d748a1c

Browse files
Move Spock 2.4 usage only to problematic project that freezes on CI.
1 parent fd670c8 commit d748a1c

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

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

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

4747
dependencies {
4848
testImplementation project(':dd-java-agent:instrumentation:trace-annotation')
49-
testImplementation libs.bundles.spock24
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
5054
}
5155

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

gradle/libs.versions.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ objenesis = { module = "org.objenesis:objenesis", version = "3.3" } # Used by Sp
6969
spock24-core = { module = "org.spockframework:spock-core", version.ref = "spock24" }
7070
spock24-junit4 = { module = "org.spockframework:spock-junit4", version.ref = "spock24" }
7171
spock24-spring = { module = "org.spockframework:spock-spring", version.ref = "spock24" }
72-
objenesis34 = { module = "org.objenesis:objenesis", version = "3.4" }
7372

7473
groovy = { module = "org.codehaus.groovy:groovy-all", version.ref = "groovy" }
7574
groovy-yaml = { module = "org.codehaus.groovy:groovy-yaml", version.ref = "groovy" }
@@ -108,7 +107,6 @@ asm = ["asm", "asmcommons"]
108107
cafe-crypto = ["cafe-crypto-curve25519", "cafe-crypto-ed25519"]
109108
# Testing
110109
spock = ["spock-core", "spock-junit4", "objenesis"]
111-
spock24 = ["spock24-core", "spock24-junit4", "objenesis34"]
112110
spock24-spring = ["spock24-core", "spock24-junit4", "spock24-spring"]
113111
junit5 = ["junit-jupiter", "junit-jupiter-params"]
114112
mockito = ["mokito-core", "mokito-junit-jupiter", "byte-buddy", "byte-buddy-agent"]

0 commit comments

Comments
 (0)