From a33b10117a36addf92cd368d0d9c2e50b161276b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 16 Nov 2025 04:53:20 +0000 Subject: [PATCH 1/2] fix(deps): update spring boot to v2.7.18 --- smoke-tests-otel-starter/spring-boot-2/build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/smoke-tests-otel-starter/spring-boot-2/build.gradle.kts b/smoke-tests-otel-starter/spring-boot-2/build.gradle.kts index ca6a1752ef0d..dad38c51ed7f 100644 --- a/smoke-tests-otel-starter/spring-boot-2/build.gradle.kts +++ b/smoke-tests-otel-starter/spring-boot-2/build.gradle.kts @@ -38,8 +38,8 @@ testing { dependencies { implementation(project()) implementation(project(":smoke-tests-otel-starter:spring-boot-common")) - implementation("org.springframework.boot:spring-boot-starter-web:2.6.15") - implementation("org.springframework.boot:spring-boot-starter-test:2.6.15") + implementation("org.springframework.boot:spring-boot-starter-web:2.7.18") + implementation("org.springframework.boot:spring-boot-starter-test:2.7.18") } } } From 3d9c11f5909e6838c4ad52fa936b26630c8f7d72 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Sun, 16 Nov 2025 07:54:52 -0800 Subject: [PATCH 2/2] apply laurit's comment --- .../spring-boot-2/build.gradle.kts | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/smoke-tests-otel-starter/spring-boot-2/build.gradle.kts b/smoke-tests-otel-starter/spring-boot-2/build.gradle.kts index dad38c51ed7f..2bc0debea139 100644 --- a/smoke-tests-otel-starter/spring-boot-2/build.gradle.kts +++ b/smoke-tests-otel-starter/spring-boot-2/build.gradle.kts @@ -4,6 +4,9 @@ plugins { description = "smoke-tests-otel-starter-spring-boot-2" +val testLatestDeps = gradle.startParameter.projectProperties["testLatestDeps"] == "true" +val springBootVersion = if (testLatestDeps) "2.+" else "2.6.15" + dependencies { implementation("org.springframework.boot:spring-boot-starter-web") implementation("org.springframework.boot:spring-boot-starter-data-jdbc") @@ -13,8 +16,7 @@ dependencies { implementation("org.springframework.kafka:spring-kafka") implementation("org.springframework.boot:spring-boot-starter-data-mongodb") implementation("org.springframework.boot:spring-boot-starter-aop") - val testLatestDeps = gradle.startParameter.projectProperties["testLatestDeps"] == "true" - implementation(platform("org.springframework.boot:spring-boot-dependencies:" + if (testLatestDeps) "2.+" else "2.6.15")) + implementation(platform("org.springframework.boot:spring-boot-dependencies:$springBootVersion")) implementation(project(":smoke-tests-otel-starter:spring-boot-common")) @@ -38,8 +40,8 @@ testing { dependencies { implementation(project()) implementation(project(":smoke-tests-otel-starter:spring-boot-common")) - implementation("org.springframework.boot:spring-boot-starter-web:2.7.18") - implementation("org.springframework.boot:spring-boot-starter-test:2.7.18") + implementation("org.springframework.boot:spring-boot-starter-web:$springBootVersion") + implementation("org.springframework.boot:spring-boot-starter-test:$springBootVersion") } } }