Merge branch 'trunk' into feature/direct_session_link

SeleniumHQ · Jan 31, 2025 · 698b753 · 698b753
2 parents 6b93fdd + 0135df2
commit 698b753
Show file tree

Hide file tree

Showing 5 changed files with 84 additions and 19 deletions.
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -182,7 +182,7 @@ maven.install(
         "com.google.googlejavaformat:google-java-format:jar:1.25.2",
         "com.graphql-java:graphql-java:22.3",
         "dev.failsafe:failsafe:3.3.2",
-        "io.grpc:grpc-context:1.69.0",
+        "io.grpc:grpc-context:1.69.1",
         "io.lettuce:lettuce-core:6.5.2.RELEASE",
         "io.netty:netty-buffer",
         "io.netty:netty-codec-http",

diff --git a/java/maven_install.json b/java/maven_install.json
@@ -1,7 +1,7 @@
 {
   "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
-  "__INPUT_ARTIFACTS_HASH": -83251177,
-  "__RESOLVED_ARTIFACTS_HASH": 159666128,
+  "__INPUT_ARTIFACTS_HASH": 1099657782,
+  "__RESOLVED_ARTIFACTS_HASH": -937269061,
   "artifacts": {
     "com.beust:jcommander": {
       "shasums": {
@@ -214,17 +214,17 @@
     },
     "io.grpc:grpc-api": {
       "shasums": {
-        "jar": "ffa9af0f76fb08b4dbcade9dba9805af6b216980cafa0756b4d97b6029077506",
-        "sources": "e175c53977b6899c7be5a2e2007f79996d46c5512e852975cb4af663ffd84db9"
+        "jar": "a8d3d6dcc71f3ab613d668842282b488bdd93d3e99a0ef5dca7eee6fa734c283",
+        "sources": "766c0f64e4cdf2189241df8a0e0e2d5ce65e60a4a29bd82f295b0544e2fedc77"
       },
-      "version": "1.69.0"
+      "version": "1.69.1"
     },
     "io.grpc:grpc-context": {
       "shasums": {
-        "jar": "e682d036496d4429442955b615b931ee65486bd318d0ab13d9937d11cb36ffd5",
-        "sources": "a2ac5373e3f1021ec3f936b7c994b5fb94b391a8db24333825a0c081163d9efd"
+        "jar": "45ef95b8c158a8b5bdd3acb67b9e682ef25414bb148f488ec847438ab64715d4",
+        "sources": "f4f509999485f8ec7094b323a8865acd2d62dc97970e9b22d692c8060040a885"
       },
-      "version": "1.69.0"
+      "version": "1.69.1"
     },
     "io.lettuce:lettuce-core": {
       "shasums": {

diff --git a/java/src/org/openqa/selenium/devtools/CdpEndpointFinder.java b/java/src/org/openqa/selenium/devtools/CdpEndpointFinder.java
@@ -91,9 +91,11 @@ public static Optional<URI> getReportedUri(Capabilities caps) {
         break;
       case "firefox":
         key = "moz:debuggerAddress";
-        LOG.warning(
-            "CDP support for Firefox is deprecated and will be removed in future versions. "
-                + "Please switch to WebDriver BiDi.");
+        if (!caps.is("webSocketUrl")) {
+          LOG.warning(
+              "CDP support for Firefox is deprecated and will be removed in future versions. "
+                  + "Please switch to WebDriver BiDi.");
+        }
         break;
       default:
         return Optional.empty();

diff --git a/java/src/org/openqa/selenium/firefox/FirefoxDriver.java b/java/src/org/openqa/selenium/firefox/FirefoxDriver.java
@@ -165,7 +165,7 @@ private FirefoxDriver(
     Optional<URI> reportedUri =
         CdpEndpointFinder.getReportedUri("moz:debuggerAddress", capabilities);
 
-    if (reportedUri.isPresent()) {
+    if (reportedUri.isPresent() && !capabilities.is("webSocketUrl")) {
       LOG.warning(
           "CDP support for Firefox is deprecated and will be removed in future versions. "
               + "Please switch to WebDriver BiDi.");

diff --git a/rust/Cargo.Bazel.lock b/rust/Cargo.Bazel.lock
@@ -1,5 +1,5 @@
 {
-  "checksum": "7cafa1024c14fe343d60d434da00caf40cc5f74a656d1ffb146147861837045b",
+  "checksum": "dd0b1d61473c324a69e9446829245d736b5cf37dfd115cacf1169662fa518d3e",
   "crates": {
     "addr2line 0.21.0": {
       "name": "addr2line",
@@ -2039,16 +2039,79 @@
               "id": "jobserver 0.1.31",
               "target": "jobserver"
             },
-            {
-              "id": "libc 0.2.168",
-              "target": "libc"
-            },
             {
               "id": "shlex 1.3.0",
               "target": "shlex"
             }
           ],
-          "selects": {}
+          "selects": {
+            "aarch64-apple-darwin": [
+              {
+                "id": "libc 0.2.168",
+                "target": "libc"
+              }
+            ],
+            "aarch64-unknown-linux-gnu": [
+              {
+                "id": "libc 0.2.168",
+                "target": "libc"
+              }
+            ],
+            "aarch64-unknown-nixos-gnu": [
+              {
+                "id": "libc 0.2.168",
+                "target": "libc"
+              }
+            ],
+            "arm-unknown-linux-gnueabi": [
+              {
+                "id": "libc 0.2.168",
+                "target": "libc"
+              }
+            ],
+            "i686-unknown-linux-gnu": [
+              {
+                "id": "libc 0.2.168",
+                "target": "libc"
+              }
+            ],
+            "powerpc-unknown-linux-gnu": [
+              {
+                "id": "libc 0.2.168",
+                "target": "libc"
+              }
+            ],
+            "s390x-unknown-linux-gnu": [
+              {
+                "id": "libc 0.2.168",
+                "target": "libc"
+              }
+            ],
+            "x86_64-apple-darwin": [
+              {
+                "id": "libc 0.2.168",
+                "target": "libc"
+              }
+            ],
+            "x86_64-unknown-freebsd": [
+              {
+                "id": "libc 0.2.168",
+                "target": "libc"
+              }
+            ],
+            "x86_64-unknown-linux-gnu": [
+              {
+                "id": "libc 0.2.168",
+                "target": "libc"
+              }
+            ],
+            "x86_64-unknown-nixos-gnu": [
+              {
+                "id": "libc 0.2.168",
+                "target": "libc"
+              }
+            ]
+          }
         },
         "edition": "2018",
         "version": "1.1.30"