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 {
41
41
plugin(" versions" , " org.springframework.boot" ).version(version)
42
42
}
43
43
}
44
- // r2dbc is not compatible with earlier versions
45
- addSpringBootCatalog(" springBoot2" , " 2.6.15" , " 2.+" )
46
44
// spring boot 3.0 is not compatible with graalvm native image
47
45
addSpringBootCatalog(" springBoot31" , " 3.1.0" , " 3.+" )
48
46
addSpringBootCatalog(" springBoot32" , " 3.2.0" , " 3.+" )
Original file line number Diff line number Diff line change 1
1
plugins {
2
2
id(" otel.java-conventions" )
3
- alias(springBoot2.plugins.versions)
4
3
}
5
4
6
5
description = " smoke-tests-otel-starter-spring-boot-2"
@@ -13,7 +12,8 @@ dependencies {
13
12
implementation(" org.springframework.kafka:spring-kafka" )
14
13
implementation(" org.springframework.boot:spring-boot-starter-data-mongodb" )
15
14
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" ))
17
17
18
18
implementation(project(" :smoke-tests-otel-starter:spring-boot-common" ))
19
19
@@ -23,10 +23,6 @@ dependencies {
23
23
testImplementation(" org.springframework.boot:spring-boot-starter-test" )
24
24
}
25
25
26
- springBoot {
27
- mainClass = " io.opentelemetry.spring.smoketest.OtelSpringStarterSmokeTestApplication"
28
- }
29
-
30
26
configurations.configureEach {
31
27
resolutionStrategy {
32
28
// 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 1
1
plugins {
2
2
id(" otel.java-conventions" )
3
- alias(springBoot2.plugins.versions)
4
3
}
5
4
6
5
description = " smoke-tests-otel-starter-spring-boot-reactive-2"
7
6
8
7
dependencies {
9
8
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" ))
11
11
12
12
implementation(project(" :smoke-tests-otel-starter:spring-boot-reactive-common" ))
13
13
implementation(" org.springframework.boot:spring-boot-starter-webflux" )
@@ -20,10 +20,6 @@ dependencies {
20
20
testImplementation(" io.projectreactor:reactor-test" )
21
21
}
22
22
23
- springBoot {
24
- mainClass = " io.opentelemetry.spring.smoketest.OtelReactiveSpringStarterSmokeTestApplication"
25
- }
26
-
27
23
configurations.configureEach {
28
24
resolutionStrategy {
29
25
// 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