Skip to content

Commit 110079f

Browse files
joerg1985diemol
joerg1985
and
diemol
authored
[java] Use netty as http server for unit testing (#12211)
Use netty as http server for unit testing Co-authored-by: Diego Molina <[email protected]>
1 parent 2e346ce commit 110079f

File tree

13 files changed

+359
-503
lines changed

13 files changed

+359
-503
lines changed

‎java/maven_deps.bzl‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ def selenium_java_deps():
3030
"io.grpc:grpc-context:1.55.1",
3131
"io.lettuce:lettuce-core:6.2.4.RELEASE",
3232
"io.netty:netty-buffer:%s" % netty_version,
33-
"io.netty:netty-codec-haproxy:%s" % netty_version,
3433
"io.netty:netty-codec-http:%s" % netty_version,
3534
"io.netty:netty-codec-http2:%s" % netty_version,
3635
"io.netty:netty-common:%s" % netty_version,
@@ -59,7 +58,6 @@ def selenium_java_deps():
5958
"io.opentelemetry:opentelemetry-sdk-trace:%s" % opentelemetry_version,
6059
"io.ous:jtoml:2.0.0",
6160
"it.ozimov:embedded-redis:0.7.3",
62-
"javax.servlet:javax.servlet-api:4.0.1",
6361
maven.artifact(
6462
group = "junit",
6563
artifact = "junit",
@@ -101,7 +99,6 @@ def selenium_java_deps():
10199
"org.slf4j:slf4j-jdk14:2.0.7",
102100
"org.testng:testng:7.7.1",
103101
"org.zeromq:jeromq:0.5.3",
104-
"xyz.rogfam:littleproxy:2.0.17",
105102
"org.seleniumhq.selenium:htmlunit-driver:4.9.0",
106103
"org.redisson:redisson:3.21.1",
107104
"com.github.stephenc.jcip:jcip-annotations:1.0-1",

‎java/maven_install.json‎

Lines changed: 4 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
11
{
22
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
3-
"__INPUT_ARTIFACTS_HASH": -2050840485,
4-
"__RESOLVED_ARTIFACTS_HASH": 387336854,
3+
"__INPUT_ARTIFACTS_HASH": 1729097403,
4+
"__RESOLVED_ARTIFACTS_HASH": 1896945837,
55
"artifacts": {
6-
"com.barchart.udt:barchart-udt-bundle": {
7-
"shasums": {
8-
"jar": "e7fc65e66d3d5103a4acc810d4715c5075351b32c6c2f5defd43c549896113ad",
9-
"sources": "6966caa1eb285cbbe6a869645eb55c708ff4e2867131aeffa619f46021c3d1de"
10-
},
11-
"version": "2.3.0"
12-
},
136
"com.beust:jcommander": {
147
"shasums": {
158
"jar": "deeac157c8de6822878d85d0c7bc8467a19cc8484d37788f7804f039dde280b1",
@@ -283,13 +276,6 @@
283276
},
284277
"version": "4.1.92.Final"
285278
},
286-
"io.netty:netty-codec-haproxy": {
287-
"shasums": {
288-
"jar": "5e79b78fab4588c404daa67d268ee6e45f4e300d3298e010e734595e89cb9a9d",
289-
"sources": "7d912c5a05155daa2dc7e86d9160a3d72ada44f6d37b316087c78cae4ef8615f"
290-
},
291-
"version": "4.1.92.Final"
292-
},
293279
"io.netty:netty-codec-http": {
294280
"shasums": {
295281
"jar": "ab051c87d46c32b5e9e486e611240358d2dfa5e9af8541b6cb476a09ddc5e548",
@@ -531,13 +517,6 @@
531517
},
532518
"version": "1.1.1"
533519
},
534-
"javax.servlet:javax.servlet-api": {
535-
"shasums": {
536-
"jar": "83a03dd877d3674576f0da7b90755c8524af099ccf0607fc61aa971535ad7c60",
537-
"sources": "a2826761ae88535afb0a3a049eacc846494e22627a1dcf14de37b956ca8748d6"
538-
},
539-
"version": "4.0.1"
540-
},
541520
"jaxen:jaxen": {
542521
"shasums": {
543522
"jar": "70feef9dd75ad064def05a3ce8975aeba515ee7d1be146d12199c8828a64174c",
@@ -1098,13 +1077,6 @@
10981077
"sources": "5db8b94589e334283e01075458cfae920995e37ab997cb3b475fd0667b3158b2"
10991078
},
11001079
"version": "1.4.01"
1101-
},
1102-
"xyz.rogfam:littleproxy": {
1103-
"shasums": {
1104-
"jar": "245c6e49445951cf6602f435d6992be081e2a138b51c65c48ac4dd5791ec4090",
1105-
"sources": "50c0a9fc94333064b99072bb4b899d218fee8a36f14b84c6dfd329b30e745a7e"
1106-
},
1107-
"version": "2.0.17"
11081080
}
11091081
},
11101082
"dependencies": {
@@ -1193,11 +1165,6 @@
11931165
"io.netty:netty-common",
11941166
"io.netty:netty-transport"
11951167
],
1196-
"io.netty:netty-codec-haproxy": [
1197-
"io.netty:netty-buffer",
1198-
"io.netty:netty-codec",
1199-
"io.netty:netty-transport"
1200-
],
12011168
"io.netty:netty-codec-http": [
12021169
"io.netty:netty-buffer",
12031170
"io.netty:netty-codec",
@@ -1643,27 +1610,12 @@
16431610
],
16441611
"org.zeromq:jeromq": [
16451612
"eu.neilalexander:jnacl"
1646-
],
1647-
"xyz.rogfam:littleproxy": [
1648-
"com.barchart.udt:barchart-udt-bundle",
1649-
"com.google.guava:guava",
1650-
"org.apache.commons:commons-lang3",
1651-
"org.slf4j:slf4j-api"
16521613
]
16531614
},
16541615
"skipped": [
16551616
"com.google.guava:listenablefuture:jar:sources"
16561617
],
16571618
"packages": {
1658-
"com.barchart.udt:barchart-udt-bundle": [
1659-
"com.barchart.udt",
1660-
"com.barchart.udt.anno",
1661-
"com.barchart.udt.ccc",
1662-
"com.barchart.udt.lib",
1663-
"com.barchart.udt.net",
1664-
"com.barchart.udt.nio",
1665-
"com.barchart.udt.util"
1666-
],
16671619
"com.beust:jcommander": [
16681620
"com.beust.ah",
16691621
"com.beust.jcommander",
@@ -2115,9 +2067,6 @@
21152067
"io.netty:netty-codec-dns": [
21162068
"io.netty.handler.codec.dns"
21172069
],
2118-
"io.netty:netty-codec-haproxy": [
2119-
"io.netty.handler.codec.haproxy"
2120-
],
21212070
"io.netty:netty-codec-http": [
21222071
"io.netty.handler.codec.http",
21232072
"io.netty.handler.codec.http.cookie",
@@ -2361,12 +2310,6 @@
23612310
"javax.cache.processor",
23622311
"javax.cache.spi"
23632312
],
2364-
"javax.servlet:javax.servlet-api": [
2365-
"javax.servlet",
2366-
"javax.servlet.annotation",
2367-
"javax.servlet.descriptor",
2368-
"javax.servlet.http"
2369-
],
23702313
"jaxen:jaxen": [
23712314
"org.jaxen",
23722315
"org.jaxen.dom",
@@ -3607,17 +3550,10 @@
36073550
"org.xml.sax",
36083551
"org.xml.sax.ext",
36093552
"org.xml.sax.helpers"
3610-
],
3611-
"xyz.rogfam:littleproxy": [
3612-
"org.littleshoot.proxy",
3613-
"org.littleshoot.proxy.extras",
3614-
"org.littleshoot.proxy.impl"
36153553
]
36163554
},
36173555
"repositories": {
36183556
"https://repo1.maven.org/maven2/": [
3619-
"com.barchart.udt:barchart-udt-bundle",
3620-
"com.barchart.udt:barchart-udt-bundle:jar:sources",
36213557
"com.beust:jcommander",
36223558
"com.beust:jcommander:jar:sources",
36233559
"com.esotericsoftware:kryo",
@@ -3694,8 +3630,6 @@
36943630
"io.netty:netty-codec",
36953631
"io.netty:netty-codec-dns",
36963632
"io.netty:netty-codec-dns:jar:sources",
3697-
"io.netty:netty-codec-haproxy",
3698-
"io.netty:netty-codec-haproxy:jar:sources",
36993633
"io.netty:netty-codec-http",
37003634
"io.netty:netty-codec-http2",
37013635
"io.netty:netty-codec-http2:jar:sources",
@@ -3768,8 +3702,6 @@
37683702
"it.ozimov:embedded-redis:jar:sources",
37693703
"javax.cache:cache-api",
37703704
"javax.cache:cache-api:jar:sources",
3771-
"javax.servlet:javax.servlet-api",
3772-
"javax.servlet:javax.servlet-api:jar:sources",
37733705
"jaxen:jaxen",
37743706
"jaxen:jaxen:jar:sources",
37753707
"junit:junit",
@@ -3930,13 +3862,9 @@
39303862
"org.zeromq:jeromq",
39313863
"org.zeromq:jeromq:jar:sources",
39323864
"xml-apis:xml-apis",
3933-
"xml-apis:xml-apis:jar:sources",
3934-
"xyz.rogfam:littleproxy",
3935-
"xyz.rogfam:littleproxy:jar:sources"
3865+
"xml-apis:xml-apis:jar:sources"
39363866
],
39373867
"https://maven.google.com/": [
3938-
"com.barchart.udt:barchart-udt-bundle",
3939-
"com.barchart.udt:barchart-udt-bundle:jar:sources",
39403868
"com.beust:jcommander",
39413869
"com.beust:jcommander:jar:sources",
39423870
"com.esotericsoftware:kryo",
@@ -4013,8 +3941,6 @@
40133941
"io.netty:netty-codec",
40143942
"io.netty:netty-codec-dns",
40153943
"io.netty:netty-codec-dns:jar:sources",
4016-
"io.netty:netty-codec-haproxy",
4017-
"io.netty:netty-codec-haproxy:jar:sources",
40183944
"io.netty:netty-codec-http",
40193945
"io.netty:netty-codec-http2",
40203946
"io.netty:netty-codec-http2:jar:sources",
@@ -4087,8 +4013,6 @@
40874013
"it.ozimov:embedded-redis:jar:sources",
40884014
"javax.cache:cache-api",
40894015
"javax.cache:cache-api:jar:sources",
4090-
"javax.servlet:javax.servlet-api",
4091-
"javax.servlet:javax.servlet-api:jar:sources",
40924016
"jaxen:jaxen",
40934017
"jaxen:jaxen:jar:sources",
40944018
"junit:junit",
@@ -4249,9 +4173,7 @@
42494173
"org.zeromq:jeromq",
42504174
"org.zeromq:jeromq:jar:sources",
42514175
"xml-apis:xml-apis",
4252-
"xml-apis:xml-apis:jar:sources",
4253-
"xyz.rogfam:littleproxy",
4254-
"xyz.rogfam:littleproxy:jar:sources"
4176+
"xml-apis:xml-apis:jar:sources"
42554177
]
42564178
},
42574179
"version": "2"

‎java/src/org/openqa/selenium/jre/server/BUILD.bazel‎

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

‎java/src/org/openqa/selenium/jre/server/JreMessages.java‎

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

0 commit comments

Comments
 (0)