Skip to content

Commit c650b84

Browse files
feat: upgrade spock to final release of 2.4
1 parent b4a1885 commit c650b84

File tree

3 files changed

+16
-27
lines changed

3 files changed

+16
-27
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ dependencies {
2727
testImplementation project(':dd-java-agent:agent-ci-visibility:civisibility-instrumentation-test-fixtures')
2828

2929
testImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: libs.versions.junit.platform.get()
30-
testImplementation group: 'org.spockframework', name: 'spock-core', version: "2.4-M7-groovy-${spockGroovyVersion}"
30+
testImplementation group: 'org.spockframework', name: 'spock-core', version: "2.4-groovy-${spockGroovyVersion}"
3131

3232
latestDepTestImplementation group: 'org.spockframework', name: 'spock-core', version: '2.+'
3333
}
3434

3535
configurations.matching({ it.name.startsWith('test') }).configureEach({
3636
it.resolutionStrategy {
3737
force group: 'org.junit.platform', name: 'junit-platform-launcher', version: libs.versions.junit.platform.get()
38-
force group: 'org.spockframework', name: 'spock-core', version: "2.4-M7-groovy-${spockGroovyVersion}"
38+
force group: 'org.spockframework', name: 'spock-core', version: "2.4-groovy-${spockGroovyVersion}"
3939
}
4040
})
4141

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

Lines changed: 13 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -130,34 +130,23 @@ org.jacoco:org.jacoco.core:0.8.14=latestDepTestRuntimeClasspath,testRuntimeClass
130130
org.jacoco:org.jacoco.report:0.8.14=latestDepTestRuntimeClasspath,testRuntimeClasspath
131131
org.jctools:jctools-core:3.3.0=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
132132
org.jetbrains:annotations:20.1.0=compileClasspath
133-
org.junit.jupiter:junit-jupiter-api:5.12.2=testCompileClasspath,testRuntimeClasspath
134-
org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
133+
org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
135134
org.junit.jupiter:junit-jupiter-api:5.7.2=compileClasspath
136-
org.junit.jupiter:junit-jupiter-engine:5.12.2=testRuntimeClasspath
137-
org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath
138-
org.junit.jupiter:junit-jupiter-params:5.12.2=testCompileClasspath,testRuntimeClasspath
139-
org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
140-
org.junit.jupiter:junit-jupiter:5.12.2=testCompileClasspath,testRuntimeClasspath
141-
org.junit.jupiter:junit-jupiter:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
142-
org.junit.platform:junit-platform-commons:1.12.2=testCompileClasspath,testRuntimeClasspath
143-
org.junit.platform:junit-platform-commons:1.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
135+
org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath
136+
org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
137+
org.junit.jupiter:junit-jupiter:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
138+
org.junit.platform:junit-platform-commons:1.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
144139
org.junit.platform:junit-platform-commons:1.7.2=compileClasspath
145-
org.junit.platform:junit-platform-engine:1.12.2=testCompileClasspath,testRuntimeClasspath
146-
org.junit.platform:junit-platform-engine:1.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
140+
org.junit.platform:junit-platform-engine:1.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
147141
org.junit.platform:junit-platform-engine:1.7.2=compileClasspath
148-
org.junit.platform:junit-platform-launcher:1.12.2=testCompileClasspath,testRuntimeClasspath
149-
org.junit.platform:junit-platform-launcher:1.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
142+
org.junit.platform:junit-platform-launcher:1.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
150143
org.junit.platform:junit-platform-launcher:1.7.2=compileClasspath
151-
org.junit.platform:junit-platform-runner:1.12.2=testRuntimeClasspath
152-
org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath
153-
org.junit.platform:junit-platform-suite-api:1.12.2=testRuntimeClasspath
154-
org.junit.platform:junit-platform-suite-api:1.14.1=latestDepTestRuntimeClasspath
155-
org.junit.platform:junit-platform-suite-commons:1.12.2=testRuntimeClasspath
156-
org.junit.platform:junit-platform-suite-commons:1.14.1=latestDepTestRuntimeClasspath
144+
org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath
145+
org.junit.platform:junit-platform-suite-api:1.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath
146+
org.junit.platform:junit-platform-suite-commons:1.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath
157147
org.junit.platform:junit-platform-testkit:1.7.2=compileClasspath
158-
org.junit:junit-bom:5.12.2=testCompileClasspath,testRuntimeClasspath
159148
org.junit:junit-bom:5.14.0=spotbugs
160-
org.junit:junit-bom:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
149+
org.junit:junit-bom:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
161150
org.junit:junit-bom:5.7.2=compileClasspath
162151
org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,testRuntimeClasspath
163152
org.msgpack:jackson-dataformat-msgpack:0.9.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
@@ -187,9 +176,9 @@ org.slf4j:slf4j-api:1.7.36=latestDepTestRuntimeClasspath,testRuntimeClasspath
187176
org.slf4j:slf4j-api:2.0.17=spotbugs,spotbugsSlf4j
188177
org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j
189178
org.snakeyaml:snakeyaml-engine:2.9=instrumentPluginClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath
190-
org.spockframework:spock-bom:2.4-M7-groovy-3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath
179+
org.spockframework:spock-bom:2.4-groovy-3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
191180
org.spockframework:spock-core:2.0-groovy-3.0=compileClasspath
192-
org.spockframework:spock-core:2.4-M7-groovy-3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
181+
org.spockframework:spock-core:2.4-groovy-3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath
193182
org.testng:testng:7.5.1=latestDepTestRuntimeClasspath,testRuntimeClasspath
194183
org.webjars:jquery:3.5.1=latestDepTestRuntimeClasspath,testRuntimeClasspath
195184
org.xmlresolver:xmlresolver:5.3.3=spotbugs

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ junit4 = "4.13.2"
6666
junit5 = "5.14.1"
6767
junit-platform = "1.14.1"
6868
mockito = "4.4.0"
69-
spock = "2.4-M7-groovy-3.0"
69+
spock = "2.4-groovy-3.0"
7070
testcontainers = "1.21.3"
7171

7272
[libraries]

0 commit comments

Comments
 (0)