Skip to content

Commit a83bb41

Browse files
shs96cshs96c
committed
Add a slf4j to java.util.logging adapter
1 parent cf066b4 commit a83bb41

File tree

3 files changed

+74
-27
lines changed

3 files changed

+74
-27
lines changed

‎java/maven_deps.bzl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ def selenium_java_deps():
4949
"org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5",
5050
"org.hamcrest:hamcrest:2.2",
5151
"org.mockito:mockito-core:3.2.4",
52+
"org.slf4j:slf4j-jdk14:1.7.30",
5253
"org.testng:testng:6.14.3",
5354
"org.zeromq:jeromq:0.5.1",
5455
"xyz.rogfam:littleproxy:2.0.0-beta-5",

‎java/maven_install.json

Lines changed: 71 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"dependency_tree": {
3-
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": -1774828466,
3+
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": -88921386,
44
"conflict_resolution": {},
55
"dependencies": [
66
{
@@ -2340,14 +2340,14 @@
23402340
"coord": "org.asynchttpclient:async-http-client-netty-utils:2.10.4",
23412341
"dependencies": [
23422342
"io.netty:netty-common:4.1.44.Final",
2343+
"org.slf4j:slf4j-api:1.7.30",
23432344
"com.sun.activation:javax.activation:1.2.0",
2344-
"org.slf4j:slf4j-api:1.7.26",
23452345
"io.netty:netty-buffer:4.1.44.Final"
23462346
],
23472347
"directDependencies": [
23482348
"com.sun.activation:javax.activation:1.2.0",
23492349
"io.netty:netty-buffer:4.1.44.Final",
2350-
"org.slf4j:slf4j-api:1.7.26"
2350+
"org.slf4j:slf4j-api:1.7.30"
23512351
],
23522352
"exclusions": [
23532353
"org.hamcrest:hamcrest-all",
@@ -2366,15 +2366,15 @@
23662366
{
23672367
"coord": "org.asynchttpclient:async-http-client-netty-utils:jar:sources:2.10.4",
23682368
"dependencies": [
2369-
"org.slf4j:slf4j-api:jar:sources:1.7.26",
23702369
"io.netty:netty-buffer:jar:sources:4.1.44.Final",
2370+
"org.slf4j:slf4j-api:jar:sources:1.7.30",
23712371
"io.netty:netty-common:jar:sources:4.1.44.Final",
23722372
"com.sun.activation:javax.activation:jar:sources:1.2.0"
23732373
],
23742374
"directDependencies": [
23752375
"com.sun.activation:javax.activation:jar:sources:1.2.0",
23762376
"io.netty:netty-buffer:jar:sources:4.1.44.Final",
2377-
"org.slf4j:slf4j-api:jar:sources:1.7.26"
2377+
"org.slf4j:slf4j-api:jar:sources:1.7.30"
23782378
],
23792379
"exclusions": [
23802380
"org.hamcrest:hamcrest-all",
@@ -2395,7 +2395,7 @@
23952395
"dependencies": [
23962396
"org.reactivestreams:reactive-streams:1.0.3",
23972397
"io.netty:netty-codec-http:4.1.44.Final",
2398-
"org.slf4j:slf4j-api:1.7.26",
2398+
"org.slf4j:slf4j-api:1.7.30",
23992399
"org.asynchttpclient:async-http-client-netty-utils:2.10.4",
24002400
"io.netty:netty-resolver:4.1.44.Final",
24012401
"io.netty:netty-codec:4.1.44.Final",
@@ -2413,7 +2413,7 @@
24132413
"directDependencies": [
24142414
"org.reactivestreams:reactive-streams:1.0.3",
24152415
"io.netty:netty-codec-http:4.1.44.Final",
2416-
"org.slf4j:slf4j-api:1.7.26",
2416+
"org.slf4j:slf4j-api:1.7.30",
24172417
"org.asynchttpclient:async-http-client-netty-utils:2.10.4",
24182418
"io.netty:netty-handler-proxy:4.1.42.Final",
24192419
"com.sun.activation:javax.activation:1.2.0",
@@ -2443,10 +2443,10 @@
24432443
"com.sun.activation:javax.activation:jar:sources:1.2.0",
24442444
"io.netty:netty-resolver:jar:sources:4.1.44.Final",
24452445
"io.netty:netty-codec-dns:jar:sources:4.1.42.Final",
2446+
"org.slf4j:slf4j-api:jar:sources:1.7.30",
24462447
"io.netty:netty-codec-socks:jar:sources:4.1.42.Final",
24472448
"org.reactivestreams:reactive-streams:jar:sources:1.0.3",
24482449
"io.netty:netty-buffer:jar:sources:4.1.44.Final",
2449-
"org.slf4j:slf4j-api:jar:sources:1.7.26",
24502450
"io.netty:netty-handler:jar:sources:4.1.44.Final",
24512451
"io.netty:netty-common:jar:sources:4.1.44.Final",
24522452
"io.netty:netty-handler-proxy:jar:sources:4.1.42.Final",
@@ -2459,9 +2459,9 @@
24592459
"directDependencies": [
24602460
"io.netty:netty-resolver-dns:jar:sources:4.1.42.Final",
24612461
"com.sun.activation:javax.activation:jar:sources:1.2.0",
2462+
"org.slf4j:slf4j-api:jar:sources:1.7.30",
24622463
"io.netty:netty-codec-socks:jar:sources:4.1.42.Final",
24632464
"org.reactivestreams:reactive-streams:jar:sources:1.0.3",
2464-
"org.slf4j:slf4j-api:jar:sources:1.7.26",
24652465
"io.netty:netty-handler:jar:sources:4.1.44.Final",
24662466
"io.netty:netty-handler-proxy:jar:sources:4.1.42.Final",
24672467
"com.typesafe.netty:netty-reactive-streams:jar:sources:2.0.4",
@@ -3605,40 +3605,84 @@
36053605
"url": "https://repo1.maven.org/maven2/org/seleniumhq/selenium/htmlunit-driver/2.36.0/htmlunit-driver-2.36.0-sources.jar"
36063606
},
36073607
{
3608-
"coord": "org.slf4j:slf4j-api:1.7.26",
3608+
"coord": "org.slf4j:slf4j-api:1.7.30",
36093609
"dependencies": [],
36103610
"directDependencies": [],
36113611
"exclusions": [
36123612
"org.hamcrest:hamcrest-all",
36133613
"org.hamcrest:hamcrest-core",
36143614
"io.netty:netty-all"
36153615
],
3616-
"file": "v1/https/repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26.jar",
3616+
"file": "v1/https/repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar",
36173617
"mirror_urls": [
3618-
"https://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26.jar",
3619-
"https://jcenter.bintray.com/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26.jar",
3620-
"https://maven.google.com/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26.jar"
3618+
"https://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar",
3619+
"https://jcenter.bintray.com/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar",
3620+
"https://maven.google.com/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"
36213621
],
3622-
"sha256": "6d9e5b86cfd1dd44c676899285b5bb4fa0d371cf583e8164f9c8a0366553242b",
3623-
"url": "https://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26.jar"
3622+
"sha256": "cdba07964d1bb40a0761485c6b1e8c2f8fd9eb1d19c53928ac0d7f9510105c57",
3623+
"url": "https://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar"
36243624
},
36253625
{
3626-
"coord": "org.slf4j:slf4j-api:jar:sources:1.7.26",
3626+
"coord": "org.slf4j:slf4j-api:jar:sources:1.7.30",
36273627
"dependencies": [],
36283628
"directDependencies": [],
36293629
"exclusions": [
36303630
"org.hamcrest:hamcrest-all",
36313631
"org.hamcrest:hamcrest-core",
36323632
"io.netty:netty-all"
36333633
],
3634-
"file": "v1/https/repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26-sources.jar",
3634+
"file": "v1/https/repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30-sources.jar",
36353635
"mirror_urls": [
3636-
"https://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26-sources.jar",
3637-
"https://jcenter.bintray.com/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26-sources.jar",
3638-
"https://maven.google.com/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26-sources.jar"
3636+
"https://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30-sources.jar",
3637+
"https://jcenter.bintray.com/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30-sources.jar",
3638+
"https://maven.google.com/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30-sources.jar"
36393639
],
3640-
"sha256": "9e25ad98a324e6685752fd01fbbd0588ceec5df564e53c49486946a2d19dc482",
3641-
"url": "https://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.26/slf4j-api-1.7.26-sources.jar"
3640+
"sha256": "9ee459644577590fed7ea94afae781fa3cc9311d4553faee8a3219ffbd7cc386",
3641+
"url": "https://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30-sources.jar"
3642+
},
3643+
{
3644+
"coord": "org.slf4j:slf4j-jdk14:1.7.30",
3645+
"dependencies": [
3646+
"org.slf4j:slf4j-api:1.7.30"
3647+
],
3648+
"directDependencies": [
3649+
"org.slf4j:slf4j-api:1.7.30"
3650+
],
3651+
"exclusions": [
3652+
"org.hamcrest:hamcrest-all",
3653+
"org.hamcrest:hamcrest-core",
3654+
"io.netty:netty-all"
3655+
],
3656+
"file": "v1/https/repo1.maven.org/maven2/org/slf4j/slf4j-jdk14/1.7.30/slf4j-jdk14-1.7.30.jar",
3657+
"mirror_urls": [
3658+
"https://repo1.maven.org/maven2/org/slf4j/slf4j-jdk14/1.7.30/slf4j-jdk14-1.7.30.jar",
3659+
"https://jcenter.bintray.com/org/slf4j/slf4j-jdk14/1.7.30/slf4j-jdk14-1.7.30.jar",
3660+
"https://maven.google.com/org/slf4j/slf4j-jdk14/1.7.30/slf4j-jdk14-1.7.30.jar"
3661+
],
3662+
"sha256": "e0f9db049378f6467941771454995233285fb7adf72c467e65daf25e673acba8",
3663+
"url": "https://repo1.maven.org/maven2/org/slf4j/slf4j-jdk14/1.7.30/slf4j-jdk14-1.7.30.jar"
3664+
},
3665+
{
3666+
"coord": "org.slf4j:slf4j-jdk14:jar:sources:1.7.30",
3667+
"dependencies": [
3668+
"org.slf4j:slf4j-api:jar:sources:1.7.30"
3669+
],
3670+
"directDependencies": [
3671+
"org.slf4j:slf4j-api:jar:sources:1.7.30"
3672+
],
3673+
"exclusions": [
3674+
"org.hamcrest:hamcrest-all",
3675+
"org.hamcrest:hamcrest-core",
3676+
"io.netty:netty-all"
3677+
],
3678+
"file": "v1/https/repo1.maven.org/maven2/org/slf4j/slf4j-jdk14/1.7.30/slf4j-jdk14-1.7.30-sources.jar",
3679+
"mirror_urls": [
3680+
"https://repo1.maven.org/maven2/org/slf4j/slf4j-jdk14/1.7.30/slf4j-jdk14-1.7.30-sources.jar",
3681+
"https://jcenter.bintray.com/org/slf4j/slf4j-jdk14/1.7.30/slf4j-jdk14-1.7.30-sources.jar",
3682+
"https://maven.google.com/org/slf4j/slf4j-jdk14/1.7.30/slf4j-jdk14-1.7.30-sources.jar"
3683+
],
3684+
"sha256": "e8eb38410b7317a2cda12beae8b48362ab34abc4f3af1732d7b381eb26e9ff78",
3685+
"url": "https://repo1.maven.org/maven2/org/slf4j/slf4j-jdk14/1.7.30/slf4j-jdk14-1.7.30-sources.jar"
36423686
},
36433687
{
36443688
"coord": "org.testng:testng:6.14.3",
@@ -3906,7 +3950,7 @@
39063950
"com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava",
39073951
"com.google.j2objc:j2objc-annotations:1.3",
39083952
"com.google.code.findbugs:jsr305:3.0.2",
3909-
"org.slf4j:slf4j-api:1.7.26",
3953+
"org.slf4j:slf4j-api:1.7.30",
39103954
"com.google.errorprone:error_prone_annotations:2.3.4",
39113955
"com.google.guava:guava:28.2-jre",
39123956
"org.checkerframework:checker-qual:2.10.0",
@@ -3918,7 +3962,7 @@
39183962
"com.barchart.udt:barchart-udt-bundle:2.3.0",
39193963
"com.google.guava:guava:28.2-jre",
39203964
"org.apache.commons:commons-lang3:3.9",
3921-
"org.slf4j:slf4j-api:1.7.26"
3965+
"org.slf4j:slf4j-api:1.7.30"
39223966
],
39233967
"exclusions": [
39243968
"org.hamcrest:hamcrest-all",
@@ -3939,10 +3983,10 @@
39393983
"dependencies": [
39403984
"com.google.code.findbugs:jsr305:jar:sources:3.0.2",
39413985
"com.google.j2objc:j2objc-annotations:jar:sources:1.3",
3986+
"org.slf4j:slf4j-api:jar:sources:1.7.30",
39423987
"org.apache.commons:commons-lang3:jar:sources:3.9",
39433988
"com.google.errorprone:error_prone_annotations:jar:sources:2.3.4",
39443989
"org.checkerframework:checker-qual:jar:sources:2.10.0",
3945-
"org.slf4j:slf4j-api:jar:sources:1.7.26",
39463990
"com.google.guava:guava:jar:sources:28.2-jre",
39473991
"com.barchart.udt:barchart-udt-bundle:jar:sources:2.3.0",
39483992
"com.google.guava:listenablefuture:jar:sources:9999.0-empty-to-avoid-conflict-with-guava",
@@ -3952,7 +3996,7 @@
39523996
"com.barchart.udt:barchart-udt-bundle:jar:sources:2.3.0",
39533997
"com.google.guava:guava:jar:sources:28.2-jre",
39543998
"org.apache.commons:commons-lang3:jar:sources:3.9",
3955-
"org.slf4j:slf4j-api:jar:sources:1.7.26"
3999+
"org.slf4j:slf4j-api:jar:sources:1.7.30"
39564000
],
39574001
"exclusions": [
39584002
"org.hamcrest:hamcrest-all",

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
load("@rules_jvm_external//:defs.bzl", "artifact")
12
load("//:copy_file.bzl", "copy_file")
23
load("//java:defs.bzl", "java_dist_zip", "java_export")
34
load("//java:version.bzl", "SE_VERSION")
@@ -38,6 +39,7 @@ java_binary(
3839
],
3940
runtime_deps = [
4041
":grid",
42+
artifact("org.slf4j:slf4j-jdk14")
4143
],
4244
)
4345

0 commit comments

Comments
 (0)