Merge branch 'trunk' into patch-1

.github/workflows/java.yml

@@ -127,7 +127,7 @@ jobs:
       - name: Run browser tests in Chrome
         uses: ./.github/actions/bazel-test
         with:
-          query: attr(tags, chrome, tests(//java/client/...)) except attr(tags, remote, tests(//java/client/...))
+          query: attr(tags, chrome, tests(//java/...)) except attr(tags, remote, tests(//java/...))
         env:
           DISPLAY: :99
 
@@ -160,7 +160,7 @@ jobs:
       - name: Run browser tests in Firefox
         uses: ./.github/actions/bazel-test
         with:
-          query: attr(tags, firefox, tests(//java/client/...)) except attr(tags, remote, tests(//java/client/...))
+          query: attr(tags, firefox, tests(//java/...)) except attr(tags, remote, tests(//java/...))
         env:
           DISPLAY: :99
 
@@ -196,7 +196,7 @@ jobs:
       - name: Run server tests
         uses: ./.github/actions/bazel-test
         with:
-          query: tests(//java/server/...) except attr(tags, 'lint|ie|edge|edgehtml|safari', tests(//java/server/...))
+          query: tests(//java/...) except attr(tags, 'lint|ie|edge|edgehtml|safari', tests(//java/...))
         env:
           DISPLAY: :99
 

BUILD.bazel

@@ -13,17 +13,17 @@ filegroup(
 
 alias(
     name = "grid",
-    actual = "//java/server/src/org/openqa/selenium/grid:executable-grid",
+    actual = "//java/src/org/openqa/selenium/grid:executable-grid",
 )
 
 alias(
     name = "pinned-grid",
-    actual = "//java/server/src/org/openqa/selenium/grid:pinned-grid",
+    actual = "//java/src/org/openqa/selenium/grid:pinned-grid",
 )
 
 alias(
     name = "debug-server",
-    actual = "//java/client/test/org/openqa/selenium/environment:appserver",
+    actual = "//java/test/org/openqa/selenium/environment:appserver",
 )
 
 alias(
@@ -33,7 +33,7 @@ alias(
 
 alias(
     name = "selenium-server-standalone",
-    actual = "//java/server/src/org/openqa/selenium/grid:selenium_server_deploy.jar",
+    actual = "//java/src/org/openqa/selenium/grid:selenium_server_deploy.jar",
 )
 
 java_binary(
@@ -47,7 +47,7 @@ java_binary(
     jvm_flags = chrome_jvm_flags + firefox_jvm_flags,
     main_class = "org.openqa.selenium.grid.Bootstrap",
     runtime_deps = [
-        "//java/server/src/org/openqa/selenium/grid",
+        "//java/src/org/openqa/selenium/grid",
         artifact("org.slf4j:slf4j-jdk14"),
     ],
 )

CONTRIBUTING.md

@@ -42,13 +42,13 @@ understanding how things work and learning effective ways to exploit
 its potential.
 
 The [seleniumhq.github.io](https://github.com/SeleniumHQ/seleniumhq.github.io/)
-repository contains both Selenium’s site and documentation. This is an ongoing
-effort (not targeted at any specific release) to provide updated information on
-how to use Selenium effectively, how to get involved and how to contribute to Selenium.
+repository contains both Selenium’s site and documentation. This is an ongoing effort (not targeted
+at any specific release) to provide updated information on how to use Selenium effectively, how to
+get involved and how to contribute to Selenium.
 
-The official documentation of Selenium is at https://selenium.dev/documentation/.
-More details on how to get involved and contribute, please check the site's
-and documentation [contributing guidelines](https://selenium.dev/documentation/en/contributing/).
+The official documentation of Selenium is at https://selenium.dev/documentation/. More details on
+how to get involved and contribute, please check the site's and
+documentation [contributing guidelines](https://www.selenium.dev/documentation/about/contributing/).
 
 ## Code Contributions
 

README.md

@@ -254,6 +254,12 @@ bazel test --test_size_filters=small,medium java/...
 Bazel's "test" command will run *all* tests in the package, including integration tests. Expect
 the ```test java/...``` to launch browsers and consume a considerable amount of time and resources.
 
+To bump the versions of the pinned browsers to their latest stable versions:
+
+```sh
+bazel run scripts:pinned_browsers > temp.bzl && mv temp.bzl common/repositories.bzl
+```
+
 ## Editing Code
 
 Most of the team use either Intellij IDEA or VS.Code for their day-to-day editing. If you're