Skip to content

Commit bdb1aad

Browse files
shs96cshs96c
committed
Remove jetty from selenium
1 parent 5892fac commit bdb1aad

20 files changed

Lines changed: 96 additions & 1490 deletions

File tree

‎java/client/test/org/openqa/selenium/BUILD.bazel‎

Lines changed: 1 addition & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -74,60 +74,14 @@ java_selenium_test_suite(
7474
"//java/client/test/org/openqa/selenium/testing/drivers",
7575
"//java/server/src/org/openqa/selenium/grid/config",
7676
"//java/server/src/org/openqa/selenium/jre/server",
77+
"//java/server/src/org/openqa/selenium/netty/server",
7778
artifact("com.google.guava:guava"),
7879
artifact("io.netty:netty-codec-haproxy"),
7980
artifact("io.netty:netty-codec-http"),
8081
artifact("io.netty:netty-transport"),
8182
artifact("junit:junit"),
8283
artifact("javax.servlet:javax.servlet-api"),
8384
artifact("org.assertj:assertj-core"),
84-
artifact("org.eclipse.jetty:jetty-server"),
85-
artifact("xyz.rogfam:littleproxy"),
86-
],
87-
)
88-
89-
# TODO: replace with smaller suites
90-
java_library(
91-
name = "tests",
92-
testonly = True,
93-
srcs = glob([
94-
"*Test.java",
95-
"html5/*.java",
96-
"interactions/*.java",
97-
"interactions/touch/*Test.java",
98-
"logging/*.java",
99-
]) + [
100-
"interactions/touch/TouchTestBase.java",
101-
],
102-
javacopts = [
103-
"--release",
104-
"11",
105-
],
106-
visibility = [
107-
"//java/client/test:__subpackages__",
108-
],
109-
deps = [
110-
":helpers",
111-
"//java/client/src/org/openqa/selenium:core",
112-
"//java/client/src/org/openqa/selenium/json",
113-
"//java/client/src/org/openqa/selenium/remote",
114-
"//java/client/src/org/openqa/selenium/support",
115-
"//java/client/test/org/openqa/selenium/build",
116-
"//java/client/test/org/openqa/selenium/environment",
117-
"//java/client/test/org/openqa/selenium/testing:annotations",
118-
"//java/client/test/org/openqa/selenium/testing:test-base",
119-
"//java/client/test/org/openqa/selenium/testing/drivers",
120-
"//java/server/src/org/openqa/selenium/grid/config",
121-
"//java/server/src/org/openqa/selenium/jre/server",
122-
artifact("com.google.guava:guava"),
123-
artifact("io.netty:netty-codec-haproxy"),
124-
artifact("io.netty:netty-codec-http"),
125-
artifact("io.netty:netty-transport"),
126-
artifact("javax.servlet:javax.servlet-api"),
127-
artifact("junit:junit"),
128-
artifact("org.assertj:assertj-core"),
129-
artifact("org.eclipse.jetty:jetty-server"),
130-
artifact("org.mockito:mockito-core"),
13185
artifact("xyz.rogfam:littleproxy"),
13286
],
13387
)

‎java/client/test/org/openqa/selenium/environment/BUILD.bazel‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,9 @@ java_library(
5353
"//java/server/src/org/openqa/selenium/grid/config",
5454
"//java/server/src/org/openqa/selenium/grid/server",
5555
"//java/server/src/org/openqa/selenium/grid/web",
56-
"//java/server/src/org/openqa/selenium/jetty/server",
5756
"//java/server/src/org/openqa/selenium/netty/server",
5857
artifact("com.google.guava:guava"),
5958
artifact("org.assertj:assertj-core"),
60-
artifact("org.eclipse.jetty:jetty-http"),
61-
artifact("org.eclipse.jetty:jetty-server"),
62-
artifact("org.eclipse.jetty:jetty-servlet"),
63-
artifact("org.eclipse.jetty:jetty-util"),
64-
artifact("javax.servlet:javax.servlet-api"),
6559
],
6660
)
6761

‎java/client/test/org/openqa/selenium/environment/webserver/CreatePageServlet.java‎

Lines changed: 0 additions & 66 deletions
This file was deleted.

‎java/client/test/org/openqa/selenium/environment/webserver/GeneratedJsTestHandler.java‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,20 +17,13 @@
1717

1818
package org.openqa.selenium.environment.webserver;
1919

20-
import com.google.common.base.Strings;
2120
import com.google.common.net.MediaType;
2221
import org.openqa.selenium.remote.http.Contents;
2322
import org.openqa.selenium.remote.http.HttpHandler;
2423
import org.openqa.selenium.remote.http.HttpRequest;
2524
import org.openqa.selenium.remote.http.HttpResponse;
2625

27-
import javax.servlet.http.HttpServlet;
28-
import javax.servlet.http.HttpServletRequest;
29-
import javax.servlet.http.HttpServletResponse;
30-
import java.io.IOException;
31-
import java.io.OutputStream;
3226
import java.io.UncheckedIOException;
33-
import java.nio.charset.StandardCharsets;
3427

3528
public class GeneratedJsTestHandler implements HttpHandler {
3629

0 commit comments

Comments
 (0)