Skip to content

Commit 3517eb6

Browse files
authored
Merge branch 'trunk' into use_rbs_trace
2 parents 5fe85cd + d17c8aa commit 3517eb6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+1435
-509
lines changed

.github/ISSUE_TEMPLATE/bug-report.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ body:
5050
id: selenium-version
5151
attributes:
5252
label: What version of Selenium are you currently using?
53-
description: Important! The latest released version of Selenium is 4.31 and we can't fix old versions.
53+
description: Important! The latest released version of Selenium is 4.32 and we can't fix old versions.
5454
placeholder: e.g., 4.17.0
5555
validations:
5656
required: true

.github/workflows/ci-rbe.yml

+7-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ on:
66
branches:
77
- trunk
88
workflow_dispatch:
9+
inputs:
10+
disable_test_cache:
11+
description: 'Force re-run of tests (disable test cache)'
12+
required: false
13+
default: false
14+
type: boolean
915

1016
jobs:
1117
format:
@@ -26,4 +32,4 @@ jobs:
2632
name: All RBE tests
2733
caching: false
2834
ruby-version: jruby-9.4.12.0
29-
run: ./scripts/github-actions/ci-build.sh
35+
run: ./scripts/github-actions/ci-build.sh ${{ github.event.inputs.disable_test_cache }}

AUTHORS

+1
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,7 @@ Evan Sangaline <[email protected]>
281281
Evgeniy Roldukhin <[email protected]>
282282
283283
284+
Federico Franco <[email protected]>
284285
Felipe Knorr Kuhn <[email protected]>
285286
Fenil Mehta <[email protected]>
286287
FloKNetcare <[email protected]>

MODULE.bazel

+41-42
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,
@@ -175,32 +174,32 @@ maven.install(
175174
"com.github.spotbugs:spotbugs:4.9.3",
176175
"com.github.stephenc.jcip:jcip-annotations:1.0-1",
177176
"com.google.code.findbugs:jsr305:3.0.2",
178-
"com.google.code.gson:gson:2.12.1",
179-
"com.google.guava:guava:33.4.6-jre",
177+
"com.google.code.gson:gson:2.13.1",
178+
"com.google.guava:guava:33.4.8-jre",
180179
"com.google.auto:auto-common:1.2.2",
181180
"com.google.auto.service:auto-service:1.1.1",
182181
"com.google.auto.service:auto-service-annotations:1.1.1",
183182
"com.google.googlejavaformat:google-java-format:1.26.0",
184183
"com.graphql-java:graphql-java:22.3",
185184
"dev.failsafe:failsafe:3.3.2",
186-
"io.grpc:grpc-context:1.71.0",
187-
"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",
185+
"io.grpc:grpc-context:1.72.0",
186+
"io.lettuce:lettuce-core:6.6.0.RELEASE",
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,24 +210,24 @@ 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",
221-
"org.mockito:mockito-core:5.16.1",
222-
"org.redisson:redisson:3.45.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",
220+
"org.mockito:mockito-core:5.17.0",
221+
"org.redisson:redisson:3.46.0",
223222
"org.slf4j:slf4j-api:2.0.17",
224223
"org.slf4j:slf4j-jdk14:2.0.17",
225224
"org.tomlj:tomlj:1.1.1",
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

README.md

+7
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,13 @@ for Maven to use locally by deploying to your local maven repository (`~/.m2/rep
202202
#### Updating Dependencies
203203

204204
Dependencies are defined in the file [MODULE.bazel](https://github.com/SeleniumHQ/selenium/blob/trunk/MODULE.bazel).
205+
206+
To update a dependency, modify the version in the `MODULE.bazel` file and run:
207+
208+
```shell
209+
RULES_JVM_EXTERNAL_REPIN=1 bazel run @maven//:pin
210+
```
211+
205212
To automatically update and pin new dependencies, run:
206213

207214
```shell

Rakefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ JAVA_RELEASE_TARGETS = %w[
9898
//java/src/org/openqa/selenium/chromium:chromium.publish
9999
//java/src/org/openqa/selenium/devtools/v134:v134.publish
100100
//java/src/org/openqa/selenium/devtools/v135:v135.publish
101-
//java/src/org/openqa/selenium/devtools/v133:v133.publish
101+
//java/src/org/openqa/selenium/devtools/v136:v136.publish
102102
//java/src/org/openqa/selenium/edge:edge.publish
103103
//java/src/org/openqa/selenium/firefox:firefox.publish
104104
//java/src/org/openqa/selenium/grid/sessionmap/jdbc:jdbc.publish

0 commit comments

Comments
 (0)