Skip to content

Remove spring boot gradle plugin from boot 2 tests #14522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 26, 2025
Merged

Remove spring boot gradle plugin from boot 2 tests #14522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,6 @@ dependencyResolutionManagement {
plugin("versions", "org.springframework.boot").version(version)
}
}
// r2dbc is not compatible with earlier versions
addSpringBootCatalog("springBoot2", "2.6.15", "2.+")
// spring boot 3.0 is not compatible with graalvm native image
addSpringBootCatalog("springBoot31", "3.1.0", "3.+")
addSpringBootCatalog("springBoot32", "3.2.0", "3.+")
Expand Down
8 changes: 2 additions & 6 deletions smoke-tests-otel-starter/spring-boot-2/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
plugins {
id("otel.java-conventions")
alias(springBoot2.plugins.versions)
}

description = "smoke-tests-otel-starter-spring-boot-2"
Expand All @@ -13,7 +12,8 @@ dependencies {
implementation("org.springframework.kafka:spring-kafka")
implementation("org.springframework.boot:spring-boot-starter-data-mongodb")
implementation("org.springframework.boot:spring-boot-starter-aop")
implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES))
val testLatestDeps = gradle.startParameter.projectProperties["testLatestDeps"] == "true"
implementation(platform("org.springframework.boot:spring-boot-dependencies:" + if (testLatestDeps) "2.+" else "2.6.15"))

implementation(project(":smoke-tests-otel-starter:spring-boot-common"))

Expand All @@ -23,10 +23,6 @@ dependencies {
testImplementation("org.springframework.boot:spring-boot-starter-test")
}

springBoot {
mainClass = "io.opentelemetry.spring.smoketest.OtelSpringStarterSmokeTestApplication"
}

configurations.configureEach {
resolutionStrategy {
// our dependency management pins to a version that is not compatible with spring boot 2.7
Expand Down
8 changes: 2 additions & 6 deletions smoke-tests-otel-starter/spring-boot-reactive-2/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
plugins {
id("otel.java-conventions")
alias(springBoot2.plugins.versions)
}

description = "smoke-tests-otel-starter-spring-boot-reactive-2"

dependencies {
implementation(project(":instrumentation:spring:starters:spring-boot-starter"))
implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES))
val testLatestDeps = gradle.startParameter.projectProperties["testLatestDeps"] == "true"
implementation(platform("org.springframework.boot:spring-boot-dependencies:" + if (testLatestDeps) "2.+" else "2.6.15"))

implementation(project(":smoke-tests-otel-starter:spring-boot-reactive-common"))
implementation("org.springframework.boot:spring-boot-starter-webflux")
Expand All @@ -20,10 +20,6 @@ dependencies {
testImplementation("io.projectreactor:reactor-test")
}

springBoot {
mainClass = "io.opentelemetry.spring.smoketest.OtelReactiveSpringStarterSmokeTestApplication"
}

configurations.configureEach {
resolutionStrategy {
// our dependency management pins to a version that is not compatible with spring boot 2.7
Expand Down
Loading