Skip to content

Upgrade to Gradle 9.3.0 #4604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Copilot wants to merge 10 commits into
base: main
Choose a base branch
from
Open

Upgrade to Gradle 9.3.0 #4604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2dd10bd
Initial plan
Copilot Jan 28, 2026
03b4571
Upgrade to Gradle 9.3.0
Copilot Jan 28, 2026
33d9e32
Fix smoke test failures by replacing Spring Boot plugin with Shadow
Copilot Jan 28, 2026
92219f8
Make main class configurable for smoke test apps
Copilot Jan 28, 2026
03f6a94
Fix missing Main-Class manifest attribute in smoke test JARs
Copilot Jan 28, 2026
d97d564
Fix Spring Boot auto-configuration by appending spring.factories
Copilot Jan 28, 2026
078b8bd
Fix JavaProfiler test by changing MockExtension to compileOnly depend…
Copilot Feb 4, 2026
93ffe8d
Fix spring.factories merging using PropertiesFileTransformer
Copilot Feb 5, 2026
d6d659c
Add spring-boot-loader and fix exception handling in NonDaemonThreads
Copilot Feb 5, 2026
a0b3fb0
Revert try-catch that circumvented NonDaemonThreads test intent
Copilot Feb 5, 2026
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
3 changes: 0 additions & 3 deletions buildSrc/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,4 @@ dependencies {

implementation("gradle.plugin.io.morethan.jmhreport:gradle-jmh-report:0.9.6")
implementation("me.champeau.jmh:jmh-gradle-plugin:0.7.3")

// earlier versions aren't compatible with Gradle 8.1.1
implementation("org.springframework.boot:spring-boot-gradle-plugin:2.5.12")
}
42 changes: 39 additions & 3 deletions buildSrc/src/main/kotlin/ai.smoke-test-jar.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,47 @@
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
import com.github.jengelman.gradle.plugins.shadow.transformers.PropertiesFileTransformer
import com.microsoft.applicationinsights.gradle.AiSmokeTestExtension

plugins {
id("ai.smoke-test")
id("org.springframework.boot")
id("com.gradleup.shadow")
}

val aiSmokeTest = extensions.getByType(AiSmokeTestExtension::class)

aiSmokeTest.testAppArtifactDir.set(tasks.bootJar.flatMap { it.destinationDirectory })
aiSmokeTest.testAppArtifactFilename.set(tasks.bootJar.flatMap { it.archiveFileName })
// Create a fat JAR using Shadow instead of Spring Boot plugin for Gradle 9 compatibility
// Spring Boot 2.x doesn't support Gradle 9, and Spring Boot 3.x requires Java 17+
// Shadow creates a simple fat JAR that works with Java 8
tasks.named<ShadowJar>("shadowJar") {
archiveClassifier.set("")
mergeServiceFiles()

// Properly merge spring.factories files from all dependencies
// This is required for Spring Boot auto-configuration to work
// Use PropertiesFileTransformer to merge duplicate keys instead of simple append
transform(PropertiesFileTransformer::class.java) {
paths = listOf("META-INF/spring.factories")
mergeStrategy = "append"
}

// Set main class - can be overridden by individual projects via mainClassName property
manifest {
val mainClass = if (project.hasProperty("mainClassName")) {
project.property("mainClassName") as String
} else {
// Default main class for most smoke test apps
"com.microsoft.applicationinsights.smoketestapp.SpringBootApp"
}
attributes["Main-Class"] = mainClass
}
}

// Make jar task depend on shadowJar and use the shadow JAR output
// This prevents the regular jar task from overwriting the fat JAR
tasks.named<Jar>("jar") {
dependsOn(tasks.shadowJar)
enabled = false
}

aiSmokeTest.testAppArtifactDir.set(tasks.shadowJar.flatMap { it.destinationDirectory })
aiSmokeTest.testAppArtifactFilename.set(tasks.shadowJar.flatMap { it.archiveFileName })
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
3 changes: 2 additions & 1 deletion smoke-tests/apps/DiagnosticExtension/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ plugins {
dependencies {
implementation(project(":agent:agent-profiler:agent-diagnostics-api"))
implementation(project(":agent:agent-profiler:agent-alerting-api"))
implementation(project(":smoke-tests:apps:DiagnosticExtension:MockExtension"))
// MockExtension is loaded as a separate agent extension, not bundled in the app
compileOnly(project(":smoke-tests:apps:DiagnosticExtension:MockExtension"))
testImplementation(project(":smoke-tests:framework"))
implementation("org.springframework.boot:spring-boot-starter-web:2.5.12")
}
3 changes: 3 additions & 0 deletions smoke-tests/apps/JettyNativeHandler/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ plugins {
id("ai.smoke-test-jar")
}

// Override default main class
ext.set("mainClassName", "com.microsoft.applicationinsights.smoketestapp.JettyNativeHandlerApp")

dependencies {
implementation("org.springframework.boot:spring-boot-starter:2.5.12")

Expand Down
2 changes: 2 additions & 0 deletions smoke-tests/apps/NonDaemonThreads/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@ plugins {
dependencies {
implementation("org.springframework.boot:spring-boot-starter-web:2.5.12")
implementation("com.squareup.okhttp3:okhttp:3.12.1")
// Include Spring Boot loader classes for TestController to locate the JAR
implementation("org.springframework.boot:spring-boot-loader:2.5.12")
}
3 changes: 3 additions & 0 deletions smoke-tests/apps/ReadOnly/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
plugins {
id("ai.smoke-test-jar")
}

// Override default main class
ext.set("mainClassName", "com.microsoft.applicationinsights.smoketestapp.App")
2 changes: 1 addition & 1 deletion smoke-tests/apps/gRPC/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import com.google.protobuf.gradle.*

plugins {
id("ai.smoke-test-jar")
id("com.google.protobuf") version "0.8.19"
id("com.google.protobuf") version "0.9.6"
}

val grpcVersion = "1.26.0" // first version with support for arm64
Expand Down