From 93d9e42b5334152a9255cd19eb310cd806eb9f79 Mon Sep 17 00:00:00 2001 From: Simon Stewart Date: Tue, 18 Aug 2020 11:03:08 +0100 Subject: [PATCH] [bazel] Clean up unused deps --- .../src/com/thoughtworks/selenium/BUILD.bazel | 2 -- .../org/openqa/selenium/devtools/BUILD.bazel | 2 +- .../selenium/devtools/idealized/BUILD.bazel | 8 ++++---- .../openqa/selenium/devtools/noop/BUILD.bazel | 8 ++------ .../openqa/selenium/devtools/v84/BUILD.bazel | 2 +- .../src/org/openqa/selenium/support/BUILD.bazel | 1 - .../selenium/support/devtools/BUILD.bazel | 4 ++-- .../org/openqa/selenium/support/ui/BUILD.bazel | 4 ---- .../test/com/thoughtworks/selenium/BUILD.bazel | 1 - .../client/test/org/openqa/selenium/BUILD.bazel | 4 ---- .../test/org/openqa/selenium/atoms/BUILD.bazel | 1 - .../org/openqa/selenium/chromium/BUILD.bazel | 1 + .../org/openqa/selenium/testing/BUILD.bazel | 6 +----- .../openqa/selenium/testing/drivers/BUILD.bazel | 2 -- .../openqa/selenium/events/zeromq/BUILD.bazel | 2 +- .../openqa/selenium/grid/commands/BUILD.bazel | 2 -- .../selenium/grid/distributor/BUILD.bazel | 2 -- .../grid/distributor/config/BUILD.bazel | 1 - .../selenium/grid/distributor/httpd/BUILD.bazel | 9 +-------- .../selenium/grid/distributor/local/BUILD.bazel | 1 - .../selenium/grid/distributor/model/BUILD.bazel | 17 +++++++---------- .../grid/distributor/remote/BUILD.bazel | 4 ---- .../grid/distributor/selector/BUILD.bazel | 14 +++----------- .../openqa/selenium/grid/node/httpd/BUILD.bazel | 3 --- .../openqa/selenium/grid/node/local/BUILD.bazel | 1 - .../org/openqa/selenium/grid/router/BUILD.bazel | 2 -- .../selenium/grid/router/httpd/BUILD.bazel | 3 --- .../org/openqa/selenium/grid/server/BUILD.bazel | 2 -- .../openqa/selenium/grid/sessionmap/BUILD.bazel | 1 - .../selenium/grid/sessionmap/config/BUILD.bazel | 1 - .../selenium/grid/sessionmap/httpd/BUILD.bazel | 6 +----- .../selenium/grid/sessionmap/remote/BUILD.bazel | 1 - .../openqa/selenium/jetty/server/BUILD.bazel | 1 - .../openqa/selenium/netty/server/BUILD.bazel | 1 - .../selenium/server/htmlrunner/BUILD.bazel | 3 ++- .../grid/distributor/selector/BUILD.bazel | 8 ++++---- .../openqa/selenium/grid/testing/BUILD.bazel | 1 - 37 files changed, 31 insertions(+), 101 deletions(-) diff --git a/java/client/src/com/thoughtworks/selenium/BUILD.bazel b/java/client/src/com/thoughtworks/selenium/BUILD.bazel index 12107e08db924..4de4314322d88 100644 --- a/java/client/src/com/thoughtworks/selenium/BUILD.bazel +++ b/java/client/src/com/thoughtworks/selenium/BUILD.bazel @@ -40,8 +40,6 @@ java_library( deps = [ ":api", "//java/client/src/org/openqa/selenium:core", - "//java/client/src/org/openqa/selenium/edge", - "//java/client/src/org/openqa/selenium/remote", artifact("junit:junit"), artifact("org.testng:testng"), ], diff --git a/java/client/src/org/openqa/selenium/devtools/BUILD.bazel b/java/client/src/org/openqa/selenium/devtools/BUILD.bazel index d19a52d101613..83a51d9bf6f72 100644 --- a/java/client/src/org/openqa/selenium/devtools/BUILD.bazel +++ b/java/client/src/org/openqa/selenium/devtools/BUILD.bazel @@ -44,9 +44,9 @@ java_export( ], deps = [ ":devtools-prototypes", - "//java/client/src/org/openqa/selenium/devtools/idealized", "//java:auto-service", "//java/client/src/org/openqa/selenium:core", + "//java/client/src/org/openqa/selenium/devtools/idealized", "//java/client/src/org/openqa/selenium/json", "//java/client/src/org/openqa/selenium/remote", artifact("com.google.guava:guava"), diff --git a/java/client/src/org/openqa/selenium/devtools/idealized/BUILD.bazel b/java/client/src/org/openqa/selenium/devtools/idealized/BUILD.bazel index ee5dadbe1382b..103ab2d644c71 100644 --- a/java/client/src/org/openqa/selenium/devtools/idealized/BUILD.bazel +++ b/java/client/src/org/openqa/selenium/devtools/idealized/BUILD.bazel @@ -3,14 +3,14 @@ load("@rules_jvm_external//:defs.bzl", "artifact") java_library( name = "idealized", srcs = glob(["**/*.java"]), + visibility = [ + "//java/client/src/org/openqa/selenium/devtools:__subpackages__", + ], deps = [ "//java/client/src/org/openqa/selenium:core", + "//java/client/src/org/openqa/selenium/devtools:devtools-prototypes", "//java/client/src/org/openqa/selenium/json", "//java/client/src/org/openqa/selenium/remote/http", - "//java/client/src/org/openqa/selenium/devtools:devtools-prototypes", artifact("com.google.guava:guava"), ], - visibility = [ - "//java/client/src/org/openqa/selenium/devtools:__subpackages__", - ] ) diff --git a/java/client/src/org/openqa/selenium/devtools/noop/BUILD.bazel b/java/client/src/org/openqa/selenium/devtools/noop/BUILD.bazel index 7198d42e4751b..4f777d168fa93 100644 --- a/java/client/src/org/openqa/selenium/devtools/noop/BUILD.bazel +++ b/java/client/src/org/openqa/selenium/devtools/noop/BUILD.bazel @@ -1,12 +1,8 @@ - java_library( name = "noop", srcs = glob(["*.java"]), - deps = [ - "//java/client/src/org/openqa/selenium/devtools", - "//java/client/src/org/openqa/selenium/json", - ], visibility = [ "//java/client/src/org/openqa/selenium/chromium:__pkg__", - ] + ], + deps = ["//java/client/src/org/openqa/selenium/devtools"], ) diff --git a/java/client/src/org/openqa/selenium/devtools/v84/BUILD.bazel b/java/client/src/org/openqa/selenium/devtools/v84/BUILD.bazel index 321cc8197b538..416ff37dddb76 100644 --- a/java/client/src/org/openqa/selenium/devtools/v84/BUILD.bazel +++ b/java/client/src/org/openqa/selenium/devtools/v84/BUILD.bazel @@ -20,7 +20,7 @@ java_export( "//java/client/src/org/openqa/selenium/json", "//java/client/src/org/openqa/selenium/remote/http", artifact("com.google.guava:guava"), - ] + ], ) java_library( diff --git a/java/client/src/org/openqa/selenium/support/BUILD.bazel b/java/client/src/org/openqa/selenium/support/BUILD.bazel index 45eaecb3cf640..d340cd4ddb86c 100644 --- a/java/client/src/org/openqa/selenium/support/BUILD.bazel +++ b/java/client/src/org/openqa/selenium/support/BUILD.bazel @@ -51,7 +51,6 @@ java_library( ]), deps = [ "//java/client/src/org/openqa/selenium:core", - "//java/client/src/org/openqa/selenium/support/ui:clock", "//java/client/src/org/openqa/selenium/support/ui:components", ], ) diff --git a/java/client/src/org/openqa/selenium/support/devtools/BUILD.bazel b/java/client/src/org/openqa/selenium/support/devtools/BUILD.bazel index 5421e209637f4..41c9b0238a919 100644 --- a/java/client/src/org/openqa/selenium/support/devtools/BUILD.bazel +++ b/java/client/src/org/openqa/selenium/support/devtools/BUILD.bazel @@ -7,9 +7,9 @@ java_library( "//java/client/src/org/openqa/selenium/support:__pkg__", ], deps = [ - "//java/client/src/org/openqa/selenium/chrome", "//java/client/src/org/openqa/selenium/devtools", - "//java/client/src/org/openqa/selenium/remote", artifact("com.google.guava:guava"), + "//java/client/src/org/openqa/selenium:core", + "//java/client/src/org/openqa/selenium/remote/http", ], ) diff --git a/java/client/src/org/openqa/selenium/support/ui/BUILD.bazel b/java/client/src/org/openqa/selenium/support/ui/BUILD.bazel index 444e8caa48be1..3469b1962125d 100644 --- a/java/client/src/org/openqa/selenium/support/ui/BUILD.bazel +++ b/java/client/src/org/openqa/selenium/support/ui/BUILD.bazel @@ -18,10 +18,6 @@ java_library( "SlowLoadableComponent.java", ], visibility = ["//visibility:public"], - deps = [ - ":clock", - "//java/client/src/org/openqa/selenium:core", - ], ) java_library( diff --git a/java/client/test/com/thoughtworks/selenium/BUILD.bazel b/java/client/test/com/thoughtworks/selenium/BUILD.bazel index 86dea9648327f..b04cace199a12 100644 --- a/java/client/test/com/thoughtworks/selenium/BUILD.bazel +++ b/java/client/test/com/thoughtworks/selenium/BUILD.bazel @@ -22,7 +22,6 @@ java_library( "//java/client/src/org/openqa/selenium/safari", "//java/client/test/org/openqa/selenium/build", "//java/client/test/org/openqa/selenium/environment", - "//java/client/test/org/openqa/selenium/testing:test-base", "//java/client/test/org/openqa/selenium/testing/drivers", artifact("com.google.guava:guava"), artifact("junit:junit"), diff --git a/java/client/test/org/openqa/selenium/BUILD.bazel b/java/client/test/org/openqa/selenium/BUILD.bazel index e3d9eab06bc4f..e810a14437fe3 100644 --- a/java/client/test/org/openqa/selenium/BUILD.bazel +++ b/java/client/test/org/openqa/selenium/BUILD.bazel @@ -46,7 +46,6 @@ java_library( deps = [ "//java/client/src/org/openqa/selenium:core", "//java/client/src/org/openqa/selenium/support", - "//java/client/test/org/openqa/selenium/environment", artifact("com.google.guava:guava"), artifact("junit:junit"), ], @@ -98,14 +97,11 @@ java_library( deps = [ ":helpers", "//java/client/src/org/openqa/selenium:core", - "//java/client/src/org/openqa/selenium/ie", "//java/client/src/org/openqa/selenium/json", "//java/client/src/org/openqa/selenium/remote", "//java/client/src/org/openqa/selenium/support", - "//java/client/src/org/openqa/selenium/support/ui:wait", "//java/client/test/org/openqa/selenium/build", "//java/client/test/org/openqa/selenium/environment", - "//java/client/test/org/openqa/selenium/net", "//java/client/test/org/openqa/selenium/testing:annotations", "//java/client/test/org/openqa/selenium/testing:test-base", "//java/client/test/org/openqa/selenium/testing/drivers", diff --git a/java/client/test/org/openqa/selenium/atoms/BUILD.bazel b/java/client/test/org/openqa/selenium/atoms/BUILD.bazel index c6082ad5b551f..2fb4d2edaa222 100644 --- a/java/client/test/org/openqa/selenium/atoms/BUILD.bazel +++ b/java/client/test/org/openqa/selenium/atoms/BUILD.bazel @@ -18,7 +18,6 @@ java_library( name = "lib", srcs = ["JavaScriptLoader.java"], deps = [ - "//java/client/test/org/openqa/selenium/build", artifact("com.google.guava:guava"), artifact("org.hamcrest:hamcrest"), artifact("junit:junit"), diff --git a/java/client/test/org/openqa/selenium/chromium/BUILD.bazel b/java/client/test/org/openqa/selenium/chromium/BUILD.bazel index e636d64ecb123..5dc743c13b8fd 100644 --- a/java/client/test/org/openqa/selenium/chromium/BUILD.bazel +++ b/java/client/test/org/openqa/selenium/chromium/BUILD.bazel @@ -11,6 +11,7 @@ java_test_suite( "//java/client/src/org/openqa/selenium/chromium", "//java/client/src/org/openqa/selenium/edge", "//java/client/src/org/openqa/selenium/json", + "//java/client/test/org/openqa/selenium/testing:test-base", artifact("junit:junit"), artifact("org.assertj:assertj-core"), ], diff --git a/java/client/test/org/openqa/selenium/testing/BUILD.bazel b/java/client/test/org/openqa/selenium/testing/BUILD.bazel index 62ff5b29f95f0..3287d5e5aa176 100644 --- a/java/client/test/org/openqa/selenium/testing/BUILD.bazel +++ b/java/client/test/org/openqa/selenium/testing/BUILD.bazel @@ -21,10 +21,7 @@ java_library( exports = [ "//java/client/test/org/openqa/selenium/testing/drivers:browser", ], - deps = [ - "//java/client/src/org/openqa/selenium:core", - "//java/client/test/org/openqa/selenium/testing/drivers:browser", - ], + deps = ["//java/client/test/org/openqa/selenium/testing/drivers:browser"], ) java_library( @@ -47,7 +44,6 @@ java_library( deps = [ ":annotations", "//java/client/src/org/openqa/selenium:core", - "//java/client/src/org/openqa/selenium/json", "//java/client/src/org/openqa/selenium/remote", "//java/client/src/org/openqa/selenium/support/ui:wait", "//java/client/test/org/openqa/selenium/build", diff --git a/java/client/test/org/openqa/selenium/testing/drivers/BUILD.bazel b/java/client/test/org/openqa/selenium/testing/drivers/BUILD.bazel index 32c18deafe803..5f4cb9a62f83b 100644 --- a/java/client/test/org/openqa/selenium/testing/drivers/BUILD.bazel +++ b/java/client/test/org/openqa/selenium/testing/drivers/BUILD.bazel @@ -52,9 +52,7 @@ java_library( "//java/client/src/org/openqa/selenium/remote/http", "//java/client/src/org/openqa/selenium/safari", "//java/client/src/org/openqa/selenium/support", - "//java/client/test/org/openqa/selenium:helpers", "//java/client/test/org/openqa/selenium/build", - "//java/client/test/org/openqa/selenium/testing:annotations", artifact("com.google.guava:guava"), artifact("junit:junit"), artifact("org.seleniumhq.selenium:htmlunit-driver"), diff --git a/java/server/src/org/openqa/selenium/events/zeromq/BUILD.bazel b/java/server/src/org/openqa/selenium/events/zeromq/BUILD.bazel index 50364a6903d26..cf797d2b773b1 100644 --- a/java/server/src/org/openqa/selenium/events/zeromq/BUILD.bazel +++ b/java/server/src/org/openqa/selenium/events/zeromq/BUILD.bazel @@ -8,8 +8,8 @@ java_library( "//java/server/test/org/openqa/selenium/grid/router:__pkg__", ], deps = [ + "//java/client/src/org/openqa/selenium:core", "//java/client/src/org/openqa/selenium/json", - "//java/client/src/org/openqa/selenium/remote", "//java/server/src/org/openqa/selenium/events", "//java/server/src/org/openqa/selenium/grid/config", artifact("com.google.guava:guava"), diff --git a/java/server/src/org/openqa/selenium/grid/commands/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/commands/BUILD.bazel index 6d53f164d9dec..8b00f1f9156a2 100644 --- a/java/server/src/org/openqa/selenium/grid/commands/BUILD.bazel +++ b/java/server/src/org/openqa/selenium/grid/commands/BUILD.bazel @@ -22,7 +22,6 @@ java_library( "//java/server/src/org/openqa/selenium/grid/config", "//java/server/src/org/openqa/selenium/grid/distributor", "//java/server/src/org/openqa/selenium/grid/distributor/local", - "//java/server/src/org/openqa/selenium/grid/docker", "//java/server/src/org/openqa/selenium/grid/graphql", "//java/server/src/org/openqa/selenium/grid/log", "//java/server/src/org/openqa/selenium/grid/node", @@ -34,7 +33,6 @@ java_library( "//java/server/src/org/openqa/selenium/grid/sessionmap/local", "//java/server/src/org/openqa/selenium/grid/web", "//java/server/src/org/openqa/selenium/netty/server", - "//java/server/src/org/openqa/selenium/status", artifact("com.beust:jcommander"), artifact("com.google.guava:guava"), ], diff --git a/java/server/src/org/openqa/selenium/grid/distributor/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/distributor/BUILD.bazel index 8cb2b0ca6f6e1..d1c5effa86f96 100644 --- a/java/server/src/org/openqa/selenium/grid/distributor/BUILD.bazel +++ b/java/server/src/org/openqa/selenium/grid/distributor/BUILD.bazel @@ -17,8 +17,6 @@ java_library( "//java/server/src/org/openqa/selenium/grid/data", "//java/server/src/org/openqa/selenium/grid/node", "//java/server/src/org/openqa/selenium/grid/node/remote", - "//java/server/src/org/openqa/selenium/grid/sessionmap/remote", - "//java/server/src/org/openqa/selenium/grid/web", "//java/server/src/org/openqa/selenium/status", artifact("com.google.guava:guava"), ], diff --git a/java/server/src/org/openqa/selenium/grid/distributor/config/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/distributor/config/BUILD.bazel index 0ae290650af42..a3927c34ea036 100644 --- a/java/server/src/org/openqa/selenium/grid/distributor/config/BUILD.bazel +++ b/java/server/src/org/openqa/selenium/grid/distributor/config/BUILD.bazel @@ -8,7 +8,6 @@ java_library( ], deps = [ "//java:auto-service", - "//java/client/src/org/openqa/selenium/remote", "//java/server/src/org/openqa/selenium/grid/config", "//java/server/src/org/openqa/selenium/grid/distributor", artifact("com.beust:jcommander"), diff --git a/java/server/src/org/openqa/selenium/grid/distributor/httpd/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/distributor/httpd/BUILD.bazel index 2f9070068b4a1..1d0c24cfe4ce9 100644 --- a/java/server/src/org/openqa/selenium/grid/distributor/httpd/BUILD.bazel +++ b/java/server/src/org/openqa/selenium/grid/distributor/httpd/BUILD.bazel @@ -9,20 +9,13 @@ java_library( ], deps = [ "//java:auto-service", - "//java/client/src/org/openqa/selenium/remote", + "//java/client/src/org/openqa/selenium:core", "//java/server/src/org/openqa/selenium/cli", - "//java/server/src/org/openqa/selenium/events", "//java/server/src/org/openqa/selenium/grid:base-command", "//java/server/src/org/openqa/selenium/grid/config", - "//java/server/src/org/openqa/selenium/grid/data", "//java/server/src/org/openqa/selenium/grid/distributor", "//java/server/src/org/openqa/selenium/grid/distributor/config", - "//java/server/src/org/openqa/selenium/grid/distributor/local", - "//java/server/src/org/openqa/selenium/grid/log", "//java/server/src/org/openqa/selenium/grid/server", - "//java/server/src/org/openqa/selenium/grid/sessionmap", - "//java/server/src/org/openqa/selenium/grid/sessionmap/config", - "//java/server/src/org/openqa/selenium/grid/web", "//java/server/src/org/openqa/selenium/netty/server", artifact("com.beust:jcommander"), artifact("com.google.guava:guava"), diff --git a/java/server/src/org/openqa/selenium/grid/distributor/local/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/distributor/local/BUILD.bazel index 1b22e70dd4d8d..56b984aebba16 100644 --- a/java/server/src/org/openqa/selenium/grid/distributor/local/BUILD.bazel +++ b/java/server/src/org/openqa/selenium/grid/distributor/local/BUILD.bazel @@ -13,7 +13,6 @@ java_library( "//java/client/src/org/openqa/selenium/remote", "//java/server/src/org/openqa/selenium/concurrent", "//java/server/src/org/openqa/selenium/events", - "//java/server/src/org/openqa/selenium/grid/component", "//java/server/src/org/openqa/selenium/grid/config", "//java/server/src/org/openqa/selenium/grid/data", "//java/server/src/org/openqa/selenium/grid/distributor", diff --git a/java/server/src/org/openqa/selenium/grid/distributor/model/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/distributor/model/BUILD.bazel index b3ee789688c5f..c63f27750ff5d 100644 --- a/java/server/src/org/openqa/selenium/grid/distributor/model/BUILD.bazel +++ b/java/server/src/org/openqa/selenium/grid/distributor/model/BUILD.bazel @@ -8,15 +8,12 @@ java_library( "//java/server/test/org/openqa/selenium:__subpackages__", ], deps = [ - "//java/server/src/org/openqa/selenium/concurrent", - "//java/client/src/org/openqa/selenium:core", - "//java/server/src/org/openqa/selenium/events", - "//java/server/src/org/openqa/selenium/grid/data", - "//java/server/src/org/openqa/selenium/grid/node", - "//java/server/src/org/openqa/selenium/grid/node/remote", - "//java/server/src/org/openqa/selenium/grid/component", - "//java/client/src/org/openqa/selenium/json", - "//java/client/src/org/openqa/selenium/remote", - artifact("com.google.guava:guava"), + "//java/client/src/org/openqa/selenium:core", + "//java/client/src/org/openqa/selenium/remote", + "//java/server/src/org/openqa/selenium/events", + "//java/server/src/org/openqa/selenium/grid/component", + "//java/server/src/org/openqa/selenium/grid/data", + "//java/server/src/org/openqa/selenium/grid/node", + artifact("com.google.guava:guava"), ], ) diff --git a/java/server/src/org/openqa/selenium/grid/distributor/remote/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/distributor/remote/BUILD.bazel index 6b55158bc7dce..416c7e8c51f71 100644 --- a/java/server/src/org/openqa/selenium/grid/distributor/remote/BUILD.bazel +++ b/java/server/src/org/openqa/selenium/grid/distributor/remote/BUILD.bazel @@ -8,14 +8,10 @@ java_library( ], deps = [ "//java/client/src/org/openqa/selenium:core", - "//java/client/src/org/openqa/selenium/json", "//java/client/src/org/openqa/selenium/remote", - "//java/server/src/org/openqa/selenium/grid/config", "//java/server/src/org/openqa/selenium/grid/data", "//java/server/src/org/openqa/selenium/grid/distributor", - "//java/server/src/org/openqa/selenium/grid/log", "//java/server/src/org/openqa/selenium/grid/node", - "//java/server/src/org/openqa/selenium/grid/server", "//java/server/src/org/openqa/selenium/grid/web", ], ) diff --git a/java/server/src/org/openqa/selenium/grid/distributor/selector/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/distributor/selector/BUILD.bazel index 9a8f3b4cd31d4..4852e705a4a48 100644 --- a/java/server/src/org/openqa/selenium/grid/distributor/selector/BUILD.bazel +++ b/java/server/src/org/openqa/selenium/grid/distributor/selector/BUILD.bazel @@ -8,16 +8,8 @@ java_library( "//java/server/test/org/openqa/selenium:__subpackages__", ], deps = [ - "//java/server/src/org/openqa/selenium/concurrent", - "//java/client/src/org/openqa/selenium:core", - "//java/server/src/org/openqa/selenium/events", - "//java/server/src/org/openqa/selenium/grid/component", - "//java/server/src/org/openqa/selenium/grid/data", - "//java/server/src/org/openqa/selenium/grid/distributor/model", - "//java/server/src/org/openqa/selenium/grid/node", - "//java/server/src/org/openqa/selenium/grid/node/remote", - "//java/client/src/org/openqa/selenium/json", - "//java/client/src/org/openqa/selenium/remote", - artifact("com.google.guava:guava"), + "//java/client/src/org/openqa/selenium:core", + "//java/server/src/org/openqa/selenium/grid/distributor/model", + artifact("com.google.guava:guava"), ], ) diff --git a/java/server/src/org/openqa/selenium/grid/node/httpd/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/node/httpd/BUILD.bazel index 6780c97a3c86e..7d634b3b42208 100644 --- a/java/server/src/org/openqa/selenium/grid/node/httpd/BUILD.bazel +++ b/java/server/src/org/openqa/selenium/grid/node/httpd/BUILD.bazel @@ -10,18 +10,15 @@ java_library( "//java:auto-service", "//java/client/src/org/openqa/selenium/remote", "//java/server/src/org/openqa/selenium/cli", - "//java/server/src/org/openqa/selenium/concurrent", "//java/server/src/org/openqa/selenium/events", "//java/server/src/org/openqa/selenium/grid:base-command", "//java/server/src/org/openqa/selenium/grid/component", "//java/server/src/org/openqa/selenium/grid/config", "//java/server/src/org/openqa/selenium/grid/data", - "//java/server/src/org/openqa/selenium/grid/docker", "//java/server/src/org/openqa/selenium/grid/log", "//java/server/src/org/openqa/selenium/grid/node", "//java/server/src/org/openqa/selenium/grid/node/config", "//java/server/src/org/openqa/selenium/grid/server", - "//java/server/src/org/openqa/selenium/grid/web", "//java/server/src/org/openqa/selenium/netty/server", artifact("com.beust:jcommander"), artifact("com.google.guava:guava"), diff --git a/java/server/src/org/openqa/selenium/grid/node/local/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/node/local/BUILD.bazel index 8301ec94fda3b..1c500220ac802 100644 --- a/java/server/src/org/openqa/selenium/grid/node/local/BUILD.bazel +++ b/java/server/src/org/openqa/selenium/grid/node/local/BUILD.bazel @@ -23,7 +23,6 @@ java_library( "//java/server/src/org/openqa/selenium/grid/node", "//java/server/src/org/openqa/selenium/grid/node/config", "//java/server/src/org/openqa/selenium/grid/server", - "//java/server/src/org/openqa/selenium/grid/web", artifact("com.google.guava:guava"), ], ) diff --git a/java/server/src/org/openqa/selenium/grid/router/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/router/BUILD.bazel index 6b79bf229e2ad..a7e2c525641db 100644 --- a/java/server/src/org/openqa/selenium/grid/router/BUILD.bazel +++ b/java/server/src/org/openqa/selenium/grid/router/BUILD.bazel @@ -17,9 +17,7 @@ java_library( "//java/client/src/org/openqa/selenium/remote", "//java/server/src/org/openqa/selenium/grid/data", "//java/server/src/org/openqa/selenium/grid/distributor", - "//java/server/src/org/openqa/selenium/grid/server", "//java/server/src/org/openqa/selenium/grid/sessionmap", - "//java/server/src/org/openqa/selenium/grid/sessionmap/remote", "//java/server/src/org/openqa/selenium/grid/web", "//java/server/src/org/openqa/selenium/status", artifact("com.google.guava:guava"), diff --git a/java/server/src/org/openqa/selenium/grid/router/httpd/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/router/httpd/BUILD.bazel index 51e6785079d66..ad60b6c70bc2d 100644 --- a/java/server/src/org/openqa/selenium/grid/router/httpd/BUILD.bazel +++ b/java/server/src/org/openqa/selenium/grid/router/httpd/BUILD.bazel @@ -13,18 +13,15 @@ java_library( "//java/server/src/org/openqa/selenium/cli", "//java/server/src/org/openqa/selenium/grid:base-command", "//java/server/src/org/openqa/selenium/grid/config", - "//java/server/src/org/openqa/selenium/grid/data", "//java/server/src/org/openqa/selenium/grid/distributor", "//java/server/src/org/openqa/selenium/grid/distributor/config", "//java/server/src/org/openqa/selenium/grid/distributor/remote", "//java/server/src/org/openqa/selenium/grid/graphql", "//java/server/src/org/openqa/selenium/grid/log", - "//java/server/src/org/openqa/selenium/grid/node", "//java/server/src/org/openqa/selenium/grid/router", "//java/server/src/org/openqa/selenium/grid/server", "//java/server/src/org/openqa/selenium/grid/sessionmap", "//java/server/src/org/openqa/selenium/grid/sessionmap/config", - "//java/server/src/org/openqa/selenium/grid/web", "//java/server/src/org/openqa/selenium/netty/server", artifact("com.beust:jcommander"), artifact("com.google.guava:guava"), diff --git a/java/server/src/org/openqa/selenium/grid/server/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/server/BUILD.bazel index c675d77e96af1..88e1aeeddab10 100644 --- a/java/server/src/org/openqa/selenium/grid/server/BUILD.bazel +++ b/java/server/src/org/openqa/selenium/grid/server/BUILD.bazel @@ -14,12 +14,10 @@ java_library( deps = [ "//java:auto-service", "//java/client/src/org/openqa/selenium:core", - "//java/client/src/org/openqa/selenium/json", "//java/client/src/org/openqa/selenium/remote", "//java/server/src/org/openqa/selenium/events", "//java/server/src/org/openqa/selenium/grid/component", "//java/server/src/org/openqa/selenium/grid/config", - "//java/server/src/org/openqa/selenium/grid/log", "//java/server/src/org/openqa/selenium/grid/web", artifact("com.beust:jcommander"), artifact("com.google.guava:guava"), diff --git a/java/server/src/org/openqa/selenium/grid/sessionmap/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/sessionmap/BUILD.bazel index 118ac52b1dd00..9bd6f45551e4a 100644 --- a/java/server/src/org/openqa/selenium/grid/sessionmap/BUILD.bazel +++ b/java/server/src/org/openqa/selenium/grid/sessionmap/BUILD.bazel @@ -16,7 +16,6 @@ java_library( "//java/client/src/org/openqa/selenium/remote", "//java/client/src/org/openqa/selenium/remote/http", "//java/server/src/org/openqa/selenium/grid/data", - "//java/server/src/org/openqa/selenium/grid/web", "//java/server/src/org/openqa/selenium/status", artifact("com.google.guava:guava"), ], diff --git a/java/server/src/org/openqa/selenium/grid/sessionmap/config/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/sessionmap/config/BUILD.bazel index 2c40f1a3b9920..499436e03fbfd 100644 --- a/java/server/src/org/openqa/selenium/grid/sessionmap/config/BUILD.bazel +++ b/java/server/src/org/openqa/selenium/grid/sessionmap/config/BUILD.bazel @@ -8,7 +8,6 @@ java_library( ], deps = [ "//java:auto-service", - "//java/client/src/org/openqa/selenium/remote/http", "//java/server/src/org/openqa/selenium/grid/config", "//java/server/src/org/openqa/selenium/grid/sessionmap", artifact("com.beust:jcommander"), diff --git a/java/server/src/org/openqa/selenium/grid/sessionmap/httpd/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/sessionmap/httpd/BUILD.bazel index 2885367981525..72976d7d1f3ea 100644 --- a/java/server/src/org/openqa/selenium/grid/sessionmap/httpd/BUILD.bazel +++ b/java/server/src/org/openqa/selenium/grid/sessionmap/httpd/BUILD.bazel @@ -9,18 +9,14 @@ java_library( ], deps = [ "//java:auto-service", + "//java/client/src/org/openqa/selenium:core", "//java/client/src/org/openqa/selenium/json", - "//java/client/src/org/openqa/selenium/remote", "//java/server/src/org/openqa/selenium/cli", - "//java/server/src/org/openqa/selenium/events", "//java/server/src/org/openqa/selenium/grid:base-command", "//java/server/src/org/openqa/selenium/grid/config", - "//java/server/src/org/openqa/selenium/grid/log", "//java/server/src/org/openqa/selenium/grid/server", "//java/server/src/org/openqa/selenium/grid/sessionmap", "//java/server/src/org/openqa/selenium/grid/sessionmap/config", - "//java/server/src/org/openqa/selenium/grid/sessionmap/local", - "//java/server/src/org/openqa/selenium/grid/web", "//java/server/src/org/openqa/selenium/netty/server", artifact("com.beust:jcommander"), artifact("com.google.guava:guava"), diff --git a/java/server/src/org/openqa/selenium/grid/sessionmap/remote/BUILD.bazel b/java/server/src/org/openqa/selenium/grid/sessionmap/remote/BUILD.bazel index e7d854b1c8a80..7d8a305738340 100644 --- a/java/server/src/org/openqa/selenium/grid/sessionmap/remote/BUILD.bazel +++ b/java/server/src/org/openqa/selenium/grid/sessionmap/remote/BUILD.bazel @@ -6,7 +6,6 @@ java_library( "//java/server/test/org/openqa/selenium/grid:__subpackages__", ], deps = [ - "//java/client/src/org/openqa/selenium/json", "//java/client/src/org/openqa/selenium/remote", "//java/server/src/org/openqa/selenium/grid/config", "//java/server/src/org/openqa/selenium/grid/data", diff --git a/java/server/src/org/openqa/selenium/jetty/server/BUILD.bazel b/java/server/src/org/openqa/selenium/jetty/server/BUILD.bazel index b7bc524f1045f..204e679b50d57 100644 --- a/java/server/src/org/openqa/selenium/jetty/server/BUILD.bazel +++ b/java/server/src/org/openqa/selenium/jetty/server/BUILD.bazel @@ -10,7 +10,6 @@ java_library( ], deps = [ "//java/client/src/org/openqa/selenium:core", - "//java/client/src/org/openqa/selenium/json", "//java/client/src/org/openqa/selenium/remote/http", "//java/server/src/org/openqa/selenium/grid/server", artifact("org.eclipse.jetty:jetty-security"), diff --git a/java/server/src/org/openqa/selenium/netty/server/BUILD.bazel b/java/server/src/org/openqa/selenium/netty/server/BUILD.bazel index 3545f74cdee99..eb413291c05e2 100644 --- a/java/server/src/org/openqa/selenium/netty/server/BUILD.bazel +++ b/java/server/src/org/openqa/selenium/netty/server/BUILD.bazel @@ -15,7 +15,6 @@ java_library( ], deps = [ "//java/client/src/org/openqa/selenium:core", - "//java/client/src/org/openqa/selenium/json", "//java/client/src/org/openqa/selenium/remote/http", "//java/server/src/org/openqa/selenium/grid/server", "//java/server/src/org/openqa/selenium/grid/web", diff --git a/java/server/src/org/openqa/selenium/server/htmlrunner/BUILD.bazel b/java/server/src/org/openqa/selenium/server/htmlrunner/BUILD.bazel index 52b7d2c53810b..03a408f8bc6b8 100644 --- a/java/server/src/org/openqa/selenium/server/htmlrunner/BUILD.bazel +++ b/java/server/src/org/openqa/selenium/server/htmlrunner/BUILD.bazel @@ -17,13 +17,14 @@ java_library( deps = [ "//java/client/src/com/thoughtworks/selenium", "//java/client/src/com/thoughtworks/selenium/webdriven", + "//java/client/src/org/openqa/selenium:core", "//java/client/src/org/openqa/selenium/chrome", "//java/client/src/org/openqa/selenium/edge", "//java/client/src/org/openqa/selenium/firefox", "//java/client/src/org/openqa/selenium/ie", "//java/client/src/org/openqa/selenium/json", "//java/client/src/org/openqa/selenium/opera", - "//java/client/src/org/openqa/selenium/remote", + "//java/client/src/org/openqa/selenium/remote/http", "//java/client/src/org/openqa/selenium/safari", "//java/server/src/org/openqa/selenium/grid/config", "//java/server/src/org/openqa/selenium/grid/server", diff --git a/java/server/test/org/openqa/selenium/grid/distributor/selector/BUILD.bazel b/java/server/test/org/openqa/selenium/grid/distributor/selector/BUILD.bazel index a5f5d2d3ad80b..85c39430c03fd 100644 --- a/java/server/test/org/openqa/selenium/grid/distributor/selector/BUILD.bazel +++ b/java/server/test/org/openqa/selenium/grid/distributor/selector/BUILD.bazel @@ -6,6 +6,9 @@ java_test_suite( size = "small", srcs = glob(["*.java"]), deps = [ + "//java/client/src/org/openqa/selenium/remote", + "//java/client/src/org/openqa/selenium/remote/http", + "//java/client/test/org/openqa/selenium/remote/tracing:tracing-support", "//java/server/src/org/openqa/selenium/events", "//java/server/src/org/openqa/selenium/events/local", "//java/server/src/org/openqa/selenium/grid/data", @@ -13,11 +16,8 @@ java_test_suite( "//java/server/src/org/openqa/selenium/grid/distributor/selector", "//java/server/src/org/openqa/selenium/grid/node", "//java/server/src/org/openqa/selenium/grid/node/local", - "//java/client/src/org/openqa/selenium/remote", - "//java/client/src/org/openqa/selenium/remote/http", - "//java/client/test/org/openqa/selenium/remote/tracing:tracing-support", "//java/server/test/org/openqa/selenium/grid/testing", artifact("junit:junit"), artifact("org.assertj:assertj-core"), - ] + ], ) diff --git a/java/server/test/org/openqa/selenium/grid/testing/BUILD.bazel b/java/server/test/org/openqa/selenium/grid/testing/BUILD.bazel index 612692030bd22..36eb0a6fd59b7 100644 --- a/java/server/test/org/openqa/selenium/grid/testing/BUILD.bazel +++ b/java/server/test/org/openqa/selenium/grid/testing/BUILD.bazel @@ -9,6 +9,5 @@ java_library( "//java/client/src/org/openqa/selenium/remote", "//java/server/src/org/openqa/selenium/grid/data", "//java/server/src/org/openqa/selenium/grid/node", - "//java/server/src/org/openqa/selenium/grid/web", ], )