Skip to content

Commit bddce46

Browse files
committed
Fix spring-security-config-6.0 latest dep tests
1 parent 187c585 commit bddce46

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

instrumentation/spring/spring-security-config-6.0/javaagent/build.gradle.kts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,9 @@ muzzle {
1515
}
1616

1717
dependencies {
18+
// SpringExtension in spring-test 7 requires JUnit 6
19+
implementation(enforcedPlatform("org.junit:junit-bom:6.0.1"))
20+
1821
implementation(project(":instrumentation:spring:spring-security-config-6.0:library"))
1922

2023
library("org.springframework.security:spring-security-config:6.0.0")
@@ -23,11 +26,15 @@ dependencies {
2326

2427
testLibrary("org.springframework:spring-test:6.0.0")
2528
testLibrary("org.springframework:spring-context:6.0.0")
26-
// can't use testLibrary for now because 6.2.0-M1 is latest and its POM referes to a missing
29+
// can't use testLibrary for now because 6.2.0-M1 is latest and its POM refers to a missing
2730
// parent POM, switch back to testLibrary when a new version is released
2831
// testLibrary("jakarta.servlet:jakarta.servlet-api:6.0.0")
2932
testImplementation("jakarta.servlet:jakarta.servlet-api:6.0.0")
3033
latestDepTestLibrary("jakarta.servlet:jakarta.servlet-api:6.1.0") // documented limitation
34+
// remove after 7.0 is released for spring security
35+
// spring-test 7 requires spring-context 7
36+
latestDepTestLibrary("org.springframework:spring-context:latest.release")
37+
latestDepTestLibrary("org.springframework:spring-web:latest.release")
3138
}
3239

3340
otelJava {

instrumentation/spring/spring-security-config-6.0/library/build.gradle.kts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@ plugins {
33
}
44

55
dependencies {
6+
// SpringExtension in spring-test 7 requires JUnit 6
7+
implementation(enforcedPlatform("org.junit:junit-bom:6.0.1"))
8+
69
library("org.springframework.security:spring-security-config:6.0.0")
710
library("org.springframework.security:spring-security-web:6.0.0")
811
library("org.springframework:spring-web:6.0.0")
@@ -17,6 +20,9 @@ dependencies {
1720
implementation(project(":instrumentation:reactor:reactor-3.1:library"))
1821

1922
testLibrary("org.springframework:spring-test:6.0.0")
23+
// remove after 7.0 is released for spring security
24+
// spring-test 7 requires spring-context 7
25+
latestDepTestLibrary("org.springframework:spring-context:latest.release")
2026
}
2127

2228
otelJava {

0 commit comments

Comments
 (0)