From 64463e33651113ae0de72b2aacc4c8dbc0e3e34e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
<41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 26 Oct 2024 20:13:44 +0100
Subject: [PATCH] Update Spring Boot to v3.3.5 (#27677)
---
.../resources/spring-boot-dependencies.pom | 219 +++++++++---------
.../SecurityConfiguration_imperative.java.ejs | 24 ++
.../SecurityConfiguration_reactive.java.ejs | 24 ++
3 files changed, 155 insertions(+), 112 deletions(-)
diff --git a/generators/spring-boot/resources/spring-boot-dependencies.pom b/generators/spring-boot/resources/spring-boot-dependencies.pom
index f15fc2b99c32..5ad2940a2c8d 100644
--- a/generators/spring-boot/resources/spring-boot-dependencies.pom
+++ b/generators/spring-boot/resources/spring-boot-dependencies.pom
@@ -3,7 +3,7 @@
4.0.0
org.springframework.boot
spring-boot-dependencies
- 3.3.4
+ 3.3.5
pom
spring-boot-dependencies
Spring Boot Dependencies
@@ -25,6 +25,7 @@
https://github.com/spring-projects/spring-boot
+
6.1.3
2.0.3
@@ -46,9 +47,8 @@
1.6
2.12.0
3.6.3
- 3.4.1
1.4.0
- 2.8.1
+ 2.8.2
11.5.9.0
1.1.6
10.16.1.1
@@ -59,7 +59,7 @@
8.0.2
4.0.5
3.0.1
- 22.1
+ 22.3
4.0.23
2.10.1
2.2.224
@@ -74,7 +74,7 @@
5.3.1
4.4.16
5.2.5
- 15.0.8.Final
+ 15.0.10.Final
2.24
2.17.2
2.1.3
@@ -99,21 +99,21 @@
1.1.1
1.1
2.0.0
- 5.0.5.java11
+ 5.0.6.java11
3.5.3.Final
2.0.6.1
5.0.2
- 3.1.8
- 4.0.7
- 12.0.13
+ 3.1.9
+ 4.0.8
+ 12.0.14
1.16
- 3.19.11
+ 3.19.14
2.9.0
2.5.1
1.5.3
1.3.1
4.13.2
- 5.10.3
+ 5.10.5
3.7.1
1.9.25
1.8.1
@@ -121,7 +121,7 @@
6.3.2.RELEASE
4.27.0
2.23.1
- 1.5.8
+ 1.5.11
1.18.34
3.3.3
3.1.0
@@ -142,40 +142,40 @@
3.3.1
3.2.5
3.4.0
- 1.13.4
- 1.3.4
+ 1.13.6
+ 1.3.5
5.11.0
5.0.1
12.6.4.jre11
8.3.0
0.10.3
1.9.22
- 5.23.0
- 4.1.113.Final
+ 5.25.0
+ 4.1.114.Final
4.12.0
1.37.0
21.9.0.0
1.2.0
- 3.1.6
+ 3.1.7
42.7.4
1.2.1
0.16.0
3.2.4
- 0.5.7
+ 0.5.8
2.3.2
5.1.0
1.0.0.RELEASE
1.2.2
1.0.2.RELEASE
1.1.3
- 1.0.1.RELEASE
- 1.0.5.RELEASE
+ 1.0.2.RELEASE
+ 1.0.7.RELEASE
1.1.5.RELEASE
1.0.0.RELEASE
5.21.0
0.15.0
1.0.4
- 2023.0.10
+ 2023.0.11
5.4.0
1.1.3
3.1.9
@@ -186,20 +186,20 @@
2.0.16
2.2
3.1.7
- 1.3.2
+ 1.3.3
5.1.2
- 2024.0.4
- 6.1.13
- 1.3.2
+ 2024.0.5
+ 6.1.14
+ 1.3.3
2.3.3
- 6.3.4
+ 6.3.5
3.2.4
- 3.2.6
- 1.1.4
- 3.0.1
- 2.0.9
- 6.3.3
- 3.3.2
+ 3.2.7
+ 1.1.5
+ 3.0.2
+ 2.0.10
+ 6.3.4
+ 3.3.3
4.0.11
3.45.3.0
1.19.8
@@ -207,7 +207,7 @@
2.0.1
3.1.2.RELEASE
3.3.0
- 10.1.30
+ 10.1.31
6.0.11
2.3.17.Final
2.16.2
@@ -427,11 +427,6 @@
java-client
${couchbase-client.version}
-
- com.github.differentway
- couchmove
- ${couchmove.version}
-
org.crac
crac
@@ -1562,367 +1557,367 @@
org.springframework.boot
spring-boot
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-test
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-test-autoconfigure
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-testcontainers
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-actuator
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-actuator-autoconfigure
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-autoconfigure
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-autoconfigure-processor
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-buildpack-platform
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-configuration-metadata
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-configuration-processor
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-devtools
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-docker-compose
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-jarmode-tools
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-loader
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-loader-classic
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-loader-tools
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-properties-migrator
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-activemq
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-actuator
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-amqp
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-aop
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-artemis
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-batch
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-cache
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-data-cassandra
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-data-cassandra-reactive
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-data-couchbase
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-data-couchbase-reactive
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-data-elasticsearch
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-data-jdbc
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-data-jpa
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-data-ldap
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-data-mongodb
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-data-mongodb-reactive
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-data-r2dbc
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-data-redis
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-data-redis-reactive
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-data-neo4j
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-data-rest
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-freemarker
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-graphql
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-groovy-templates
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-hateoas
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-integration
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-jdbc
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-jersey
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-jetty
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-jooq
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-json
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-log4j2
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-logging
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-mail
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-mustache
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-oauth2-authorization-server
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-oauth2-client
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-oauth2-resource-server
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-pulsar
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-pulsar-reactive
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-quartz
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-reactor-netty
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-rsocket
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-security
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-test
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-thymeleaf
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-tomcat
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-undertow
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-validation
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-web
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-webflux
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-websocket
- 3.3.4
+ 3.3.5
org.springframework.boot
spring-boot-starter-web-services
- 3.3.4
+ 3.3.5
com.sun.xml.messaging.saaj
@@ -2628,7 +2623,7 @@
org.springframework.boot
spring-boot-maven-plugin
- 3.3.4
+ 3.3.5
org.codehaus.mojo
diff --git a/generators/spring-boot/templates/src/main/java/_package_/config/SecurityConfiguration_imperative.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/SecurityConfiguration_imperative.java.ejs
index 2608def03185..0fca34168b5d 100644
--- a/generators/spring-boot/templates/src/main/java/_package_/config/SecurityConfiguration_imperative.java.ejs
+++ b/generators/spring-boot/templates/src/main/java/_package_/config/SecurityConfiguration_imperative.java.ejs
@@ -51,6 +51,10 @@ import tech.jhipster.web.filter.CookieCsrfFilter;
<%_ if (!skipClient) { _%>
import <%= packageName %>.web.filter.SpaWebFilter;
<%_ } _%>
+<%_ if (applicationTypeGateway) { _%>
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.config.BeanPostProcessor;
+<%_ } _%>
<%_ if (authenticationUsesCsrf && !applicationTypeMicroservice) { _%>
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
@@ -113,6 +117,10 @@ import <%= packageName %>.security.oauth2.CustomClaimConverter;
<%_ if(!skipClient) { _%>
import org.springframework.security.web.header.writers.ReferrerPolicyHeaderWriter;
<%_ } _%>
+<%_ if (applicationTypeGateway) { _%>
+import org.springframework.security.web.server.WebFilterChainProxy;
+import org.springframework.security.web.server.firewall.ServerWebExchangeFirewall;
+<%_ } _%>
<%_ if (authenticationUsesCsrf && !applicationTypeMicroservice) { _%>
import org.springframework.util.StringUtils;
<%_ } _%>
@@ -416,4 +424,20 @@ public class SecurityConfiguration {
}
}
<%_ } _%>
+<%_ if (applicationTypeGateway) { _%>
+
+ // Fix for Spring Boot 3.3.5: https://github.com/spring-cloud/spring-cloud-gateway/issues/3568
+ @Bean
+ BeanPostProcessor beanPostProcessor() {
+ return new BeanPostProcessor() {
+ @Override
+ public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
+ if (bean instanceof WebFilterChainProxy springSecurity) {
+ springSecurity.setFirewall(ServerWebExchangeFirewall.INSECURE_NOOP);
+ }
+ return bean;
+ }
+ };
+ }
+<%_ } _%>
}
diff --git a/generators/spring-boot/templates/src/main/java/_package_/config/SecurityConfiguration_reactive.java.ejs b/generators/spring-boot/templates/src/main/java/_package_/config/SecurityConfiguration_reactive.java.ejs
index ea732caf90c1..f5424a90b626 100644
--- a/generators/spring-boot/templates/src/main/java/_package_/config/SecurityConfiguration_reactive.java.ejs
+++ b/generators/spring-boot/templates/src/main/java/_package_/config/SecurityConfiguration_reactive.java.ejs
@@ -39,6 +39,10 @@ import org.springframework.boot.autoconfigure.security.SecurityProperties;
<%_ if (!skipClient) { _%>
import <%= packageName %>.web.filter.SpaWebFilter;
<%_ } _%>
+<%_ if (applicationTypeGateway) { _%>
+import org.springframework.beans.BeansException;
+import org.springframework.beans.factory.config.BeanPostProcessor;
+<%_ } _%>
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
<%_ if (authenticationTypeOauth2) { _%>
@@ -114,6 +118,10 @@ import org.springframework.security.web.server.savedrequest.NoOpServerRequestCac
<%_ } _%>
import org.springframework.security.web.server.util.matcher.NegatedServerWebExchangeMatcher;
import org.springframework.security.web.server.util.matcher.OrServerWebExchangeMatcher;
+<%_ if (applicationTypeGateway) { _%>
+import org.springframework.security.web.server.WebFilterChainProxy;
+import org.springframework.security.web.server.firewall.ServerWebExchangeFirewall;
+<%_ } _%>
<%_ if (authenticationUsesCsrf) { _%>
import reactor.core.publisher.Mono;
<%_ } _%>
@@ -482,4 +490,20 @@ public class SecurityConfiguration {
return Mono.empty();
}
<%_ } _%>
+<%_ if (applicationTypeGateway) { _%>
+
+ // Fix for Spring Boot 3.3.5: https://github.com/spring-cloud/spring-cloud-gateway/issues/3568
+ @Bean
+ BeanPostProcessor beanPostProcessor() {
+ return new BeanPostProcessor() {
+ @Override
+ public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
+ if (bean instanceof WebFilterChainProxy springSecurity) {
+ springSecurity.setFirewall(ServerWebExchangeFirewall.INSECURE_NOOP);
+ }
+ return bean;
+ }
+ };
+ }
+<%_ } _%>
}