From 755f25bda11f4d632893eb30777098623abc1da1 Mon Sep 17 00:00:00 2001 From: Chris Bono Date: Fri, 9 Aug 2024 22:59:59 -0500 Subject: [PATCH] Update to Spring Boot 3.4.0-M1 (#764) NOTE: Also had to update to SCSt 4.2.0-SNAPSHOT to workaround https://github.com/spring-cloud/spring-cloud-function/issues/1149 Resolves #758 --- gradle/libs.versions.toml | 6 +++--- settings.gradle | 1 + .../modules/ROOT/pages/appendix/version-compatibility.adoc | 6 ++++++ spring-pulsar-sample-apps/sample-apps-check-ci.gradle | 7 ++++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f317ce21..8e4f91a5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -22,9 +22,9 @@ junit = "5.10.3" hamcrest = "2.2" mockito = "5.12.0" spring-dep-mgmt = "1.1.6" -spring-boot = "3.3.3-SNAPSHOT" -spring-boot-for-docs = "3.3.3-SNAPSHOT" -spring-cloud-stream = "4.1.1" +spring-boot = "3.4.0-M1" +spring-boot-for-docs = "3.4.0-M1" +spring-cloud-stream = "4.2.0-SNAPSHOT" spring-retry = "2.0.7" system-lambda = "1.2.1" testcontainers = "1.19.8" diff --git a/settings.gradle b/settings.gradle index 9ae7d4cf..ed5f984b 100644 --- a/settings.gradle +++ b/settings.gradle @@ -3,6 +3,7 @@ pluginManagement { mavenCentral() gradlePluginPortal() maven { url "https://repo.spring.io/release" } + maven { url "https://repo.spring.io/milestone" } maven { url "https://repo.spring.io/snapshot" } } } diff --git a/spring-pulsar-docs/src/main/antora/modules/ROOT/pages/appendix/version-compatibility.adoc b/spring-pulsar-docs/src/main/antora/modules/ROOT/pages/appendix/version-compatibility.adoc index 6d3bfad8..e3cb3857 100644 --- a/spring-pulsar-docs/src/main/antora/modules/ROOT/pages/appendix/version-compatibility.adoc +++ b/spring-pulsar-docs/src/main/antora/modules/ROOT/pages/appendix/version-compatibility.adoc @@ -7,6 +7,12 @@ The following is the compatibility matrix: |=== | Spring for Apache Pulsar | Pulsar Client | Pulsar Reactive Client | Spring Boot | Java +| 1.2.x +| 3.3.x +| 0.6.x +| 3.4.x +| 17+ + | 1.1.x | 3.2.x | 0.5.x diff --git a/spring-pulsar-sample-apps/sample-apps-check-ci.gradle b/spring-pulsar-sample-apps/sample-apps-check-ci.gradle index fafb3f1f..fd0f60e9 100644 --- a/spring-pulsar-sample-apps/sample-apps-check-ci.gradle +++ b/spring-pulsar-sample-apps/sample-apps-check-ci.gradle @@ -1,6 +1,11 @@ settingsEvaluated { settings -> - settings.pluginManagement { + repositories { + mavenCentral() + gradlePluginPortal() + maven { url "https://repo.spring.io/milestone" } + maven { url "https://repo.spring.io/snapshot" } + } resolutionStrategy { eachPlugin { if (requested.id.id == "org.springframework.boot") {