diff --git a/smoke-tests/images/spring-boot/build.gradle.kts b/smoke-tests/images/spring-boot/build.gradle.kts index 0ee7f321aa5d..ba2f540473d8 100644 --- a/smoke-tests/images/spring-boot/build.gradle.kts +++ b/smoke-tests/images/spring-boot/build.gradle.kts @@ -5,11 +5,11 @@ plugins { id("otel.java-conventions") id("com.google.cloud.tools.jib") - id("org.springframework.boot") version "2.6.15" + id("org.springframework.boot") version "3.5.4" } dependencies { - implementation(platform("io.opentelemetry:opentelemetry-bom:1.0.0")) + implementation(platform("io.opentelemetry:opentelemetry-bom")) implementation(platform("org.springframework.boot:spring-boot-dependencies:2.6.15")) implementation("io.opentelemetry:opentelemetry-api") @@ -17,6 +17,10 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter-web") } +otelJava { + minJavaVersionSupported = JavaVersion.VERSION_17 +} + configurations.runtimeClasspath { resolutionStrategy { // requires old logback (and therefore also old slf4j) @@ -25,18 +29,11 @@ configurations.runtimeClasspath { } } -val targetJDK = project.findProperty("targetJDK") ?: "11" +val targetJDK = project.findProperty("targetJDK") ?: "17" val tag = findProperty("tag") ?: DateTimeFormatter.ofPattern("yyyyMMdd.HHmmSS").format(LocalDateTime.now()) -java { - // needed by jib to detect java version used in project - // for jdk9+ jib uses an entrypoint that doesn't work with jdk8 - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 -} - springBoot { buildInfo { } diff --git a/smoke-tests/images/spring-boot/src/main/resources/application.properties b/smoke-tests/images/spring-boot/src/main/resources/application.properties index e15fa6f1a715..4c84ee7ad726 100644 --- a/smoke-tests/images/spring-boot/src/main/resources/application.properties +++ b/smoke-tests/images/spring-boot/src/main/resources/application.properties @@ -2,4 +2,4 @@ spring.application.name=otel-spring-test-app logging.level.root=WARN logging.level.io.opentelemetry=INFO -logging.pattern.console=%-5level [%t] %C{1.}: %msg trace_id=%X{trace_id}%n +logging.pattern.console=%-5level [%t] %C: %msg trace_id=%X{trace_id}%n