Skip to content

Commit 6ee3535

Browse files
committed
test against the earliest supported spring version
1 parent dbbd39b commit 6ee3535

File tree

8 files changed

+9
-9
lines changed

8 files changed

+9
-9
lines changed

instrumentation/spring/spring-boot-autoconfigure/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ base.archivesName.set("opentelemetry-spring-boot")
77
group = "io.opentelemetry.instrumentation"
88

99
val versions: Map<String, String> by project
10-
val springBootVersion = "2.7.18"
10+
val springBootVersion = "2.6.15"
1111

1212
// r2dbc-proxy is shadowed to prevent org.springframework.boot.autoconfigure.r2dbc.R2dbcAutoConfiguration
1313
// from being loaded by Spring Boot (by the presence of META-INF/services/io.r2dbc.spi.ConnectionFactoryProvider) - even if the user doesn't want to use R2DBC.

instrumentation/spring/spring-webmvc/spring-webmvc-5.3/library/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ plugins {
33
}
44

55
val versions: Map<String, String> by project
6-
val springBootVersion = "2.7.18"
6+
val springBootVersion = "2.6.15"
77

88
dependencies {
99
compileOnly("org.springframework:spring-webmvc:5.3.0")

instrumentation/spring/starters/spring-boot-starter/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
group = "io.opentelemetry.instrumentation"
77

88
val versions: Map<String, String> by project
9-
val springBootVersion = "2.7.18"
9+
val springBootVersion = "2.6.15"
1010

1111
dependencies {
1212
compileOnly("org.springframework.boot:spring-boot-starter:$springBootVersion")

instrumentation/spring/starters/zipkin-spring-boot-starter/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66
group = "io.opentelemetry.instrumentation"
77

88
val versions: Map<String, String> by project
9-
val springBootVersion = "2.7.18"
9+
val springBootVersion = "2.6.15"
1010

1111
dependencies {
1212
api("org.springframework.boot:spring-boot-starter:$springBootVersion")

smoke-tests-otel-starter/spring-boot-common/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import org.springframework.boot.gradle.tasks.bundling.BootJar
22

33
plugins {
44
id("otel.java-conventions")
5-
id("org.springframework.boot") version "2.7.18"
5+
id("org.springframework.boot") version "2.6.15"
66
}
77

88
description = "smoke-tests-otel-starter-spring-boot-common"

smoke-tests-otel-starter/spring-boot-reactive-common/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import org.springframework.boot.gradle.tasks.bundling.BootJar
22

33
plugins {
44
id("otel.java-conventions")
5-
id("org.springframework.boot") version "2.7.18"
5+
id("org.springframework.boot") version "2.6.15"
66
}
77

88
description = "smoke-tests-otel-starter-spring-boot-reactive-common"

smoke-tests-otel-starter/spring-smoke-testing/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import org.springframework.boot.gradle.tasks.bundling.BootJar
22

33
plugins {
44
id("otel.java-conventions")
5-
id("org.springframework.boot") version "2.7.18"
5+
id("org.springframework.boot") version "2.6.15"
66
}
77

88
description = "smoke-tests-otel-starter-spring-smoke-testing"

smoke-tests/images/spring-boot/build.gradle.kts

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ plugins {
55
id("otel.java-conventions")
66

77
id("com.google.cloud.tools.jib")
8-
id("org.springframework.boot") version "2.7.18"
8+
id("org.springframework.boot") version "2.6.15"
99
}
1010

1111
dependencies {
1212
implementation(platform("io.opentelemetry:opentelemetry-bom:1.0.0"))
13-
implementation(platform("org.springframework.boot:spring-boot-dependencies:2.7.18"))
13+
implementation(platform("org.springframework.boot:spring-boot-dependencies:2.6.15"))
1414

1515
implementation("io.opentelemetry:opentelemetry-api")
1616
implementation(project(":instrumentation-annotations"))

0 commit comments

Comments
 (0)