FELIX-6750-Jetty-12.1.0-tryout

- Move to EE11 for new tests
- Simplify HTTP client migration

Author: paulrutter

http/base/src/test/java/org/apache/felix/http/base/internal/handler/WebSocketHandlerTest.java

@@ -21,7 +21,7 @@
 import static org.mockito.Mockito.mock;
 
 import org.apache.felix.http.javaxwrappers.ServletWrapper;
-import org.eclipse.jetty.ee10.websocket.server.JettyWebSocketServlet;
+import org.eclipse.jetty.ee11.websocket.server.JettyWebSocketServlet;
 import org.junit.Before;
 import org.junit.Test;
 

http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettyMaxFormSizeIT.java

@@ -64,9 +64,9 @@ protected Option[] additionalOptions() throws IOException {
                 spifly(),
 
                 // bundles for the server side
-                mavenBundle().groupId("org.eclipse.jetty.ee10").artifactId("jetty-ee10-webapp").version(jettyVersion),
+                mavenBundle().groupId("org.eclipse.jetty.ee11").artifactId("jetty-ee11-webapp").version(jettyVersion),
                 mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-ee").version(jettyVersion),
-                mavenBundle().groupId("org.eclipse.jetty.ee10").artifactId("jetty-ee10-servlet").version(jettyVersion),
+                mavenBundle().groupId("org.eclipse.jetty.ee11").artifactId("jetty-ee11-servlet").version(jettyVersion),
                 mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-xml").version(jettyVersion),
 
                 // additional bundles for the client side
@@ -94,8 +94,7 @@ public void setup(){
 
     @Test
     public void testFormSizeLimit() throws Exception {
-        HttpClientTransportOverHTTP transport = new HttpClientTransportOverHTTP();
-        try (HttpClient httpClient = new HttpClient(transport)) {
+        try (HttpClient httpClient = new HttpClient()) {
             Object value = bundleContext.getServiceReference(HttpService.class).getProperty("org.osgi.service.http.port");
             int httpPort = Integer.parseInt((String) value);
 

http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettySizeLimitHandlerIT.java

@@ -63,9 +63,9 @@ protected Option[] additionalOptions() throws IOException {
                 spifly(),
 
                 // bundles for the server side
-                mavenBundle().groupId("org.eclipse.jetty.ee10").artifactId("jetty-ee10-webapp").version(jettyVersion),
+                mavenBundle().groupId("org.eclipse.jetty.ee11").artifactId("jetty-ee11-webapp").version(jettyVersion),
                 mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-ee").version(jettyVersion),
-                mavenBundle().groupId("org.eclipse.jetty.ee10").artifactId("jetty-ee10-servlet").version(jettyVersion),
+                mavenBundle().groupId("org.eclipse.jetty.ee11").artifactId("jetty-ee11-servlet").version(jettyVersion),
                 mavenBundle().groupId("org.eclipse.jetty").artifactId("jetty-xml").version(jettyVersion),
 
                 // additional bundles for the client side
@@ -97,8 +97,7 @@ public void setup(){
 
     @Test
     public void testRequestResponseLimits() throws Exception {
-        HttpClientTransportOverHTTP transport = new HttpClientTransportOverHTTP();
-        try (HttpClient httpClient = new HttpClient(transport)) {
+        try (HttpClient httpClient = new HttpClient()) {
             Object value = bundleContext.getServiceReference(HttpService.class).getProperty("org.osgi.service.http.port");
             int httpPort = Integer.parseInt((String) value);
 

http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettyUriComplianceModeDefaultIT.java

@@ -91,8 +91,7 @@ public void setup(){
 
     @Test
     public void testUriCompliance() throws Exception {
-        HttpClientTransportOverHTTP transport = new HttpClientTransportOverHTTP();
-        try (HttpClient httpClient = new HttpClient(transport)) {
+        try (HttpClient httpClient = new HttpClient()) {
             Object value = bundleContext.getServiceReference(HttpService.class).getProperty("org.osgi.service.http.port");
             int httpPort = Integer.parseInt((String) value);
 

http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettyUriComplianceModeLegacyIT.java

@@ -61,8 +61,7 @@ protected Option felixHttpConfig(int httpPort) {
 
     @Test
     public void testUriCompliance() throws Exception {
-        HttpClientTransportOverHTTP transport = new HttpClientTransportOverHTTP();
-        try (HttpClient httpClient = new HttpClient(transport)) {
+        try (HttpClient httpClient = new HttpClient()) {
             Object value = bundleContext.getServiceReference(HttpService.class).getProperty("org.osgi.service.http.port");
             int httpPort = Integer.parseInt((String) value);
 

http/jetty12/src/test/java/org/apache/felix/http/jetty/it/JettyVirtualThreadsIT.java

@@ -95,8 +95,7 @@ public void testJettyRunningWithVirtualThreads() throws Exception {
             // This test only works on Java 21 or newer
             return;
         }
-        HttpClientTransportOverHTTP transport = new HttpClientTransportOverHTTP();
-        try (HttpClient httpClient = new HttpClient(transport)) {
+        try (HttpClient httpClient = new HttpClient()) {
             Object value = bundleContext.getServiceReference(HttpService.class).getProperty("org.osgi.service.http.port");
             int httpPort = Integer.parseInt((String) value);