From 1068504c2ca11258db8b4bc8da2a16089850b5c9 Mon Sep 17 00:00:00 2001 From: onobc Date: Fri, 21 Nov 2025 14:34:46 -0600 Subject: [PATCH 1/2] Update dependencies to latest GA versions This updates the following dependencies which are managed by Spring Boot to the GA version now that the November 2025 GA release train has arrived: - Spring Boot to 4.0.0 - Spring Framework to 7.0.1 - Micrometer to 1.16.0 - Netty to 4.2.7.Final - Jackson to 2.20.1 - JUnit to 6.0.1 - AssertJ to 3.27.6 NOTE: Update to Spring Security required a removal of checked exception from configurer implementations. Signed-off-by: onobc --- pom.xml | 8 ++++---- spring-grpc-build-dependencies/pom.xml | 8 ++++---- .../grpc/server/security/GrpcSecurity.java | 4 ++-- .../grpc/server/security/HttpBasicConfigurer.java | 2 +- .../grpc/server/security/PreAuthConfigurer.java | 2 +- .../grpc/server/security/RequestMapperConfigurer.java | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index 9da4321e..901463f2 100644 --- a/pom.xml +++ b/pom.xml @@ -81,10 +81,10 @@ UTF-8 17 - 4.0.0-RC2 - 2.20.0 - 5.13.4 - 3.27.4 + 4.0.0 + 2.20.1 + 6.0.1 + 3.27.6 4.3.0 5.20.0 diff --git a/spring-grpc-build-dependencies/pom.xml b/spring-grpc-build-dependencies/pom.xml index dcf4f904..4fe00dde 100644 --- a/spring-grpc-build-dependencies/pom.xml +++ b/spring-grpc-build-dependencies/pom.xml @@ -49,10 +49,10 @@ - 7.0.0-M9 - 7.0.0-M3 - 1.16.0-M3 - 4.2.6.Final + 7.0.1 + 7.0.0 + 1.16.0 + 4.2.7.Final 0.0.43 3.1.4 diff --git a/spring-grpc-core/src/main/java/org/springframework/grpc/server/security/GrpcSecurity.java b/spring-grpc-core/src/main/java/org/springframework/grpc/server/security/GrpcSecurity.java index 2756d7d2..f2c89643 100644 --- a/spring-grpc-core/src/main/java/org/springframework/grpc/server/security/GrpcSecurity.java +++ b/spring-grpc-core/src/main/java/org/springframework/grpc/server/security/GrpcSecurity.java @@ -102,7 +102,7 @@ private ApplicationContext getContext() { } @Override - protected AuthenticationProcessInterceptor performBuild() throws Exception { + protected AuthenticationProcessInterceptor performBuild() { if (this.authenticationManager != null) { setSharedObject(AuthenticationManager.class, this.authenticationManager); } @@ -121,7 +121,7 @@ protected AuthenticationProcessInterceptor performBuild() throws Exception { new CompositeAuthenticationExtractor(this.authenticationExtractors), this.authorizationManager); } - private AuthenticationManager getAuthenticationManager() throws Exception { + private AuthenticationManager getAuthenticationManager() { return getAuthenticationRegistry().getOrBuild(); } diff --git a/spring-grpc-core/src/main/java/org/springframework/grpc/server/security/HttpBasicConfigurer.java b/spring-grpc-core/src/main/java/org/springframework/grpc/server/security/HttpBasicConfigurer.java index 45b54299..88547d68 100644 --- a/spring-grpc-core/src/main/java/org/springframework/grpc/server/security/HttpBasicConfigurer.java +++ b/spring-grpc-core/src/main/java/org/springframework/grpc/server/security/HttpBasicConfigurer.java @@ -43,7 +43,7 @@ public HttpBasicConfigurer userDetailsService(UserDetailsService userDetailsS } @Override - public void configure(H builder) throws Exception { + public void configure(H builder) { UserDetailsService userDetailsService = this.userDetailsService; if (userDetailsService == null) { userDetailsService = this.authenticationManagerBuilder.getDefaultUserDetailsService(); diff --git a/spring-grpc-core/src/main/java/org/springframework/grpc/server/security/PreAuthConfigurer.java b/spring-grpc-core/src/main/java/org/springframework/grpc/server/security/PreAuthConfigurer.java index 5bbf61b7..7c75edb6 100644 --- a/spring-grpc-core/src/main/java/org/springframework/grpc/server/security/PreAuthConfigurer.java +++ b/spring-grpc-core/src/main/java/org/springframework/grpc/server/security/PreAuthConfigurer.java @@ -45,7 +45,7 @@ public PreAuthConfigurer userDetailsService(UserDetailsService userDetailsSer } @Override - public void configure(H builder) throws Exception { + public void configure(H builder) { PreAuthenticatedAuthenticationProvider provider = new PreAuthenticatedAuthenticationProvider(); UserDetailsService userDetailsService = this.userDetailsService; if (userDetailsService == null) { diff --git a/spring-grpc-core/src/main/java/org/springframework/grpc/server/security/RequestMapperConfigurer.java b/spring-grpc-core/src/main/java/org/springframework/grpc/server/security/RequestMapperConfigurer.java index 29b116b3..c03d89c9 100644 --- a/spring-grpc-core/src/main/java/org/springframework/grpc/server/security/RequestMapperConfigurer.java +++ b/spring-grpc-core/src/main/java/org/springframework/grpc/server/security/RequestMapperConfigurer.java @@ -59,7 +59,7 @@ public RequestMapperConfigurer(ApplicationContext context) throws Exception { } @Override - public void configure(GrpcSecurity builder) throws Exception { + public void configure(GrpcSecurity builder) { builder.authorizationManager(new RequestMapperAuthorizationManager(this.authorizedCalls, this.publisher)); } From 9cff0e81bc54472991007db175dd42755bb28e0d Mon Sep 17 00:00:00 2001 From: onobc Date: Fri, 21 Nov 2025 14:41:24 -0600 Subject: [PATCH 2/2] Update samples to use Spring Boot 4.0.0 Signed-off-by: onobc --- .github/workflows/check-samples.yml | 4 ++-- samples/grpc-client/build.gradle | 2 +- samples/grpc-client/pom.xml | 2 +- samples/grpc-oauth2/build.gradle | 2 +- samples/grpc-oauth2/pom.xml | 2 +- samples/grpc-reactive/build.gradle | 2 +- samples/grpc-reactive/pom.xml | 2 +- samples/grpc-secure/build.gradle | 2 +- samples/grpc-secure/pom.xml | 2 +- samples/grpc-server-kotlin/build.gradle | 2 +- samples/grpc-server-kotlin/pom.xml | 2 +- samples/grpc-server-netty-shaded/build.gradle | 2 +- samples/grpc-server-netty-shaded/pom.xml | 2 +- samples/grpc-server/build.gradle | 2 +- samples/grpc-server/pom.xml | 2 +- samples/grpc-tomcat-secure/build.gradle | 2 +- samples/grpc-tomcat-secure/pom.xml | 2 +- samples/grpc-tomcat/build.gradle | 2 +- samples/grpc-tomcat/pom.xml | 2 +- samples/grpc-webflux-secure/build.gradle | 2 +- samples/grpc-webflux-secure/pom.xml | 2 +- samples/grpc-webflux/build.gradle | 2 +- samples/grpc-webflux/pom.xml | 2 +- 23 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/check-samples.yml b/.github/workflows/check-samples.yml index bfddf2d2..03ea0ca4 100644 --- a/.github/workflows/check-samples.yml +++ b/.github/workflows/check-samples.yml @@ -11,9 +11,9 @@ jobs: matrix: include: - javaVersion: 17 - springBootVersion: "4.0.0-RC2" + springBootVersion: "4.0.0" - javaVersion: 17 - springBootVersion: "4.0.0-SNAPSHOT" + springBootVersion: "4.0.1-SNAPSHOT" runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 diff --git a/samples/grpc-client/build.gradle b/samples/grpc-client/build.gradle index dfce5694..e2b404f4 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 '4.0.0-RC2' + id 'org.springframework.boot' version '4.0.0' id 'io.spring.dependency-management' version '1.1.7' id 'com.google.protobuf' version '0.9.4' } diff --git a/samples/grpc-client/pom.xml b/samples/grpc-client/pom.xml index f9fdccee..0f620a7f 100644 --- a/samples/grpc-client/pom.xml +++ b/samples/grpc-client/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 4.0.0-RC2 + 4.0.0 org.springframework.grpc diff --git a/samples/grpc-oauth2/build.gradle b/samples/grpc-oauth2/build.gradle index eaf24674..f62cb6fe 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 '4.0.0-RC2' + id 'org.springframework.boot' version '4.0.0' id 'io.spring.dependency-management' version '1.1.7' 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 3cd67b7b..c9b84569 100644 --- a/samples/grpc-oauth2/pom.xml +++ b/samples/grpc-oauth2/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 4.0.0-RC2 + 4.0.0 org.springframework.grpc diff --git a/samples/grpc-reactive/build.gradle b/samples/grpc-reactive/build.gradle index 2058359f..f34b41da 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 '4.0.0-RC2' + id 'org.springframework.boot' version '4.0.0' id 'io.spring.dependency-management' version '1.1.7' id 'com.google.protobuf' version '0.9.4' } diff --git a/samples/grpc-reactive/pom.xml b/samples/grpc-reactive/pom.xml index 101e5b95..aa3ff62f 100644 --- a/samples/grpc-reactive/pom.xml +++ b/samples/grpc-reactive/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 4.0.0-RC2 + 4.0.0 org.springframework.grpc diff --git a/samples/grpc-secure/build.gradle b/samples/grpc-secure/build.gradle index b2d3fe79..65b0db25 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 '4.0.0-RC2' + id 'org.springframework.boot' version '4.0.0' id 'io.spring.dependency-management' version '1.1.7' 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 9a2d2296..58e53253 100644 --- a/samples/grpc-secure/pom.xml +++ b/samples/grpc-secure/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 4.0.0-RC2 + 4.0.0 org.springframework.grpc diff --git a/samples/grpc-server-kotlin/build.gradle b/samples/grpc-server-kotlin/build.gradle index f726cf0d..2c8cef2c 100644 --- a/samples/grpc-server-kotlin/build.gradle +++ b/samples/grpc-server-kotlin/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version '4.0.0-RC2' + id 'org.springframework.boot' version '4.0.0' id 'io.spring.dependency-management' version '1.1.7' id 'com.google.protobuf' version '0.9.4' id 'org.jetbrains.kotlin.jvm' version '2.2.21' diff --git a/samples/grpc-server-kotlin/pom.xml b/samples/grpc-server-kotlin/pom.xml index da25b9c7..f182f9b7 100644 --- a/samples/grpc-server-kotlin/pom.xml +++ b/samples/grpc-server-kotlin/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 4.0.0-RC2 + 4.0.0 org.springframework.grpc diff --git a/samples/grpc-server-netty-shaded/build.gradle b/samples/grpc-server-netty-shaded/build.gradle index de1152b5..6a5069b5 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 '4.0.0-RC2' + id 'org.springframework.boot' version '4.0.0' id 'io.spring.dependency-management' version '1.1.7' 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 91eb7786..00012599 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 - 4.0.0-RC2 + 4.0.0 com.example diff --git a/samples/grpc-server/build.gradle b/samples/grpc-server/build.gradle index e8f4cbaf..c9ae27fa 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 '4.0.0-RC2' + id 'org.springframework.boot' version '4.0.0' id 'io.spring.dependency-management' version '1.1.7' 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 a16f2a26..7a58d22c 100644 --- a/samples/grpc-server/pom.xml +++ b/samples/grpc-server/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 4.0.0-RC2 + 4.0.0 org.springframework.grpc diff --git a/samples/grpc-tomcat-secure/build.gradle b/samples/grpc-tomcat-secure/build.gradle index 0a907e73..3b37d0e7 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 '4.0.0-RC2' + id 'org.springframework.boot' version '4.0.0' id 'io.spring.dependency-management' version '1.1.7' 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 0448167a..d07f5c71 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 - 4.0.0-RC2 + 4.0.0 org.springframework.grpc diff --git a/samples/grpc-tomcat/build.gradle b/samples/grpc-tomcat/build.gradle index a0cc82f1..95801574 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 '4.0.0-RC2' + id 'org.springframework.boot' version '4.0.0' id 'io.spring.dependency-management' version '1.1.7' 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 fdbf6802..882f6fa3 100644 --- a/samples/grpc-tomcat/pom.xml +++ b/samples/grpc-tomcat/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 4.0.0-RC2 + 4.0.0 org.springframework.grpc diff --git a/samples/grpc-webflux-secure/build.gradle b/samples/grpc-webflux-secure/build.gradle index 4fcee7da..00c18de8 100644 --- a/samples/grpc-webflux-secure/build.gradle +++ b/samples/grpc-webflux-secure/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version '4.0.0-RC2' + id 'org.springframework.boot' version '4.0.0' id 'io.spring.dependency-management' version '1.1.7' id 'org.graalvm.buildtools.native' version '0.10.3' id 'com.google.protobuf' version '0.9.4' diff --git a/samples/grpc-webflux-secure/pom.xml b/samples/grpc-webflux-secure/pom.xml index a8d5c3a5..b21d5f2d 100644 --- a/samples/grpc-webflux-secure/pom.xml +++ b/samples/grpc-webflux-secure/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 4.0.0-RC2 + 4.0.0 org.springframework.grpc diff --git a/samples/grpc-webflux/build.gradle b/samples/grpc-webflux/build.gradle index 81bd0c7c..a939a250 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 '4.0.0-RC2' + id 'org.springframework.boot' version '4.0.0' id 'io.spring.dependency-management' version '1.1.7' 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 80a7f532..e89a02bf 100644 --- a/samples/grpc-webflux/pom.xml +++ b/samples/grpc-webflux/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 4.0.0-RC2 + 4.0.0 org.springframework.grpc