Skip to content

Commit 4afa8cc

Browse files
authored
Update spring boot gradle plugin in smoke test image (#14488)
1 parent 7631fc1 commit 4afa8cc

File tree

2 files changed

+8
-11
lines changed

2 files changed

+8
-11
lines changed

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

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,22 @@ plugins {
55
id("otel.java-conventions")
66

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

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

1515
implementation("io.opentelemetry:opentelemetry-api")
1616
implementation(project(":instrumentation-annotations"))
1717
implementation("org.springframework.boot:spring-boot-starter-web")
1818
}
1919

20+
otelJava {
21+
minJavaVersionSupported = JavaVersion.VERSION_17
22+
}
23+
2024
configurations.runtimeClasspath {
2125
resolutionStrategy {
2226
// requires old logback (and therefore also old slf4j)
@@ -25,18 +29,11 @@ configurations.runtimeClasspath {
2529
}
2630
}
2731

28-
val targetJDK = project.findProperty("targetJDK") ?: "11"
32+
val targetJDK = project.findProperty("targetJDK") ?: "17"
2933

3034
val tag = findProperty("tag")
3135
?: DateTimeFormatter.ofPattern("yyyyMMdd.HHmmSS").format(LocalDateTime.now())
3236

33-
java {
34-
// needed by jib to detect java version used in project
35-
// for jdk9+ jib uses an entrypoint that doesn't work with jdk8
36-
sourceCompatibility = JavaVersion.VERSION_1_8
37-
targetCompatibility = JavaVersion.VERSION_1_8
38-
}
39-
4037
springBoot {
4138
buildInfo {
4239
}

smoke-tests/images/spring-boot/src/main/resources/application.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ spring.application.name=otel-spring-test-app
22

33
logging.level.root=WARN
44
logging.level.io.opentelemetry=INFO
5-
logging.pattern.console=%-5level [%t] %C{1.}: %msg trace_id=%X{trace_id}%n
5+
logging.pattern.console=%-5level [%t] %C: %msg trace_id=%X{trace_id}%n

0 commit comments

Comments
 (0)