Skip to content

Commit 0fc2f41

Browse files
committed
Update JUnit jupiter and platform versions
1 parent c92a468 commit 0fc2f41

File tree

4 files changed

+28
-29
lines changed

4 files changed

+28
-29
lines changed

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
21
apply from: "$rootDir/gradle/java.gradle"
32

43
// JUnit5 5.3.0+ version is needed because of the fix in the TestInheritance test suite names.
54
// Previously at that version, the test suite name was the base class.
6-
def jupiterVersion = '5.3.0'
7-
def platformVersion = '1.3.0'
5+
def jupiterVersion = '5.13.1'
6+
def platformVersion = '1.13.1'
87

98
muzzle {
109
pass {
@@ -33,9 +32,9 @@ dependencies {
3332

3433
// versions used below are not the minimum ones that we support,
3534
// but the tests need to use them in order to be compliant with Spock 2.x
36-
testImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.9.2'
37-
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.9.2'
38-
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.9.2'
35+
testImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.13.1'
36+
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.13.1'
37+
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.13.1'
3938

4039
latestDepTestImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: '+'
4140
latestDepTestImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '+'
@@ -44,8 +43,8 @@ dependencies {
4443

4544
configurations.matching({ it.name.startsWith('test') }).each({
4645
it.resolutionStrategy {
47-
force group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.9.2'
48-
force group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.9.2'
49-
force group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.9.2'
46+
force group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.13.1'
47+
force group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.13.1'
48+
force group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.13.1'
5049
}
5150
})

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ muzzle {
55
group = 'io.cucumber'
66
module = 'cucumber-junit-platform-engine'
77
versions = '[5.4.0,)'
8-
extraDependency "org.junit.platform:junit-platform-launcher:1.9.2"
8+
extraDependency "org.junit.platform:junit-platform-launcher:1.13.1"
99
}
1010
}
1111

@@ -19,9 +19,9 @@ dependencies {
1919

2020
testImplementation testFixtures(project(':dd-java-agent:agent-ci-visibility'))
2121

22-
testImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.9.2'
23-
testImplementation group: 'org.junit.platform', name: 'junit-platform-suite', version: '1.9.2'
24-
testImplementation group: 'org.junit.platform', name: 'junit-platform-suite-engine', version: '1.9.2'
22+
testImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.13.1'
23+
testImplementation group: 'org.junit.platform', name: 'junit-platform-suite', version: '1.13.1'
24+
testImplementation group: 'org.junit.platform', name: 'junit-platform-suite-engine', version: '1.13.1'
2525

2626
testImplementation group: 'io.cucumber', name: 'cucumber-junit-platform-engine', version: '5.4.0'
2727
testImplementation group: 'io.cucumber', name: 'cucumber-java', version: '5.4.0'
@@ -33,8 +33,8 @@ dependencies {
3333

3434
configurations.matching({ it.name.startsWith('test') }).each({
3535
it.resolutionStrategy {
36-
force group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.9.2'
37-
force group: 'org.junit.platform', name: 'junit-platform-suite', version: '1.9.2'
38-
force group: 'org.junit.platform', name: 'junit-platform-suite', version: '1.9.2'
36+
force group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.13.1'
37+
force group: 'org.junit.platform', name: 'junit-platform-suite', version: '1.13.1'
38+
force group: 'org.junit.platform', name: 'junit-platform-suite-engine', version: '1.13.1'
3939
}
4040
})

dd-java-agent/instrumentation/junit-5.3/junit-5.8/build.gradle

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apply from: "$rootDir/gradle/java.gradle"
22

3-
def jupiterVersion = '5.8.0'
4-
def platformVersion = '1.8.0'
3+
def jupiterVersion = '5.13.1'
4+
def platformVersion = '1.13.1'
55

66
muzzle {
77
pass {
@@ -36,9 +36,9 @@ dependencies {
3636

3737
// versions used below are not the minimum ones that we support,
3838
// but the tests need to use them in order to be compliant with Spock 2.x
39-
testImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.9.2'
40-
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.9.2'
41-
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.9.2'
39+
testImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.13.1'
40+
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.13.1'
41+
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.13.1'
4242

4343
latestDepTestImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: '+'
4444
latestDepTestImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '+'
@@ -47,8 +47,8 @@ dependencies {
4747

4848
configurations.matching({ it.name.startsWith('test') }).each({
4949
it.resolutionStrategy {
50-
force group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.9.2'
51-
force group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.9.2'
52-
force group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.9.2'
50+
force group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.13.1'
51+
force group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.13.1'
52+
force group: 'org.junit.jupiter', name: 'junit-jupiter-params', version: '5.13.1'
5353
}
5454
})

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ muzzle {
77
group = 'org.spockframework'
88
module = 'spock-core'
99
versions = "[2.0-groovy-${spockGroovyVersion},)"
10-
extraDependency "org.junit.platform:junit-platform-launcher:1.9.2"
10+
extraDependency "org.junit.platform:junit-platform-launcher:1.13.1"
1111
}
1212
}
1313

@@ -16,13 +16,13 @@ addTestSuiteForDir('latestDepTest', 'test')
1616
dependencies {
1717
implementation project(':dd-java-agent:instrumentation:junit-5.3')
1818

19-
compileOnly group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.7.2'
20-
compileOnly group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.7.2'
19+
compileOnly group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.13.1'
20+
compileOnly group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.13.1'
2121
compileOnly group: 'org.spockframework', name: 'spock-core', version: "2.0-groovy-${spockGroovyVersion}"
2222

2323
testImplementation testFixtures(project(':dd-java-agent:agent-ci-visibility'))
2424

25-
testImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.9.2'
25+
testImplementation group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.13.1'
2626
testImplementation group: 'org.spockframework', name: 'spock-core', version: "2.2-groovy-${spockGroovyVersion}"
2727

2828
// Broken from 2.4: https://datadoghq.atlassian.net/browse/AIDM-163
@@ -31,7 +31,7 @@ dependencies {
3131

3232
configurations.matching({ it.name.startsWith('test') }).each({
3333
it.resolutionStrategy {
34-
force group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.9.2'
34+
force group: 'org.junit.platform', name: 'junit-platform-launcher', version: '1.13.1'
3535
force group: 'org.spockframework', name: 'spock-core', version: "2.2-groovy-${spockGroovyVersion}"
3636
}
3737
})

0 commit comments

Comments
 (0)