From 7cd936e81a4b05c672cf2ef15475a27856c00682 Mon Sep 17 00:00:00 2001 From: Chris Bono Date: Thu, 22 May 2025 18:09:40 -0500 Subject: [PATCH] Update to Spring Boot 3.5.0 This commit updates to Spring Boot 3.5.0 and also updates dependency versions that are specified by both spring-grpc and spring boot as follows: - jackson from `2.17.2` to `2.19.0` - junit from `5.10.5` to `5.12.2` - spring-security from `6.2.6` to `6.4.4` - micrometer from `1.14.6` to `1.15.0` - netty from `4.1.118.Final` to `4.1.121.Final` Signed-off-by: Chris Bono --- .github/workflows/check-samples.yml | 2 +- pom.xml | 6 +++--- samples/grpc-client/README.md | 2 +- samples/grpc-client/build.gradle | 2 +- samples/grpc-client/pom.xml | 2 +- samples/grpc-oauth2/README.md | 2 +- samples/grpc-oauth2/build.gradle | 2 +- samples/grpc-oauth2/pom.xml | 2 +- samples/grpc-reactive/README.md | 2 +- samples/grpc-reactive/build.gradle | 2 +- samples/grpc-reactive/pom.xml | 2 +- samples/grpc-secure/README.md | 2 +- samples/grpc-secure/build.gradle | 2 +- samples/grpc-secure/pom.xml | 2 +- samples/grpc-server-netty-shaded/build.gradle | 2 +- samples/grpc-server-netty-shaded/pom.xml | 2 +- samples/grpc-server/HELP-gradle.md | 6 +++--- samples/grpc-server/HELP-maven.md | 6 +++--- samples/grpc-server/README.md | 2 +- samples/grpc-server/build.gradle | 2 +- samples/grpc-server/pom.xml | 2 +- samples/grpc-tomcat-secure/README.md | 2 +- samples/grpc-tomcat-secure/build.gradle | 2 +- samples/grpc-tomcat-secure/pom.xml | 2 +- samples/grpc-tomcat/README.md | 2 +- samples/grpc-tomcat/build.gradle | 2 +- samples/grpc-tomcat/pom.xml | 2 +- samples/grpc-webflux/README.md | 2 +- samples/grpc-webflux/build.gradle | 2 +- samples/grpc-webflux/pom.xml | 2 +- spring-grpc-build-dependencies/pom.xml | 8 ++++---- 31 files changed, 40 insertions(+), 40 deletions(-) diff --git a/.github/workflows/check-samples.yml b/.github/workflows/check-samples.yml index 69dff9f0..22cbf97c 100644 --- a/.github/workflows/check-samples.yml +++ b/.github/workflows/check-samples.yml @@ -11,7 +11,7 @@ jobs: matrix: include: - javaVersion: 17 - springBootVersion: "3.4.5" + springBootVersion: "3.5.0" - javaVersion: 17 springBootVersion: "3.5.0-SNAPSHOT" runs-on: ubuntu-latest diff --git a/pom.xml b/pom.xml index 5fc2b650..518ac75b 100644 --- a/pom.xml +++ b/pom.xml @@ -79,9 +79,9 @@ 17 - 3.4.5 - 2.17.2 - 5.10.5 + 3.5.0 + 2.19.0 + 5.12.2 3.27.3 0.0.4 diff --git a/samples/grpc-client/README.md b/samples/grpc-client/README.md index ec5cb339..8a5d08e1 100644 --- a/samples/grpc-client/README.md +++ b/samples/grpc-client/README.md @@ -11,7 +11,7 @@ $ ./mvnw spring-boot:run \\/ ___)| |_)| | | | | || (_| | ) ) ) ) ' |____| .__|_| |_|_| |_\__, | / / / / =========|_|==============|___/=/_/_/_/ - :: Spring Boot :: (v3.4.5) + :: Spring Boot :: (v3.5.0) ... 2025-02-27T09:21:19.515Z INFO 1211091 --- [grpc-client] [ main] o.s.g.sample.GrpcClientApplication : Started GrpcClientApplication in 0.909 seconds (process running for 1.172) diff --git a/samples/grpc-client/build.gradle b/samples/grpc-client/build.gradle index 2dc6da79..6b59a0c9 100644 --- a/samples/grpc-client/build.gradle +++ b/samples/grpc-client/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version '3.4.5' + id 'org.springframework.boot' version '3.5.0' id 'io.spring.dependency-management' version '1.1.6' id 'com.google.protobuf' version '0.9.4' } diff --git a/samples/grpc-client/pom.xml b/samples/grpc-client/pom.xml index 38e57901..382ad45b 100644 --- a/samples/grpc-client/pom.xml +++ b/samples/grpc-client/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 3.4.5 + 3.5.0 org.springframework.grpc diff --git a/samples/grpc-oauth2/README.md b/samples/grpc-oauth2/README.md index 2751dabc..5dd8203a 100644 --- a/samples/grpc-oauth2/README.md +++ b/samples/grpc-oauth2/README.md @@ -11,7 +11,7 @@ $ ./mvnw spring-boot:test-run \\/ ___)| |_)| | | | | || (_| | ) ) ) ) ' |____| .__|_| |_|_| |_\__, | / / / / =========|_|==============|___/=/_/_/_/ - :: Spring Boot :: (v3.4.5) + :: Spring Boot :: (v3.5.0) ... 2022-12-08T05:32:25.427-08:00 INFO 551632 --- [ main] g.s.a.GrpcServerFactoryAutoConfiguration : Detected grpc-netty: Creating NettyGrpcServerFactory diff --git a/samples/grpc-oauth2/build.gradle b/samples/grpc-oauth2/build.gradle index 4f4fc3a5..ea126560 100644 --- a/samples/grpc-oauth2/build.gradle +++ b/samples/grpc-oauth2/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version '3.4.5' + id 'org.springframework.boot' version '3.5.0' id 'io.spring.dependency-management' version '1.1.6' id 'org.graalvm.buildtools.native' version '0.10.3' id 'com.google.protobuf' version '0.9.4' diff --git a/samples/grpc-oauth2/pom.xml b/samples/grpc-oauth2/pom.xml index d68cc624..b0796859 100644 --- a/samples/grpc-oauth2/pom.xml +++ b/samples/grpc-oauth2/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 3.4.5 + 3.5.0 org.springframework.grpc diff --git a/samples/grpc-reactive/README.md b/samples/grpc-reactive/README.md index 0b2e2c57..6c30b70b 100644 --- a/samples/grpc-reactive/README.md +++ b/samples/grpc-reactive/README.md @@ -11,7 +11,7 @@ $ ./mvnw spring-boot:run \\/ ___)| |_)| | | | | || (_| | ) ) ) ) ' |____| .__|_| |_|_| |_\__, | / / / / =========|_|==============|___/=/_/_/_/ - :: Spring Boot :: (v3.4.5) + :: Spring Boot :: (v3.5.0) 2022-12-08T05:32:24.934-08:00 INFO 551632 --- [ main] com.example.demo.DemoApplication : Starting DemoApplication using Java 17.0.5 with PID 551632 (/home/dsyer/dev/scratch/demo/target/classes started by dsyer in /home/dsyer/dev/scratch/demo) 2022-12-08T05:32:24.938-08:00 INFO 551632 --- [ main] com.example.demo.DemoApplication : No active profile set, falling back to 1 default profile: "default" diff --git a/samples/grpc-reactive/build.gradle b/samples/grpc-reactive/build.gradle index 93a9b7f5..fbf9ca0a 100644 --- a/samples/grpc-reactive/build.gradle +++ b/samples/grpc-reactive/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version '3.4.5' + id 'org.springframework.boot' version '3.5.0' id 'io.spring.dependency-management' version '1.1.6' id 'org.graalvm.buildtools.native' version '0.10.3' id 'com.google.protobuf' version '0.9.4' diff --git a/samples/grpc-reactive/pom.xml b/samples/grpc-reactive/pom.xml index 4a86be01..922498ab 100644 --- a/samples/grpc-reactive/pom.xml +++ b/samples/grpc-reactive/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 3.4.5 + 3.5.0 org.springframework.grpc diff --git a/samples/grpc-secure/README.md b/samples/grpc-secure/README.md index 2d682e70..ed4b9c7e 100644 --- a/samples/grpc-secure/README.md +++ b/samples/grpc-secure/README.md @@ -11,7 +11,7 @@ $ ./mvnw spring-boot:run \\/ ___)| |_)| | | | | || (_| | ) ) ) ) ' |____| .__|_| |_|_| |_\__, | / / / / =========|_|==============|___/=/_/_/_/ - :: Spring Boot :: (v3.4.5) + :: Spring Boot :: (v3.5.0) 2022-12-08T05:32:24.934-08:00 INFO 551632 --- [ main] com.example.demo.DemoApplication : Starting DemoApplication using Java 17.0.5 with PID 551632 (/home/dsyer/dev/scratch/demo/target/classes started by dsyer in /home/dsyer/dev/scratch/demo) 2022-12-08T05:32:24.938-08:00 INFO 551632 --- [ main] com.example.demo.DemoApplication : No active profile set, falling back to 1 default profile: "default" diff --git a/samples/grpc-secure/build.gradle b/samples/grpc-secure/build.gradle index ebcc667a..7e933b21 100644 --- a/samples/grpc-secure/build.gradle +++ b/samples/grpc-secure/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version '3.4.5' + id 'org.springframework.boot' version '3.5.0' id 'io.spring.dependency-management' version '1.1.6' id 'org.graalvm.buildtools.native' version '0.10.3' id 'com.google.protobuf' version '0.9.4' diff --git a/samples/grpc-secure/pom.xml b/samples/grpc-secure/pom.xml index 69ff5b57..040979d8 100644 --- a/samples/grpc-secure/pom.xml +++ b/samples/grpc-secure/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 3.4.5 + 3.5.0 org.springframework.grpc diff --git a/samples/grpc-server-netty-shaded/build.gradle b/samples/grpc-server-netty-shaded/build.gradle index 7b153b6f..e43dd7f6 100644 --- a/samples/grpc-server-netty-shaded/build.gradle +++ b/samples/grpc-server-netty-shaded/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version '3.4.5' + id 'org.springframework.boot' version '3.5.0' id 'io.spring.dependency-management' version '1.1.6' id 'org.graalvm.buildtools.native' version '0.10.3' id 'com.google.protobuf' version '0.9.4' diff --git a/samples/grpc-server-netty-shaded/pom.xml b/samples/grpc-server-netty-shaded/pom.xml index 367954a1..0615d3c8 100644 --- a/samples/grpc-server-netty-shaded/pom.xml +++ b/samples/grpc-server-netty-shaded/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 3.4.5 + 3.5.0 com.example diff --git a/samples/grpc-server/HELP-gradle.md b/samples/grpc-server/HELP-gradle.md index 3dd84be2..eeef1582 100644 --- a/samples/grpc-server/HELP-gradle.md +++ b/samples/grpc-server/HELP-gradle.md @@ -4,9 +4,9 @@ For further reference, please consider the following sections: * [Official Gradle documentation](https://docs.gradle.org) -* [Spring Boot Gradle Plugin Reference Guide](https://docs.spring.io/spring-boot/3.4.5/gradle-plugin) -* [Create an OCI image](https://docs.spring.io/spring-boot/3.4.5/gradle-plugin/packaging-oci-image.html) -* [GraalVM Native Image Support](https://docs.spring.io/spring-boot/3.4.5/reference/packaging/native-image/introducing-graalvm-native-images.html) +* [Spring Boot Gradle Plugin Reference Guide](https://docs.spring.io/spring-boot/3.5.0/gradle-plugin) +* [Create an OCI image](https://docs.spring.io/spring-boot/3.5.0/gradle-plugin/packaging-oci-image.html) +* [GraalVM Native Image Support](https://docs.spring.io/spring-boot/3.5.0/reference/packaging/native-image/introducing-graalvm-native-images.html) * [Spring gRPC [Experimental]](https://docs.spring.io/spring-grpc/reference/index.html) ### Additional Links diff --git a/samples/grpc-server/HELP-maven.md b/samples/grpc-server/HELP-maven.md index a1d90765..cde187da 100644 --- a/samples/grpc-server/HELP-maven.md +++ b/samples/grpc-server/HELP-maven.md @@ -4,9 +4,9 @@ For further reference, please consider the following sections: * [Official Apache Maven documentation](https://maven.apache.org/guides/index.html) -* [Spring Boot Maven Plugin Reference Guide](https://docs.spring.io/spring-boot/3.4.5/maven-plugin) -* [Create an OCI image](https://docs.spring.io/spring-boot/3.4.5/maven-plugin/build-image.html) -* [GraalVM Native Image Support](https://docs.spring.io/spring-boot/3.4.5/reference/packaging/native-image/introducing-graalvm-native-images.html) +* [Spring Boot Maven Plugin Reference Guide](https://docs.spring.io/spring-boot/3.5.0/maven-plugin) +* [Create an OCI image](https://docs.spring.io/spring-boot/3.5.0/maven-plugin/build-image.html) +* [GraalVM Native Image Support](https://docs.spring.io/spring-boot/3.5.0/reference/packaging/native-image/introducing-graalvm-native-images.html) * [Spring gRPC [Experimental]](https://docs.spring.io/spring-grpc/reference/index.html) ### Additional Links diff --git a/samples/grpc-server/README.md b/samples/grpc-server/README.md index 5304c4ee..61bc494f 100644 --- a/samples/grpc-server/README.md +++ b/samples/grpc-server/README.md @@ -11,7 +11,7 @@ $ ./mvnw spring-boot:run \\/ ___)| |_)| | | | | || (_| | ) ) ) ) ' |____| .__|_| |_|_| |_\__, | / / / / =========|_|==============|___/=/_/_/_/ - :: Spring Boot :: (v3.4.5) + :: Spring Boot :: (v3.5.0) 2022-12-08T05:32:24.934-08:00 INFO 551632 --- [ main] com.example.demo.DemoApplication : Starting DemoApplication using Java 17.0.5 with PID 551632 (/home/dsyer/dev/scratch/demo/target/classes started by dsyer in /home/dsyer/dev/scratch/demo) 2022-12-08T05:32:24.938-08:00 INFO 551632 --- [ main] com.example.demo.DemoApplication : No active profile set, falling back to 1 default profile: "default" 2022-12-08T05:32:25.377-08:00 WARN 551632 --- [ main] ocalVariableTableParameterNameDiscoverer : Using deprecated '-debug' fallback for parameter name resolution. Compile the affected code with '-parameters' instead or avoid its introspection: net.devh.boot.grpc.server.autoconfigure.GrpcHealthServiceAutoConfiguration diff --git a/samples/grpc-server/build.gradle b/samples/grpc-server/build.gradle index fc891dd3..55655d32 100644 --- a/samples/grpc-server/build.gradle +++ b/samples/grpc-server/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version '3.4.5' + id 'org.springframework.boot' version '3.5.0' id 'io.spring.dependency-management' version '1.1.6' id 'org.graalvm.buildtools.native' version '0.10.3' id 'com.google.protobuf' version '0.9.4' diff --git a/samples/grpc-server/pom.xml b/samples/grpc-server/pom.xml index cb1ef71a..f7958381 100644 --- a/samples/grpc-server/pom.xml +++ b/samples/grpc-server/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 3.4.5 + 3.5.0 org.springframework.grpc diff --git a/samples/grpc-tomcat-secure/README.md b/samples/grpc-tomcat-secure/README.md index 0b2e2c57..6c30b70b 100644 --- a/samples/grpc-tomcat-secure/README.md +++ b/samples/grpc-tomcat-secure/README.md @@ -11,7 +11,7 @@ $ ./mvnw spring-boot:run \\/ ___)| |_)| | | | | || (_| | ) ) ) ) ' |____| .__|_| |_|_| |_\__, | / / / / =========|_|==============|___/=/_/_/_/ - :: Spring Boot :: (v3.4.5) + :: Spring Boot :: (v3.5.0) 2022-12-08T05:32:24.934-08:00 INFO 551632 --- [ main] com.example.demo.DemoApplication : Starting DemoApplication using Java 17.0.5 with PID 551632 (/home/dsyer/dev/scratch/demo/target/classes started by dsyer in /home/dsyer/dev/scratch/demo) 2022-12-08T05:32:24.938-08:00 INFO 551632 --- [ main] com.example.demo.DemoApplication : No active profile set, falling back to 1 default profile: "default" diff --git a/samples/grpc-tomcat-secure/build.gradle b/samples/grpc-tomcat-secure/build.gradle index d4e31f73..d9275cf4 100644 --- a/samples/grpc-tomcat-secure/build.gradle +++ b/samples/grpc-tomcat-secure/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version '3.4.5' + id 'org.springframework.boot' version '3.5.0' id 'io.spring.dependency-management' version '1.1.6' id 'org.graalvm.buildtools.native' version '0.10.3' id 'com.google.protobuf' version '0.9.4' diff --git a/samples/grpc-tomcat-secure/pom.xml b/samples/grpc-tomcat-secure/pom.xml index 110cfcdb..f158c3ed 100644 --- a/samples/grpc-tomcat-secure/pom.xml +++ b/samples/grpc-tomcat-secure/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 3.4.5 + 3.5.0 org.springframework.grpc diff --git a/samples/grpc-tomcat/README.md b/samples/grpc-tomcat/README.md index 0b2e2c57..6c30b70b 100644 --- a/samples/grpc-tomcat/README.md +++ b/samples/grpc-tomcat/README.md @@ -11,7 +11,7 @@ $ ./mvnw spring-boot:run \\/ ___)| |_)| | | | | || (_| | ) ) ) ) ' |____| .__|_| |_|_| |_\__, | / / / / =========|_|==============|___/=/_/_/_/ - :: Spring Boot :: (v3.4.5) + :: Spring Boot :: (v3.5.0) 2022-12-08T05:32:24.934-08:00 INFO 551632 --- [ main] com.example.demo.DemoApplication : Starting DemoApplication using Java 17.0.5 with PID 551632 (/home/dsyer/dev/scratch/demo/target/classes started by dsyer in /home/dsyer/dev/scratch/demo) 2022-12-08T05:32:24.938-08:00 INFO 551632 --- [ main] com.example.demo.DemoApplication : No active profile set, falling back to 1 default profile: "default" diff --git a/samples/grpc-tomcat/build.gradle b/samples/grpc-tomcat/build.gradle index 325ef473..81f0e126 100644 --- a/samples/grpc-tomcat/build.gradle +++ b/samples/grpc-tomcat/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version '3.4.5' + id 'org.springframework.boot' version '3.5.0' id 'io.spring.dependency-management' version '1.1.6' id 'org.graalvm.buildtools.native' version '0.10.3' id 'com.google.protobuf' version '0.9.4' diff --git a/samples/grpc-tomcat/pom.xml b/samples/grpc-tomcat/pom.xml index b179a3e1..895500e8 100644 --- a/samples/grpc-tomcat/pom.xml +++ b/samples/grpc-tomcat/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 3.4.5 + 3.5.0 org.springframework.grpc diff --git a/samples/grpc-webflux/README.md b/samples/grpc-webflux/README.md index 0b2e2c57..6c30b70b 100644 --- a/samples/grpc-webflux/README.md +++ b/samples/grpc-webflux/README.md @@ -11,7 +11,7 @@ $ ./mvnw spring-boot:run \\/ ___)| |_)| | | | | || (_| | ) ) ) ) ' |____| .__|_| |_|_| |_\__, | / / / / =========|_|==============|___/=/_/_/_/ - :: Spring Boot :: (v3.4.5) + :: Spring Boot :: (v3.5.0) 2022-12-08T05:32:24.934-08:00 INFO 551632 --- [ main] com.example.demo.DemoApplication : Starting DemoApplication using Java 17.0.5 with PID 551632 (/home/dsyer/dev/scratch/demo/target/classes started by dsyer in /home/dsyer/dev/scratch/demo) 2022-12-08T05:32:24.938-08:00 INFO 551632 --- [ main] com.example.demo.DemoApplication : No active profile set, falling back to 1 default profile: "default" diff --git a/samples/grpc-webflux/build.gradle b/samples/grpc-webflux/build.gradle index 6bf5ad82..ca49d69e 100644 --- a/samples/grpc-webflux/build.gradle +++ b/samples/grpc-webflux/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version '3.4.5' + id 'org.springframework.boot' version '3.5.0' id 'io.spring.dependency-management' version '1.1.6' id 'org.graalvm.buildtools.native' version '0.10.3' id 'com.google.protobuf' version '0.9.4' diff --git a/samples/grpc-webflux/pom.xml b/samples/grpc-webflux/pom.xml index 99fbd2bf..50d9d792 100644 --- a/samples/grpc-webflux/pom.xml +++ b/samples/grpc-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 3.4.5 + 3.5.0 org.springframework.grpc diff --git a/spring-grpc-build-dependencies/pom.xml b/spring-grpc-build-dependencies/pom.xml index 47e11bd6..4bd4e468 100644 --- a/spring-grpc-build-dependencies/pom.xml +++ b/spring-grpc-build-dependencies/pom.xml @@ -49,10 +49,10 @@ - 6.2.6 - 6.4.4 - 1.14.6 - 4.1.118.Final + 6.2.7 + 6.5.0 + 1.15.0 + 4.1.121.Final 0.0.43