Skip to content

Commit 033ff4d

Browse files
authored
Merge branch 'trunk' into relay-node-match
2 parents 82e3809 + bce221b commit 033ff4d

40 files changed

+2295
-480
lines changed

.github/label-commenter-config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ labels:
66
body: |
77
@{{ issue.user.login }}, thank you for creating this issue. We will troubleshoot it as soon as we can.
88
9-
Selenium Triage Team: remember to follow the [Triage Guide](https://github.com/SeleniumHQ/selenium/blob/trunk/README.md)
9+
Selenium Triage Team: remember to follow the [Triage Guide](https://github.com/SeleniumHQ/selenium/wiki/How-to-Triage-Issues)
1010
- name: G-w3c
1111
labeled:
1212
issue:

MODULE.bazel

Lines changed: 35 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,15 @@ bazel_dep(name = "rules_python", version = "1.1.0")
2727
bazel_dep(name = "rules_proto", version = "7.0.2")
2828
bazel_dep(name = "rules_ruby", version = "0.18.0")
2929

30+
# Until `rules_jvm_external` 6.8 ships
31+
git_override(
32+
module_name = "rules_jvm_external",
33+
commit = "d8af22108bd8b353a226140570008231f2921931",
34+
patch_strip = 1,
35+
patches = ["//java:rules_jvm_external_javadoc.patch"],
36+
remote = "https://github.com/bazel-contrib/rules_jvm_external.git",
37+
)
38+
3039
linter = use_extension("@apple_rules_lint//lint:extensions.bzl", "linter")
3140
linter.configure(
3241
name = "java-spotbugs",
@@ -140,16 +149,6 @@ use_repo(pip, "py_dev_requirements")
140149

141150
register_toolchains("@pythons_hub//:all")
142151

143-
# https://github.com/bazelbuild/rules_jvm_external/pull/1079
144-
archive_override(
145-
module_name = "rules_jvm_external",
146-
integrity = "sha256-yS8Qes1PLbYbe10b1WSgl0Auqn/1Wlxg8O3wSr7a/Sg=",
147-
patch_strip = 1,
148-
patches = ["//java:rules_jvm_external_javadoc.patch"],
149-
strip_prefix = "rules_jvm_external-f572a26116c7ef71d8842dd056c2605782f7be8d",
150-
urls = ["https://github.com/bazelbuild/rules_jvm_external/archive/f572a26116c7ef71d8842dd056c2605782f7be8d.tar.gz"],
151-
)
152-
153152
java_toolchains = use_extension("@rules_java//java:extensions.bzl", "toolchains")
154153
use_repo(
155154
java_toolchains,
@@ -185,22 +184,22 @@ maven.install(
185184
"dev.failsafe:failsafe:3.3.2",
186185
"io.grpc:grpc-context:1.71.0",
187186
"io.lettuce:lettuce-core:6.5.5.RELEASE",
188-
"io.netty:netty-buffer:4.2.0.Final",
189-
"io.netty:netty-codec-http:4.2.0.Final",
190-
"io.netty:netty-codec-http2:4.2.0.Final",
191-
"io.netty:netty-common:4.2.0.Final",
192-
"io.netty:netty-handler:4.2.0.Final",
193-
"io.netty:netty-handler-proxy:4.2.0.Final",
194-
"io.netty:netty-transport:4.2.0.Final",
195-
"io.opentelemetry:opentelemetry-api:1.48.0",
196-
"io.opentelemetry:opentelemetry-context:1.48.0",
197-
"io.opentelemetry:opentelemetry-exporter-logging:1.48.0",
198-
"io.opentelemetry:opentelemetry-sdk:1.48.0",
199-
"io.opentelemetry:opentelemetry-sdk-common:1.48.0",
200-
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.48.0",
201-
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.48.0",
202-
"io.opentelemetry:opentelemetry-sdk-testing:1.48.0",
203-
"io.opentelemetry:opentelemetry-sdk-trace:1.48.0",
187+
"io.netty:netty-buffer",
188+
"io.netty:netty-codec-http",
189+
"io.netty:netty-codec-http2",
190+
"io.netty:netty-common",
191+
"io.netty:netty-handler",
192+
"io.netty:netty-handler-proxy",
193+
"io.netty:netty-transport",
194+
"io.opentelemetry:opentelemetry-api",
195+
"io.opentelemetry:opentelemetry-context",
196+
"io.opentelemetry:opentelemetry-exporter-logging",
197+
"io.opentelemetry:opentelemetry-sdk",
198+
"io.opentelemetry:opentelemetry-sdk-common",
199+
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure",
200+
"io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi",
201+
"io.opentelemetry:opentelemetry-sdk-testing",
202+
"io.opentelemetry:opentelemetry-sdk-trace",
204203
"it.ozimov:embedded-redis:0.7.3",
205204
"net.bytebuddy:byte-buddy:1.17.5",
206205
"org.htmlunit:htmlunit-core-js:4.11.0",
@@ -211,13 +210,13 @@ maven.install(
211210
"org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5",
212211
"org.hsqldb:hsqldb:2.7.4",
213212
"org.jspecify:jspecify:1.0.0",
214-
"org.junit.jupiter:junit-jupiter-api:5.12.1",
215-
"org.junit.jupiter:junit-jupiter-engine:5.12.1",
216-
"org.junit.jupiter:junit-jupiter-params:5.12.1",
217-
"org.junit.platform:junit-platform-launcher:1.12.1",
218-
"org.junit.platform:junit-platform-reporting:1.12.1",
219-
"org.junit.platform:junit-platform-commons:1.12.1",
220-
"org.junit.platform:junit-platform-engine:1.12.1",
213+
"org.junit.jupiter:junit-jupiter-api",
214+
"org.junit.jupiter:junit-jupiter-engine",
215+
"org.junit.jupiter:junit-jupiter-params",
216+
"org.junit.platform:junit-platform-launcher",
217+
"org.junit.platform:junit-platform-reporting",
218+
"org.junit.platform:junit-platform-commons",
219+
"org.junit.platform:junit-platform-engine",
221220
"org.mockito:mockito-core:5.16.1",
222221
"org.redisson:redisson:3.45.1",
223222
"org.slf4j:slf4j-api:2.0.17",
@@ -226,9 +225,9 @@ maven.install(
226225
"org.zeromq:jeromq:0.6.0",
227226
],
228227
boms = [
229-
"io.opentelemetry:opentelemetry-bom:1.46.0",
230-
"io.netty:netty-bom:4.1.118.Final",
231-
"org.junit:junit-bom:5.11.4",
228+
"io.opentelemetry:opentelemetry-bom:1.49.0",
229+
"io.netty:netty-bom:4.1.121.Final",
230+
"org.junit:junit-bom:5.12.2",
232231
],
233232
excluded_artifacts = [
234233
"org.hamcrest:hamcrest-all", # Replaced by hamcrest 2

common/repositories.bzl

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,10 @@ js_library(
123123

124124
pkg_archive(
125125
name = "mac_edge",
126-
url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/b405fb02-0c71-4762-be7f-08a88b17c176/MicrosoftEdge-135.0.3179.85.pkg",
127-
sha256 = "292b4794bc9452908d67971e04f5184c167316b2e0fcead3f5739c3738a358b6",
126+
url = "https://msedge.sf.dl.delivery.mp.microsoft.com/filestreamingservice/files/784d0da7-3b50-4888-8a30-159d8af03e55/MicrosoftEdge-135.0.3179.98.pkg",
127+
sha256 = "fda91427e9172b704228f01a35f9a426479e9f5f592f6ff2de85e75ade0b25c8",
128128
move = {
129-
"MicrosoftEdge-135.0.3179.85.pkg/Payload/Microsoft Edge.app": "Edge.app",
129+
"MicrosoftEdge-135.0.3179.98.pkg/Payload/Microsoft Edge.app": "Edge.app",
130130
},
131131
build_file_content = """
132132
load("@aspect_rules_js//js:defs.bzl", "js_library")
@@ -143,8 +143,8 @@ js_library(
143143

144144
deb_archive(
145145
name = "linux_edge",
146-
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_135.0.3179.85-1_amd64.deb",
147-
sha256 = "c756292acbe3d89c75fd5135dde13f68292ff9beeb18e428e3171162ed864060",
146+
url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_135.0.3179.98-1_amd64.deb",
147+
sha256 = "0291339ce51e66b2987f6e5fc76c310b9a5c54c0d05c3f70b3cdda2743f6774e",
148148
build_file_content = """
149149
load("@aspect_rules_js//js:defs.bzl", "js_library")
150150
package(default_visibility = ["//visibility:public"])
@@ -165,8 +165,8 @@ js_library(
165165

166166
http_archive(
167167
name = "linux_edgedriver",
168-
url = "https://msedgedriver.azureedge.net/135.0.3179.85/edgedriver_linux64.zip",
169-
sha256 = "d05ef36fc3c6fdc4bc0b0c96a9fffc0ce0afd2289f08dfe2cd141d41e8dea195",
168+
url = "https://msedgedriver.azureedge.net/135.0.3179.98/edgedriver_linux64.zip",
169+
sha256 = "ea89d43034f86c70f37b9f580cd7bc5f18cb9537697af55e113b94c9dc766336",
170170
build_file_content = """
171171
load("@aspect_rules_js//js:defs.bzl", "js_library")
172172
package(default_visibility = ["//visibility:public"])
@@ -182,8 +182,8 @@ js_library(
182182

183183
http_archive(
184184
name = "mac_edgedriver",
185-
url = "https://msedgedriver.azureedge.net/135.0.3179.85/edgedriver_mac64.zip",
186-
sha256 = "9f9c59099b664c9c4a8f59d501e9fcf0dec3e4bfd860635669730a6e59d55ca9",
185+
url = "https://msedgedriver.azureedge.net/135.0.3179.98/edgedriver_mac64.zip",
186+
sha256 = "5b8b5e019e432b86e49a4e1d8f3a312373a0c7ad88b84ae2419419d100f99fdb",
187187
build_file_content = """
188188
load("@aspect_rules_js//js:defs.bzl", "js_library")
189189
package(default_visibility = ["//visibility:public"])
@@ -199,8 +199,8 @@ js_library(
199199

200200
http_archive(
201201
name = "linux_chrome",
202-
url = "https://storage.googleapis.com/chrome-for-testing-public/135.0.7049.97/linux64/chrome-linux64.zip",
203-
sha256 = "dca0a86931162c85fbd054cc037519fcf855dca912c7fd2dc2e2e48fb7d59961",
202+
url = "https://storage.googleapis.com/chrome-for-testing-public/135.0.7049.114/linux64/chrome-linux64.zip",
203+
sha256 = "dd86dbac5d1a362bf9d46818e21e4afe2e8b1b419e0810573d298842eef88b82",
204204
build_file_content = """
205205
load("@aspect_rules_js//js:defs.bzl", "js_library")
206206
package(default_visibility = ["//visibility:public"])
@@ -221,8 +221,8 @@ js_library(
221221

222222
http_archive(
223223
name = "mac_chrome",
224-
url = "https://storage.googleapis.com/chrome-for-testing-public/135.0.7049.97/mac-x64/chrome-mac-x64.zip",
225-
sha256 = "53880ac98a04490c647d1a5649eb0ebd8001741bb17501df34908e8826fe516f",
224+
url = "https://storage.googleapis.com/chrome-for-testing-public/135.0.7049.114/mac-x64/chrome-mac-x64.zip",
225+
sha256 = "e7deb29034368567bab7f5b24a7c09d329ef2023f61e6ed349b714abb80292c2",
226226
strip_prefix = "chrome-mac-x64",
227227
patch_cmds = [
228228
"mv 'Google Chrome for Testing.app' Chrome.app",
@@ -243,8 +243,8 @@ js_library(
243243

244244
http_archive(
245245
name = "linux_chromedriver",
246-
url = "https://storage.googleapis.com/chrome-for-testing-public/135.0.7049.97/linux64/chromedriver-linux64.zip",
247-
sha256 = "12a0e6e8035b3671a7a884e33949f1f5154d2d2ca68593715851f6f3a5e836ec",
246+
url = "https://storage.googleapis.com/chrome-for-testing-public/135.0.7049.114/linux64/chromedriver-linux64.zip",
247+
sha256 = "28ef94323503f927f8fca4650d5acf6325e69829720900cc696c3d8179ce855c",
248248
strip_prefix = "chromedriver-linux64",
249249
build_file_content = """
250250
load("@aspect_rules_js//js:defs.bzl", "js_library")
@@ -261,8 +261,8 @@ js_library(
261261

262262
http_archive(
263263
name = "mac_chromedriver",
264-
url = "https://storage.googleapis.com/chrome-for-testing-public/135.0.7049.97/mac-x64/chromedriver-mac-x64.zip",
265-
sha256 = "2eedf6406ca4e9f11a4c196ce56e8d25c15dc68bd8ea07c7da8423d2327e9aa1",
264+
url = "https://storage.googleapis.com/chrome-for-testing-public/135.0.7049.114/mac-x64/chromedriver-mac-x64.zip",
265+
sha256 = "a1da3421971762c4d6f258fb8e49dfd3aa855387f0b82d0333a59e972feb21d9",
266266
strip_prefix = "chromedriver-mac-x64",
267267
build_file_content = """
268268
load("@aspect_rules_js//js:defs.bzl", "js_library")

0 commit comments

Comments
 (0)