diff --git a/boot-data-cassandra/pom.xml b/boot-data-cassandra/pom.xml index a72d06ffc..b5f1aba9b 100644 --- a/boot-data-cassandra/pom.xml +++ b/boot-data-cassandra/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/boot-data-couchbase/pom.xml b/boot-data-couchbase/pom.xml index cea46cca7..bf493aff8 100644 --- a/boot-data-couchbase/pom.xml +++ b/boot-data-couchbase/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/boot-data-elasticsearch/pom.xml b/boot-data-elasticsearch/pom.xml index fb7352cb8..28fffaf27 100644 --- a/boot-data-elasticsearch/pom.xml +++ b/boot-data-elasticsearch/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 com.example diff --git a/boot-data-mongo-gridfs/pom.xml b/boot-data-mongo-gridfs/pom.xml index 7faa18a6c..e3c8e5cb6 100644 --- a/boot-data-mongo-gridfs/pom.xml +++ b/boot-data-mongo-gridfs/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 com.example diff --git a/boot-data-mongo-querydsl/pom.xml b/boot-data-mongo-querydsl/pom.xml index b37ce2f5a..32935b8da 100644 --- a/boot-data-mongo-querydsl/pom.xml +++ b/boot-data-mongo-querydsl/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 com.example diff --git a/boot-data-mongo-tailable/pom.xml b/boot-data-mongo-tailable/pom.xml index 174484bcc..dc4b1da4c 100644 --- a/boot-data-mongo-tailable/pom.xml +++ b/boot-data-mongo-tailable/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 com.example diff --git a/boot-data-mongo/pom.xml b/boot-data-mongo/pom.xml index 165069519..f2d3d56d2 100644 --- a/boot-data-mongo/pom.xml +++ b/boot-data-mongo/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/boot-data-neo4j/pom.xml b/boot-data-neo4j/pom.xml index 03742be2c..c6fbeff96 100644 --- a/boot-data-neo4j/pom.xml +++ b/boot-data-neo4j/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 com.example diff --git a/boot-data-redis/pom.xml b/boot-data-redis/pom.xml index 3dde7ab86..c7c75b431 100644 --- a/boot-data-redis/pom.xml +++ b/boot-data-redis/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/boot-exception-handler/pom.xml b/boot-exception-handler/pom.xml index 0121fe6a7..37bb9ad03 100644 --- a/boot-exception-handler/pom.xml +++ b/boot-exception-handler/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/boot-groovy/pom.xml b/boot-groovy/pom.xml index 9f34b5bd3..fe1633d7c 100644 --- a/boot-groovy/pom.xml +++ b/boot-groovy/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/boot-kotlin-dsl/pom.xml b/boot-kotlin-dsl/pom.xml index 2b0ad068a..8a1c05bb2 100644 --- a/boot-kotlin-dsl/pom.xml +++ b/boot-kotlin-dsl/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 com.example diff --git a/boot-kotlin/pom.xml b/boot-kotlin/pom.xml index d110225e6..d0503026e 100644 --- a/boot-kotlin/pom.xml +++ b/boot-kotlin/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/boot-mongo/pom.xml b/boot-mongo/pom.xml index 8889bda59..74acf1dbd 100644 --- a/boot-mongo/pom.xml +++ b/boot-mongo/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/boot-mvc-freemarker/pom.xml b/boot-mvc-freemarker/pom.xml index d0431b1dc..fcb3ee049 100644 --- a/boot-mvc-freemarker/pom.xml +++ b/boot-mvc-freemarker/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/boot-mvc-mustache/pom.xml b/boot-mvc-mustache/pom.xml index ed71f591f..670a9cd71 100644 --- a/boot-mvc-mustache/pom.xml +++ b/boot-mvc-mustache/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/boot-mvc-thymeleaf/pom.xml b/boot-mvc-thymeleaf/pom.xml index 408957ade..5062a04f5 100644 --- a/boot-mvc-thymeleaf/pom.xml +++ b/boot-mvc-thymeleaf/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/boot-neo4j-cypher/pom.xml b/boot-neo4j-cypher/pom.xml index 4f5ecc950..d13423957 100644 --- a/boot-neo4j-cypher/pom.xml +++ b/boot-neo4j-cypher/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 com.example diff --git a/boot-neo4j/pom.xml b/boot-neo4j/pom.xml index 1f7b1319f..ffd389855 100644 --- a/boot-neo4j/pom.xml +++ b/boot-neo4j/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 com.example diff --git a/boot-reactor-kafka/receiver/pom.xml b/boot-reactor-kafka/receiver/pom.xml index c4019dec1..b23118340 100644 --- a/boot-reactor-kafka/receiver/pom.xml +++ b/boot-reactor-kafka/receiver/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 com.example diff --git a/boot-reactor-kafka/sender/pom.xml b/boot-reactor-kafka/sender/pom.xml index 3b6d39fa7..d5839e2f8 100644 --- a/boot-reactor-kafka/sender/pom.xml +++ b/boot-reactor-kafka/sender/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 com.example diff --git a/boot-reactor-rabbitmq/receiver/pom.xml b/boot-reactor-rabbitmq/receiver/pom.xml index 8d9b15f1f..729063f79 100644 --- a/boot-reactor-rabbitmq/receiver/pom.xml +++ b/boot-reactor-rabbitmq/receiver/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 com.example diff --git a/boot-reactor-rabbitmq/sender/pom.xml b/boot-reactor-rabbitmq/sender/pom.xml index 46c3126f1..ccd3ffacc 100644 --- a/boot-reactor-rabbitmq/sender/pom.xml +++ b/boot-reactor-rabbitmq/sender/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 com.example diff --git a/boot-redis/pom.xml b/boot-redis/pom.xml index 0592dc57c..a7ee18121 100644 --- a/boot-redis/pom.xml +++ b/boot-redis/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/boot-start-routes/pom.xml b/boot-start-routes/pom.xml index dcd10c9ab..559feb97d 100644 --- a/boot-start-routes/pom.xml +++ b/boot-start-routes/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/boot-start/pom.xml b/boot-start/pom.xml index 4560c9c95..5d44f3381 100644 --- a/boot-start/pom.xml +++ b/boot-start/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/client/pom.xml b/client/pom.xml index 4aa953730..b350c0021 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/data-cassandra/pom.xml b/data-cassandra/pom.xml index ef28856e1..3e96352c0 100644 --- a/data-cassandra/pom.xml +++ b/data-cassandra/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/data-couchbase/pom.xml b/data-couchbase/pom.xml index f463b96e3..eaca8bbfc 100644 --- a/data-couchbase/pom.xml +++ b/data-couchbase/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/data-elasticsearch/pom.xml b/data-elasticsearch/pom.xml index 453a5e5a6..236a9a977 100644 --- a/data-elasticsearch/pom.xml +++ b/data-elasticsearch/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/data-mongo-pageable/pom.xml b/data-mongo-pageable/pom.xml index a2bf461fe..73d96a702 100644 --- a/data-mongo-pageable/pom.xml +++ b/data-mongo-pageable/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/data-mongo-transaction/pom.xml b/data-mongo-transaction/pom.xml index 32480e201..e6af797f3 100644 --- a/data-mongo-transaction/pom.xml +++ b/data-mongo-transaction/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/data-mongo/pom.xml b/data-mongo/pom.xml index 4a73cde93..8f6c8d097 100644 --- a/data-mongo/pom.xml +++ b/data-mongo/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/data-neo4j/pom.xml b/data-neo4j/pom.xml index 721844a41..d60c93888 100644 --- a/data-neo4j/pom.xml +++ b/data-neo4j/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 com.example diff --git a/data-redis-message/pom.xml b/data-redis-message/pom.xml index 6651d7264..2f98eda87 100644 --- a/data-redis-message/pom.xml +++ b/data-redis-message/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/data-redis/pom.xml b/data-redis/pom.xml index f94093c19..2dd689cc6 100644 --- a/data-redis/pom.xml +++ b/data-redis/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/exception-handler/pom.xml b/exception-handler/pom.xml index a7e53a36b..dd913899c 100644 --- a/exception-handler/pom.xml +++ b/exception-handler/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/groovy-dsl/pom.xml b/groovy-dsl/pom.xml index 373ac1816..ed8158cac 100644 --- a/groovy-dsl/pom.xml +++ b/groovy-dsl/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 @@ -137,7 +137,7 @@ diff --git a/integration-dsl/pom.xml b/integration-dsl/pom.xml index 95534a39e..4aa85c533 100644 --- a/integration-dsl/pom.xml +++ b/integration-dsl/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/integration/pom.xml b/integration/pom.xml index e65273203..6dddf69d4 100644 --- a/integration/pom.xml +++ b/integration/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/java8/pom.xml b/java8/pom.xml index c639a2b2b..2ffd3c4af 100644 --- a/java8/pom.xml +++ b/java8/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/java9/pom.xml b/java9/pom.xml index 7d0c2fdb4..ac3f69cba 100644 --- a/java9/pom.xml +++ b/java9/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/kotlin-dsl/pom.xml b/kotlin-dsl/pom.xml index aba57e49f..e4b653532 100644 --- a/kotlin-dsl/pom.xml +++ b/kotlin-dsl/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/kotlin-routes/pom.xml b/kotlin-routes/pom.xml index e4c6b7dd3..bf1cb291d 100644 --- a/kotlin-routes/pom.xml +++ b/kotlin-routes/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/kotlin/pom.xml b/kotlin/pom.xml index 481b9b90c..b200a57d5 100644 --- a/kotlin/pom.xml +++ b/kotlin/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/multipart-data-mongo/pom.xml b/multipart-data-mongo/pom.xml index 73bc4cdcf..04f429ba4 100644 --- a/multipart-data-mongo/pom.xml +++ b/multipart-data-mongo/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/multipart/pom.xml b/multipart/pom.xml index 4f09c4a27..656bb4d31 100644 --- a/multipart/pom.xml +++ b/multipart/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/mvc-freemarker/pom.xml b/mvc-freemarker/pom.xml index 4a5a8da78..242512e30 100644 --- a/mvc-freemarker/pom.xml +++ b/mvc-freemarker/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/mvc-mustache/pom.xml b/mvc-mustache/pom.xml index 4e4c9d535..ab776d739 100644 --- a/mvc-mustache/pom.xml +++ b/mvc-mustache/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/mvc-thymeleaf/pom.xml b/mvc-thymeleaf/pom.xml index 5e98e935d..923126d61 100644 --- a/mvc-thymeleaf/pom.xml +++ b/mvc-thymeleaf/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/register-bean/pom.xml b/register-bean/pom.xml index 961228a41..facb6fc67 100644 --- a/register-bean/pom.xml +++ b/register-bean/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/restdocs/pom.xml b/restdocs/pom.xml index 31c7a0f56..0a0f383d4 100644 --- a/restdocs/pom.xml +++ b/restdocs/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/routes/pom.xml b/routes/pom.xml index 2a70800a4..4a7bb6789 100644 --- a/routes/pom.xml +++ b/routes/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/rxjava3/pom.xml b/rxjava3/pom.xml index 97f8ee7cf..e076ef157 100644 --- a/rxjava3/pom.xml +++ b/rxjava3/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/security-data-mongo/pom.xml b/security-data-mongo/pom.xml index c8be12513..0d2b0036f 100644 --- a/security-data-mongo/pom.xml +++ b/security-data-mongo/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/security-form/pom.xml b/security-form/pom.xml index 7026b7430..566564004 100644 --- a/security-form/pom.xml +++ b/security-form/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/security-method/pom.xml b/security-method/pom.xml index e8a27c533..3d699b1b5 100644 --- a/security-method/pom.xml +++ b/security-method/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/security-user-properties/pom.xml b/security-user-properties/pom.xml index 3d692fce8..c171fa06f 100644 --- a/security-user-properties/pom.xml +++ b/security-user-properties/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/security/pom.xml b/security/pom.xml index e82a76b7e..95738f232 100644 --- a/security/pom.xml +++ b/security/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/session-data-mongo/pom.xml b/session-data-mongo/pom.xml index f277d8dc7..c55a4baf2 100644 --- a/session-data-mongo/pom.xml +++ b/session-data-mongo/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/session-data-redis/pom.xml b/session-data-redis/pom.xml index 75eea0956..82e2e0746 100644 --- a/session-data-redis/pom.xml +++ b/session-data-redis/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/session-header/pom.xml b/session-header/pom.xml index 649918156..663726df8 100644 --- a/session-header/pom.xml +++ b/session-header/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/session/pom.xml b/session/pom.xml index c5115c8a0..c91d97f1c 100644 --- a/session/pom.xml +++ b/session/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/smallrye-mutiny/pom.xml b/smallrye-mutiny/pom.xml index 941c1fde5..7638eeae4 100644 --- a/smallrye-mutiny/pom.xml +++ b/smallrye-mutiny/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/sse/pom.xml b/sse/pom.xml index 62e082383..ab25e4bd5 100644 --- a/sse/pom.xml +++ b/sse/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/vanilla-jetty/pom.xml b/vanilla-jetty/pom.xml index b562d5b0e..9f9a8efbd 100644 --- a/vanilla-jetty/pom.xml +++ b/vanilla-jetty/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 @@ -22,6 +22,7 @@ UTF-8 UTF-8 17 + 12.0.2 @@ -60,8 +61,8 @@ - org.eclipse.jetty - jetty-servlet + org.eclipse.jetty.ee10 + jetty-ee10-servlet diff --git a/vanilla-jetty/src/main/java/com/example/demo/Application.java b/vanilla-jetty/src/main/java/com/example/demo/Application.java index 7339ce3d7..be0693cdd 100644 --- a/vanilla-jetty/src/main/java/com/example/demo/Application.java +++ b/vanilla-jetty/src/main/java/com/example/demo/Application.java @@ -1,16 +1,15 @@ package com.example.demo; import jakarta.servlet.Servlet; +import org.eclipse.jetty.ee10.servlet.ServletContextHandler; +import org.eclipse.jetty.ee10.servlet.ServletHolder; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.ServerConnector; -import org.eclipse.jetty.servlet.ServletContextHandler; -import org.eclipse.jetty.servlet.ServletHolder; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.*; import org.springframework.http.server.reactive.HttpHandler; import org.springframework.http.server.reactive.JettyHttpHandlerAdapter; -import org.springframework.web.reactive.config.EnableWebFlux; import org.springframework.web.server.adapter.WebHttpHandlerBuilder; @Configuration @@ -25,7 +24,7 @@ public static void main(String[] args) throws Exception { ApplicationContext context = new AnnotationConfigApplicationContext(Application.class); // (1) Server server = context.getBean(Server.class); server.start(); - server.join(); + //server.join(); System.out.println("Press ENTER to exit."); System.in.read(); @@ -36,15 +35,11 @@ public Server jettyServer(ApplicationContext context) throws Exception { HttpHandler handler = WebHttpHandlerBuilder.applicationContext(context).build(); Servlet servlet = new JettyHttpHandlerAdapter(handler); - Server server = new Server(); - ServletContextHandler contextHandler = new ServletContextHandler(server, ""); - contextHandler.addServlet(new ServletHolder(servlet), "/"); - contextHandler.start(); + Server server = new Server(8080); - ServerConnector connector = new ServerConnector(server); - connector.setHost("localhost"); - connector.setPort(port); - server.addConnector(connector); + ServletContextHandler contextHandler = new ServletContextHandler(""); + contextHandler.addServlet(new ServletHolder(servlet), "/*"); + server.setHandler(contextHandler); return server; } diff --git a/vanilla-jetty/src/test/java/com/example/demo/IntegrationTests.java b/vanilla-jetty/src/test/java/com/example/demo/IntegrationTests.java index 313dc8a91..b0872608b 100644 --- a/vanilla-jetty/src/test/java/com/example/demo/IntegrationTests.java +++ b/vanilla-jetty/src/test/java/com/example/demo/IntegrationTests.java @@ -40,7 +40,7 @@ public static void afterAll() throws Exception { public void setup() { this.client = WebTestClient .bindToServer() - .responseTimeout(Duration.ofDays(1)) + .responseTimeout(Duration.ofMillis(500)) .baseUrl("http://localhost:8080") .build(); } diff --git a/vanilla-tomcat/pom.xml b/vanilla-tomcat/pom.xml index 20fb3bfa2..0169d1aa7 100644 --- a/vanilla-tomcat/pom.xml +++ b/vanilla-tomcat/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/vanilla-undertow/pom.xml b/vanilla-undertow/pom.xml index 0fa0de227..eb007e960 100644 --- a/vanilla-undertow/pom.xml +++ b/vanilla-undertow/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/vanilla/pom.xml b/vanilla/pom.xml index d3a1a57e3..3af7e8540 100644 --- a/vanilla/pom.xml +++ b/vanilla/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/war/pom.xml b/war/pom.xml index b8d2a513d..f4e546506 100644 --- a/war/pom.xml +++ b/war/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 @@ -22,11 +22,11 @@ UTF-8 UTF-8 17 - 11.0.16 - 3.1.2 + 12.0.2 1.10.9 + 3.2.1 + 3.2.1 - org.springframework @@ -167,6 +167,7 @@ org.apache.maven.plugins maven-failsafe-plugin + ${maven-failsafe-plugin.version} **/IntegrationTests* @@ -190,8 +191,8 @@ - org.eclipse.jetty - jetty-maven-plugin + org.eclipse.jetty.ee10 + jetty-ee10-maven-plugin ${jetty.version} 10 diff --git a/web-filter/pom.xml b/web-filter/pom.xml index 4d98b3fd7..114c1955d 100644 --- a/web-filter/pom.xml +++ b/web-filter/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 diff --git a/websocket/pom.xml b/websocket/pom.xml index 5d194cf8a..24a91de52 100644 --- a/websocket/pom.xml +++ b/websocket/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.4 + 3.2.0-RC1 @@ -137,7 +137,7 @@ org.codehaus.mojo exec-maven-plugin - 3.1.4 + 3.2.0-RC1 com.example.demo.Application