Skip to content

Commit 3a5e476

Browse files
authored
Merge branch 'trunk' into renovate/serde_json-1.x-lockfile
2 parents df2d339 + acb3422 commit 3a5e476

File tree

22 files changed

+232
-195
lines changed

22 files changed

+232
-195
lines changed

MODULE.bazel

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
module(name = "selenium")
22

33
bazel_dep(name = "apple_rules_lint", version = "0.4.0")
4-
bazel_dep(name = "aspect_bazel_lib", version = "2.8.1")
4+
bazel_dep(name = "aspect_bazel_lib", version = "2.10.0")
55
bazel_dep(name = "aspect_rules_esbuild", version = "0.21.0")
66
bazel_dep(name = "aspect_rules_js", version = "2.0.1")
77
bazel_dep(name = "aspect_rules_ts", version = "3.1.0")
8-
bazel_dep(name = "bazel_features", version = "1.13.0")
8+
bazel_dep(name = "bazel_features", version = "1.23.0")
99
bazel_dep(name = "bazel_skylib", version = "1.7.1")
1010
bazel_dep(name = "buildifier_prebuilt", version = "6.4.0")
1111
bazel_dep(name = "contrib_rules_jvm", version = "0.27.0")
@@ -17,10 +17,10 @@ bazel_dep(name = "protobuf", version = "29.1", dev_dependency = True, repo_name
1717
# Required for rules_rust to import the crates properly
1818
bazel_dep(name = "rules_cc", version = "0.0.9", dev_dependency = True)
1919

20-
bazel_dep(name = "rules_dotnet", version = "0.16.1")
20+
bazel_dep(name = "rules_dotnet", version = "0.17.5")
2121
bazel_dep(name = "rules_java", version = "7.11.1")
2222
bazel_dep(name = "rules_jvm_external", version = "6.6")
23-
bazel_dep(name = "rules_nodejs", version = "6.3.0")
23+
bazel_dep(name = "rules_nodejs", version = "6.3.2")
2424
bazel_dep(name = "rules_oci", version = "1.7.6")
2525
bazel_dep(name = "rules_pkg", version = "0.10.1")
2626
bazel_dep(name = "rules_python", version = "0.33.0")
@@ -200,10 +200,10 @@ maven.install(
200200
"io.opentelemetry:opentelemetry-sdk-trace",
201201
"io.opentelemetry.semconv:opentelemetry-semconv:1.28.0-alpha",
202202
"it.ozimov:embedded-redis:0.7.3",
203-
"net.bytebuddy:byte-buddy:1.15.10",
203+
"net.bytebuddy:byte-buddy:1.15.11",
204204
"org.htmlunit:htmlunit-core-js:4.6.0",
205205
"org.apache.commons:commons-exec:1.4.0",
206-
"org.apache.logging.log4j:log4j-core:2.24.1",
206+
"org.apache.logging.log4j:log4j-core:2.24.3",
207207
"org.assertj:assertj-core:3.26.3",
208208
"org.bouncycastle:bcpkix-jdk18on:1.79",
209209
"org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5",

dotnet/paket.nuget.bzl

Lines changed: 46 additions & 46 deletions
Large diffs are not rendered by default.

dotnet/src/webdriver/WebDriver.cs

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -612,20 +612,7 @@ protected virtual async Task<Response> ExecuteAsync(string driverCommandToExecut
612612
{
613613
Command commandToExecute = new Command(SessionId, driverCommandToExecute, parameters);
614614

615-
Response commandResponse;
616-
617-
try
618-
{
619-
commandResponse = await this.executor.ExecuteAsync(commandToExecute).ConfigureAwait(false);
620-
}
621-
catch (System.Net.Http.HttpRequestException e)
622-
{
623-
commandResponse = new Response
624-
{
625-
Status = WebDriverResult.UnknownError,
626-
Value = e
627-
};
628-
}
615+
Response commandResponse = await this.executor.ExecuteAsync(commandToExecute).ConfigureAwait(false);
629616

630617
if (commandResponse.Status != WebDriverResult.Success)
631618
{

java/maven_install.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
3-
"__INPUT_ARTIFACTS_HASH": 52710383,
4-
"__RESOLVED_ARTIFACTS_HASH": -820674754,
3+
"__INPUT_ARTIFACTS_HASH": 818842380,
4+
"__RESOLVED_ARTIFACTS_HASH": 1188602649,
55
"artifacts": {
66
"com.beust:jcommander": {
77
"shasums": {
@@ -452,10 +452,10 @@
452452
},
453453
"net.bytebuddy:byte-buddy": {
454454
"shasums": {
455-
"jar": "d8390d20685a41a2bdca640f958942cd91bcbf21c42470494bdf5752d9a07b14",
456-
"sources": "254ea80bf6f932e785b6f7dcdf3666b6fad4ceea36ef187c064a5346c650cb2c"
455+
"jar": "fa08998aae1e7bdae83bde0712c50e8444d71c0e0c196bb2247ade8d4ad0eb90",
456+
"sources": "f215e745c8c7e62cd02ade3b3a9deec4a98c85a3786e3b8854efa6e83b6da4c3"
457457
},
458-
"version": "1.15.10"
458+
"version": "1.15.11"
459459
},
460460
"net.bytebuddy:byte-buddy-agent": {
461461
"shasums": {
@@ -529,17 +529,17 @@
529529
},
530530
"org.apache.logging.log4j:log4j-api": {
531531
"shasums": {
532-
"jar": "6e77bb229fc8dcaf09038beeb5e9030b22e9e01b51b458b0183ce669ebcc92ef",
533-
"sources": "e01afccb47c9340abba621f1cd93e05a092525614071a446c3958f2cd9f48bf6"
532+
"jar": "5b4a0a0cd0e751ded431c162442bdbdd53328d1f8bb2bae5fc1bbeee0f66d80f",
533+
"sources": "a7e2290fd22242d85d8423efb8eff5fd7e14f80fed94bc959415d61cb8aa0d11"
534534
},
535-
"version": "2.24.1"
535+
"version": "2.24.3"
536536
},
537537
"org.apache.logging.log4j:log4j-core": {
538538
"shasums": {
539-
"jar": "00bcf388472ca80a687014181763b66d777177f22cbbf179fd60e1b1ac9bc9b0",
540-
"sources": "b5b4eafe913e457160a3c19773c7f59e132a62b1c74ab9fa744ebc6f9ba9bc9a"
539+
"jar": "7eb4084596ae25bd3c61698e48e8d0ab65a9260758884ed5cbb9c6e55c44a56a",
540+
"sources": "909158f99135ee7d3cb583e00eac314a22d873aca87440a2a0f20c7e3dc85440"
541541
},
542-
"version": "2.24.1"
542+
"version": "2.24.3"
543543
},
544544
"org.apiguardian:apiguardian-api": {
545545
"shasums": {

java/src/org/openqa/selenium/Dimension.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,11 @@
1818
package org.openqa.selenium;
1919

2020
import java.util.Objects;
21+
import org.jspecify.annotations.NullMarked;
22+
import org.jspecify.annotations.Nullable;
2123

2224
/** Similar to Point - implement locally to avoid depending on GWT. */
25+
@NullMarked
2326
public class Dimension {
2427
public final int width;
2528
public final int height;
@@ -38,7 +41,7 @@ public int getHeight() {
3841
}
3942

4043
@Override
41-
public boolean equals(Object o) {
44+
public boolean equals(@Nullable Object o) {
4245
if (!(o instanceof Dimension)) {
4346
return false;
4447
}

java/src/org/openqa/selenium/Keys.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
package org.openqa.selenium;
1919

2020
import java.util.Arrays;
21+
import org.jspecify.annotations.NullMarked;
22+
import org.jspecify.annotations.Nullable;
2123

2224
/**
2325
* Representations of pressable keys that aren't text. These are stored in the Unicode PUA (Private
@@ -26,6 +28,7 @@
2628
* @see <a
2729
* href="http://www.google.com.au/search?&amp;q=unicode+pua&amp;btnK=Search">http://www.google.com.au/search?&amp;q=unicode+pua&amp;btnK=Search</a>
2830
*/
31+
@NullMarked
2932
public enum Keys implements CharSequence {
3033
NULL('\uE000'),
3134
CANCEL('\uE001'), // ^break
@@ -180,7 +183,7 @@ public static String chord(Iterable<CharSequence> value) {
180183
* @param key unicode character code
181184
* @return special key linked to the character code, or null if character is not a special key
182185
*/
183-
public static Keys getKeyFromUnicode(char key) {
186+
public static @Nullable Keys getKeyFromUnicode(char key) {
184187
for (Keys unicodeKey : values()) {
185188
if (unicodeKey.charAt(0) == key) {
186189
return unicodeKey;

java/src/org/openqa/selenium/Point.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,11 @@
1818
package org.openqa.selenium;
1919

2020
import java.util.Objects;
21+
import org.jspecify.annotations.NullMarked;
22+
import org.jspecify.annotations.Nullable;
2123

2224
/** A copy of java.awt.Point, to remove dependency on awt. */
25+
@NullMarked
2326
public class Point {
2427
public int x;
2528
public int y;
@@ -42,7 +45,7 @@ public Point moveBy(int xOffset, int yOffset) {
4245
}
4346

4447
@Override
45-
public boolean equals(Object o) {
48+
public boolean equals(@Nullable Object o) {
4649
if (!(o instanceof Point)) {
4750
return false;
4851
}

java/src/org/openqa/selenium/Rectangle.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@
1919

2020
import java.util.Map;
2121
import java.util.Objects;
22+
import org.jspecify.annotations.NullMarked;
23+
import org.jspecify.annotations.Nullable;
2224

25+
@NullMarked
2326
public class Rectangle {
2427

2528
public final int x;
@@ -70,7 +73,7 @@ private Map<String, Object> toJson() {
7073
}
7174

7275
@Override
73-
public boolean equals(Object o) {
76+
public boolean equals(@Nullable Object o) {
7477
if (this == o) {
7578
return true;
7679
}

java/src/org/openqa/selenium/UsernameAndPassword.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@
1818
package org.openqa.selenium;
1919

2020
import java.util.function.Supplier;
21+
import org.jspecify.annotations.NullMarked;
2122
import org.openqa.selenium.internal.Require;
2223

2324
/** A combination of username and password to use when authenticating a browser with a website. */
25+
@NullMarked
2426
public class UsernameAndPassword implements Credentials {
2527

2628
private final String username;

java/src/org/openqa/selenium/WrapsDriver.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,13 @@
1717

1818
package org.openqa.selenium;
1919

20+
import org.jspecify.annotations.NullMarked;
21+
2022
/**
2123
* This interface indicates that the implementing class knows about the driver that contains it and
2224
* can export it.
2325
*/
26+
@NullMarked
2427
@FunctionalInterface
2528
public interface WrapsDriver {
2629
/**

0 commit comments

Comments
 (0)