Skip to content

Commit f38a285

Browse files
onobconobc
committed
Updates library version to Spring Boot 4.x line
Updates the library versions used by Spring gRPC to the versions currently targeted in Spring Boot 4.0.x. Also removes use of Spring Boot test module and gets tests working again. Signed-off-by: onobc <chris.bono@gmail.com>
1 parent 0fb27b5 commit f38a285

File tree

7 files changed

+232
-213
lines changed

7 files changed

+232
-213
lines changed

‎pom.xml‎

Lines changed: 25 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,13 @@
6969
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
7070
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
7171
<java.version>17</java.version>
72-
7372
<!-- internal dependencies -->
74-
<spring-boot.version>3.5.5</spring-boot.version>
75-
<jackson.version>2.19.2</jackson.version>
76-
<junit.version>5.12.2</junit.version>
77-
<assertj.version>3.27.3</assertj.version>
73+
<spring-boot.version>4.0.0-M3</spring-boot.version>
74+
<jackson.version>2.20.0</jackson.version>
75+
<junit.version>5.13.4</junit.version>
76+
<assertj.version>3.27.4</assertj.version>
77+
<awaitility.version>4.3.0</awaitility.version>
78+
<mockito.version>5.19.0</mockito.version>
7879
<!-- documentation dependencies -->
7980
<io.spring.maven.antora-version>0.0.4</io.spring.maven.antora-version>
8081
<!-- FIXME build failure with version 2.3.9: -->
@@ -483,12 +484,18 @@
483484
<dependencyManagement>
484485
<dependencies>
485486
<dependency>
486-
<groupId>org.springframework.grpc</groupId>
487-
<artifactId>spring-grpc-build-dependencies</artifactId>
488-
<version>${project.version}</version>
487+
<groupId>org.assertj</groupId>
488+
<artifactId>assertj-bom</artifactId>
489+
<version>${assertj.version}</version>
489490
<type>pom</type>
490491
<scope>import</scope>
491492
</dependency>
493+
<dependency>
494+
<groupId>org.awaitility</groupId>
495+
<artifactId>awaitility</artifactId>
496+
<version>${awaitility.version}</version>
497+
<scope>import</scope>
498+
</dependency>
492499
<dependency>
493500
<groupId>org.junit</groupId>
494501
<artifactId>junit-bom</artifactId>
@@ -497,9 +504,16 @@
497504
<scope>import</scope>
498505
</dependency>
499506
<dependency>
500-
<groupId>org.assertj</groupId>
501-
<artifactId>assertj-bom</artifactId>
502-
<version>${assertj.version}</version>
507+
<groupId>org.mockito</groupId>
508+
<artifactId>mockito-bom</artifactId>
509+
<version>${mockito.version}</version>
510+
<type>pom</type>
511+
<scope>import</scope>
512+
</dependency>
513+
<dependency>
514+
<groupId>org.springframework.grpc</groupId>
515+
<artifactId>spring-grpc-build-dependencies</artifactId>
516+
<version>${project.version}</version>
503517
<type>pom</type>
504518
<scope>import</scope>
505519
</dependency>

‎spring-grpc-build-dependencies/pom.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@
4949
</licenses>
5050

5151
<properties>
52-
<spring-framework.version>6.2.9</spring-framework.version>
53-
<spring-security.version>6.5.2</spring-security.version>
54-
<micrometer.version>1.15.2</micrometer.version>
55-
<netty.version>4.1.122.Final</netty.version>
52+
<spring-framework.version>7.0.0-M9</spring-framework.version>
53+
<spring-security.version>7.0.0-M3</spring-security.version>
54+
<micrometer.version>1.16.0-M3</micrometer.version>
55+
<netty.version>4.2.6.Final</netty.version>
5656
<spring-javaformat-maven-plugin.version>0.0.43</spring-javaformat-maven-plugin.version>
5757
<maven-deploy-plugin.version>3.1.4</maven-deploy-plugin.version>
5858
</properties>

‎spring-grpc-core/pom.xml‎

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,36 @@
104104
<artifactId>reactor-grpc-stub</artifactId>
105105
<optional>true</optional>
106106
</dependency>
107-
108107
<dependency>
109-
<groupId>org.springframework.boot</groupId>
110-
<artifactId>spring-boot-starter-test</artifactId>
111-
<version>${spring-boot.version}</version>
108+
<groupId>org.assertj</groupId>
109+
<artifactId>assertj-core</artifactId>
110+
<scope>test</scope>
111+
</dependency>
112+
<dependency>
113+
<groupId>org.awaitility</groupId>
114+
<artifactId>awaitility</artifactId>
115+
<scope>test</scope>
116+
</dependency>
117+
<dependency>
118+
<groupId>org.junit.jupiter</groupId>
119+
<artifactId>junit-jupiter</artifactId>
120+
<scope>test</scope>
121+
</dependency>
122+
<dependency>
123+
<groupId>org.mockito</groupId>
124+
<artifactId>mockito-core</artifactId>
125+
<scope>test</scope>
126+
</dependency>
127+
<dependency>
128+
<groupId>org.mockito</groupId>
129+
<artifactId>mockito-junit-jupiter</artifactId>
130+
<scope>test</scope>
131+
</dependency>
132+
<dependency>
133+
<groupId>org.springframework</groupId>
134+
<artifactId>spring-test</artifactId>
112135
<scope>test</scope>
113136
</dependency>
114-
115137
</dependencies>
116138

117139

‎spring-grpc-core/src/main/java/org/springframework/grpc/server/security/RequestMapperConfigurer.java‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
import java.util.List;
2020
import java.util.function.Supplier;
2121

22+
import org.jspecify.annotations.Nullable;
23+
2224
import org.springframework.context.ApplicationContext;
2325
import org.springframework.security.access.hierarchicalroles.NullRoleHierarchy;
2426
import org.springframework.security.access.hierarchicalroles.RoleHierarchy;
@@ -28,6 +30,7 @@
2830
import org.springframework.security.authorization.AuthorizationEventPublisher;
2931
import org.springframework.security.authorization.AuthorizationManager;
3032
import org.springframework.security.authorization.AuthorizationManagers;
33+
import org.springframework.security.authorization.AuthorizationResult;
3134
import org.springframework.security.authorization.SpringAuthorizationEventPublisher;
3235
import org.springframework.security.config.annotation.SecurityConfigurerAdapter;
3336
import org.springframework.security.core.Authentication;
@@ -159,17 +162,17 @@ public RequestMapperAuthorizationManager(List<AuthorizedCall> authorizedCalls,
159162
this.publisher = publisher;
160163
}
161164

162-
@SuppressWarnings("deprecation")
163165
@Override
164-
public AuthorizationDecision check(Supplier<Authentication> authentication, CallContext context) {
165-
AuthorizationDecision result = new AuthorizationDecision(false);
166+
public @Nullable AuthorizationResult authorize(Supplier<? extends @Nullable Authentication> authentication,
167+
CallContext context) {
168+
AuthorizationResult result = new AuthorizationDecision(false);
166169
for (AuthorizedCall authorizedCall : this.authorizedCalls) {
167170
if (authorizedCall.matcher.matches(context)) {
168-
result = authorizedCall.authorizationManager.check(authentication, context);
171+
result = authorizedCall.authorizationManager.authorize(authentication, context);
169172
break;
170173
}
171174
}
172-
this.publisher.publishAuthorizationEvent(authentication, context, result);
175+
this.publisher.publishAuthorizationEvent((Supplier<Authentication>) authentication, context, result);
173176
return result;
174177
}
175178

0 commit comments

Comments
 (0)