Skip to content

Commit 5e6f297

Browse files
committed
fix more
1 parent 9cfd106 commit 5e6f297

File tree

2 files changed

+13
-2
lines changed

2 files changed

+13
-2
lines changed

instrumentation/spring/spring-core-2.0/javaagent/build.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ dependencies {
1818
// 3.0 introduces submit() methods
1919
// 4.0 introduces submitListenable() methods
2020
testLibrary("org.springframework:spring-core:4.0.0.RELEASE")
21+
22+
latestDepTestLibrary("org.springframework:spring-core:6.+") // documented limitation
2123
}
2224

2325
// spring 6 requires java 17

instrumentation/spring/spring-web/spring-web-3.1/library/build.gradle.kts

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,24 @@ plugins {
22
id("otel.library-instrumentation")
33
}
44

5+
val latestDepTest = findProperty("testLatestDeps") as Boolean
6+
57
dependencies {
68
compileOnly("org.springframework:spring-web:3.1.0.RELEASE")
79

810
testLibrary("org.springframework:spring-web:3.1.0.RELEASE")
911

1012
testImplementation("io.opentelemetry:opentelemetry-sdk-testing")
11-
}
1213

13-
val latestDepTest = findProperty("testLatestDeps") as Boolean
14+
if (latestDepTest) {
15+
// Exclude Spring Framework 7.0+ until compatible version available
16+
testImplementation("org.springframework:spring-web") {
17+
version {
18+
strictly("[6.0,7.0[")
19+
}
20+
}
21+
}
22+
}
1423

1524
// spring 6 requires java 17
1625
if (latestDepTest) {

0 commit comments

Comments
 (0)