Skip to content

Update spring boot plugin #14498

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

Closed
laurit wants to merge 1 commit into from
Closed

Update spring boot plugin #14498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 0 additions & 17 deletions settings.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,23 +28,6 @@ dependencyResolutionManagement {
mavenCentral()
mavenLocal()
}

versionCatalogs {
fun addSpringBootCatalog(name: String, minVersion: String, maxVersion: String) {
val latestDepTest = gradle.startParameter.projectProperties["testLatestDeps"] == "true"
create(name) {
val version =
gradle.startParameter.projectProperties["${name}Version"]
?: (if (latestDepTest) maxVersion else minVersion)
plugin("versions", "org.springframework.boot").version(version)
}
}
// r2dbc is not compatible with earlier versions
addSpringBootCatalog("springBoot2", "2.6.15", "2.+")
// spring boot 3.0 is not compatible with graalvm native image
addSpringBootCatalog("springBoot31", "3.1.0", "3.+")
addSpringBootCatalog("springBoot32", "3.2.0", "3.+")
}
}

develocity {
Expand Down
5 changes: 3 additions & 2 deletions smoke-tests-otel-starter/spring-boot-2/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id("otel.java-conventions")
alias(springBoot2.plugins.versions)
id("org.springframework.boot") version "3.5.4"
}

description = "smoke-tests-otel-starter-spring-boot-2"
Expand All @@ -13,7 +13,8 @@ dependencies {
implementation("org.springframework.kafka:spring-kafka")
implementation("org.springframework.boot:spring-boot-starter-data-mongodb")
implementation("org.springframework.boot:spring-boot-starter-aop")
implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES))
val testLatestDeps = gradle.startParameter.projectProperties["testLatestDeps"] == "true"
implementation(platform("org.springframework.boot:spring-boot-dependencies:" + if (testLatestDeps) "2.+" else "2.6.15"))

implementation(project(":smoke-tests-otel-starter:spring-boot-common"))

Expand Down
7 changes: 4 additions & 3 deletions smoke-tests-otel-starter/spring-boot-3.2/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id("otel.java-conventions")
alias(springBoot32.plugins.versions)
id("org.springframework.boot") version "3.5.4"
id("org.graalvm.buildtools.native")
}

Expand All @@ -10,6 +10,8 @@ otelJava {
minJavaVersionSupported.set(JavaVersion.VERSION_17)
}

val testLatestDeps = gradle.startParameter.projectProperties["testLatestDeps"] == "true"

dependencies {
implementation("org.springframework.boot:spring-boot-starter-web")
implementation("org.springframework.boot:spring-boot-starter-data-jdbc")
Expand All @@ -18,12 +20,11 @@ dependencies {
implementation("org.springframework.kafka:spring-kafka")
implementation("org.springframework.boot:spring-boot-starter-data-mongodb")
implementation("org.springframework.boot:spring-boot-starter-aop")
implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES))
implementation(platform("org.springframework.boot:spring-boot-dependencies:" + if (testLatestDeps) "3.+" else "3.2.0"))

implementation(project(":smoke-tests-otel-starter:spring-boot-common"))
testImplementation("org.springframework.boot:spring-boot-starter-test")

val testLatestDeps = gradle.startParameter.projectProperties["testLatestDeps"] == "true"
if (testLatestDeps) {
// with spring boot 3.5.0 versions of org.mongodb:mongodb-driver-sync and org.mongodb:mongodb-driver-core
// are not in sync
Expand Down
7 changes: 4 additions & 3 deletions smoke-tests-otel-starter/spring-boot-3/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id("otel.java-conventions")
alias(springBoot31.plugins.versions)
id("org.springframework.boot") version "3.5.4"
id("org.graalvm.buildtools.native")
}

Expand All @@ -10,6 +10,8 @@ otelJava {
minJavaVersionSupported.set(JavaVersion.VERSION_17)
}

val testLatestDeps = gradle.startParameter.projectProperties["testLatestDeps"] == "true"

dependencies {
implementation("org.springframework.boot:spring-boot-starter-web")
implementation("org.springframework.boot:spring-boot-starter-data-jdbc")
Expand All @@ -18,15 +20,14 @@ dependencies {
implementation("org.springframework.kafka:spring-kafka")
implementation("org.springframework.boot:spring-boot-starter-data-mongodb")
implementation("org.springframework.boot:spring-boot-starter-aop")
implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES))
implementation(platform("org.springframework.boot:spring-boot-dependencies:" + if (testLatestDeps) "3.1.+" else "3.1.0"))

implementation(project(":smoke-tests-otel-starter:spring-boot-common"))
testImplementation("org.testcontainers:junit-jupiter")
testImplementation("org.testcontainers:kafka")
testImplementation("org.testcontainers:mongodb")
testImplementation("org.springframework.boot:spring-boot-starter-test")

val testLatestDeps = gradle.startParameter.projectProperties["testLatestDeps"] == "true"
if (testLatestDeps) {
// with spring boot 3.5.0 versions of org.mongodb:mongodb-driver-sync and org.mongodb:mongodb-driver-core
// are not in sync
Expand Down
5 changes: 3 additions & 2 deletions smoke-tests-otel-starter/spring-boot-reactive-2/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
plugins {
id("otel.java-conventions")
alias(springBoot2.plugins.versions)
id("org.springframework.boot") version "3.5.4"
}

description = "smoke-tests-otel-starter-spring-boot-reactive-2"

dependencies {
implementation(project(":instrumentation:spring:starters:spring-boot-starter"))
implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES))
val testLatestDeps = gradle.startParameter.projectProperties["testLatestDeps"] == "true"
implementation(platform("org.springframework.boot:spring-boot-dependencies:" + if (testLatestDeps) "2.+" else "2.6.15"))

implementation(project(":smoke-tests-otel-starter:spring-boot-reactive-common"))
implementation("org.springframework.boot:spring-boot-starter-webflux")
Expand Down
5 changes: 3 additions & 2 deletions smoke-tests-otel-starter/spring-boot-reactive-3/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
plugins {
id("otel.java-conventions")
alias(springBoot31.plugins.versions)
id("org.springframework.boot") version "3.5.4"
id("org.graalvm.buildtools.native")
}

Expand All @@ -12,7 +12,8 @@ otelJava {

dependencies {
implementation(project(":instrumentation:spring:starters:spring-boot-starter"))
implementation(platform(org.springframework.boot.gradle.plugin.SpringBootPlugin.BOM_COORDINATES))
val testLatestDeps = gradle.startParameter.projectProperties["testLatestDeps"] == "true"
implementation(platform("org.springframework.boot:spring-boot-dependencies:" + if (testLatestDeps) "3.+" else "3.1.0"))

implementation(project(":smoke-tests-otel-starter:spring-boot-reactive-common"))
implementation("org.springframework.boot:spring-boot-starter-webflux")
Expand Down
Loading