From c3450b118da1ac0fbe5aecc675b14c305b6e0e03 Mon Sep 17 00:00:00 2001 From: Simon Mavi Stewart Date: Mon, 27 Sep 2021 16:49:07 +0100 Subject: [PATCH] Run buildifier over the tree Should be no logical changes :) The command used was: buildifier -r -lint fix -mode fix . --- WORKSPACE | 16 ++++++-------- common/repositories.bzl | 2 -- .../src/com/thoughtworks/selenium/BUILD.bazel | 2 -- .../selenium/webdriven/BUILD.bazel | 12 +++++----- .../openqa/selenium/events/zeromq/BUILD.bazel | 4 ++-- java/src/org/openqa/selenium/grid/BUILD.bazel | 3 +-- .../openqa/selenium/grid/commands/BUILD.bazel | 4 ++-- .../openqa/selenium/grid/config/BUILD.bazel | 6 ++--- .../org/openqa/selenium/grid/data/BUILD.bazel | 4 ++-- .../grid/distributor/local/BUILD.bazel | 4 ++-- .../grid/distributor/remote/BUILD.bazel | 2 +- .../openqa/selenium/grid/graphql/BUILD.bazel | 6 ++--- .../org/openqa/selenium/grid/log/BUILD.bazel | 2 +- .../org/openqa/selenium/grid/node/BUILD.bazel | 4 ++-- .../selenium/grid/node/config/BUILD.bazel | 4 ++-- .../selenium/grid/node/docker/BUILD.bazel | 6 ++--- .../selenium/grid/node/httpd/BUILD.bazel | 2 +- .../openqa/selenium/grid/node/k8s/BUILD.bazel | 2 +- .../selenium/grid/node/local/BUILD.bazel | 6 ++--- .../selenium/grid/node/relay/BUILD.bazel | 4 ++-- .../selenium/grid/node/remote/BUILD.bazel | 4 ++-- .../openqa/selenium/grid/router/BUILD.bazel | 4 ++-- .../selenium/grid/router/httpd/BUILD.bazel | 2 +- .../openqa/selenium/grid/security/BUILD.bazel | 4 ++-- .../openqa/selenium/grid/server/BUILD.bazel | 4 ++-- .../openqa/selenium/grid/session/BUILD.bazel | 2 +- .../selenium/grid/sessionmap/BUILD.bazel | 2 +- .../grid/sessionmap/httpd/BUILD.bazel | 2 +- .../selenium/grid/sessionmap/jdbc/BUILD.bazel | 2 +- .../grid/sessionmap/local/BUILD.bazel | 2 +- .../grid/sessionmap/redis/BUILD.bazel | 4 ++-- .../grid/sessionmap/remote/BUILD.bazel | 2 +- .../selenium/grid/sessionqueue/BUILD.bazel | 6 ++--- .../grid/sessionqueue/httpd/BUILD.bazel | 2 +- .../grid/sessionqueue/local/BUILD.bazel | 2 +- .../grid/sessionqueue/remote/BUILD.bazel | 4 ++-- .../org/openqa/selenium/grid/web/BUILD.bazel | 1 - java/src/org/openqa/selenium/io/BUILD.bazel | 6 ++--- .../openqa/selenium/jre/server/BUILD.bazel | 3 +-- .../openqa/selenium/netty/server/BUILD.bazel | 7 +++--- .../openqa/selenium/remote/server/BUILD.bazel | 2 +- .../selenium/remote/tracing/BUILD.bazel | 2 +- .../remote/tracing/opentelemetry/BUILD.bazel | 2 +- .../selenium/server/htmlrunner/BUILD.bazel | 8 +++---- java/test/org/openqa/selenium/BUILD.bazel | 11 ++++------ .../org/openqa/selenium/build/BUILD.bazel | 6 +---- .../org/openqa/selenium/chrome/BUILD.bazel | 8 +++---- .../org/openqa/selenium/docker/BUILD.bazel | 2 +- .../openqa/selenium/environment/BUILD.bazel | 10 ++++----- .../org/openqa/selenium/grid/data/BUILD.bazel | 4 ++-- .../selenium/grid/distributor/BUILD.bazel | 8 +++---- .../grid/distributor/selector/BUILD.bazel | 6 ++--- .../openqa/selenium/grid/graphql/BUILD.bazel | 8 +++---- .../openqa/selenium/grid/gridui/BUILD.bazel | 12 +++++----- .../org/openqa/selenium/grid/node/BUILD.bazel | 8 +++---- .../selenium/grid/node/config/BUILD.bazel | 14 ++++++------ .../selenium/grid/node/local/BUILD.bazel | 6 ++--- .../selenium/grid/node/relay/BUILD.bazel | 4 ++-- .../openqa/selenium/grid/router/BUILD.bazel | 10 ++++----- .../openqa/selenium/grid/security/BUILD.bazel | 2 +- .../openqa/selenium/grid/server/BUILD.bazel | 6 ++--- .../selenium/grid/sessionmap/BUILD.bazel | 6 ++--- .../selenium/grid/sessionmap/jdbc/BUILD.bazel | 4 ++-- .../grid/sessionmap/redis/BUILD.bazel | 2 +- .../selenium/grid/sessionqueue/BUILD.bazel | 8 +++---- .../grid/sessionqueue/local/BUILD.bazel | 10 ++++----- .../openqa/selenium/grid/testing/BUILD.bazel | 2 +- .../org/openqa/selenium/grid/web/BUILD.bazel | 2 +- .../openqa/selenium/netty/server/BUILD.bazel | 4 ++-- .../selenium/remote/tracing/BUILD.bazel | 6 +---- .../remote/tracing/opentelemetry/BUILD.bazel | 2 +- .../openqa/selenium/support/ui/BUILD.bazel | 5 +---- .../org/openqa/selenium/testing/BUILD.bazel | 22 ++++++------------- .../selenium/testing/drivers/BUILD.bazel | 6 +---- scripts/BUILD.bazel | 2 +- 75 files changed, 171 insertions(+), 209 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index 98cbf2ff541f7..8b4e557b28f99 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -50,8 +50,8 @@ bazel_skylib_workspace() http_archive( name = "rules_python", - url = "https://github.com/bazelbuild/rules_python/releases/download/0.3.0/rules_python-0.3.0.tar.gz", sha256 = "934c9ceb552e84577b0faf1e5a2f0450314985b4d8712b2b70717dc679fdc01b", + url = "https://github.com/bazelbuild/rules_python/releases/download/0.3.0/rules_python-0.3.0.tar.gz", ) # This one is only needed if you're using the packaging rules. @@ -127,18 +127,16 @@ http_archive( urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/4.1.0/rules_nodejs-4.1.0.tar.gz"], ) -load("@build_bazel_rules_nodejs//:index.bzl", "node_repositories") +load("@build_bazel_rules_nodejs//:index.bzl", "node_repositories", "npm_install") node_repositories( - package_json = [ - "//:package.json", - "//javascript/grid-ui:package.json", - ], - node_version = "16.4.1", + node_version = "16.4.1", + package_json = [ + "//:package.json", + "//javascript/grid-ui:package.json", + ], ) -load("@build_bazel_rules_nodejs//:index.bzl", "npm_install") - npm_install( name = "npm", package_json = "//:package.json", diff --git a/common/repositories.bzl b/common/repositories.bzl index 9e18c71344bbb..5c55f77ee2c38 100644 --- a/common/repositories.bzl +++ b/common/repositories.bzl @@ -1,4 +1,3 @@ - # This file has been generated using `bazel run scripts:pinned_browsers` load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") @@ -82,4 +81,3 @@ def pin_browsers(): sha256 = "ff4469d533dd09998fc99767468995b81b2ccd180811d961496e3b4f9d058284", build_file_content = "exports_files([\"chromedriver\"])", ) - diff --git a/java/src/com/thoughtworks/selenium/BUILD.bazel b/java/src/com/thoughtworks/selenium/BUILD.bazel index fac40f316a745..290566bb5a4e6 100644 --- a/java/src/com/thoughtworks/selenium/BUILD.bazel +++ b/java/src/com/thoughtworks/selenium/BUILD.bazel @@ -29,8 +29,6 @@ java_library( "SeleniumLogLevels.java", ], visibility = [ - "//java/src/com/thoughtworks/selenium:__subpackages__", - "//java/test/com/thoughtworks/selenium:__subpackages__", "//java/src/com/thoughtworks/selenium:__subpackages__", "//java/src/org/openqa/selenium/server/htmlrunner:__pkg__", "//java/test/com/thoughtworks/selenium:__subpackages__", diff --git a/java/src/com/thoughtworks/selenium/webdriven/BUILD.bazel b/java/src/com/thoughtworks/selenium/webdriven/BUILD.bazel index dd9e20a80ca00..53ec204427596 100644 --- a/java/src/com/thoughtworks/selenium/webdriven/BUILD.bazel +++ b/java/src/com/thoughtworks/selenium/webdriven/BUILD.bazel @@ -20,6 +20,8 @@ java_export( "WebDriverBackedSeleniumHandler.java", "WebDriverCommandProcessor.java", ], + maven_coordinates = "org.seleniumhq.selenium:selenium-leg-rc:%s" % SE_VERSION, + pom_template = "//java/src/org/openqa/selenium:template-pom", resources = [ "htmlutils.js", "injectableSelenium.js", @@ -29,17 +31,15 @@ java_export( ":fireEventAt", ":getAttribute", ":getText", - ":linkLocator", ":isElementPresent", ":isSomethingSelected", ":isTextPresent", ":isVisible", + ":linkLocator", ":setCursorPosition", - ":type", ":sizzle", + ":type", ], - maven_coordinates = "org.seleniumhq.selenium:selenium-leg-rc:%s" % SE_VERSION, - pom_template = "//java/src/org/openqa/selenium:template-pom", visibility = [ "//visibility:public", ], @@ -51,12 +51,12 @@ java_export( "//java/src/org/openqa/selenium/chrome", "//java/src/org/openqa/selenium/edge", "//java/src/org/openqa/selenium/firefox", + "//java/src/org/openqa/selenium/grid", "//java/src/org/openqa/selenium/ie", "//java/src/org/openqa/selenium/opera", "//java/src/org/openqa/selenium/remote", - "//java/src/org/openqa/selenium/safari", - "//java/src/org/openqa/selenium/grid", "//java/src/org/openqa/selenium/remote/server", + "//java/src/org/openqa/selenium/safari", artifact("com.google.guava:guava"), ], ) diff --git a/java/src/org/openqa/selenium/events/zeromq/BUILD.bazel b/java/src/org/openqa/selenium/events/zeromq/BUILD.bazel index 8bc755e1fa0c4..759edd0570ea1 100644 --- a/java/src/org/openqa/selenium/events/zeromq/BUILD.bazel +++ b/java/src/org/openqa/selenium/events/zeromq/BUILD.bazel @@ -7,15 +7,15 @@ java_library( visibility = [ "//java/src/org/openqa/selenium/grid:__subpackages__", "//java/test/org/openqa/selenium/events:__subpackages__", - "//java/test/org/openqa/selenium/grid/router:__pkg__", "//java/test/org/openqa/selenium/grid/distributor:__pkg__", + "//java/test/org/openqa/selenium/grid/router:__pkg__", ], deps = [ "//java/src/org/openqa/selenium:core", - "//java/src/org/openqa/selenium/json", "//java/src/org/openqa/selenium/events", "//java/src/org/openqa/selenium/grid/config", "//java/src/org/openqa/selenium/grid/security", + "//java/src/org/openqa/selenium/json", artifact("com.google.guava:guava"), artifact("net.jodah:failsafe"), artifact("org.zeromq:jeromq"), diff --git a/java/src/org/openqa/selenium/grid/BUILD.bazel b/java/src/org/openqa/selenium/grid/BUILD.bazel index 9550f4a9d68d2..8132bcdf57833 100644 --- a/java/src/org/openqa/selenium/grid/BUILD.bazel +++ b/java/src/org/openqa/selenium/grid/BUILD.bazel @@ -71,12 +71,12 @@ java_library( ], deps = [ "//java/src/org/openqa/selenium:core", - "//java/src/org/openqa/selenium/remote/http", "//java/src/org/openqa/selenium/cli", "//java/src/org/openqa/selenium/grid/config", "//java/src/org/openqa/selenium/grid/log", "//java/src/org/openqa/selenium/grid/server", "//java/src/org/openqa/selenium/netty/server", + "//java/src/org/openqa/selenium/remote/http", artifact("com.beust:jcommander"), artifact("com.google.guava:guava"), ], @@ -145,7 +145,6 @@ java_binary( "//:__pkg__", "//deploys/docker:__pkg__", "//java/test:__subpackages__", - "//java/test:__subpackages__", "//javascript:__subpackages__", "//py:__pkg__", "//rb:__pkg__", diff --git a/java/src/org/openqa/selenium/grid/commands/BUILD.bazel b/java/src/org/openqa/selenium/grid/commands/BUILD.bazel index d1c0c89c31386..1446a1e1978fa 100644 --- a/java/src/org/openqa/selenium/grid/commands/BUILD.bazel +++ b/java/src/org/openqa/selenium/grid/commands/BUILD.bazel @@ -16,8 +16,6 @@ java_library( deps = [ "//java:auto-service", "//java/src/org/openqa/selenium:core", - "//java/src/org/openqa/selenium/json", - "//java/src/org/openqa/selenium/remote", "//java/src/org/openqa/selenium/cli", "//java/src/org/openqa/selenium/events", "//java/src/org/openqa/selenium/grid:base-command", @@ -40,7 +38,9 @@ java_library( "//java/src/org/openqa/selenium/grid/sessionqueue/config", "//java/src/org/openqa/selenium/grid/sessionqueue/local", "//java/src/org/openqa/selenium/grid/web", + "//java/src/org/openqa/selenium/json", "//java/src/org/openqa/selenium/netty/server", + "//java/src/org/openqa/selenium/remote", artifact("com.beust:jcommander"), artifact("com.google.guava:guava"), ], diff --git a/java/src/org/openqa/selenium/grid/config/BUILD.bazel b/java/src/org/openqa/selenium/grid/config/BUILD.bazel index 442281c1ce0d7..a697c78f779da 100644 --- a/java/src/org/openqa/selenium/grid/config/BUILD.bazel +++ b/java/src/org/openqa/selenium/grid/config/BUILD.bazel @@ -5,17 +5,17 @@ java_library( name = "config", srcs = glob(["*.java"]), visibility = [ - "//java/src/org/openqa/selenium/remote:__pkg__", - "//java/src/org/openqa/selenium/remote/tracing:__subpackages__", "//java/src/org/openqa/selenium/cli:__pkg__", "//java/src/org/openqa/selenium/events:__subpackages__", "//java/src/org/openqa/selenium/grid:__subpackages__", "//java/src/org/openqa/selenium/netty/server:__pkg__", + "//java/src/org/openqa/selenium/remote:__pkg__", + "//java/src/org/openqa/selenium/remote/tracing:__subpackages__", "//java/src/org/openqa/selenium/server/htmlrunner:__pkg__", "//java/test/com/thoughtworks/selenium/webdriven:__pkg__", "//java/test/org/openqa/selenium:__pkg__", - "//java/test/org/openqa/selenium/environment:__pkg__", "//java/test/org/openqa/selenium:__subpackages__", + "//java/test/org/openqa/selenium/environment:__pkg__", ], deps = [ "//java:auto-service", diff --git a/java/src/org/openqa/selenium/grid/data/BUILD.bazel b/java/src/org/openqa/selenium/grid/data/BUILD.bazel index 84bd4fcd26aa1..761bf51d92992 100644 --- a/java/src/org/openqa/selenium/grid/data/BUILD.bazel +++ b/java/src/org/openqa/selenium/grid/data/BUILD.bazel @@ -11,9 +11,9 @@ java_library( ], deps = [ "//java/src/org/openqa/selenium:core", - "//java/src/org/openqa/selenium/json", - "//java/src/org/openqa/selenium/remote", "//java/src/org/openqa/selenium/events", "//java/src/org/openqa/selenium/grid/security", + "//java/src/org/openqa/selenium/json", + "//java/src/org/openqa/selenium/remote", ], ) diff --git a/java/src/org/openqa/selenium/grid/distributor/local/BUILD.bazel b/java/src/org/openqa/selenium/grid/distributor/local/BUILD.bazel index 885ac79cc2a7b..cbd2e97f374fd 100644 --- a/java/src/org/openqa/selenium/grid/distributor/local/BUILD.bazel +++ b/java/src/org/openqa/selenium/grid/distributor/local/BUILD.bazel @@ -10,8 +10,6 @@ java_library( "//java/test/org/openqa/selenium/grid:__subpackages__", ], deps = [ - "//java/src/org/openqa/selenium/json", - "//java/src/org/openqa/selenium/remote", "//java/src/org/openqa/selenium/concurrent", "//java/src/org/openqa/selenium/events", "//java/src/org/openqa/selenium/grid/config", @@ -29,6 +27,8 @@ java_library( "//java/src/org/openqa/selenium/grid/sessionqueue", "//java/src/org/openqa/selenium/grid/sessionqueue/config", "//java/src/org/openqa/selenium/grid/sessionqueue/remote", + "//java/src/org/openqa/selenium/json", + "//java/src/org/openqa/selenium/remote", artifact("com.google.guava:guava"), ], ) diff --git a/java/src/org/openqa/selenium/grid/distributor/remote/BUILD.bazel b/java/src/org/openqa/selenium/grid/distributor/remote/BUILD.bazel index c685fc2be7d75..53ebc5ce3f192 100644 --- a/java/src/org/openqa/selenium/grid/distributor/remote/BUILD.bazel +++ b/java/src/org/openqa/selenium/grid/distributor/remote/BUILD.bazel @@ -10,12 +10,12 @@ java_library( ], deps = [ "//java/src/org/openqa/selenium:core", - "//java/src/org/openqa/selenium/remote", "//java/src/org/openqa/selenium/grid/data", "//java/src/org/openqa/selenium/grid/distributor", "//java/src/org/openqa/selenium/grid/node", "//java/src/org/openqa/selenium/grid/security", "//java/src/org/openqa/selenium/grid/sessionmap", "//java/src/org/openqa/selenium/grid/web", + "//java/src/org/openqa/selenium/remote", ], ) diff --git a/java/src/org/openqa/selenium/grid/graphql/BUILD.bazel b/java/src/org/openqa/selenium/grid/graphql/BUILD.bazel index 9e23f01f57230..4fc0d84d5aa70 100644 --- a/java/src/org/openqa/selenium/grid/graphql/BUILD.bazel +++ b/java/src/org/openqa/selenium/grid/graphql/BUILD.bazel @@ -13,12 +13,12 @@ java_library( ], deps = [ "//java/src/org/openqa/selenium:core", - "//java/src/org/openqa/selenium/json", - "//java/src/org/openqa/selenium/remote", - "//java/src/org/openqa/selenium/remote/http", "//java/src/org/openqa/selenium/grid/data", "//java/src/org/openqa/selenium/grid/distributor", "//java/src/org/openqa/selenium/grid/sessionqueue", + "//java/src/org/openqa/selenium/json", + "//java/src/org/openqa/selenium/remote", + "//java/src/org/openqa/selenium/remote/http", artifact("com.google.guava:guava"), artifact("com.graphql-java:graphql-java"), ], diff --git a/java/src/org/openqa/selenium/grid/log/BUILD.bazel b/java/src/org/openqa/selenium/grid/log/BUILD.bazel index 434a033bc6bd1..a8d998a81e209 100644 --- a/java/src/org/openqa/selenium/grid/log/BUILD.bazel +++ b/java/src/org/openqa/selenium/grid/log/BUILD.bazel @@ -10,9 +10,9 @@ java_library( ], deps = [ "//java:auto-service", + "//java/src/org/openqa/selenium/grid/config", "//java/src/org/openqa/selenium/json", "//java/src/org/openqa/selenium/remote", - "//java/src/org/openqa/selenium/grid/config", artifact("com.beust:jcommander"), ], ) diff --git a/java/src/org/openqa/selenium/grid/node/BUILD.bazel b/java/src/org/openqa/selenium/grid/node/BUILD.bazel index 1793861191118..26bec60efbaac 100644 --- a/java/src/org/openqa/selenium/grid/node/BUILD.bazel +++ b/java/src/org/openqa/selenium/grid/node/BUILD.bazel @@ -14,14 +14,14 @@ java_library( deps = [ "//java/src/org/openqa/selenium:core", "//java/src/org/openqa/selenium/devtools", - "//java/src/org/openqa/selenium/json", - "//java/src/org/openqa/selenium/remote", "//java/src/org/openqa/selenium/grid/component", "//java/src/org/openqa/selenium/grid/data", "//java/src/org/openqa/selenium/grid/jmx", "//java/src/org/openqa/selenium/grid/node/locators", "//java/src/org/openqa/selenium/grid/security", "//java/src/org/openqa/selenium/grid/web", + "//java/src/org/openqa/selenium/json", + "//java/src/org/openqa/selenium/remote", "//java/src/org/openqa/selenium/status", artifact("com.google.guava:guava"), ], diff --git a/java/src/org/openqa/selenium/grid/node/config/BUILD.bazel b/java/src/org/openqa/selenium/grid/node/config/BUILD.bazel index 45ca85809e371..11d34040e2d60 100644 --- a/java/src/org/openqa/selenium/grid/node/config/BUILD.bazel +++ b/java/src/org/openqa/selenium/grid/node/config/BUILD.bazel @@ -13,11 +13,11 @@ java_library( "//java:auto-service", "//java/src/org/openqa/selenium/chromium", "//java/src/org/openqa/selenium/devtools", - "//java/src/org/openqa/selenium/json", - "//java/src/org/openqa/selenium/remote", "//java/src/org/openqa/selenium/grid/config", "//java/src/org/openqa/selenium/grid/data", "//java/src/org/openqa/selenium/grid/node", + "//java/src/org/openqa/selenium/json", + "//java/src/org/openqa/selenium/remote", artifact("com.beust:jcommander"), artifact("com.google.guava:guava"), ], diff --git a/java/src/org/openqa/selenium/grid/node/docker/BUILD.bazel b/java/src/org/openqa/selenium/grid/node/docker/BUILD.bazel index 2e2ea683026b7..4addfe8f8757a 100644 --- a/java/src/org/openqa/selenium/grid/node/docker/BUILD.bazel +++ b/java/src/org/openqa/selenium/grid/node/docker/BUILD.bazel @@ -11,13 +11,13 @@ java_library( ], deps = [ "//java:auto-service", - "//java/src/org/openqa/selenium/json", - "//java/src/org/openqa/selenium/remote", - "//java/src/org/openqa/selenium/support", "//java/src/org/openqa/selenium/docker", "//java/src/org/openqa/selenium/grid/config", "//java/src/org/openqa/selenium/grid/data", "//java/src/org/openqa/selenium/grid/node", + "//java/src/org/openqa/selenium/json", + "//java/src/org/openqa/selenium/remote", + "//java/src/org/openqa/selenium/support", artifact("com.beust:jcommander"), artifact("com.google.guava:guava"), ], diff --git a/java/src/org/openqa/selenium/grid/node/httpd/BUILD.bazel b/java/src/org/openqa/selenium/grid/node/httpd/BUILD.bazel index a9ff7d42a92d9..0b7fe113206f8 100644 --- a/java/src/org/openqa/selenium/grid/node/httpd/BUILD.bazel +++ b/java/src/org/openqa/selenium/grid/node/httpd/BUILD.bazel @@ -10,7 +10,6 @@ java_library( ], deps = [ "//java:auto-service", - "//java/src/org/openqa/selenium/remote", "//java/src/org/openqa/selenium/cli", "//java/src/org/openqa/selenium/events", "//java/src/org/openqa/selenium/grid:base-command", @@ -22,6 +21,7 @@ java_library( "//java/src/org/openqa/selenium/grid/node/config", "//java/src/org/openqa/selenium/grid/server", "//java/src/org/openqa/selenium/netty/server", + "//java/src/org/openqa/selenium/remote", artifact("com.google.guava:guava"), artifact("net.jodah:failsafe"), ], diff --git a/java/src/org/openqa/selenium/grid/node/k8s/BUILD.bazel b/java/src/org/openqa/selenium/grid/node/k8s/BUILD.bazel index ed007b0a510d7..68b5f9cd50cc0 100644 --- a/java/src/org/openqa/selenium/grid/node/k8s/BUILD.bazel +++ b/java/src/org/openqa/selenium/grid/node/k8s/BUILD.bazel @@ -9,9 +9,9 @@ java_library( ], deps = [ "//java:auto-service", + "//java/src/org/openqa/selenium/grid", "//java/src/org/openqa/selenium/json", "//java/src/org/openqa/selenium/remote", - "//java/src/org/openqa/selenium/grid", artifact("com.beust:jcommander"), artifact("com.google.guava:guava"), ], diff --git a/java/src/org/openqa/selenium/grid/node/local/BUILD.bazel b/java/src/org/openqa/selenium/grid/node/local/BUILD.bazel index 81befac0f1844..b3a6839819e14 100644 --- a/java/src/org/openqa/selenium/grid/node/local/BUILD.bazel +++ b/java/src/org/openqa/selenium/grid/node/local/BUILD.bazel @@ -12,8 +12,6 @@ java_library( "//java/test/org/openqa/selenium/grid:__subpackages__", ], deps = [ - "//java/src/org/openqa/selenium/json", - "//java/src/org/openqa/selenium/remote", "//java/src/org/openqa/selenium/concurrent", "//java/src/org/openqa/selenium/events", "//java/src/org/openqa/selenium/grid/component", @@ -23,10 +21,12 @@ java_library( "//java/src/org/openqa/selenium/grid/log", "//java/src/org/openqa/selenium/grid/node", "//java/src/org/openqa/selenium/grid/node/config", - "//java/src/org/openqa/selenium/grid/node/docker:docker", + "//java/src/org/openqa/selenium/grid/node/docker", "//java/src/org/openqa/selenium/grid/node/relay", "//java/src/org/openqa/selenium/grid/security", "//java/src/org/openqa/selenium/grid/server", + "//java/src/org/openqa/selenium/json", + "//java/src/org/openqa/selenium/remote", artifact("com.google.guava:guava"), ], ) diff --git a/java/src/org/openqa/selenium/grid/node/relay/BUILD.bazel b/java/src/org/openqa/selenium/grid/node/relay/BUILD.bazel index c69861d8627d4..957d386b7bd5f 100644 --- a/java/src/org/openqa/selenium/grid/node/relay/BUILD.bazel +++ b/java/src/org/openqa/selenium/grid/node/relay/BUILD.bazel @@ -10,10 +10,10 @@ java_library( ], deps = [ "//java:auto-service", - "//java/src/org/openqa/selenium/json", - "//java/src/org/openqa/selenium/remote", "//java/src/org/openqa/selenium/grid/data", "//java/src/org/openqa/selenium/grid/node", + "//java/src/org/openqa/selenium/json", + "//java/src/org/openqa/selenium/remote", artifact("com.beust:jcommander"), artifact("com.google.guava:guava"), ], diff --git a/java/src/org/openqa/selenium/grid/node/remote/BUILD.bazel b/java/src/org/openqa/selenium/grid/node/remote/BUILD.bazel index 4e2ccd1c826d0..400855ed6a686 100644 --- a/java/src/org/openqa/selenium/grid/node/remote/BUILD.bazel +++ b/java/src/org/openqa/selenium/grid/node/remote/BUILD.bazel @@ -10,13 +10,13 @@ java_library( "//java/test/org/openqa/selenium/grid/router:__pkg__", ], deps = [ - "//java/src/org/openqa/selenium/json", - "//java/src/org/openqa/selenium/remote", "//java/src/org/openqa/selenium/grid/component", "//java/src/org/openqa/selenium/grid/data", "//java/src/org/openqa/selenium/grid/node", "//java/src/org/openqa/selenium/grid/security", "//java/src/org/openqa/selenium/grid/web", + "//java/src/org/openqa/selenium/json", + "//java/src/org/openqa/selenium/remote", artifact("com.google.guava:guava"), ], ) diff --git a/java/src/org/openqa/selenium/grid/router/BUILD.bazel b/java/src/org/openqa/selenium/grid/router/BUILD.bazel index 50779ef4732fd..70065bd707e4e 100644 --- a/java/src/org/openqa/selenium/grid/router/BUILD.bazel +++ b/java/src/org/openqa/selenium/grid/router/BUILD.bazel @@ -14,14 +14,14 @@ java_library( ], deps = [ "//java/src/org/openqa/selenium:core", - "//java/src/org/openqa/selenium/json", - "//java/src/org/openqa/selenium/remote", "//java/src/org/openqa/selenium/concurrent", "//java/src/org/openqa/selenium/grid/data", "//java/src/org/openqa/selenium/grid/distributor", "//java/src/org/openqa/selenium/grid/sessionmap", "//java/src/org/openqa/selenium/grid/sessionqueue", "//java/src/org/openqa/selenium/grid/web", + "//java/src/org/openqa/selenium/json", + "//java/src/org/openqa/selenium/remote", "//java/src/org/openqa/selenium/status", artifact("com.google.guava:guava"), ], diff --git a/java/src/org/openqa/selenium/grid/router/httpd/BUILD.bazel b/java/src/org/openqa/selenium/grid/router/httpd/BUILD.bazel index d3db462c34b61..ab9a590f3f15c 100644 --- a/java/src/org/openqa/selenium/grid/router/httpd/BUILD.bazel +++ b/java/src/org/openqa/selenium/grid/router/httpd/BUILD.bazel @@ -11,7 +11,6 @@ java_library( ], deps = [ "//java:auto-service", - "//java/src/org/openqa/selenium/remote", "//java/src/org/openqa/selenium/cli", "//java/src/org/openqa/selenium/grid:base-command", "//java/src/org/openqa/selenium/grid/config", @@ -30,6 +29,7 @@ java_library( "//java/src/org/openqa/selenium/grid/sessionqueue/remote", "//java/src/org/openqa/selenium/grid/web", "//java/src/org/openqa/selenium/netty/server", + "//java/src/org/openqa/selenium/remote", artifact("com.beust:jcommander"), artifact("com.google.guava:guava"), ], diff --git a/java/src/org/openqa/selenium/grid/security/BUILD.bazel b/java/src/org/openqa/selenium/grid/security/BUILD.bazel index 00267d47ee7b7..ae959d8c1d8c4 100644 --- a/java/src/org/openqa/selenium/grid/security/BUILD.bazel +++ b/java/src/org/openqa/selenium/grid/security/BUILD.bazel @@ -5,17 +5,17 @@ java_library( name = "security", srcs = glob(["*.java"]), visibility = [ - "//java/test/org/openqa/selenium:__subpackages__", "//java/src/org/openqa/selenium/events:__subpackages__", "//java/src/org/openqa/selenium/grid:__subpackages__", + "//java/test/org/openqa/selenium:__subpackages__", "//java/test/org/openqa/selenium/events:__subpackages__", "//java/test/org/openqa/selenium/grid:__subpackages__", ], deps = [ "//java/src/org/openqa/selenium:core", + "//java/src/org/openqa/selenium/grid/config", "//java/src/org/openqa/selenium/json", "//java/src/org/openqa/selenium/remote/http", - "//java/src/org/openqa/selenium/grid/config", artifact("com.google.guava:guava"), ], ) diff --git a/java/src/org/openqa/selenium/grid/server/BUILD.bazel b/java/src/org/openqa/selenium/grid/server/BUILD.bazel index c0ee40af82c9d..715d8adb850bf 100644 --- a/java/src/org/openqa/selenium/grid/server/BUILD.bazel +++ b/java/src/org/openqa/selenium/grid/server/BUILD.bazel @@ -5,8 +5,8 @@ java_library( name = "server", srcs = glob(["*.java"]), visibility = [ - "//java/test/org/openqa/selenium/environment:__pkg__", "//java/src/org/openqa/selenium:__subpackages__", + "//java/test/org/openqa/selenium/environment:__pkg__", "//java/test/org/openqa/selenium/grid:__subpackages__", ], runtime_deps = [ @@ -15,12 +15,12 @@ java_library( deps = [ "//java:auto-service", "//java/src/org/openqa/selenium:core", - "//java/src/org/openqa/selenium/remote", "//java/src/org/openqa/selenium/events", "//java/src/org/openqa/selenium/grid/component", "//java/src/org/openqa/selenium/grid/config", "//java/src/org/openqa/selenium/grid/jmx", "//java/src/org/openqa/selenium/grid/web", + "//java/src/org/openqa/selenium/remote", artifact("com.beust:jcommander"), artifact("com.google.guava:guava"), artifact("javax.servlet:javax.servlet-api"), diff --git a/java/src/org/openqa/selenium/grid/session/BUILD.bazel b/java/src/org/openqa/selenium/grid/session/BUILD.bazel index ae2b215be90e1..551ed759669d4 100644 --- a/java/src/org/openqa/selenium/grid/session/BUILD.bazel +++ b/java/src/org/openqa/selenium/grid/session/BUILD.bazel @@ -12,10 +12,10 @@ java_library( "//java/src/org/openqa/selenium/remote/server:__subpackages__", ], deps = [ - "//java/src/org/openqa/selenium/remote", "//java/src/org/openqa/selenium/grid/data", "//java/src/org/openqa/selenium/grid/jmx", "//java/src/org/openqa/selenium/grid/web", + "//java/src/org/openqa/selenium/remote", artifact("com.google.guava:guava"), ], ) diff --git a/java/src/org/openqa/selenium/grid/sessionmap/BUILD.bazel b/java/src/org/openqa/selenium/grid/sessionmap/BUILD.bazel index 3169acbb49a43..0c8d812e8c185 100644 --- a/java/src/org/openqa/selenium/grid/sessionmap/BUILD.bazel +++ b/java/src/org/openqa/selenium/grid/sessionmap/BUILD.bazel @@ -13,10 +13,10 @@ java_library( ], deps = [ "//java/src/org/openqa/selenium:core", + "//java/src/org/openqa/selenium/grid/data", "//java/src/org/openqa/selenium/json", "//java/src/org/openqa/selenium/remote", "//java/src/org/openqa/selenium/remote/http", - "//java/src/org/openqa/selenium/grid/data", "//java/src/org/openqa/selenium/status", artifact("com.google.guava:guava"), ], diff --git a/java/src/org/openqa/selenium/grid/sessionmap/httpd/BUILD.bazel b/java/src/org/openqa/selenium/grid/sessionmap/httpd/BUILD.bazel index bde5d3e495586..61bbd869ee58d 100644 --- a/java/src/org/openqa/selenium/grid/sessionmap/httpd/BUILD.bazel +++ b/java/src/org/openqa/selenium/grid/sessionmap/httpd/BUILD.bazel @@ -11,13 +11,13 @@ java_library( deps = [ "//java:auto-service", "//java/src/org/openqa/selenium:core", - "//java/src/org/openqa/selenium/json", "//java/src/org/openqa/selenium/cli", "//java/src/org/openqa/selenium/grid:base-command", "//java/src/org/openqa/selenium/grid/config", "//java/src/org/openqa/selenium/grid/server", "//java/src/org/openqa/selenium/grid/sessionmap", "//java/src/org/openqa/selenium/grid/sessionmap/config", + "//java/src/org/openqa/selenium/json", "//java/src/org/openqa/selenium/netty/server", artifact("com.beust:jcommander"), artifact("com.google.guava:guava"), diff --git a/java/src/org/openqa/selenium/grid/sessionmap/jdbc/BUILD.bazel b/java/src/org/openqa/selenium/grid/sessionmap/jdbc/BUILD.bazel index 0f3bdeb604e96..b838c2e349af5 100644 --- a/java/src/org/openqa/selenium/grid/sessionmap/jdbc/BUILD.bazel +++ b/java/src/org/openqa/selenium/grid/sessionmap/jdbc/BUILD.bazel @@ -15,9 +15,9 @@ java_export( ], deps = [ "//java:auto-service", + "//java/src/org/openqa/selenium/grid", "//java/src/org/openqa/selenium/json", "//java/src/org/openqa/selenium/remote", - "//java/src/org/openqa/selenium/grid", artifact("com.beust:jcommander"), artifact("com.google.guava:guava"), ], diff --git a/java/src/org/openqa/selenium/grid/sessionmap/local/BUILD.bazel b/java/src/org/openqa/selenium/grid/sessionmap/local/BUILD.bazel index e2e288d88d5a9..8aebc4c6c52c9 100644 --- a/java/src/org/openqa/selenium/grid/sessionmap/local/BUILD.bazel +++ b/java/src/org/openqa/selenium/grid/sessionmap/local/BUILD.bazel @@ -9,12 +9,12 @@ java_library( "//java/test/org/openqa/selenium/grid:__subpackages__", ], deps = [ - "//java/src/org/openqa/selenium/remote", "//java/src/org/openqa/selenium/events", "//java/src/org/openqa/selenium/grid/config", "//java/src/org/openqa/selenium/grid/data", "//java/src/org/openqa/selenium/grid/log", "//java/src/org/openqa/selenium/grid/server", "//java/src/org/openqa/selenium/grid/sessionmap", + "//java/src/org/openqa/selenium/remote", ], ) diff --git a/java/src/org/openqa/selenium/grid/sessionmap/redis/BUILD.bazel b/java/src/org/openqa/selenium/grid/sessionmap/redis/BUILD.bazel index 68a30b53e8f2a..819cf323c550d 100644 --- a/java/src/org/openqa/selenium/grid/sessionmap/redis/BUILD.bazel +++ b/java/src/org/openqa/selenium/grid/sessionmap/redis/BUILD.bazel @@ -15,10 +15,10 @@ java_export( "//java/src/org/openqa/selenium/grid", ], deps = [ - "//java/src/org/openqa/selenium/json", - "//java/src/org/openqa/selenium/remote", "//java/src/org/openqa/selenium/grid", + "//java/src/org/openqa/selenium/json", "//java/src/org/openqa/selenium/redis", + "//java/src/org/openqa/selenium/remote", artifact("com.google.guava:guava"), artifact("io.lettuce:lettuce-core"), ], diff --git a/java/src/org/openqa/selenium/grid/sessionmap/remote/BUILD.bazel b/java/src/org/openqa/selenium/grid/sessionmap/remote/BUILD.bazel index 913739fad2e7b..1d250a65cbb16 100644 --- a/java/src/org/openqa/selenium/grid/sessionmap/remote/BUILD.bazel +++ b/java/src/org/openqa/selenium/grid/sessionmap/remote/BUILD.bazel @@ -8,7 +8,6 @@ java_library( "//java/test/org/openqa/selenium/grid:__subpackages__", ], deps = [ - "//java/src/org/openqa/selenium/remote", "//java/src/org/openqa/selenium/grid/config", "//java/src/org/openqa/selenium/grid/data", "//java/src/org/openqa/selenium/grid/log", @@ -16,5 +15,6 @@ java_library( "//java/src/org/openqa/selenium/grid/sessionmap", "//java/src/org/openqa/selenium/grid/sessionmap/config", "//java/src/org/openqa/selenium/grid/web", + "//java/src/org/openqa/selenium/remote", ], ) diff --git a/java/src/org/openqa/selenium/grid/sessionqueue/BUILD.bazel b/java/src/org/openqa/selenium/grid/sessionqueue/BUILD.bazel index ef611a4b24189..5f8c1b2f43e8f 100644 --- a/java/src/org/openqa/selenium/grid/sessionqueue/BUILD.bazel +++ b/java/src/org/openqa/selenium/grid/sessionqueue/BUILD.bazel @@ -13,14 +13,14 @@ java_library( ], deps = [ "//java/src/org/openqa/selenium:core", - "//java/src/org/openqa/selenium/json", - "//java/src/org/openqa/selenium/remote", - "//java/src/org/openqa/selenium/remote/http", "//java/src/org/openqa/selenium/events", "//java/src/org/openqa/selenium/grid/data", "//java/src/org/openqa/selenium/grid/jmx", "//java/src/org/openqa/selenium/grid/log", "//java/src/org/openqa/selenium/grid/security", + "//java/src/org/openqa/selenium/json", + "//java/src/org/openqa/selenium/remote", + "//java/src/org/openqa/selenium/remote/http", "//java/src/org/openqa/selenium/status", artifact("com.google.guava:guava"), ], diff --git a/java/src/org/openqa/selenium/grid/sessionqueue/httpd/BUILD.bazel b/java/src/org/openqa/selenium/grid/sessionqueue/httpd/BUILD.bazel index 87c9e5a7abbab..91cb97059421e 100644 --- a/java/src/org/openqa/selenium/grid/sessionqueue/httpd/BUILD.bazel +++ b/java/src/org/openqa/selenium/grid/sessionqueue/httpd/BUILD.bazel @@ -11,7 +11,6 @@ java_library( deps = [ "//java:auto-service", "//java/src/org/openqa/selenium:core", - "//java/src/org/openqa/selenium/json", "//java/src/org/openqa/selenium/cli", "//java/src/org/openqa/selenium/grid:base-command", "//java/src/org/openqa/selenium/grid/config", @@ -19,6 +18,7 @@ java_library( "//java/src/org/openqa/selenium/grid/sessionqueue", "//java/src/org/openqa/selenium/grid/sessionqueue/config", "//java/src/org/openqa/selenium/grid/sessionqueue/local", + "//java/src/org/openqa/selenium/json", "//java/src/org/openqa/selenium/netty/server", artifact("com.beust:jcommander"), artifact("com.google.guava:guava"), diff --git a/java/src/org/openqa/selenium/grid/sessionqueue/local/BUILD.bazel b/java/src/org/openqa/selenium/grid/sessionqueue/local/BUILD.bazel index 8bcfb9a186206..601027e3142ff 100644 --- a/java/src/org/openqa/selenium/grid/sessionqueue/local/BUILD.bazel +++ b/java/src/org/openqa/selenium/grid/sessionqueue/local/BUILD.bazel @@ -10,7 +10,6 @@ java_library( "//java/test/org/openqa/selenium/grid:__subpackages__", ], deps = [ - "//java/src/org/openqa/selenium/remote", "//java/src/org/openqa/selenium/concurrent", "//java/src/org/openqa/selenium/events", "//java/src/org/openqa/selenium/grid/config", @@ -22,6 +21,7 @@ java_library( "//java/src/org/openqa/selenium/grid/server", "//java/src/org/openqa/selenium/grid/sessionqueue", "//java/src/org/openqa/selenium/grid/sessionqueue/config", + "//java/src/org/openqa/selenium/remote", artifact("com.google.guava:guava"), ], ) diff --git a/java/src/org/openqa/selenium/grid/sessionqueue/remote/BUILD.bazel b/java/src/org/openqa/selenium/grid/sessionqueue/remote/BUILD.bazel index 5828c8c9dbf38..27ddf5111011e 100644 --- a/java/src/org/openqa/selenium/grid/sessionqueue/remote/BUILD.bazel +++ b/java/src/org/openqa/selenium/grid/sessionqueue/remote/BUILD.bazel @@ -10,8 +10,6 @@ java_library( "//java/test/org/openqa/selenium/grid/sessionqueue:__subpackages__", ], deps = [ - "//java/src/org/openqa/selenium/json", - "//java/src/org/openqa/selenium/remote", "//java/src/org/openqa/selenium/grid/config", "//java/src/org/openqa/selenium/grid/data", "//java/src/org/openqa/selenium/grid/log", @@ -20,6 +18,8 @@ java_library( "//java/src/org/openqa/selenium/grid/sessionqueue", "//java/src/org/openqa/selenium/grid/sessionqueue/config", "//java/src/org/openqa/selenium/grid/web", + "//java/src/org/openqa/selenium/json", + "//java/src/org/openqa/selenium/remote", artifact("com.google.guava:guava"), ], ) diff --git a/java/src/org/openqa/selenium/grid/web/BUILD.bazel b/java/src/org/openqa/selenium/grid/web/BUILD.bazel index 64667c2f0b61b..1cbb71a7577c1 100644 --- a/java/src/org/openqa/selenium/grid/web/BUILD.bazel +++ b/java/src/org/openqa/selenium/grid/web/BUILD.bazel @@ -5,7 +5,6 @@ java_library( name = "web", srcs = glob(["*.java"]), visibility = [ - "//java/test/org/openqa/selenium:__subpackages__", "//java/src/org/openqa/selenium/grid:__subpackages__", "//java/src/org/openqa/selenium/netty/server:__pkg__", "//java/src/org/openqa/selenium/remote/server:__subpackages__", diff --git a/java/src/org/openqa/selenium/io/BUILD.bazel b/java/src/org/openqa/selenium/io/BUILD.bazel index 1e0936a9a7d92..110f49478e510 100644 --- a/java/src/org/openqa/selenium/io/BUILD.bazel +++ b/java/src/org/openqa/selenium/io/BUILD.bazel @@ -4,11 +4,11 @@ java_library( name = "io", srcs = glob(["*.java"]), visibility = [ - "//java/src/org/openqa/selenium/os:__pkg__", - "//java/src/org/openqa/selenium/remote:__pkg__", - "//java/test/org/openqa/selenium/io:__pkg__", "//java/src/dev/selenium/tools/jar:__pkg__", "//java/src/dev/selenium/tools/javadoc:__pkg__", "//java/src/dev/selenium/tools/modules:__pkg__", + "//java/src/org/openqa/selenium/os:__pkg__", + "//java/src/org/openqa/selenium/remote:__pkg__", + "//java/test/org/openqa/selenium/io:__pkg__", ], ) diff --git a/java/src/org/openqa/selenium/jre/server/BUILD.bazel b/java/src/org/openqa/selenium/jre/server/BUILD.bazel index 484bb824cd30b..f8c4fca6cc378 100644 --- a/java/src/org/openqa/selenium/jre/server/BUILD.bazel +++ b/java/src/org/openqa/selenium/jre/server/BUILD.bazel @@ -5,7 +5,6 @@ java_library( name = "server", srcs = glob(["*.java"]), visibility = [ - "//java/test/org/openqa/selenium:__subpackages__", "//java/src/org/openqa/selenium/server/htmlrunner:__pkg__", "//java/test/com/thoughtworks/selenium/webdriven:__pkg__", "//java/test/org/openqa/selenium:__subpackages__", @@ -15,8 +14,8 @@ java_library( ], deps = [ "//java/src/org/openqa/selenium:core", - "//java/src/org/openqa/selenium/remote/http", "//java/src/org/openqa/selenium/grid/server", + "//java/src/org/openqa/selenium/remote/http", artifact("com.google.guava:guava"), ], ) diff --git a/java/src/org/openqa/selenium/netty/server/BUILD.bazel b/java/src/org/openqa/selenium/netty/server/BUILD.bazel index f1b4e777c8ae8..e08f1233945b6 100644 --- a/java/src/org/openqa/selenium/netty/server/BUILD.bazel +++ b/java/src/org/openqa/selenium/netty/server/BUILD.bazel @@ -5,22 +5,21 @@ java_library( name = "server", srcs = glob(["*.java"]), visibility = [ - "//java/test/org/openqa/selenium:__subpackages__", "//java/src/org/openqa/selenium/grid:__subpackages__", "//java/src/org/openqa/selenium/netty/server:__pkg__", "//java/src/org/openqa/selenium/remote/server:__pkg__", "//java/test/org/openqa/selenium:__subpackages__", ], exports = [ - "//java/src/org/openqa/selenium/remote/http", "//java/src/org/openqa/selenium/grid/server", + "//java/src/org/openqa/selenium/remote/http", ], deps = [ "//java/src/org/openqa/selenium:core", - "//java/src/org/openqa/selenium/remote", - "//java/src/org/openqa/selenium/remote/http", "//java/src/org/openqa/selenium/grid/server", "//java/src/org/openqa/selenium/grid/web", + "//java/src/org/openqa/selenium/remote", + "//java/src/org/openqa/selenium/remote/http", artifact("com.google.guava:guava"), artifact("io.netty:netty-buffer"), artifact("io.netty:netty-codec-http"), diff --git a/java/src/org/openqa/selenium/remote/server/BUILD.bazel b/java/src/org/openqa/selenium/remote/server/BUILD.bazel index d61095293132c..677db44840578 100644 --- a/java/src/org/openqa/selenium/remote/server/BUILD.bazel +++ b/java/src/org/openqa/selenium/remote/server/BUILD.bazel @@ -34,9 +34,9 @@ java_library( "//java/test/com/thoughtworks/selenium:__subpackages__", ], deps = [ + "//java/src/org/openqa/selenium/grid", "//java/src/org/openqa/selenium/json", "//java/src/org/openqa/selenium/remote", - "//java/src/org/openqa/selenium/grid", artifact("com.google.guava:guava"), artifact("javax.servlet:javax.servlet-api"), ], diff --git a/java/src/org/openqa/selenium/remote/tracing/BUILD.bazel b/java/src/org/openqa/selenium/remote/tracing/BUILD.bazel index 09a3ed35f1be2..951e4c80cdc6b 100644 --- a/java/src/org/openqa/selenium/remote/tracing/BUILD.bazel +++ b/java/src/org/openqa/selenium/remote/tracing/BUILD.bazel @@ -26,8 +26,8 @@ java_library( ], deps = [ "//java/src/org/openqa/selenium:core", - "//java/src/org/openqa/selenium/remote/http", "//java/src/org/openqa/selenium/grid/config", + "//java/src/org/openqa/selenium/remote/http", artifact("com.google.guava:guava"), artifact("io.opentelemetry:opentelemetry-api"), artifact("io.opentelemetry:opentelemetry-context"), diff --git a/java/src/org/openqa/selenium/remote/tracing/opentelemetry/BUILD.bazel b/java/src/org/openqa/selenium/remote/tracing/opentelemetry/BUILD.bazel index ebf365adba40e..a092654a5e8c1 100644 --- a/java/src/org/openqa/selenium/remote/tracing/opentelemetry/BUILD.bazel +++ b/java/src/org/openqa/selenium/remote/tracing/opentelemetry/BUILD.bazel @@ -11,9 +11,9 @@ java_library( deps = [ "//java:auto-service", "//java/src/org/openqa/selenium:core", + "//java/src/org/openqa/selenium/grid/config", "//java/src/org/openqa/selenium/json", "//java/src/org/openqa/selenium/remote/tracing", - "//java/src/org/openqa/selenium/grid/config", artifact("com.google.guava:guava"), artifact("io.opentelemetry:opentelemetry-api"), artifact("io.opentelemetry:opentelemetry-context"), diff --git a/java/src/org/openqa/selenium/server/htmlrunner/BUILD.bazel b/java/src/org/openqa/selenium/server/htmlrunner/BUILD.bazel index 02bf1704478e8..80a4b693988b5 100644 --- a/java/src/org/openqa/selenium/server/htmlrunner/BUILD.bazel +++ b/java/src/org/openqa/selenium/server/htmlrunner/BUILD.bazel @@ -22,15 +22,15 @@ java_library( "//java/src/org/openqa/selenium/chrome", "//java/src/org/openqa/selenium/edge", "//java/src/org/openqa/selenium/firefox", + "//java/src/org/openqa/selenium/grid/config", + "//java/src/org/openqa/selenium/grid/server", + "//java/src/org/openqa/selenium/grid/web", "//java/src/org/openqa/selenium/ie", + "//java/src/org/openqa/selenium/jre/server", "//java/src/org/openqa/selenium/json", "//java/src/org/openqa/selenium/opera", "//java/src/org/openqa/selenium/remote/http", "//java/src/org/openqa/selenium/safari", - "//java/src/org/openqa/selenium/grid/config", - "//java/src/org/openqa/selenium/grid/server", - "//java/src/org/openqa/selenium/grid/web", - "//java/src/org/openqa/selenium/jre/server", artifact("com.beust:jcommander"), artifact("com.google.guava:guava"), ], diff --git a/java/test/org/openqa/selenium/BUILD.bazel b/java/test/org/openqa/selenium/BUILD.bazel index 385721eea6a81..059ef0ffc8fc5 100644 --- a/java/test/org/openqa/selenium/BUILD.bazel +++ b/java/test/org/openqa/selenium/BUILD.bazel @@ -43,10 +43,7 @@ java_library( "WaitingConditions.java", "WrappedWebElement.java", ], - visibility = [ - "//java/test:__subpackages__", - "//java/test:__subpackages__", - ], + visibility = ["//java/test:__subpackages__"], deps = [ "//java/src/org/openqa/selenium:core", "//java/src/org/openqa/selenium/support", @@ -68,6 +65,9 @@ java_selenium_test_suite( ], deps = [ ":helpers", + "//java/src/org/openqa/selenium/grid/config", + "//java/src/org/openqa/selenium/jre/server", + "//java/src/org/openqa/selenium/netty/server", "//java/src/org/openqa/selenium/remote", "//java/src/org/openqa/selenium/support", "//java/test/org/openqa/selenium/build", @@ -75,9 +75,6 @@ java_selenium_test_suite( "//java/test/org/openqa/selenium/testing:annotations", "//java/test/org/openqa/selenium/testing:test-base", "//java/test/org/openqa/selenium/testing/drivers", - "//java/src/org/openqa/selenium/grid/config", - "//java/src/org/openqa/selenium/jre/server", - "//java/src/org/openqa/selenium/netty/server", artifact("com.google.guava:guava"), artifact("io.netty:netty-codec-haproxy"), artifact("io.netty:netty-codec-http"), diff --git a/java/test/org/openqa/selenium/build/BUILD.bazel b/java/test/org/openqa/selenium/build/BUILD.bazel index d029d55e82656..e2fe173358bab 100644 --- a/java/test/org/openqa/selenium/build/BUILD.bazel +++ b/java/test/org/openqa/selenium/build/BUILD.bazel @@ -4,11 +4,7 @@ load("//java:defs.bzl", "java_library") java_library( name = "build", srcs = glob(["*.java"]), - visibility = [ - "//java/test:__subpackages__", - "//java/test:__subpackages__", - "//java/test:__subpackages__", - ], + visibility = ["//java/test:__subpackages__"], deps = [ "//java/src/org/openqa/selenium:core", "//java/src/org/openqa/selenium/os", diff --git a/java/test/org/openqa/selenium/chrome/BUILD.bazel b/java/test/org/openqa/selenium/chrome/BUILD.bazel index e5a8542df5ac6..5c46d1004d3f1 100644 --- a/java/test/org/openqa/selenium/chrome/BUILD.bazel +++ b/java/test/org/openqa/selenium/chrome/BUILD.bazel @@ -11,6 +11,10 @@ java_selenium_test_suite( data = [ "//third_party/chrome_ext:backspace.crx", ], + javacopts = [ + "--release", + "11", + ], deps = [ "//java/src/org/openqa/selenium/chrome", "//java/src/org/openqa/selenium/remote", @@ -22,8 +26,4 @@ java_selenium_test_suite( artifact("org.assertj:assertj-core"), artifact("org.mockito:mockito-core"), ], - javacopts = [ - "--release", - "11", - ], ) diff --git a/java/test/org/openqa/selenium/docker/BUILD.bazel b/java/test/org/openqa/selenium/docker/BUILD.bazel index 924975b633d78..5605fd4bc9d78 100644 --- a/java/test/org/openqa/selenium/docker/BUILD.bazel +++ b/java/test/org/openqa/selenium/docker/BUILD.bazel @@ -6,9 +6,9 @@ java_test_suite( size = "small", srcs = glob(["**/*Test.java"]), deps = [ + "//java/src/org/openqa/selenium/docker", "//java/src/org/openqa/selenium/json", "//java/src/org/openqa/selenium/remote/http", - "//java/src/org/openqa/selenium/docker", artifact("junit:junit"), artifact("org.assertj:assertj-core"), ], diff --git a/java/test/org/openqa/selenium/environment/BUILD.bazel b/java/test/org/openqa/selenium/environment/BUILD.bazel index 722df85ce348d..b124cd3bd1ad7 100644 --- a/java/test/org/openqa/selenium/environment/BUILD.bazel +++ b/java/test/org/openqa/selenium/environment/BUILD.bazel @@ -41,22 +41,20 @@ java_library( "11", ], visibility = [ - "//java/test:__subpackages__", - "//java/test:__subpackages__", "//java/test:__subpackages__", "//javascript:__subpackages__", ], deps = [ "//java/src/org/openqa/selenium:core", - "//java/src/org/openqa/selenium/json", - "//java/src/org/openqa/selenium/remote", - "//java/src/org/openqa/selenium/remote/http", - "//java/test/org/openqa/selenium/build", "//java/src/org/openqa/selenium/grid/config", "//java/src/org/openqa/selenium/grid/security", "//java/src/org/openqa/selenium/grid/server", "//java/src/org/openqa/selenium/grid/web", + "//java/src/org/openqa/selenium/json", "//java/src/org/openqa/selenium/netty/server", + "//java/src/org/openqa/selenium/remote", + "//java/src/org/openqa/selenium/remote/http", + "//java/test/org/openqa/selenium/build", artifact("com.google.guava:guava"), artifact("org.assertj:assertj-core"), ], diff --git a/java/test/org/openqa/selenium/grid/data/BUILD.bazel b/java/test/org/openqa/selenium/grid/data/BUILD.bazel index 4bca00b5e084d..373e6aa74f0cc 100644 --- a/java/test/org/openqa/selenium/grid/data/BUILD.bazel +++ b/java/test/org/openqa/selenium/grid/data/BUILD.bazel @@ -7,10 +7,10 @@ java_test_suite( srcs = glob(["*Test.java"]), deps = [ "//java/src/org/openqa/selenium:core", - "//java/src/org/openqa/selenium/json", - "//java/src/org/openqa/selenium/remote", "//java/src/org/openqa/selenium/grid/data", "//java/src/org/openqa/selenium/grid/security", + "//java/src/org/openqa/selenium/json", + "//java/src/org/openqa/selenium/remote", artifact("com.google.guava:guava"), artifact("junit:junit"), artifact("org.assertj:assertj-core"), diff --git a/java/test/org/openqa/selenium/grid/distributor/BUILD.bazel b/java/test/org/openqa/selenium/grid/distributor/BUILD.bazel index 73f631f432b89..4cba31006e661 100644 --- a/java/test/org/openqa/selenium/grid/distributor/BUILD.bazel +++ b/java/test/org/openqa/selenium/grid/distributor/BUILD.bazel @@ -11,10 +11,6 @@ java_test_suite( ], deps = [ "//java/src/org/openqa/selenium:core", - "//java/src/org/openqa/selenium/json", - "//java/src/org/openqa/selenium/remote", - "//java/src/org/openqa/selenium/support", - "//java/test/org/openqa/selenium/remote/tracing:tracing-support", "//java/src/org/openqa/selenium/events", "//java/src/org/openqa/selenium/events/local", "//java/src/org/openqa/selenium/events/zeromq", @@ -32,7 +28,11 @@ java_test_suite( "//java/src/org/openqa/selenium/grid/sessionqueue", "//java/src/org/openqa/selenium/grid/sessionqueue/local", "//java/src/org/openqa/selenium/grid/web", + "//java/src/org/openqa/selenium/json", + "//java/src/org/openqa/selenium/remote", + "//java/src/org/openqa/selenium/support", "//java/test/org/openqa/selenium/grid/testing", + "//java/test/org/openqa/selenium/remote/tracing:tracing-support", artifact("com.google.guava:guava"), artifact("io.opentelemetry:opentelemetry-api"), artifact("junit:junit"), diff --git a/java/test/org/openqa/selenium/grid/distributor/selector/BUILD.bazel b/java/test/org/openqa/selenium/grid/distributor/selector/BUILD.bazel index 8672b25aeda87..3b665180db6a6 100644 --- a/java/test/org/openqa/selenium/grid/distributor/selector/BUILD.bazel +++ b/java/test/org/openqa/selenium/grid/distributor/selector/BUILD.bazel @@ -6,9 +6,6 @@ java_test_suite( size = "small", srcs = glob(["*.java"]), deps = [ - "//java/src/org/openqa/selenium/remote", - "//java/src/org/openqa/selenium/remote/http", - "//java/test/org/openqa/selenium/remote/tracing:tracing-support", "//java/src/org/openqa/selenium/events", "//java/src/org/openqa/selenium/events/local", "//java/src/org/openqa/selenium/grid/data", @@ -16,7 +13,10 @@ java_test_suite( "//java/src/org/openqa/selenium/grid/node", "//java/src/org/openqa/selenium/grid/node/local", "//java/src/org/openqa/selenium/grid/security", + "//java/src/org/openqa/selenium/remote", + "//java/src/org/openqa/selenium/remote/http", "//java/test/org/openqa/selenium/grid/testing", + "//java/test/org/openqa/selenium/remote/tracing:tracing-support", artifact("com.google.guava:guava"), artifact("junit:junit"), artifact("org.assertj:assertj-core"), diff --git a/java/test/org/openqa/selenium/grid/graphql/BUILD.bazel b/java/test/org/openqa/selenium/grid/graphql/BUILD.bazel index 2ea2f8dd19dac..873fa346d7991 100644 --- a/java/test/org/openqa/selenium/grid/graphql/BUILD.bazel +++ b/java/test/org/openqa/selenium/grid/graphql/BUILD.bazel @@ -10,10 +10,6 @@ java_test_suite( "11", ], deps = [ - "//java/src/org/openqa/selenium/json", - "//java/src/org/openqa/selenium/remote", - "//java/src/org/openqa/selenium/support", - "//java/test/org/openqa/selenium/remote/tracing:tracing-support", "//java/src/org/openqa/selenium/events", "//java/src/org/openqa/selenium/events/local", "//java/src/org/openqa/selenium/grid/data", @@ -28,7 +24,11 @@ java_test_suite( "//java/src/org/openqa/selenium/grid/sessionmap/local", "//java/src/org/openqa/selenium/grid/sessionqueue", "//java/src/org/openqa/selenium/grid/sessionqueue/local", + "//java/src/org/openqa/selenium/json", + "//java/src/org/openqa/selenium/remote", + "//java/src/org/openqa/selenium/support", "//java/test/org/openqa/selenium/grid/testing", + "//java/test/org/openqa/selenium/remote/tracing:tracing-support", artifact("com.google.guava:guava"), artifact("junit:junit"), artifact("org.assertj:assertj-core"), diff --git a/java/test/org/openqa/selenium/grid/gridui/BUILD.bazel b/java/test/org/openqa/selenium/grid/gridui/BUILD.bazel index 7aacda4279da0..80d4aa58ca78f 100644 --- a/java/test/org/openqa/selenium/grid/gridui/BUILD.bazel +++ b/java/test/org/openqa/selenium/grid/gridui/BUILD.bazel @@ -10,12 +10,6 @@ java_selenium_test_suite( ], deps = [ "//java/src/org/openqa/selenium:core", - "//java/src/org/openqa/selenium/json", - "//java/src/org/openqa/selenium/remote", - "//java/src/org/openqa/selenium/remote/http", - "//java/src/org/openqa/selenium/support/ui:wait", - "//java/test/org/openqa/selenium/testing:test-base", - "//java/test/org/openqa/selenium/testing/drivers", "//java/src/org/openqa/selenium/grid", "//java/src/org/openqa/selenium/grid/commands", "//java/src/org/openqa/selenium/grid/config", @@ -23,6 +17,12 @@ java_selenium_test_suite( "//java/src/org/openqa/selenium/grid/node", "//java/src/org/openqa/selenium/grid/server", "//java/src/org/openqa/selenium/grid/web", + "//java/src/org/openqa/selenium/json", + "//java/src/org/openqa/selenium/remote", + "//java/src/org/openqa/selenium/remote/http", + "//java/src/org/openqa/selenium/support/ui:wait", + "//java/test/org/openqa/selenium/testing:test-base", + "//java/test/org/openqa/selenium/testing/drivers", artifact("com.google.guava:guava"), artifact("junit:junit"), artifact("org.assertj:assertj-core"), diff --git a/java/test/org/openqa/selenium/grid/node/BUILD.bazel b/java/test/org/openqa/selenium/grid/node/BUILD.bazel index b711173430d43..7a5a9a7344ad3 100644 --- a/java/test/org/openqa/selenium/grid/node/BUILD.bazel +++ b/java/test/org/openqa/selenium/grid/node/BUILD.bazel @@ -10,10 +10,6 @@ java_test_suite( ], deps = [ "//java/src/org/openqa/selenium:core", - "//java/src/org/openqa/selenium/json", - "//java/src/org/openqa/selenium/remote", - "//java/src/org/openqa/selenium/support", - "//java/test/org/openqa/selenium/remote/tracing:tracing-support", "//java/src/org/openqa/selenium/events", "//java/src/org/openqa/selenium/events/local", "//java/src/org/openqa/selenium/grid/data", @@ -23,7 +19,11 @@ java_test_suite( "//java/src/org/openqa/selenium/grid/node/remote", "//java/src/org/openqa/selenium/grid/security", "//java/src/org/openqa/selenium/grid/web", + "//java/src/org/openqa/selenium/json", + "//java/src/org/openqa/selenium/remote", + "//java/src/org/openqa/selenium/support", "//java/test/org/openqa/selenium/grid/testing", + "//java/test/org/openqa/selenium/remote/tracing:tracing-support", artifact("com.google.guava:guava"), artifact("io.opentelemetry:opentelemetry-api"), artifact("junit:junit"), diff --git a/java/test/org/openqa/selenium/grid/node/config/BUILD.bazel b/java/test/org/openqa/selenium/grid/node/config/BUILD.bazel index 13fe399bdc32b..4bd9f9bd41559 100644 --- a/java/test/org/openqa/selenium/grid/node/config/BUILD.bazel +++ b/java/test/org/openqa/selenium/grid/node/config/BUILD.bazel @@ -9,22 +9,22 @@ java_test_suite( "//java/src/org/openqa/selenium:core", "//java/src/org/openqa/selenium/chrome", "//java/src/org/openqa/selenium/edge", - "//java/src/org/openqa/selenium/firefox", - "//java/src/org/openqa/selenium/ie", - "//java/src/org/openqa/selenium/json", - "//java/src/org/openqa/selenium/remote", - "//java/src/org/openqa/selenium/remote/http", - "//java/src/org/openqa/selenium/safari", - "//java/test/org/openqa/selenium/remote/tracing:tracing-support", "//java/src/org/openqa/selenium/events", "//java/src/org/openqa/selenium/events/local", + "//java/src/org/openqa/selenium/firefox", "//java/src/org/openqa/selenium/grid/config", "//java/src/org/openqa/selenium/grid/data", "//java/src/org/openqa/selenium/grid/node", "//java/src/org/openqa/selenium/grid/node/config", "//java/src/org/openqa/selenium/grid/node/local", "//java/src/org/openqa/selenium/grid/security", + "//java/src/org/openqa/selenium/ie", + "//java/src/org/openqa/selenium/json", + "//java/src/org/openqa/selenium/remote", + "//java/src/org/openqa/selenium/remote/http", + "//java/src/org/openqa/selenium/safari", "//java/test/org/openqa/selenium/grid/testing", + "//java/test/org/openqa/selenium/remote/tracing:tracing-support", artifact("com.google.guava:guava"), artifact("io.opentelemetry:opentelemetry-api"), artifact("junit:junit"), diff --git a/java/test/org/openqa/selenium/grid/node/local/BUILD.bazel b/java/test/org/openqa/selenium/grid/node/local/BUILD.bazel index d3298c744efb5..547140e146218 100644 --- a/java/test/org/openqa/selenium/grid/node/local/BUILD.bazel +++ b/java/test/org/openqa/selenium/grid/node/local/BUILD.bazel @@ -6,16 +6,16 @@ java_test_suite( size = "small", srcs = glob(["*Test.java"]), deps = [ - "//java/src/org/openqa/selenium/json", - "//java/src/org/openqa/selenium/remote", - "//java/test/org/openqa/selenium/remote/tracing:tracing-support", "//java/src/org/openqa/selenium/events", "//java/src/org/openqa/selenium/events/local", "//java/src/org/openqa/selenium/grid/data", "//java/src/org/openqa/selenium/grid/node", "//java/src/org/openqa/selenium/grid/node/local", "//java/src/org/openqa/selenium/grid/security", + "//java/src/org/openqa/selenium/json", + "//java/src/org/openqa/selenium/remote", "//java/test/org/openqa/selenium/grid/testing", + "//java/test/org/openqa/selenium/remote/tracing:tracing-support", artifact("com.google.guava:guava"), artifact("io.opentelemetry:opentelemetry-api"), artifact("junit:junit"), diff --git a/java/test/org/openqa/selenium/grid/node/relay/BUILD.bazel b/java/test/org/openqa/selenium/grid/node/relay/BUILD.bazel index 2b9e2a47234cf..410d863018ab0 100644 --- a/java/test/org/openqa/selenium/grid/node/relay/BUILD.bazel +++ b/java/test/org/openqa/selenium/grid/node/relay/BUILD.bazel @@ -6,12 +6,12 @@ java_test_suite( size = "medium", srcs = glob(["*Test.java"]), deps = [ - "//java/src/org/openqa/selenium/remote", - "//java/test/org/openqa/selenium/remote/tracing:tracing-support", "//java/src/org/openqa/selenium/grid/node", "//java/src/org/openqa/selenium/grid/node/relay", "//java/src/org/openqa/selenium/grid/server", + "//java/src/org/openqa/selenium/remote", "//java/test/org/openqa/selenium/grid/testing", + "//java/test/org/openqa/selenium/remote/tracing:tracing-support", artifact("junit:junit"), artifact("org.assertj:assertj-core"), ], diff --git a/java/test/org/openqa/selenium/grid/router/BUILD.bazel b/java/test/org/openqa/selenium/grid/router/BUILD.bazel index 65f2dc1a6b42a..f8007fe89b5d1 100644 --- a/java/test/org/openqa/selenium/grid/router/BUILD.bazel +++ b/java/test/org/openqa/selenium/grid/router/BUILD.bazel @@ -23,12 +23,12 @@ java_library( ], deps = [ "//java/src/org/openqa/selenium:core", + "//java/src/org/openqa/selenium/grid", + "//java/src/org/openqa/selenium/grid/config", "//java/src/org/openqa/selenium/json", "//java/src/org/openqa/selenium/remote/http", "//java/src/org/openqa/selenium/support", "//java/test/org/openqa/selenium/testing:test-base", - "//java/src/org/openqa/selenium/grid", - "//java/src/org/openqa/selenium/grid/config", ], ) @@ -78,14 +78,14 @@ java_test_suite( ], deps = [ ":support", + "//java/src/org/openqa/selenium/grid", + "//java/src/org/openqa/selenium/grid/config", "//java/src/org/openqa/selenium/json", "//java/src/org/openqa/selenium/remote", "//java/src/org/openqa/selenium/support", + "//java/test/org/openqa/selenium/grid/testing", "//java/test/org/openqa/selenium/remote/tracing:tracing-support", "//java/test/org/openqa/selenium/testing:test-base", - "//java/src/org/openqa/selenium/grid", - "//java/src/org/openqa/selenium/grid/config", - "//java/test/org/openqa/selenium/grid/testing", artifact("com.google.guava:guava"), artifact("io.opentelemetry:opentelemetry-api"), artifact("junit:junit"), diff --git a/java/test/org/openqa/selenium/grid/security/BUILD.bazel b/java/test/org/openqa/selenium/grid/security/BUILD.bazel index b745872a98a2b..c4610787fb87d 100644 --- a/java/test/org/openqa/selenium/grid/security/BUILD.bazel +++ b/java/test/org/openqa/selenium/grid/security/BUILD.bazel @@ -5,8 +5,8 @@ java_test_suite( size = "small", srcs = glob(["*.java"]), deps = [ - "//java/src/org/openqa/selenium/remote/http", "//java/src/org/openqa/selenium/grid/security", + "//java/src/org/openqa/selenium/remote/http", artifact("junit:junit"), artifact("org.assertj:assertj-core"), ], diff --git a/java/test/org/openqa/selenium/grid/server/BUILD.bazel b/java/test/org/openqa/selenium/grid/server/BUILD.bazel index 0b73e9aab838d..d6f6cea92644f 100644 --- a/java/test/org/openqa/selenium/grid/server/BUILD.bazel +++ b/java/test/org/openqa/selenium/grid/server/BUILD.bazel @@ -6,13 +6,13 @@ java_test_suite( size = "medium", srcs = glob(["*Test.java"]), deps = [ - "//java/src/org/openqa/selenium/json", - "//java/src/org/openqa/selenium/remote", - "//java/test/org/openqa/selenium/remote/tracing:tracing-support", "//java/src/org/openqa/selenium/grid/config", "//java/src/org/openqa/selenium/grid/server", "//java/src/org/openqa/selenium/grid/web", "//java/src/org/openqa/selenium/jre/server", + "//java/src/org/openqa/selenium/json", + "//java/src/org/openqa/selenium/remote", + "//java/test/org/openqa/selenium/remote/tracing:tracing-support", "//java/test/org/openqa/testing", artifact("com.google.guava:guava"), artifact("javax.servlet:javax.servlet-api"), diff --git a/java/test/org/openqa/selenium/grid/sessionmap/BUILD.bazel b/java/test/org/openqa/selenium/grid/sessionmap/BUILD.bazel index df5df60209573..c6d1eff84044f 100644 --- a/java/test/org/openqa/selenium/grid/sessionmap/BUILD.bazel +++ b/java/test/org/openqa/selenium/grid/sessionmap/BUILD.bazel @@ -6,16 +6,16 @@ java_test_suite( size = "small", srcs = glob(["*Test.java"]), deps = [ - "//java/src/org/openqa/selenium/remote", - "//java/src/org/openqa/selenium/support", - "//java/test/org/openqa/selenium/remote/tracing:tracing-support", "//java/src/org/openqa/selenium/events", "//java/src/org/openqa/selenium/events/local", "//java/src/org/openqa/selenium/grid/data", "//java/src/org/openqa/selenium/grid/sessionmap", "//java/src/org/openqa/selenium/grid/sessionmap/local", "//java/src/org/openqa/selenium/grid/sessionmap/remote", + "//java/src/org/openqa/selenium/remote", + "//java/src/org/openqa/selenium/support", "//java/test/org/openqa/selenium/grid/testing", + "//java/test/org/openqa/selenium/remote/tracing:tracing-support", artifact("junit:junit"), artifact("io.opentelemetry:opentelemetry-api"), artifact("org.assertj:assertj-core"), diff --git a/java/test/org/openqa/selenium/grid/sessionmap/jdbc/BUILD.bazel b/java/test/org/openqa/selenium/grid/sessionmap/jdbc/BUILD.bazel index 10d379119df62..70ac62bfb868f 100644 --- a/java/test/org/openqa/selenium/grid/sessionmap/jdbc/BUILD.bazel +++ b/java/test/org/openqa/selenium/grid/sessionmap/jdbc/BUILD.bazel @@ -6,11 +6,11 @@ java_test_suite( size = "medium", srcs = glob(["*Test.java"]), deps = [ + "//java/src/org/openqa/selenium/events/local", + "//java/src/org/openqa/selenium/grid/sessionmap/jdbc", "//java/src/org/openqa/selenium/remote", "//java/test/org/openqa/selenium/remote/tracing:tracing-support", "//java/test/org/openqa/selenium/testing:test-base", - "//java/src/org/openqa/selenium/events/local", - "//java/src/org/openqa/selenium/grid/sessionmap/jdbc", artifact("io.opentelemetry:opentelemetry-api"), artifact("junit:junit"), artifact("org.assertj:assertj-core"), diff --git a/java/test/org/openqa/selenium/grid/sessionmap/redis/BUILD.bazel b/java/test/org/openqa/selenium/grid/sessionmap/redis/BUILD.bazel index 313d73eaa0270..23ed55630263b 100644 --- a/java/test/org/openqa/selenium/grid/sessionmap/redis/BUILD.bazel +++ b/java/test/org/openqa/selenium/grid/sessionmap/redis/BUILD.bazel @@ -6,10 +6,10 @@ java_test_suite( size = "medium", srcs = glob(["*Test.java"]), deps = [ + "//java/src/org/openqa/selenium/grid/sessionmap/redis", "//java/src/org/openqa/selenium/remote", "//java/test/org/openqa/selenium/remote/tracing:tracing-support", "//java/test/org/openqa/selenium/testing:test-base", - "//java/src/org/openqa/selenium/grid/sessionmap/redis", artifact("io.opentelemetry:opentelemetry-api"), artifact("it.ozimov:embedded-redis"), artifact("junit:junit"), diff --git a/java/test/org/openqa/selenium/grid/sessionqueue/BUILD.bazel b/java/test/org/openqa/selenium/grid/sessionqueue/BUILD.bazel index 4cf6ec6a2a52f..b33f6bb57db0a 100644 --- a/java/test/org/openqa/selenium/grid/sessionqueue/BUILD.bazel +++ b/java/test/org/openqa/selenium/grid/sessionqueue/BUILD.bazel @@ -10,10 +10,6 @@ java_test_suite( "11", ], deps = [ - "//java/src/org/openqa/selenium/json", - "//java/src/org/openqa/selenium/remote", - "//java/src/org/openqa/selenium/support", - "//java/test/org/openqa/selenium/remote/tracing:tracing-support", "//java/src/org/openqa/selenium/events", "//java/src/org/openqa/selenium/events/local", "//java/src/org/openqa/selenium/grid/data", @@ -21,7 +17,11 @@ java_test_suite( "//java/src/org/openqa/selenium/grid/sessionqueue", "//java/src/org/openqa/selenium/grid/sessionqueue/local", "//java/src/org/openqa/selenium/grid/sessionqueue/remote", + "//java/src/org/openqa/selenium/json", + "//java/src/org/openqa/selenium/remote", + "//java/src/org/openqa/selenium/support", "//java/test/org/openqa/selenium/grid/testing", + "//java/test/org/openqa/selenium/remote/tracing:tracing-support", artifact("junit:junit"), artifact("io.opentelemetry:opentelemetry-api"), artifact("org.assertj:assertj-core"), diff --git a/java/test/org/openqa/selenium/grid/sessionqueue/local/BUILD.bazel b/java/test/org/openqa/selenium/grid/sessionqueue/local/BUILD.bazel index 8c16cc5cd625e..4c7f4b2b18c9a 100644 --- a/java/test/org/openqa/selenium/grid/sessionqueue/local/BUILD.bazel +++ b/java/test/org/openqa/selenium/grid/sessionqueue/local/BUILD.bazel @@ -10,11 +10,6 @@ java_test_suite( "11", ], deps = [ - "//java/src/org/openqa/selenium/json", - "//java/src/org/openqa/selenium/remote", - "//java/src/org/openqa/selenium/support", - "//java/test/org/openqa/selenium/remote/tracing:tracing-support", - "//java/test/org/openqa/selenium/testing:test-base", "//java/src/org/openqa/selenium/events", "//java/src/org/openqa/selenium/events/local", "//java/src/org/openqa/selenium/grid/data", @@ -22,7 +17,12 @@ java_test_suite( "//java/src/org/openqa/selenium/grid/sessionqueue", "//java/src/org/openqa/selenium/grid/sessionqueue/local", "//java/src/org/openqa/selenium/grid/sessionqueue/remote", + "//java/src/org/openqa/selenium/json", + "//java/src/org/openqa/selenium/remote", + "//java/src/org/openqa/selenium/support", "//java/test/org/openqa/selenium/grid/testing", + "//java/test/org/openqa/selenium/remote/tracing:tracing-support", + "//java/test/org/openqa/selenium/testing:test-base", artifact("com.google.guava:guava"), artifact("io.opentelemetry:opentelemetry-api"), artifact("junit:junit"), diff --git a/java/test/org/openqa/selenium/grid/testing/BUILD.bazel b/java/test/org/openqa/selenium/grid/testing/BUILD.bazel index 969dadd16ed9d..7bf6844f10cae 100644 --- a/java/test/org/openqa/selenium/grid/testing/BUILD.bazel +++ b/java/test/org/openqa/selenium/grid/testing/BUILD.bazel @@ -8,9 +8,9 @@ java_library( "//java/test/org/openqa/selenium/grid:__subpackages__", ], deps = [ - "//java/src/org/openqa/selenium/remote", "//java/src/org/openqa/selenium/grid/data", "//java/src/org/openqa/selenium/grid/node", + "//java/src/org/openqa/selenium/remote", artifact("org.assertj:assertj-core"), ], ) diff --git a/java/test/org/openqa/selenium/grid/web/BUILD.bazel b/java/test/org/openqa/selenium/grid/web/BUILD.bazel index 418250309caf1..e03ce512c7943 100644 --- a/java/test/org/openqa/selenium/grid/web/BUILD.bazel +++ b/java/test/org/openqa/selenium/grid/web/BUILD.bazel @@ -12,11 +12,11 @@ java_test_suite( "no-sandbox", ], deps = [ + "//java/src/org/openqa/selenium/grid/web", "//java/src/org/openqa/selenium/json", "//java/src/org/openqa/selenium/remote", "//java/src/org/openqa/selenium/remote/http", "//java/test/org/openqa/selenium/remote/tracing:tracing-support", - "//java/src/org/openqa/selenium/grid/web", artifact("com.google.guava:guava"), artifact("junit:junit"), artifact("org.assertj:assertj-core"), diff --git a/java/test/org/openqa/selenium/netty/server/BUILD.bazel b/java/test/org/openqa/selenium/netty/server/BUILD.bazel index 9423de7e7e1d7..e308282ce1b1c 100644 --- a/java/test/org/openqa/selenium/netty/server/BUILD.bazel +++ b/java/test/org/openqa/selenium/netty/server/BUILD.bazel @@ -27,11 +27,11 @@ java_test_suite( ), deps = [ "//java/src/org/openqa/selenium:core", + "//java/src/org/openqa/selenium/grid/config", + "//java/src/org/openqa/selenium/netty/server", "//java/src/org/openqa/selenium/remote/http", "//java/src/org/openqa/selenium/support", "//java/test/org/openqa/selenium/testing:test-base", - "//java/src/org/openqa/selenium/grid/config", - "//java/src/org/openqa/selenium/netty/server", artifact("com.google.guava:guava"), artifact("junit:junit"), artifact("org.assertj:assertj-core"), diff --git a/java/test/org/openqa/selenium/remote/tracing/BUILD.bazel b/java/test/org/openqa/selenium/remote/tracing/BUILD.bazel index 35b342d5227ad..1e0e531af5285 100644 --- a/java/test/org/openqa/selenium/remote/tracing/BUILD.bazel +++ b/java/test/org/openqa/selenium/remote/tracing/BUILD.bazel @@ -5,11 +5,7 @@ java_library( name = "tracing-support", testonly = True, srcs = glob(["*.java"]), - visibility = [ - "//java/test:__subpackages__", - "//java/test:__subpackages__", - "//java/test:__subpackages__", - ], + visibility = ["//java/test:__subpackages__"], deps = [ "//java/src/org/openqa/selenium/remote/tracing", "//java/src/org/openqa/selenium/remote/tracing/opentelemetry", diff --git a/java/test/org/openqa/selenium/remote/tracing/opentelemetry/BUILD.bazel b/java/test/org/openqa/selenium/remote/tracing/opentelemetry/BUILD.bazel index 3764963a9d248..823eb35c9b44e 100644 --- a/java/test/org/openqa/selenium/remote/tracing/opentelemetry/BUILD.bazel +++ b/java/test/org/openqa/selenium/remote/tracing/opentelemetry/BUILD.bazel @@ -6,10 +6,10 @@ java_test_suite( size = "small", srcs = glob(["*.java"]), deps = [ + "//java/src/org/openqa/selenium/grid/web", "//java/src/org/openqa/selenium/remote/tracing", "//java/src/org/openqa/selenium/remote/tracing/opentelemetry", "//java/test/org/openqa/selenium/testing:annotations", - "//java/src/org/openqa/selenium/grid/web", artifact("io.opentelemetry:opentelemetry-api"), artifact("io.opentelemetry:opentelemetry-sdk"), artifact("io.opentelemetry:opentelemetry-sdk-common"), diff --git a/java/test/org/openqa/selenium/support/ui/BUILD.bazel b/java/test/org/openqa/selenium/support/ui/BUILD.bazel index 0abe90fb32126..16eb56ff00c5e 100644 --- a/java/test/org/openqa/selenium/support/ui/BUILD.bazel +++ b/java/test/org/openqa/selenium/support/ui/BUILD.bazel @@ -11,10 +11,7 @@ java_library( srcs = [ "TickingClock.java", ], - visibility = [ - "//java/test:__subpackages__", - "//java/test:__subpackages__", - ], + visibility = ["//java/test:__subpackages__"], deps = ["//java/src/org/openqa/selenium/support/ui:clock"], ) diff --git a/java/test/org/openqa/selenium/testing/BUILD.bazel b/java/test/org/openqa/selenium/testing/BUILD.bazel index a683f560e5df9..f5752a6e6f152 100644 --- a/java/test/org/openqa/selenium/testing/BUILD.bazel +++ b/java/test/org/openqa/selenium/testing/BUILD.bazel @@ -3,18 +3,19 @@ load("//java:defs.bzl", "java_library", "java_test_suite") java_library( name = "testing", - exports = [ - ":annotations", - ":test-base", - ], testonly = True, visibility = [ "//java/test:__subpackages__", ], + exports = [ + ":annotations", + ":test-base", + ], ) java_library( name = "annotations", + testonly = True, srcs = [ "Ignore.java", "IgnoreList.java", @@ -27,12 +28,7 @@ java_library( "SwitchToTopAfterTest.java", "UnitTests.java", ], - testonly = True, - visibility = [ - "//java/test:__subpackages__", - "//java/test:__subpackages__", - "//java/test:__subpackages__", - ], + visibility = ["//java/test:__subpackages__"], exports = [ "//java/test/org/openqa/selenium/testing/drivers:browser", ], @@ -55,11 +51,7 @@ java_library( "TestIgnorance.java", "TestUtilities.java", ], - visibility = [ - "//java/test:__subpackages__", - "//java/test:__subpackages__", - "//java/test:__subpackages__", - ], + visibility = ["//java/test:__subpackages__"], deps = [ ":annotations", "//java/src/org/openqa/selenium:core", diff --git a/java/test/org/openqa/selenium/testing/drivers/BUILD.bazel b/java/test/org/openqa/selenium/testing/drivers/BUILD.bazel index 8fc68c595c078..b4152617dba7e 100644 --- a/java/test/org/openqa/selenium/testing/drivers/BUILD.bazel +++ b/java/test/org/openqa/selenium/testing/drivers/BUILD.bazel @@ -36,11 +36,7 @@ java_library( "--release", "11", ], - visibility = [ - "//java/test:__subpackages__", - "//java/test:__subpackages__", - "//java/test:__subpackages__", - ], + visibility = ["//java/test:__subpackages__"], exports = [ ":browser", ], diff --git a/scripts/BUILD.bazel b/scripts/BUILD.bazel index bc07b3ca4ab32..d7fd9824a555b 100644 --- a/scripts/BUILD.bazel +++ b/scripts/BUILD.bazel @@ -4,6 +4,6 @@ py_binary( name = "pinned_browsers", srcs = ["pinned_browsers.py"], deps = [ - requirement("urllib3"), + requirement("urllib3"), ], )