From 87ea55e31ad3f78a785f0d068f96393722129070 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Fri, 10 Oct 2025 17:42:50 -0700 Subject: [PATCH] Support Java 8 and 11 in spring boot smoke test app --- smoke-tests/images/spring-boot/build.gradle.kts | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/smoke-tests/images/spring-boot/build.gradle.kts b/smoke-tests/images/spring-boot/build.gradle.kts index b29f50e01240..1f66078ef1a2 100644 --- a/smoke-tests/images/spring-boot/build.gradle.kts +++ b/smoke-tests/images/spring-boot/build.gradle.kts @@ -17,10 +17,6 @@ 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) @@ -34,6 +30,16 @@ val targetJDK = project.findProperty("targetJDK") ?: "17" val tag = findProperty("tag") ?: DateTimeFormatter.ofPattern("yyyyMMdd.HHmmSS").format(LocalDateTime.now()) +java { + // Jib detects the Java version from sourceCompatibility to determine the entrypoint format. + // Java 8 doesn't support the @argfile syntax (added in Java 9), so Jib needs to know + // to use an expanded classpath format instead (e.g., /app/classes:/app/libs/*). + if (targetJDK == "8") { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } +} + springBoot { buildInfo { }