Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions smoke-tests/images/spring-boot/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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 {
}
Expand Down
Loading