Upgrade to Spring Boot 3.0.13

akkinoc · Dec 2, 2023 · 3991192 · 3991192
1 parent d601be7
commit 3991192
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 8 deletions.
diff --git a/examples/webflux-jetty-java/pom.xml b/examples/webflux-jetty-java/pom.xml
@@ -13,7 +13,7 @@
  <parent>
  <groupId>org.springframework.boot</groupId>
  <artifactId>spring-boot-starter-parent</artifactId>
- <version>3.0.6</version>
+ <version>3.0.13</version>
  </parent>
 
  <properties>

diff --git a/examples/webflux-tomcat-java/pom.xml b/examples/webflux-tomcat-java/pom.xml
@@ -13,7 +13,7 @@
  <parent>
  <groupId>org.springframework.boot</groupId>
  <artifactId>spring-boot-starter-parent</artifactId>
- <version>3.0.6</version>
+ <version>3.0.13</version>
  </parent>
 
  <properties>

diff --git a/examples/webflux-undertow-java/pom.xml b/examples/webflux-undertow-java/pom.xml
@@ -13,7 +13,7 @@
  <parent>
  <groupId>org.springframework.boot</groupId>
  <artifactId>spring-boot-starter-parent</artifactId>
- <version>3.0.6</version>
+ <version>3.0.13</version>
  </parent>
 
  <properties>

diff --git a/examples/webmvc-jetty-java/pom.xml b/examples/webmvc-jetty-java/pom.xml
@@ -13,7 +13,7 @@
  <parent>
  <groupId>org.springframework.boot</groupId>
  <artifactId>spring-boot-starter-parent</artifactId>
- <version>3.0.6</version>
+ <version>3.0.13</version>
  </parent>
 
  <properties>

diff --git a/examples/webmvc-tomcat-java/pom.xml b/examples/webmvc-tomcat-java/pom.xml
@@ -13,7 +13,7 @@
  <parent>
  <groupId>org.springframework.boot</groupId>
  <artifactId>spring-boot-starter-parent</artifactId>
- <version>3.0.6</version>
+ <version>3.0.13</version>
  </parent>
 
  <properties>

diff --git a/examples/webmvc-tomcat-kotlin/pom.xml b/examples/webmvc-tomcat-kotlin/pom.xml
@@ -13,7 +13,7 @@
  <parent>
  <groupId>org.springframework.boot</groupId>
  <artifactId>spring-boot-starter-parent</artifactId>
- <version>3.0.6</version>
+ <version>3.0.13</version>
  </parent>
 
  <properties>

diff --git a/examples/webmvc-undertow-java/pom.xml b/examples/webmvc-undertow-java/pom.xml
@@ -13,7 +13,7 @@
  <parent>
  <groupId>org.springframework.boot</groupId>
  <artifactId>spring-boot-starter-parent</artifactId>
- <version>3.0.6</version>
+ <version>3.0.13</version>
  </parent>
 
  <properties>

diff --git a/pom.xml b/pom.xml
@@ -17,7 +17,7 @@
  <parent>
  <groupId>org.springframework.boot</groupId>
  <artifactId>spring-boot-starter-parent</artifactId>
- <version>3.0.6</version>
+ <version>3.0.13</version>
  </parent>
 
  <organization>

diff --git a/.../spring/boot/logback/access/test/configuration/TestContextClassLoaderCustomizerFactory.kt b/.../spring/boot/logback/access/test/configuration/TestContextClassLoaderCustomizerFactory.kt
@@ -17,7 +17,10 @@ import org.springframework.test.context.ContextConfigurationAttributes
 import org.springframework.test.context.ContextCustomizerFactory
 import org.springframework.util.ClassUtils.convertClassNameToResourcePath
 import java.net.URL
+import io.undertow.websockets.jsr.Bootstrap as UndertowBootstrap
+import org.apache.tomcat.websocket.server.WsSci as TomcatWsSci
 import org.eclipse.jetty.server.Server as JettyServer
+import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer as JettyJakartaWebSocketServletContainerInitializer
 import reactor.netty.http.server.HttpServer as NettyHttpServer
 
 /**
@@ -59,8 +62,11 @@ class TestContextClassLoaderCustomizerFactory : ContextCustomizerFactory {
  val usesNetty = annotations.isPresent(NettyReactiveWebTest::class.java)
  return buildSet {
  if (!usesTomcat) add(Tomcat::class.java)
+ if (!usesTomcat) add(TomcatWsSci::class.java)
  if (!usesJetty) add(JettyServer::class.java)
+ if (!usesJetty) add(JettyJakartaWebSocketServletContainerInitializer::class.java)
  if (!usesUndertow) add(Undertow::class.java)
+ if (!usesUndertow) add(UndertowBootstrap::class.java)
  if (!usesNetty) add(NettyHttpServer::class.java)
  }
  }