File tree Expand file tree Collapse file tree 3 files changed +4
-14
lines changed Expand file tree Collapse file tree 3 files changed +4
-14
lines changed Original file line number Diff line number Diff line change @@ -41,8 +41,6 @@ dependencyResolutionManagement {
4141 plugin(" versions" , " org.springframework.boot" ).version(version)
4242 }
4343 }
44- // r2dbc is not compatible with earlier versions
45- addSpringBootCatalog(" springBoot2" , " 2.6.15" , " 2.+" )
4644 // spring boot 3.0 is not compatible with graalvm native image
4745 addSpringBootCatalog(" springBoot31" , " 3.1.0" , " 3.+" )
4846 addSpringBootCatalog(" springBoot32" , " 3.2.0" , " 3.+" )
Original file line number Diff line number Diff line change 11plugins {
22 id(" otel.java-conventions" )
3- alias(springBoot2.plugins.versions)
43}
54
65description = " smoke-tests-otel-starter-spring-boot-2"
@@ -13,7 +12,8 @@ dependencies {
1312 implementation(" org.springframework.kafka:spring-kafka" )
1413 implementation(" org.springframework.boot:spring-boot-starter-data-mongodb" )
1514 implementation(" org.springframework.boot:spring-boot-starter-aop" )
16- implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin .BOM_COORDINATES ))
15+ val testLatestDeps = gradle.startParameter.projectProperties[" testLatestDeps" ] == " true"
16+ implementation(platform(" org.springframework.boot:spring-boot-dependencies:" + if (testLatestDeps) " 2.+" else " 2.6.15" ))
1717
1818 implementation(project(" :smoke-tests-otel-starter:spring-boot-common" ))
1919
@@ -23,10 +23,6 @@ dependencies {
2323 testImplementation(" org.springframework.boot:spring-boot-starter-test" )
2424}
2525
26- springBoot {
27- mainClass = " io.opentelemetry.spring.smoketest.OtelSpringStarterSmokeTestApplication"
28- }
29-
3026configurations.configureEach {
3127 resolutionStrategy {
3228 // our dependency management pins to a version that is not compatible with spring boot 2.7
Original file line number Diff line number Diff line change 11plugins {
22 id(" otel.java-conventions" )
3- alias(springBoot2.plugins.versions)
43}
54
65description = " smoke-tests-otel-starter-spring-boot-reactive-2"
76
87dependencies {
98 implementation(project(" :instrumentation:spring:starters:spring-boot-starter" ))
10- implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin .BOM_COORDINATES ))
9+ val testLatestDeps = gradle.startParameter.projectProperties[" testLatestDeps" ] == " true"
10+ implementation(platform(" org.springframework.boot:spring-boot-dependencies:" + if (testLatestDeps) " 2.+" else " 2.6.15" ))
1111
1212 implementation(project(" :smoke-tests-otel-starter:spring-boot-reactive-common" ))
1313 implementation(" org.springframework.boot:spring-boot-starter-webflux" )
@@ -20,10 +20,6 @@ dependencies {
2020 testImplementation(" io.projectreactor:reactor-test" )
2121}
2222
23- springBoot {
24- mainClass = " io.opentelemetry.spring.smoketest.OtelReactiveSpringStarterSmokeTestApplication"
25- }
26-
2723configurations.configureEach {
2824 resolutionStrategy {
2925 // our dependency management pins to a version that is not compatible with spring boot 2.7
You can’t perform that action at this time.
0 commit comments