Updated to Spring 6.1.x.

Restored Spring tests.

Signed-off-by: Simone Bordet <[email protected]>

.github/dependabot.yml

@@ -26,16 +26,6 @@ updates:
       - dependency-name: "org.springframework:*"
         versions: [ ">=6.0.0" ]
 
-  - package-ecosystem: "maven"
-    directory: "/"
-    open-pull-requests-limit: 50
-    target-branch: "4.0.x"
-    schedule:
-      interval: "daily"
-    ignore:
-      - dependency-name: "org.springframework:*"
-        versions: [ ">=6.0.0" ]
-
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:

pom.xml

@@ -86,7 +86,7 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <jetty-version>12.0.4</jetty-version>
     <rxjava-version>3.1.8</rxjava-version>
-    <spring-version>5.3.31</spring-version>
+    <spring-version>6.1.1</spring-version>
     <slf4j-version>2.0.9</slf4j-version>
     <reactivestreams-version>1.0.4</reactivestreams-version>
   </properties>

src/test/java/org/eclipse/jetty/reactive/client/ReactorTest.java

@@ -21,13 +21,11 @@
 import java.time.Duration;
 import java.util.Random;
 import java.util.concurrent.TimeoutException;
-
 import org.eclipse.jetty.io.Content;
 import org.eclipse.jetty.server.Handler;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Response;
 import org.eclipse.jetty.util.Callback;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.springframework.http.client.reactive.JettyClientHttpConnector;
@@ -37,7 +35,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
-@Disabled("Spring WebFlux is only compatible with Jetty 9.4.x")
 public class ReactorTest extends AbstractTest {
     @ParameterizedTest
     @MethodSource("protocols")