Merge branch 'trunk' of https://github.com/SeleniumHQ/selenium into t…

…runk

.github/workflows/java.yml

@@ -72,7 +72,7 @@ jobs:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
 
   lint:
-    needs: small_tests
+    needs: build
     runs-on: ubuntu-latest
     steps:
       - name: Checkout source tree
@@ -120,7 +120,7 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: '11'
-      - name: Setup Chrome and chromedriver
+      - name: Setup Chrome and ChromeDriver
         uses: ./.github/actions/setup-chrome
       - name: Start XVFB
         run: Xvfb :99 &
@@ -153,20 +153,20 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: '11'
-      - name: Setup Firefox and geckodriver
+      - name: Setup Firefox and GeckoDriver
         uses: ./.github/actions/setup-firefox
       - name: Start XVFB
         run: Xvfb :99 &
       - name: Run browser tests in Firefox
         uses: ./.github/actions/bazel-test
         with:
-          query: attr(tags, firefox, tests(//java/...)) except attr(tags, remote, tests(//java/...))
+          query: attr(tags, firefox, tests(//java/...)) except attr(tags, 'rc|remote', tests(//java/...))
         env:
           DISPLAY: :99
 
 
   server_tests:
-    needs: small_tests
+    needs: [ chrome_tests, firefox_tests ]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout source tree
@@ -177,8 +177,10 @@ jobs:
           path: |
             ~/.cache/bazel-disk
             ~/.cache/bazel-repo
-          key: ${{ runner.os }}-bazel-firefox-tests-${{ hashFiles('**/BUILD.bazel') }}
+          key: ${{ runner.os }}-bazel-server-tests-${{ hashFiles('**/BUILD.bazel') }}
           restore-keys: |
+            ${{ runner.os }}-bazel-server-tests-
+            ${{ runner.os }}-bazel-chrome-tests-
             ${{ runner.os }}-bazel-firefox-tests-
             ${{ runner.os }}-bazel-build-
       - name: Setup bazelisk
@@ -187,16 +189,49 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: '11'
-      - name: Setup Chrome and chromedriver
+      - name: Setup Chrome and ChromeDriver
         uses: ./.github/actions/setup-chrome
-      - name: Setup Firefox and geckodriver
+      - name: Setup Firefox and GeckoDriver
         uses: ./.github/actions/setup-firefox
       - name: Start XVFB
         run: Xvfb :99 &
       - name: Run server tests
         uses: ./.github/actions/bazel-test
         with:
-          query: tests(//java/...) except attr(tags, 'lint|ie|edge|edgehtml|safari', tests(//java/...))
+          query: tests(//java/...) except attr(tags, 'rc|lint|ie|edge|edgehtml|safari', tests(//java/...))
+        env:
+          DISPLAY: :99
+
+  rc_tests:
+    needs: small_tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout source tree
+        uses: actions/checkout@v2
+      - name: Cache Bazel artifacts
+        uses: actions/cache@v2
+        with:
+          path: |
+            ~/.cache/bazel-disk
+            ~/.cache/bazel-repo
+          key: ${{ runner.os }}-bazel-firefox-tests-${{ hashFiles('**/BUILD.bazel') }}
+          restore-keys: |
+            ${{ runner.os }}-bazel-firefox-tests-
+            ${{ runner.os }}-bazel-build-
+      - name: Setup bazelisk
+        uses: ./.github/actions/setup-bazelisk
+      - name: Setup Java
+        uses: actions/setup-java@v1
+        with:
+          java-version: '11'
+      - name: Setup Firefox and GeckoDriver
+        uses: ./.github/actions/setup-firefox
+      - name: Start XVFB
+        run: Xvfb :99 &
+      - name: Run browser tests in Firefox
+        uses: ./.github/actions/bazel-test
+        with:
+          query: attr(tags, rc, tests(//java/...))
         env:
           DISPLAY: :99
 

.github/workflows/python.yml

@@ -138,6 +138,8 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: '11'
+      - name: Setup Chrome and ChromeDriver
+        uses: ./.github/actions/setup-chrome
       - name: Start XVFB
         run: Xvfb :99 &
       - name: Run browser tests in Chrome
@@ -173,7 +175,7 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: '11'
-      - name: Setup Firefox and geckodriver
+      - name: Setup Firefox and GeckoDriver
         uses: ./.github/actions/setup-firefox
       - name: Start XVFB
         run: Xvfb :99 &
@@ -210,7 +212,7 @@ jobs:
         uses: actions/setup-java@v1
         with:
           java-version: '11'
-      - name: Setup Firefox and geckodriver
+      - name: Setup Firefox and GeckoDriver
         uses: ./.github/actions/setup-firefox
       - name: Start XVFB
         run: Xvfb :99 &

.tours/bazel.tour

@@ -0,0 +1,22 @@
+{
+  "$schema": "https://aka.ms/codetour-schema",
+  "title": "Bazel",
+  "steps": [
+    {
+      "file": "WORKSPACE",
+      "description": "This is the main file creating the Bazel Workspace for this repository",
+      "line": 1
+    },
+    {
+      "file": "WORKSPACE",
+      "description": "These are the packages that support our rules and give us the extra functionality that we can use. There are a number of imported rules for different programming languages and extra features we need",
+      "line": 11
+    },
+    {
+      "file": "BUILD.bazel",
+      "description": "These are aliases to some of the most common build targets. To build a target you can run `bazel build <alias>` e.g. `bazel build grid`",
+      "line": 14
+    }
+  ],
+  "ref": "trunk"
+}

.tours/building-and-testing-the-python-bindings.tour

@@ -0,0 +1,47 @@
+{
+  "$schema": "https://aka.ms/codetour-schema",
+  "title": "Building and Testing the Python Bindings",
+  "steps": [
+    {
+      "file": "py/BUILD.bazel",
+      "description": "Files, like this, can be found all over this repository and will have all the targets that we need. To access this file with bazel you will need to use bazel build|test|run //py:<targets below>",
+      "line": 7
+    },
+    {
+      "file": "py/BUILD.bazel",
+      "description": "This is how we create the python library that will be used",
+      "line": 69
+    },
+    {
+      "file": "py/BUILD.bazel",
+      "description": "This creates the Selenium wheel that is published. We can upload it with `twine`",
+      "line": 110
+    },
+    {
+      "file": "py/BUILD.bazel",
+      "description": "This creates the targets we need when we want to use \"pinned browsers\". Using \"pinned browsers\" means bazel will download the necessary browser and the corresponding driver. To use this target you will do `bazel test //py:auto-<browser name> --//common:pin_browsers`",
+      "line": 229
+    },
+    {
+      "file": "py/BUILD.bazel",
+      "description": "If you want to use targets that have the installed browser and the driver on the $PATH environment variables",
+      "line": 255
+    },
+    {
+      "file": "py/BUILD.bazel",
+      "description": "This target is called from other targets and will generate the CDP libraries that we use within the Selenium Python Bindings",
+      "line": 186
+    },
+    {
+      "file": "py/BUILD.bazel",
+      "description": "These are the dependencies for building and testing",
+      "line": 17
+    },
+    {
+      "file": "py/BUILD.bazel",
+      "description": "Below are the JavaScript atoms we use for certain features like checking if an element if visible.",
+      "line": 38
+    }
+  ],
+  "ref": "trunk"
+}

WORKSPACE

@@ -259,9 +259,9 @@ pin_browsers()
 
 http_archive(
     name = "bazelruby_rules_ruby",
-    sha256 = "14861aed0c9be47577808757ce2e54aa7c729f58d4c99ed907834df2a2245c6d",
-    strip_prefix = "rules_ruby-1-36893fe82ea490cb4cc0ec0a5542298e2b45fb1c",
-    url = "https://github.com/p0deje/rules_ruby-1/archive/36893fe82ea490cb4cc0ec0a5542298e2b45fb1c.tar.gz",
+    sha256 = "43e1dc0b747d51617dcbc02c15c4a1383cb572d58bef3accc10b9c8bd1e06b62",
+    strip_prefix = "rules_ruby-2caa1f20d5ba22080af653470037c72bf219af45",
+    url = "https://github.com/bazelruby/rules_ruby/archive/2caa1f20d5ba22080af653470037c72bf219af45.tar.gz",
 )
 
 load(

dotnet/CHANGELOG

@@ -1,3 +1,10 @@
+v4.1.0
+======
+* add CDP support for v96 and remove v93
+* Adding test configuration for Edge in IE Mode
+* Refactor registration and execution of custom WebDriver commands
+
+
 v4.0.1
 ======
  * Refactored WebSocket handling of CDP. The handling of sending and receiving

dotnet/selenium-dotnet-version.bzl

@@ -1,6 +1,6 @@
 # BUILD FILE SYNTAX: STARLARK
 
-SE_VERSION = "4.0.1"
+SE_VERSION = "4.1.0"
 ASSEMBLY_VERSION = "4.0.0.0"
 SUPPORTED_NET_FRAMEWORKS = ["net45", "net46", "net47", "net48"]
 SUPPORTED_NET_STANDARD_VERSIONS = ["netstandard2.0", "netstandard2.1", "net5.0"]

java/CHANGELOG

@@ -1,3 +1,20 @@
+v4.1.0
+======
+
+* Supported CDP versions: 85, 94, 95, 96
+* Removed USE_CHROMIUM from EdgeOptions as new Edge is the default
+* [grid] Fixed command completion for ZSH when using the Selenium Server
+* Pass WebDriver instead of Loggable to allow augmentation of HasLogEvents
+* [grid] Using a random port when "-1" is set as port number for the Selenium Server
+* Handle Json parsing error such that future messages are not blocked
+* [grid] Fix host option
+* Changing type of extraInfo from HashMap to ConcurrentHasMap to avoid
+  ConcurrentModificationException while reading exception message by parallel threads
+* Add retry http request filter for transient errors.
+* Fix Javadoc code block formatting
+* [grid] Using non-loopback address when default config is used
+* Fix classloading error in host identifier
+
 v4.0.0
 ======
 

java/maven_deps.bzl

@@ -2,8 +2,8 @@ load("@rules_jvm_external//:defs.bzl", "maven_install")
 load("@rules_jvm_external//:specs.bzl", "maven")
 
 def selenium_java_deps():
-    netty_version = "4.1.67.Final"
-    opentelemetry_version = "1.6.0"
+    netty_version = "4.1.69.Final"
+    opentelemetry_version = "1.9.0"
 
     maven_install(
         artifacts = [
@@ -12,18 +12,18 @@ def selenium_java_deps():
             maven.artifact(
                 group = "com.github.spotbugs",
                 artifact = "spotbugs",
-                version = "4.4.0",
+                version = "4.5.0",
                 exclusions = [
                     "org.slf4j:slf4j-api",
                 ],
             ),
-            "com.google.code.gson:gson:2.8.8",
+            "com.google.code.gson:gson:2.8.9",
             "com.google.guava:guava:31.0.1-jre",
-            "com.google.auto:auto-common:1.1.2",
-            "com.google.auto.service:auto-service:1.0",
-            "com.google.auto.service:auto-service-annotations:1.0",
-            "com.graphql-java:graphql-java:16.2",
-            "io.grpc:grpc-context:1.41.0",
+            "com.google.auto:auto-common:1.2.1",
+            "com.google.auto.service:auto-service:1.0.1",
+            "com.google.auto.service:auto-service-annotations:1.0.1",
+            "com.graphql-java:graphql-java:17.0",
+            "io.grpc:grpc-context:1.42.1",
             "io.lettuce:lettuce-core:6.1.5.RELEASE",
             "io.netty:netty-buffer:%s" % netty_version,
             "io.netty:netty-codec-haproxy:%s" % netty_version,
@@ -61,23 +61,23 @@ def selenium_java_deps():
                     "org.hamcrest:hamcrest-library",
                 ],
             ),
-            "net.bytebuddy:byte-buddy:1.11.19",
+            "net.bytebuddy:byte-buddy:1.12.1",
             "net.jodah:failsafe:2.4.4",
-            "net.sourceforge.htmlunit:htmlunit-core-js:2.53.0",
+            "net.sourceforge.htmlunit:htmlunit-core-js:2.55.0",
             "org.apache.commons:commons-exec:1.3",
             "org.assertj:assertj-core:3.21.0",
             "org.asynchttpclient:async-http-client:2.12.3",
             "org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5",
             "org.hamcrest:hamcrest:2.2",
-            "org.hsqldb:hsqldb:2.6.0",
+            "org.hsqldb:hsqldb:2.6.1",
             "org.mockito:mockito-core:4.0.0",
             "org.slf4j:slf4j-api:1.7.32",
             "org.slf4j:slf4j-jdk14:1.7.32",
             "org.testng:testng:7.4.0",
             "org.zeromq:jeromq:0.5.2",
             "xyz.rogfam:littleproxy:2.0.5",
-            "org.seleniumhq.selenium:htmlunit-driver:2.53.0",
-            "org.redisson:redisson:3.16.3",
+            "org.seleniumhq.selenium:htmlunit-driver:3.55.0",
+            "org.redisson:redisson:3.16.4",
             "com.github.stephenc.jcip:jcip-annotations:1.0-1",
         ],
         excluded_artifacts = [