Merge branch 'trunk' of https://github.com/SeleniumHQ/selenium into java-bc-event-tests

Author: navin772

.github/label-commenter-config.yml

@@ -117,7 +117,7 @@ labels:
           This is related to code in the Support packages. The support packages contain example code that
           many users find helpful, but they do not necessarily represent the best practices for using Selenium,
           and the Selenium team is not prioritizing work on them right now.
-          This doesn't mean that we won't ever work on them, but it is not on our roadmap as we push to release Selenium 5.
+          This doesn't mean that we won't ever work on them, but it is not on our long term roadmap.
 
           We actively encourage people to create their own wrapper and helper code that makes sense for them.
           If you have any questions, please [contact us](https://www.selenium.dev/support)
@@ -127,10 +127,12 @@ labels:
 
           The support packages contain example code that many users find helpful, but they do not necessarily represent
           the best practices for using Selenium, and the Selenium team is not currently merging changes to them.
+          
+          After reviewing the change, unless it is a critical fix or a feature that is needed for Selenium 
+          to work, we will likely close the PR.
 
           We actively encourage people to add the wrapper and helper code that makes sense for them to their own frameworks.
           If you have any questions, please [contact us](https://www.selenium.dev/support)
-        action: close
 
 
 

.github/renovate.json

@@ -1,3 +1,26 @@
 {
-  "labels": ["B-dependencies"]
+  "labels": [
+    "B-dependencies"
+  ],
+  "docker": {
+    "enabled": false
+  },
+  "packageRules": [
+    {
+      "matchDatasources": [
+        "docker"
+      ],
+      "enabled": false
+    },
+    {
+      "matchPackagePatterns": [
+        "^docker:",
+        "^gcr.io/",
+        "^registry.k8s.io/",
+        "^quay.io/",
+        "^ghcr.io/"
+      ],
+      "enabled": false
+    }
+  ]
 }

MODULE.bazel

@@ -19,7 +19,7 @@ bazel_dep(name = "rules_cc", version = "0.2.0", dev_dependency = True)
 
 bazel_dep(name = "rules_dotnet", version = "0.17.5")
 bazel_dep(name = "rules_java", version = "8.7.1")
-bazel_dep(name = "rules_jvm_external", version = "6.6")
+bazel_dep(name = "rules_jvm_external", version = "6.8")
 bazel_dep(name = "rules_multitool", version = "1.3.0")
 bazel_dep(name = "rules_nodejs", version = "6.3.2")
 bazel_dep(name = "rules_oci", version = "1.8.0")
@@ -29,12 +29,10 @@ bazel_dep(name = "rules_proto", version = "7.0.2")
 bazel_dep(name = "rules_ruby", version = "0.19.0")
 
 # Until `rules_jvm_external` 6.8 ships
-git_override(
+single_version_override(
     module_name = "rules_jvm_external",
-    commit = "aca619b117c1fe306ffdd20c5f47cc4dbd5effed",
     patch_strip = 1,
     patches = ["//java:rules_jvm_external_javadoc.patch"],
-    remote = "https://github.com/bazel-contrib/rules_jvm_external.git",
 )
 
 multitool = use_extension("@rules_multitool//multitool:extension.bzl", "multitool")
@@ -207,7 +205,7 @@ maven.install(
         "io.opentelemetry:opentelemetry-sdk-testing",
         "io.opentelemetry:opentelemetry-sdk-trace",
         "it.ozimov:embedded-redis:0.7.3",
-        "net.bytebuddy:byte-buddy:1.17.6",
+        "net.bytebuddy:byte-buddy:1.17.7",
         "org.htmlunit:htmlunit-core-js:4.14.0",
         "org.apache.commons:commons-exec:1.5.0",
         "org.apache.logging.log4j:log4j-core:2.25.1",

common/repositories.bzl

@@ -50,8 +50,8 @@ js_library(
 
     http_archive(
         name = "linux_beta_firefox",
-        url = "https://ftp.mozilla.org/pub/firefox/releases/143.0b2/linux-x86_64/en-US/firefox-143.0b2.tar.xz",
-        sha256 = "70a8af598dedca123b72422811ec04e5a28060778d4a86622f4ecd400f234a78",
+        url = "https://ftp.mozilla.org/pub/firefox/releases/143.0b3/linux-x86_64/en-US/firefox-143.0b3.tar.xz",
+        sha256 = "ea43085f0a47d14a8c088175b489c8af149f59703aec20e6dd2bbf01e36d36fc",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -72,8 +72,8 @@ js_library(
 
     dmg_archive(
         name = "mac_beta_firefox",
-        url = "https://ftp.mozilla.org/pub/firefox/releases/143.0b2/mac/en-US/Firefox%20143.0b2.dmg",
-        sha256 = "52f9a7a944f857b207bc79f66ae2d600ff8736264d708d6c0fa5138aea664f97",
+        url = "https://ftp.mozilla.org/pub/firefox/releases/143.0b3/mac/en-US/Firefox%20143.0b3.dmg",
+        sha256 = "0e392fc487de20c31c4fe66e25473f91ce001dd6e56528409720f7b9934f34e0",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -123,10 +123,10 @@ js_library(
 
     pkg_archive(
         name = "mac_edge",
-        url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/017e25fc-2906-45b2-958c-1c71c4667dc1/MicrosoftEdge-139.0.3405.111.pkg",
-        sha256 = "1aa42cbaaf38b035e17d43fbbe0a293ceb286c5fd298d463b1a369ed900a03ac",
+        url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/95344cbf-d116-4494-8485-b96014e98901/MicrosoftEdge-139.0.3405.119.pkg",
+        sha256 = "31b3ddce353180a706179d64086ed01b53cfd20a7daea45597a7e9e405fc553f",
         move = {
-            "MicrosoftEdge-139.0.3405.111.pkg/Payload/Microsoft Edge.app": "Edge.app",
+            "MicrosoftEdge-139.0.3405.119.pkg/Payload/Microsoft Edge.app": "Edge.app",
         },
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
@@ -143,8 +143,8 @@ js_library(
 
     deb_archive(
         name = "linux_edge",
-        url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_139.0.3405.111-1_amd64.deb",
-        sha256 = "d61b2fcef695083496184a6a323b2bcfb57d45af8fb6867ffe54974a5992dc52",
+        url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_139.0.3405.119-1_amd64.deb",
+        sha256 = "e51e4e36cde5e7be2031fd9145ac9bf26444f734a88ff43858e05c7782e60c7b",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -165,8 +165,8 @@ js_library(
 
     http_archive(
         name = "linux_edgedriver",
-        url = "https://msedgedriver.microsoft.com/139.0.3405.102/edgedriver_linux64.zip",
-        sha256 = "e092178901c011ccfddc0556193742a01f206d71b5bb1a12cc1ba7a243262fc2",
+        url = "https://msedgedriver.microsoft.com/139.0.3405.111/edgedriver_linux64.zip",
+        sha256 = "76f1c0e35120e37848c174eee1368150b7c2461b8e4907c80bcfc2e61b93c471",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])
@@ -182,8 +182,8 @@ js_library(
 
     http_archive(
         name = "mac_edgedriver",
-        url = "https://msedgedriver.microsoft.com/139.0.3405.102/edgedriver_mac64.zip",
-        sha256 = "98aa637081061ea610c1f70be09fdea6b5f5b3a46c94a87ca291e2285bad1328",
+        url = "https://msedgedriver.microsoft.com/139.0.3405.111/edgedriver_mac64.zip",
+        sha256 = "c97588078c6f661dd6c66b858f5e21dc9cbcee40420a2b2e839a05803e0e468f",
         build_file_content = """
 load("@aspect_rules_js//js:defs.bzl", "js_library")
 package(default_visibility = ["//visibility:public"])

dotnet/src/webdriver/BUILD.bazel

@@ -168,14 +168,14 @@ copy_file(
 )
 
 copy_file(
-    name = "assets-nuget-build-netstandard20-targets",
-    src = "//dotnet/src/webdriver/assets:nuget/build/netstandard2.0/Selenium.WebDriver.targets",
+    name = "assets-nuget-build-targets",
+    src = "//dotnet/src/webdriver/assets:nuget/build/Selenium.WebDriver.targets",
     out = "Selenium.WebDriver.targets",
 )
 
 copy_file(
-    name = "assets-nuget-buildtransitive-netstandard20-targets",
-    src = "//dotnet/src/webdriver/assets:nuget/buildTransitive/netstandard2.0/Selenium.WebDriver.targets",
+    name = "assets-nuget-buildtransitive-targets",
+    src = "//dotnet/src/webdriver/assets:nuget/buildTransitive/Selenium.WebDriver.targets",
     out = "transitiveSelenium.WebDriver.targets",
 )
 
@@ -208,8 +208,8 @@ nuget_pack(
         "//common/manager:selenium-manager-macos": "manager/macos/selenium-manager",
         "//common/manager:selenium-manager-windows": "manager/windows/selenium-manager.exe",
         ":assets-nuget-readme": "README.md",
-        ":assets-nuget-build-netstandard20-targets": "build/netstandard2.0/Selenium.WebDriver.targets",
-        ":assets-nuget-buildtransitive-netstandard20-targets": "buildTransitive/netstandard2.0/Selenium.WebDriver.targets",
+        ":assets-nuget-build-targets": "build/Selenium.WebDriver.targets",
+        ":assets-nuget-buildtransitive-targets": "buildTransitive/Selenium.WebDriver.targets",
     },
     id = "Selenium.WebDriver",
     libs = {
@@ -234,8 +234,8 @@ nuget_pack(
         "//common/manager:selenium-manager-macos": "manager/macos/selenium-manager",
         "//common/manager:selenium-manager-windows": "manager/windows/selenium-manager.exe",
         ":assets-nuget-readme": "README.md",
-        ":assets-nuget-build-netstandard20-targets": "build/netstandard2.0/Selenium.WebDriver.StrongNamed.targets",
-        ":assets-nuget-buildtransitive-netstandard20-targets": "buildTransitive/netstandard2.0/Selenium.WebDriver.StrongNamed.targets",
+        ":assets-nuget-build-targets": "build/Selenium.WebDriver.StrongNamed.targets",
+        ":assets-nuget-buildtransitive-targets": "buildTransitive/Selenium.WebDriver.StrongNamed.targets",
     },
     id = "Selenium.WebDriver.StrongNamed",
     libs = {

dotnet/src/webdriver/BiDi/Communication/Broker.cs

@@ -84,7 +84,6 @@ internal Broker(BiDi bidi, Uri url)
                 new RealmConverter(_bidi),
                 new RealmTypeConverter(),
                 new DateTimeOffsetConverter(),
-                new TimeSpanConverter(),
                 new PrintPageRangeConverter(),
                 new InputOriginConverter(),
                 new WebExtensionConverter(_bidi),

dotnet/src/webdriver/BiDi/Communication/Json/Converters/DateTimeOffsetConverter.cs

@@ -27,11 +27,24 @@ internal class DateTimeOffsetConverter : JsonConverter<DateTimeOffset>
 {
     public override DateTimeOffset Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
-        return DateTimeOffset.FromUnixTimeMilliseconds(reader.GetInt64());
+        return DateTimeOffset.FromUnixTimeMilliseconds((long)reader.GetDouble()); // still might get a double
     }
 
     public override void Write(Utf8JsonWriter writer, DateTimeOffset value, JsonSerializerOptions options)
     {
         writer.WriteNumberValue(value.ToUnixTimeMilliseconds());
     }
 }
+
+internal class DateTimeOffsetSecondsConverter : JsonConverter<DateTimeOffset>
+{
+    public override DateTimeOffset Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        return DateTimeOffset.FromUnixTimeSeconds((long)reader.GetDouble()); // still might get a double
+    }
+
+    public override void Write(Utf8JsonWriter writer, DateTimeOffset value, JsonSerializerOptions options)
+    {
+        writer.WriteNumberValue(value.ToUnixTimeSeconds());
+    }
+}

dotnet/src/webdriver/BiDi/Communication/Json/Converters/TimeSpanConverter.cs

@@ -17,11 +17,13 @@
 // under the License.
 // </copyright>
 
+using OpenQA.Selenium.BiDi.Communication.Json.Converters;
 using System;
+using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Network;
 
-public sealed record Cookie(string Name, BytesValue Value, string Domain, string Path, long Size, bool HttpOnly, bool Secure, SameSite SameSite, TimeSpan? Expiry);
+public sealed record Cookie(string Name, BytesValue Value, string Domain, string Path, long Size, bool HttpOnly, bool Secure, SameSite SameSite, [property: JsonConverter(typeof(DateTimeOffsetSecondsConverter))] DateTimeOffset? Expiry);
 
 public enum SameSite
 {

dotnet/src/webdriver/BiDi/Network/Cookie.cs

@@ -18,7 +18,9 @@
 // </copyright>
 
 using OpenQA.Selenium.BiDi.Communication;
+using OpenQA.Selenium.BiDi.Communication.Json.Converters;
 using System;
+using System.Text.Json.Serialization;
 
 namespace OpenQA.Selenium.BiDi.Storage;
 
@@ -37,6 +39,7 @@ public sealed record PartialCookie(string Name, Network.BytesValue Value, string
 
     public Network.SameSite? SameSite { get; set; }
 
+    [JsonConverter(typeof(DateTimeOffsetSecondsConverter))]
     public DateTimeOffset? Expiry { get; set; }
 }