Skip to content

fix(build): remove Spring Boot 2 Gradle plugin for Gradle 9 compatibility #5263

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

Draft
adinauer wants to merge 6 commits into
base: deps/scripts/update-gradle.sh
Choose a base branch
from
+173 −34
Draft

fix(build): remove Spring Boot 2 Gradle plugin for Gradle 9 compatibility #5263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
055a019
fix(build): remove Spring Boot 2 Gradle plugin for Gradle 9 compatibi…
adinauer Apr 2, 2026
9dd4f2f
fix: set duplicatesStrategy=INCLUDE for shadow JAR spring.factories m…
adinauer Apr 2, 2026
63aa458
fix: remove duplicate shadow plugin entry in version catalog
adinauer Apr 2, 2026
0e43fc7
Format code
getsentry-bot Apr 2, 2026
da7d400
fix: update system test runner for shadow JAR compatibility
adinauer Apr 2, 2026
c0acbd7
fix(otel): use DuplicatesStrategy.INCLUDE for otel agent shadow JAR
adinauer Apr 2, 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
4 changes: 2 additions & 2 deletions gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,13 @@ detekt = { id = "io.gitlab.arturbosch.detekt", version = "1.23.8" }
jacoco-android = { id = "com.mxalbert.gradle.jacoco-android", version = "0.2.0" }
kover = { id = "org.jetbrains.kotlinx.kover", version = "0.7.3" }
vanniktech-maven-publish = { id = "com.vanniktech.maven.publish", version = "0.30.0" }
springboot2 = { id = "org.springframework.boot", version.ref = "springboot2" }
springboot3 = { id = "org.springframework.boot", version.ref = "springboot3" }
springboot4 = { id = "org.springframework.boot", version.ref = "springboot4" }
spring-dependency-management = { id = "io.spring.dependency-management", version = "1.1.7" }
gretty = { id = "org.gretty", version = "4.0.0" }
animalsniffer = { id = "ru.vyarus.animalsniffer", version = "2.0.1" }
sentry = { id = "io.sentry.android.gradle", version = "6.0.0-alpha.6"}
shadow = { id = "com.gradleup.shadow", version = "8.3.6" }
shadow = { id = "com.gradleup.shadow", version = "9.4.1" }

[libraries]
apache-httpclient = { module = "org.apache.httpcomponents.client5:httpclient5", version = "5.0.4" }
Expand Down Expand Up @@ -159,6 +158,7 @@ slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4j" }
slf4j-jdk14 = { module = "org.slf4j:slf4j-jdk14", version.ref = "slf4j" }
slf4j2-api = { module = "org.slf4j:slf4j-api", version = "2.0.5" }
spotlessLib = { module = "com.diffplug.spotless:com.diffplug.spotless.gradle.plugin", version.ref = "spotless"}
springboot2-bom = { module = "org.springframework.boot:spring-boot-dependencies", version.ref = "springboot2" }
springboot-starter = { module = "org.springframework.boot:spring-boot-starter", version.ref = "springboot2" }
springboot-starter-graphql = { module = "org.springframework.boot:spring-boot-starter-graphql", version.ref = "springboot2" }
springboot-starter-quartz = { module = "org.springframework.boot:spring-boot-starter-quartz", version.ref = "springboot2" }
Expand Down
6 changes: 5 additions & 1 deletion sentry-opentelemetry/sentry-opentelemetry-agent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,11 @@ tasks {

archiveClassifier.set("")

duplicatesStrategy = DuplicatesStrategy.FAIL
// INCLUDE is required so that mergeServiceFiles can see duplicates from both the
// upstream agent JAR and the isolated distro libs before they are deduplicated.
// Shadow 9.x enforces duplicatesStrategy before transformers run, so FAIL/EXCLUDE
// would prevent service file merging.
duplicatesStrategy = DuplicatesStrategy.INCLUDE

mergeServiceFiles { include("inst/META-INF/services/*") }
exclude("**/module-info.class")
Expand Down
27 changes: 25 additions & 2 deletions sentry-samples/sentry-samples-netflix-dgs/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@ import org.jetbrains.kotlin.config.KotlinCompilerVersion
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
alias(libs.plugins.springboot2)
alias(libs.plugins.spring.dependency.management)
java
application
alias(libs.plugins.shadow)
alias(libs.plugins.kotlin.jvm)
alias(libs.plugins.kotlin.spring)
}

application { mainClass.set("io.sentry.samples.netflix.dgs.NetlixDgsApplication") }

group = "io.sentry.sample.spring-boot"

version = "0.0.1-SNAPSHOT"
Expand All @@ -19,6 +22,7 @@ java.targetCompatibility = JavaVersion.VERSION_1_8
repositories { mavenCentral() }

dependencies {
implementation(platform(libs.springboot2.bom))
implementation(libs.springboot.starter.web)
implementation(Config.Libs.kotlinReflect)
implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
Expand All @@ -32,6 +36,25 @@ dependencies {
}
}

// Configure the Shadow JAR (executable JAR with all dependencies)
tasks.shadowJar {
manifest { attributes["Main-Class"] = "io.sentry.samples.netflix.dgs.NetlixDgsApplication" }
archiveClassifier.set("")
duplicatesStrategy = DuplicatesStrategy.INCLUDE
mergeServiceFiles()
append("META-INF/spring.handlers")
append("META-INF/spring.schemas")
append("META-INF/spring.factories")
append("META-INF/spring-autoconfigure-metadata.properties")
}

tasks.jar {
enabled = false
dependsOn(tasks.shadowJar)
}

tasks.startScripts { dependsOn(tasks.shadowJar) }

tasks.withType<Test>().configureEach { useJUnitPlatform() }

tasks.withType<KotlinCompile>().configureEach {
Expand Down
28 changes: 25 additions & 3 deletions sentry-samples/sentry-samples-spring-boot-opentelemetry-noagent/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@ import org.jetbrains.kotlin.config.KotlinCompilerVersion
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
alias(libs.plugins.springboot2)
alias(libs.plugins.spring.dependency.management)
java
application
alias(libs.plugins.shadow)
alias(libs.plugins.kotlin.jvm)
alias(libs.plugins.kotlin.spring)
}

application { mainClass.set("io.sentry.samples.spring.boot.SentryDemoApplication") }

group = "io.sentry.sample.spring-boot"

version = "0.0.1-SNAPSHOT"
Expand Down Expand Up @@ -35,6 +38,8 @@ tasks.withType<KotlinCompile>().configureEach {
}

dependencies {
implementation(platform(libs.springboot2.bom))
implementation(platform(libs.otel.instrumentation.bom))
implementation(libs.springboot.starter)
implementation(libs.springboot.starter.actuator)
implementation(libs.springboot.starter.aop)
Expand Down Expand Up @@ -72,7 +77,24 @@ dependencies {
testImplementation("org.apache.httpcomponents:httpclient")
}

dependencyManagement { imports { mavenBom(libs.otel.instrumentation.bom.get().toString()) } }
// Configure the Shadow JAR (executable JAR with all dependencies)
tasks.shadowJar {
manifest { attributes["Main-Class"] = "io.sentry.samples.spring.boot.SentryDemoApplication" }
archiveClassifier.set("")
duplicatesStrategy = DuplicatesStrategy.INCLUDE
mergeServiceFiles()
append("META-INF/spring.handlers")
append("META-INF/spring.schemas")
append("META-INF/spring.factories")
append("META-INF/spring-autoconfigure-metadata.properties")
}

tasks.jar {
enabled = false
dependsOn(tasks.shadowJar)
}

tasks.startScripts { dependsOn(tasks.shadowJar) }

configure<SourceSetContainer> { test { java.srcDir("src/test/java") } }

Expand Down
35 changes: 28 additions & 7 deletions sentry-samples/sentry-samples-spring-boot-opentelemetry/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,16 @@
import org.jetbrains.kotlin.config.KotlinCompilerVersion
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.springframework.boot.gradle.tasks.run.BootRun

plugins {
alias(libs.plugins.springboot2)
alias(libs.plugins.spring.dependency.management)
java
application
alias(libs.plugins.shadow)
alias(libs.plugins.kotlin.jvm)
alias(libs.plugins.kotlin.spring)
}

application { mainClass.set("io.sentry.samples.spring.boot.SentryDemoApplication") }

group = "io.sentry.sample.spring-boot"

version = "0.0.1-SNAPSHOT"
Expand All @@ -33,6 +35,7 @@ tasks.withType<KotlinCompile>().configureEach {
}

dependencies {
implementation(platform(libs.springboot2.bom))
implementation(libs.springboot.starter)
implementation(libs.springboot.starter.actuator)
implementation(libs.springboot.starter.aop)
Expand Down Expand Up @@ -70,14 +73,32 @@ dependencies {
testImplementation("org.apache.httpcomponents:httpclient")
}

// Configure the Shadow JAR (executable JAR with all dependencies)
tasks.shadowJar {
manifest { attributes["Main-Class"] = "io.sentry.samples.spring.boot.SentryDemoApplication" }
archiveClassifier.set("")
duplicatesStrategy = DuplicatesStrategy.INCLUDE
mergeServiceFiles()
append("META-INF/spring.handlers")
append("META-INF/spring.schemas")
append("META-INF/spring.factories")
append("META-INF/spring-autoconfigure-metadata.properties")
}

tasks.jar {
enabled = false
dependsOn(tasks.shadowJar)
}

tasks.startScripts { dependsOn(tasks.shadowJar) }

configure<SourceSetContainer> { test { java.srcDir("src/test/java") } }

tasks.register<BootRun>("bootRunWithAgent").configure {
tasks.register<JavaExec>("bootRunWithAgent").configure {
group = "application"

val mainBootRunTask = tasks.getByName<BootRun>("bootRun")
mainClass = mainBootRunTask.mainClass
classpath = mainBootRunTask.classpath
mainClass.set("io.sentry.samples.spring.boot.SentryDemoApplication")
classpath = sourceSets["main"].runtimeClasspath

val versionName = project.properties["versionName"] as String
val agentJarPath =
Expand Down
27 changes: 25 additions & 2 deletions sentry-samples/sentry-samples-spring-boot-webflux/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@ import org.jetbrains.kotlin.config.KotlinCompilerVersion
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
alias(libs.plugins.springboot2)
alias(libs.plugins.spring.dependency.management)
java
application
alias(libs.plugins.shadow)
alias(libs.plugins.kotlin.jvm)
alias(libs.plugins.kotlin.spring)
}

application { mainClass.set("io.sentry.samples.spring.boot.SentryDemoApplication") }

group = "io.sentry.sample.spring-boot"

version = "0.0.1-SNAPSHOT"
Expand All @@ -19,6 +22,7 @@ java.targetCompatibility = JavaVersion.VERSION_17
repositories { mavenCentral() }

dependencies {
implementation(platform(libs.springboot2.bom))
implementation(libs.springboot.starter.actuator)
implementation(libs.springboot.starter.graphql)
implementation(libs.springboot.starter.webflux)
Expand All @@ -42,6 +46,25 @@ dependencies {
testImplementation("org.apache.httpcomponents:httpclient")
}

// Configure the Shadow JAR (executable JAR with all dependencies)
tasks.shadowJar {
manifest { attributes["Main-Class"] = "io.sentry.samples.spring.boot.SentryDemoApplication" }
archiveClassifier.set("")
duplicatesStrategy = DuplicatesStrategy.INCLUDE
mergeServiceFiles()
append("META-INF/spring.handlers")
append("META-INF/spring.schemas")
append("META-INF/spring.factories")
append("META-INF/spring-autoconfigure-metadata.properties")
}

tasks.jar {
enabled = false
dependsOn(tasks.shadowJar)
}

tasks.startScripts { dependsOn(tasks.shadowJar) }

configure<SourceSetContainer> { test { java.srcDir("src/test/java") } }

tasks.withType<KotlinCompile>().configureEach {
Expand Down
27 changes: 25 additions & 2 deletions sentry-samples/sentry-samples-spring-boot/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@ import org.jetbrains.kotlin.config.KotlinCompilerVersion
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
alias(libs.plugins.springboot2)
alias(libs.plugins.spring.dependency.management)
java
application
alias(libs.plugins.shadow)
alias(libs.plugins.kotlin.jvm)
alias(libs.plugins.kotlin.spring)
}

application { mainClass.set("io.sentry.samples.spring.boot.SentryDemoApplication") }

group = "io.sentry.sample.spring-boot"

version = "0.0.1-SNAPSHOT"
Expand All @@ -31,6 +34,7 @@ tasks.withType<KotlinCompile>().configureEach {
}

dependencies {
implementation(platform(libs.springboot2.bom))
implementation(libs.springboot.starter)
implementation(libs.springboot.starter.actuator)
implementation(libs.springboot.starter.aop)
Expand Down Expand Up @@ -69,6 +73,25 @@ dependencies {
testImplementation("org.apache.httpcomponents:httpclient")
}

// Configure the Shadow JAR (executable JAR with all dependencies)
tasks.shadowJar {
manifest { attributes["Main-Class"] = "io.sentry.samples.spring.boot.SentryDemoApplication" }
archiveClassifier.set("")
duplicatesStrategy = DuplicatesStrategy.INCLUDE
mergeServiceFiles()
append("META-INF/spring.handlers")
append("META-INF/spring.schemas")
append("META-INF/spring.factories")
append("META-INF/spring-autoconfigure-metadata.properties")
}

tasks.jar {
enabled = false
dependsOn(tasks.shadowJar)
}

tasks.startScripts { dependsOn(tasks.shadowJar) }

configure<SourceSetContainer> { test { java.srcDir("src/test/java") } }

tasks.register<Test>("systemTest").configure {
Expand Down
4 changes: 1 addition & 3 deletions sentry-samples/sentry-samples-spring/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES

plugins {
application
alias(libs.plugins.springboot2) apply false
alias(libs.plugins.spring.dependency.management)
alias(libs.plugins.kotlin.jvm)
alias(libs.plugins.kotlin.spring)
Expand All @@ -29,7 +27,7 @@ repositories { mavenCentral() }

dependencyManagement {
imports {
mavenBom(BOM_COORDINATES)
mavenBom(libs.springboot2.bom.get().toString())
mavenBom(libs.kotlin.bom.get().toString())
mavenBom(libs.jackson.bom.get().toString())
}
Expand Down
4 changes: 1 addition & 3 deletions sentry-spring-boot-starter/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import net.ltgt.gradle.errorprone.errorprone
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.springframework.boot.gradle.plugin.SpringBootPlugin

plugins {
`java-library`
Expand All @@ -9,7 +8,6 @@ plugins {
jacoco
alias(libs.plugins.errorprone)
alias(libs.plugins.gradle.versions)
alias(libs.plugins.springboot2) apply false
}

tasks.withType<KotlinCompile>().configureEach {
Expand All @@ -22,7 +20,7 @@ dependencies {
api(projects.sentrySpringBoot)
api(libs.springboot.starter)

annotationProcessor(platform(SpringBootPlugin.BOM_COORDINATES))
annotationProcessor(platform(libs.springboot2.bom))
annotationProcessor(Config.AnnotationProcessors.springBootAutoConfigure)
annotationProcessor(Config.AnnotationProcessors.springBootConfiguration)

Expand Down
6 changes: 2 additions & 4 deletions sentry-spring-boot/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import net.ltgt.gradle.errorprone.errorprone
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.springframework.boot.gradle.plugin.SpringBootPlugin

plugins {
`java-library`
Expand All @@ -10,7 +9,6 @@ plugins {
alias(libs.plugins.errorprone)
alias(libs.plugins.gradle.versions)
alias(libs.plugins.buildconfig)
alias(libs.plugins.springboot2) apply false
}

tasks.withType<KotlinCompile>().configureEach {
Expand Down Expand Up @@ -40,14 +38,14 @@ dependencies {
compileOnly(libs.springboot.starter.graphql)
compileOnly(libs.springboot.starter.quartz)
compileOnly(libs.springboot.starter.security)
compileOnly(platform(SpringBootPlugin.BOM_COORDINATES))
compileOnly(platform(libs.springboot2.bom))
compileOnly(Config.Libs.springWeb)
compileOnly(Config.Libs.springWebflux)
compileOnly(projects.sentryOpentelemetry.sentryOpentelemetryCore)
compileOnly(projects.sentryGraphql)
compileOnly(projects.sentryQuartz)

annotationProcessor(platform(SpringBootPlugin.BOM_COORDINATES))
annotationProcessor(platform(libs.springboot2.bom))
annotationProcessor(Config.AnnotationProcessors.springBootAutoConfigure)
annotationProcessor(Config.AnnotationProcessors.springBootConfiguration)

Expand Down
Loading
Loading