Skip to content

Commit e413d43

Browse files
committed
simplify
1 parent 96f0726 commit e413d43

2 files changed

Lines changed: 9 additions & 97 deletions

File tree

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
1-
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
1+
import com.microsoft.applicationinsights.gradle.AiSmokeTestExtension
22

33
plugins {
4-
id("ai.smoke-test-jar")
4+
id("ai.smoke-test")
5+
id("org.springframework.boot") version "4.0.0"
56
}
67

8+
// Override the workspace-wide dependencyManagement pin of logback 1.3.x (Java 8 target)
9+
// so Spring Boot 4 can resolve its required logback 1.5.x (requires Java 17, which this
10+
// app already targets).
711
configurations.configureEach {
812
resolutionStrategy.force(
913
"ch.qos.logback:logback-classic:1.5.21",
@@ -18,11 +22,6 @@ dependencies {
1822
implementation("org.springframework.boot:spring-boot-starter-micrometer-metrics:4.0.0")
1923
}
2024

21-
// Spring Boot 4 splits auto-configuration across many module JARs, each with its own
22-
// META-INF/spring/AutoConfiguration.imports file. Shadow's default behavior keeps only
23-
// one copy, losing most entries. We provide a pre-merged resource file in
24-
// src/main/resources/META-INF/spring/ and use append() to prevent any single
25-
// dependency copy from overwriting it.
26-
tasks.named<ShadowJar>("shadowJar") {
27-
append("META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports")
28-
}
25+
val aiSmokeTest = extensions.getByType(AiSmokeTestExtension::class)
26+
aiSmokeTest.testAppArtifactDir.set(tasks.bootJar.flatMap { it.destinationDirectory })
27+
aiSmokeTest.testAppArtifactFilename.set(tasks.bootJar.flatMap { it.archiveFileName })

smoke-tests/apps/ActuatorMetricsSpringBoot4/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

Lines changed: 0 additions & 87 deletions
This file was deleted.

0 commit comments

Comments
 (0)