Skip to content

Commit a790174

Browse files
committed
FELIX-6750-Jetty-12.1.0-tryout
- Organize imports
1 parent 9963f64 commit a790174

7 files changed

Lines changed: 3 additions & 44 deletions

File tree

http/base/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,9 @@
158158
<scope>test</scope>
159159
</dependency>
160160
<dependency>
161-
<groupId>org.eclipse.jetty.ee10.websocket</groupId>
162-
<artifactId>jetty-ee10-websocket-jetty-server</artifactId>
163-
<version>12.0.21</version>
161+
<groupId>org.eclipse.jetty.ee11.websocket</groupId>
162+
<artifactId>jetty-ee11-websocket-jetty-server</artifactId>
163+
<version>12.1.0.beta0</version>
164164
<scope>test</scope>
165165
</dependency>
166166
</dependencies>

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535

3636
import org.eclipse.jetty.client.ContentResponse;
3737
import org.eclipse.jetty.client.HttpClient;
38-
import org.eclipse.jetty.client.transport.HttpClientTransportOverHTTP;
3938
import org.eclipse.jetty.util.Fields;
4039
import org.junit.Before;
4140
import org.junit.Test;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535

3636
import org.eclipse.jetty.client.ContentResponse;
3737
import org.eclipse.jetty.client.HttpClient;
38-
import org.eclipse.jetty.client.transport.HttpClientTransportOverHTTP;
3938
import org.eclipse.jetty.util.Fields;
4039
import org.junit.Before;
4140
import org.junit.Test;

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535

3636
import org.eclipse.jetty.client.ContentResponse;
3737
import org.eclipse.jetty.client.HttpClient;
38-
import org.eclipse.jetty.client.transport.HttpClientTransportOverHTTP;
3938
import org.junit.Before;
4039
import org.junit.Test;
4140
import org.junit.runner.RunWith;

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

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,34 +18,19 @@
1818

1919
import static org.eclipse.jetty.http.UriCompliance.LEGACY;
2020
import static org.junit.Assert.assertEquals;
21-
import static org.junit.Assert.assertNotNull;
22-
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
2321
import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.newConfiguration;
2422

25-
import java.io.IOException;
2623
import java.net.URI;
27-
import java.util.Hashtable;
28-
import java.util.Map;
29-
30-
import javax.inject.Inject;
31-
import jakarta.servlet.Servlet;
32-
import jakarta.servlet.http.HttpServlet;
33-
import jakarta.servlet.http.HttpServletRequest;
34-
import jakarta.servlet.http.HttpServletResponse;
3524

3625
import org.eclipse.jetty.client.ContentResponse;
3726
import org.eclipse.jetty.client.HttpClient;
38-
import org.eclipse.jetty.client.transport.HttpClientTransportOverHTTP;
39-
import org.eclipse.jetty.http.UriCompliance;
4027
import org.junit.Test;
4128
import org.junit.runner.RunWith;
4229
import org.ops4j.pax.exam.Option;
4330
import org.ops4j.pax.exam.junit.PaxExam;
4431
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
4532
import org.ops4j.pax.exam.spi.reactors.PerClass;
46-
import org.osgi.framework.BundleContext;
4733
import org.osgi.service.http.HttpService;
48-
import org.osgi.service.servlet.whiteboard.HttpWhiteboardConstants;
4934

5035
@RunWith(PaxExam.class)
5136
@ExamReactorStrategy(PerClass.class)

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434

3535
import org.eclipse.jetty.client.ContentResponse;
3636
import org.eclipse.jetty.client.HttpClient;
37-
import org.eclipse.jetty.client.transport.HttpClientTransportOverHTTP;
3837
import org.junit.Before;
3938
import org.junit.Test;
4039
import org.junit.runner.RunWith;

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

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -16,35 +16,13 @@
1616
*/
1717
package org.apache.felix.http.jetty.it;
1818

19-
import static org.junit.Assert.assertEquals;
20-
import static org.junit.Assert.assertNotNull;
21-
import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
2219
import static org.ops4j.pax.exam.cm.ConfigurationAdminOptions.newConfiguration;
2320

24-
import java.io.IOException;
25-
import java.net.URI;
26-
import java.util.Hashtable;
27-
import java.util.Map;
28-
29-
import javax.inject.Inject;
30-
import jakarta.servlet.Servlet;
31-
import jakarta.servlet.http.HttpServlet;
32-
import jakarta.servlet.http.HttpServletRequest;
33-
import jakarta.servlet.http.HttpServletResponse;
34-
35-
import org.eclipse.jetty.client.ContentResponse;
36-
import org.eclipse.jetty.client.HttpClient;
37-
import org.eclipse.jetty.client.transport.HttpClientTransportOverHTTP;
38-
import org.junit.Before;
39-
import org.junit.Test;
4021
import org.junit.runner.RunWith;
4122
import org.ops4j.pax.exam.Option;
4223
import org.ops4j.pax.exam.junit.PaxExam;
4324
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
4425
import org.ops4j.pax.exam.spi.reactors.PerClass;
45-
import org.osgi.framework.BundleContext;
46-
import org.osgi.service.http.HttpService;
47-
import org.osgi.service.servlet.whiteboard.HttpWhiteboardConstants;
4826

4927
@RunWith(PaxExam.class)
5028
@ExamReactorStrategy(PerClass.class)

0 commit comments

Comments
 (0)