Skip to content

Commit 67c0d92

Browse files
authored
Merge branch 'trunk' into data-collectors-java
2 parents 6ebf1d6 + 7e1e0a8 commit 67c0d92

File tree

225 files changed

+20945
-19777
lines changed

Some content is hidden

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

225 files changed

+20945
-19777
lines changed

.bazelrc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ test --test_env=FIREFOX_NIGHTLY_BINARY
8787
test --test_env=GITHUB_ACTIONS
8888
test --test_env=MOZ_HEADLESS
8989
test --test_env=SELENIUM_BROWSER
90-
test --test_env=TRAVIS
9190
test --test_env=PYTHON_VERSION
9291
test --test_env=SE_AVOID_STATS=true
9392

.bazelrc.remote

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ build:rbe --disk_cache=
3131
build:rbe --incompatible_enable_cc_toolchain_resolution
3232
build:rbe --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
3333
test:rbe --test_env=DISPLAY=:99.0
34-
test:rbe --test_tag_filters=-skip-rbe,-remote
34+
test:rbe --test_tag_filters=-skip-rbe
3535

3636
# Env vars we can hard code
3737
build:rbe --action_env=HOME=/home/dev

.github/ISSUE_TEMPLATE/bug-report.yml

Lines changed: 1 addition & 1 deletion
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.36 and we can't fix old versions.
53+
description: Important! The latest released version of Selenium is 4.38 and we can't fix old versions.
5454
placeholder: e.g., 4.17.0
5555
validations:
5656
required: true

.github/workflows/update-documentation.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,12 @@ on:
4141
SELENIUM_CI_TOKEN:
4242
required: true
4343

44+
permissions:
45+
contents: write
46+
pull-requests: write
47+
4448
env:
45-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
49+
GITHUB_TOKEN: ${{ github.token }}
4650

4751
jobs:
4852
build-docs:

.skipped-tests

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,12 @@
2727
-//javascript/selenium-webdriver:test-chrome-devtools-test.js-chrome
2828
-//javascript/selenium-webdriver:test-firefox-options-test.js-firefox
2929
-//rb/spec/integration/selenium/webdriver/chrome:service-chrome
30-
-//rb/spec/integration/selenium/webdriver/chrome:service-chrome-bidi
3130
-//rb/spec/integration/selenium/webdriver/chrome:service-chrome-remote
3231
-//rb/spec/integration/selenium/webdriver/edge:service-edge
33-
-//rb/spec/integration/selenium/webdriver/edge:service-edge-bidi
3432
-//rb/spec/integration/selenium/webdriver/edge:service-edge-remote
35-
-//rb/spec/integration/selenium/webdriver/firefox:driver-firefox-beta-bidi
3633
-//rb/spec/integration/selenium/webdriver/firefox:service-firefox
3734
-//rb/spec/integration/selenium/webdriver/firefox:service-firefox-beta
38-
-//rb/spec/integration/selenium/webdriver/firefox:service-firefox-beta-bidi
3935
-//rb/spec/integration/selenium/webdriver/firefox:service-firefox-beta-remote
40-
-//rb/spec/integration/selenium/webdriver/firefox:service-firefox-bidi
4136
-//rb/spec/integration/selenium/webdriver/firefox:service-firefox-remote
4237
-//rb/spec/integration/selenium/webdriver/remote:driver-chrome-remote
4338
-//rb/spec/integration/selenium/webdriver/remote:driver-edge-remote
@@ -49,6 +44,5 @@
4944
-//rb/spec/integration/selenium/webdriver/remote:element-firefox-remote
5045
-//rb/spec/integration/selenium/webdriver:action_builder-firefox-beta-remote
5146
-//rb/spec/integration/selenium/webdriver:element-chrome
52-
-//rb/spec/integration/selenium/webdriver:element-chrome-bidi
5347
-//rb/spec/integration/selenium/webdriver:element-chrome-remote
5448
-//rb:lint

AUTHORS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -285,6 +285,7 @@ Eric Plaster <[email protected]>
285285
Erik Beans <[email protected]>
286286
Erik E. Beerepoot <[email protected]>
287287
Erik Kuefler <[email protected]>
288+
288289
Evan Sangaline <[email protected]>
289290
Evgeniy Roldukhin <[email protected]>
290291
@@ -601,6 +602,7 @@ Matthew Kempkers <[email protected]>
601602
Matthew Lymer <[email protected]>
602603
Matthew Rahtz <[email protected]>
603604
matthewdoerksen <[email protected]>
605+
Matthias Kurz <[email protected]>
604606
605607
Max Perrello <[email protected]>
606608
Max Schmitt <[email protected]>
@@ -683,6 +685,7 @@ nir-tal-talkspace <[email protected]>
683685
Nirantak Raghav <[email protected]>
684686
685687
Noel Gordon
688+
Noel Kim (김민혁) <[email protected]>
686689
Noritaka Kobayashi <[email protected]>
687690
NoStory-py <[email protected]>
688691
Nowell Strite <[email protected]>

MODULE.bazel

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -173,9 +173,9 @@ maven.install(
173173
name = "maven",
174174
artifacts = [
175175
"com.beust:jcommander:1.82",
176-
"org.checkerframework:checker-qual:3.49.2",
177-
"com.github.javaparser:javaparser-core:3.27.0",
178-
"com.github.spotbugs:spotbugs:4.9.6",
176+
"org.checkerframework:checker-qual:3.51.1",
177+
"com.github.javaparser:javaparser-core:3.27.1",
178+
"com.github.spotbugs:spotbugs:4.9.8",
179179
"com.github.stephenc.jcip:jcip-annotations:1.0-1",
180180
"com.google.code.findbugs:jsr305:3.0.2",
181181
"com.google.code.gson:gson:2.13.2",
@@ -184,14 +184,14 @@ maven.install(
184184
"com.google.auto:auto-common:1.2.2",
185185
"com.google.auto.service:auto-service:1.1.1",
186186
"com.google.auto.service:auto-service-annotations:1.1.1",
187-
"com.google.googlejavaformat:google-java-format:1.28.0",
188-
"com.google.protobuf:protobuf-java:4.32.1",
187+
"com.google.googlejavaformat:google-java-format:1.30.0",
188+
"com.google.protobuf:protobuf-java:4.33.0",
189189
"com.google.protobuf.nano:protobuf-javanano:3.1.0",
190190
"com.graphql-java:graphql-java:24.1",
191191
"com.uber.nullaway:nullaway:0.12.10",
192192
"dev.failsafe:failsafe:3.3.2",
193-
"io.grpc:grpc-context:1.75.0",
194-
"io.lettuce:lettuce-core:6.8.1.RELEASE",
193+
"io.grpc:grpc-context:1.76.0",
194+
"io.lettuce:lettuce-core:7.0.0.RELEASE",
195195
"io.netty:netty-buffer",
196196
"io.netty:netty-codec-http",
197197
"io.netty:netty-codec-http2",
@@ -209,11 +209,11 @@ maven.install(
209209
"io.opentelemetry:opentelemetry-sdk-testing",
210210
"io.opentelemetry:opentelemetry-sdk-trace",
211211
"it.ozimov:embedded-redis:0.7.3",
212-
"net.bytebuddy:byte-buddy:1.17.7",
213-
"org.htmlunit:htmlunit-core-js:4.16.0",
212+
"net.bytebuddy:byte-buddy:1.17.8",
213+
"org.htmlunit:htmlunit-core-js:4.17.0",
214214
"org.apache.commons:commons-exec:1.5.0",
215-
"org.apache.logging.log4j:log4j-core:2.25.1",
216-
"org.assertj:assertj-core:3.27.4",
215+
"org.apache.logging.log4j:log4j-core:2.25.2",
216+
"org.assertj:assertj-core:3.27.6",
217217
"org.bouncycastle:bcpkix-jdk18on:1.82",
218218
"org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5",
219219
"org.hsqldb:hsqldb:2.7.4",
@@ -226,8 +226,8 @@ maven.install(
226226
"org.junit.platform:junit-platform-reporting",
227227
"org.junit.platform:junit-platform-commons",
228228
"org.junit.platform:junit-platform-engine",
229-
"org.mockito:mockito-core:5.19.0",
230-
"org.redisson:redisson:3.51.0",
229+
"org.mockito:mockito-core:5.20.0",
230+
"org.redisson:redisson:3.52.0",
231231
"org.slf4j:slf4j-api:2.0.17",
232232
"org.slf4j:slf4j-jdk14:2.0.17",
233233
"org.tomlj:tomlj:1.1.1",
@@ -236,9 +236,9 @@ maven.install(
236236
"uk.org.webcompere:system-stubs-core:2.1.8",
237237
],
238238
boms = [
239-
"io.opentelemetry:opentelemetry-bom:1.54.0",
240-
"io.netty:netty-bom:4.2.6.Final",
241-
"org.junit:junit-bom:5.13.4",
239+
"io.opentelemetry:opentelemetry-bom:1.55.0",
240+
"io.netty:netty-bom:4.2.7.Final",
241+
"org.junit:junit-bom:6.0.0",
242242
],
243243
excluded_artifacts = [
244244
"org.hamcrest:hamcrest-all", # Replaced by hamcrest 2
@@ -318,7 +318,7 @@ ruby.bundle_fetch(
318318
"parser-3.3.9.0": "94d6929354b1a6e3e1f89d79d4d302cc8f5aa814431a6c9c7e0623335d7687f2",
319319
"pp-0.6.2": "947ec3120c6f92195f8ee8aa25a7b2c5297bb106d83b41baa02983686577b6ff",
320320
"prettyprint-0.2.0": "2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193",
321-
"prism-1.4.0": "dc0e3e00e93160213dc2a65519d9002a4a1e7b962db57d444cf1a71565bb703e",
321+
"prism-1.6.0": "bfc0281a81718c4872346bc858dc84abd3a60cae78336c65ad35c8fbff641c6b",
322322
"psych-5.2.6": "814328aa5dcb6d604d32126a20bc1cbcf05521a5b49dbb1a8b30a07e580f316e",
323323
"psych-5.2.6-java": "0a5f65d47ed1ae3475d062b254e7b2035a259eac578038016d62172dd4cfbd91",
324324
"public_suffix-6.0.2": "bfa7cd5108066f8c9602e0d6d4114999a5df5839a63149d3e8b0f9c1d3558394",

Rakefile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ JAVA_RELEASE_TARGETS = %w[
9797
//java/src/org/openqa/selenium/chrome:chrome.publish
9898
//java/src/org/openqa/selenium/chromium:chromium.publish
9999
//java/src/org/openqa/selenium/devtools/v140:v140.publish
100-
//java/src/org/openqa/selenium/devtools/v138:v138.publish
101-
//java/src/org/openqa/selenium/devtools/v139:v139.publish
100+
//java/src/org/openqa/selenium/devtools/v141:v141.publish
101+
//java/src/org/openqa/selenium/devtools/v142:v142.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
@@ -747,9 +747,12 @@ namespace :rb do
747747

748748
desc 'Update generated Ruby files for local development'
749749
task :local_dev do
750+
puts 'installing ruby, this may take a minute'
750751
Bazel.execute('build', [], '@bundle//:bundle')
751752
Rake::Task['rb:build'].invoke
752753
Rake::Task['grid'].invoke
754+
# A command like this is required to move ruby binary into working directory
755+
Bazel.execute('build', %w[--test_arg --dry-run], '@bundle//bin:rubocop')
753756
end
754757

755758
desc 'Push Ruby gems to rubygems'

0 commit comments

Comments
 (0)