Merge branch 'trunk' into java-session-status-test-fix

Author: VietND96

.bazelrc.remote

@@ -31,7 +31,7 @@ build:remote --disk_cache=
 build:remote --incompatible_enable_cc_toolchain_resolution
 build:remote --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
 test:remote --test_env=DISPLAY=:99.0
-test:remote --test_tag_filters=-skip-remote,-remote
+test:remote --test_tag_filters=-exclusive-if-local,-skip-remote,-remote
 
 # Env vars we can hard code
 build:remote --action_env=HOME=/home/dev

.github/workflows/ci-ruby.yml

@@ -111,7 +111,7 @@ jobs:
       browser: ${{ matrix.browser }}
       cache-key: rb-remote-${{ matrix.browser }}-${{ matrix.os }}-test
       os: ${{ matrix.os }}
-      java-version: 11
+      java-version: 17
       run: >
         bazel test
         --keep_going

MODULE.bazel

@@ -172,55 +172,56 @@ maven.install(
     artifacts = [
         "com.beust:jcommander:1.82",
         "com.github.javaparser:javaparser-core:3.26.3",
-        "com.github.spotbugs:spotbugs:4.9.1",
+        "com.github.spotbugs:spotbugs:4.9.3",
         "com.github.stephenc.jcip:jcip-annotations:1.0-1",
+        "com.google.code.findbugs:jsr305:3.0.2",
         "com.google.code.gson:gson:2.12.1",
         "com.google.guava:guava:33.4.0-jre",
         "com.google.auto:auto-common:1.2.2",
         "com.google.auto.service:auto-service:1.1.1",
         "com.google.auto.service:auto-service-annotations:1.1.1",
-        "com.google.googlejavaformat:google-java-format:jar:1.25.2",
+        "com.google.googlejavaformat:google-java-format:1.25.2",
         "com.graphql-java:graphql-java:22.3",
         "dev.failsafe:failsafe:3.3.2",
-        "io.grpc:grpc-context:1.70.0",
-        "io.lettuce:lettuce-core:6.5.4.RELEASE",
-        "io.netty:netty-buffer",
-        "io.netty:netty-codec-http",
-        "io.netty:netty-codec-http2",
-        "io.netty:netty-common",
-        "io.netty:netty-handler",
-        "io.netty:netty-handler-proxy",
-        "io.netty:netty-transport",
-        "io.opentelemetry:opentelemetry-api",
-        "io.opentelemetry:opentelemetry-context",
-        "io.opentelemetry:opentelemetry-exporter-logging",
-        "io.opentelemetry:opentelemetry-sdk",
-        "io.opentelemetry:opentelemetry-sdk-common",
-        "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure",
-        "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi",
-        "io.opentelemetry:opentelemetry-sdk-testing",
-        "io.opentelemetry:opentelemetry-sdk-trace",
+        "io.grpc:grpc-context:1.71.0",
+        "io.lettuce:lettuce-core:6.5.5.RELEASE",
+        "io.netty:netty-buffer:4.1.119.Final",
+        "io.netty:netty-codec-http:4.1.119.Final",
+        "io.netty:netty-codec-http2:4.1.119.Final",
+        "io.netty:netty-common:4.1.119.Final",
+        "io.netty:netty-handler:4.1.119.Final",
+        "io.netty:netty-handler-proxy:4.1.119.Final",
+        "io.netty:netty-transport:4.1.119.Final",
+        "io.opentelemetry:opentelemetry-api:1.48.0",
+        "io.opentelemetry:opentelemetry-context:1.48.0",
+        "io.opentelemetry:opentelemetry-exporter-logging:1.48.0",
+        "io.opentelemetry:opentelemetry-sdk:1.48.0",
+        "io.opentelemetry:opentelemetry-sdk-common:1.48.0",
+        "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.48.0",
+        "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.48.0",
+        "io.opentelemetry:opentelemetry-sdk-testing:1.48.0",
+        "io.opentelemetry:opentelemetry-sdk-trace:1.48.0",
         "it.ozimov:embedded-redis:0.7.3",
-        "net.bytebuddy:byte-buddy:1.15.11",
-        "org.htmlunit:htmlunit-core-js:4.7.0",
+        "net.bytebuddy:byte-buddy:1.17.2",
+        "org.htmlunit:htmlunit-core-js:4.10.0",
         "org.apache.commons:commons-exec:1.4.0",
         "org.apache.logging.log4j:log4j-core:2.24.3",
-        "org.assertj:assertj-core:3.27.2",
-        "org.bouncycastle:bcpkix-jdk18on:1.79",
+        "org.assertj:assertj-core:3.27.3",
+        "org.bouncycastle:bcpkix-jdk18on:1.80",
         "org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5",
         "org.hsqldb:hsqldb:2.7.4",
         "org.jspecify:jspecify:1.0.0",
-        "org.junit.jupiter:junit-jupiter-api",
-        "org.junit.jupiter:junit-jupiter-engine",
-        "org.junit.jupiter:junit-jupiter-params",
-        "org.junit.platform:junit-platform-launcher",
-        "org.junit.platform:junit-platform-reporting",
-        "org.junit.platform:junit-platform-commons",
-        "org.junit.platform:junit-platform-engine",
-        "org.mockito:mockito-core:5.15.2",
-        "org.redisson:redisson:3.41.0",
-        "org.slf4j:slf4j-api:2.0.16",
-        "org.slf4j:slf4j-jdk14:2.0.16",
+        "org.junit.jupiter:junit-jupiter-api:5.12.1",
+        "org.junit.jupiter:junit-jupiter-engine:5.12.1",
+        "org.junit.jupiter:junit-jupiter-params:5.12.1",
+        "org.junit.platform:junit-platform-launcher:1.12.1",
+        "org.junit.platform:junit-platform-reporting:1.12.1",
+        "org.junit.platform:junit-platform-commons:1.12.1",
+        "org.junit.platform:junit-platform-engine:1.12.1",
+        "org.mockito:mockito-core:5.16.1",
+        "org.redisson:redisson:3.45.0",
+        "org.slf4j:slf4j-api:2.0.17",
+        "org.slf4j:slf4j-jdk14:2.0.17",
         "org.tomlj:tomlj:1.1.1",
         "org.zeromq:jeromq:0.6.0",
     ],

README.md

@@ -210,16 +210,47 @@ To automatically update and pin new dependencies, run:
 
 ### Python
 
-You can run Python code locally by updating generated files in the python directory using:
+#### Linting
+
+We follow the [PEP8 Style Guide for Python Code](https://peps.python.org/pep-0008) (except we use a 120 character line length).
+This is checked and enforced with several linting tools, including
+[black](https://pypi.org/project/black),
+[docformatter](https://pypi.org/project/docformatter),
+[flake8](https://flake8.pycqa.org),
+and [isort](https://pycqa.github.io/isort).
+
+To run all of the linting tools:
+```shell
+./go py:lint
+```
+
+You need `tox` installed to run the linting tools (`pip install tox`).
+
+#### Local Installation
+
+To run Python code locally without building/installing the package, you must first install the dependencies:
+```shell
+pip install -r py/requirements.txt
+```
+
+Then, build the generated files and copy them into your local source tree:
 ```shell
-./go py:update
+./go py:local_dev
 ```
 
-To install Selenium locally based on a specific commit, you can use:
+After that, you can import the selenium package directly from source from the `py` directory.
+
+Instead of running from source, you can build and install the selenium package (wheel) locally:
 ```shell
 ./go py:install
 ```
 
+This will attempt to install into the global Python `site-packages` directory,
+which might not be writable. To avoid this, you should create and activate a
+[virtual environment](https://packaging.python.org/en/latest/tutorials/installing-packages/#creating-virtual-environments)
+before installing.
+
+
 ### Ruby
 
 Instead of using `irb`, you can create an interactive REPL with all gems loaded using: `bazel run //rb:console`
@@ -283,6 +314,9 @@ Tests can also be filtered by tag like:
 bazel test //<language>/... --test_tag_filters=this,-not-this
 ```
 
+If there are multiple `--test_tag_filters`, only the last one is considered,
+so be careful if also using an inherited config
+
 ### Java
 
 <details>

Rakefile

@@ -92,15 +92,13 @@ task '//java/test/org/openqa/selenium/environment/webserver:webserver:uber' => [
   '//java/test/org/openqa/selenium/environment:webserver'
 ]
 
-# Java targets required for release. These should all be java_export targets.
-# Generated from: bazel query 'kind(maven_publish, set(//java/... //third_party/...))' | sort
+# use #java_release_targets to access this list
 JAVA_RELEASE_TARGETS = %w[
   //java/src/org/openqa/selenium/chrome:chrome.publish
   //java/src/org/openqa/selenium/chromium:chromium.publish
-  //java/src/org/openqa/selenium/devtools/v131:v131.publish
+  //java/src/org/openqa/selenium/devtools/v134:v134.publish
   //java/src/org/openqa/selenium/devtools/v132:v132.publish
   //java/src/org/openqa/selenium/devtools/v133:v133.publish
-  //java/src/org/openqa/selenium/devtools/v85:v85.publish
   //java/src/org/openqa/selenium/edge:edge.publish
   //java/src/org/openqa/selenium/firefox:firefox.publish
   //java/src/org/openqa/selenium/grid/sessionmap/jdbc:jdbc.publish
@@ -120,6 +118,34 @@ JAVA_RELEASE_TARGETS = %w[
   //java/src/org/openqa/selenium:core.publish
 ].freeze
 
+def java_release_targets
+  @targets_verified ||= verify_java_release_targets
+
+  JAVA_RELEASE_TARGETS
+end
+
+def verify_java_release_targets
+  query = 'kind(maven_publish, set(//java/... //third_party/...))'
+  current_targets = []
+
+  Bazel.execute('query', [], query) do |output|
+    current_targets = output.lines.map(&:strip).reject(&:empty?)
+  end
+
+  missing_targets = current_targets - JAVA_RELEASE_TARGETS
+  extra_targets = JAVA_RELEASE_TARGETS - current_targets
+
+  return if missing_targets.empty? && extra_targets.empty?
+
+  error_message = 'Java release targets are out of sync with Bazel query results.'
+
+  error_message += "\nMissing targets: #{missing_targets.join(', ')}" unless missing_targets.empty?
+
+  error_message += "\nObsolete targets: #{extra_targets.join(', ')}" unless extra_targets.empty?
+
+  raise error_message
+end
+
 # Notice that because we're using rake, anything you can do in a normal rake
 # build can also be done here. For example, here we set the default task
 task default: [:grid]
@@ -364,7 +390,7 @@ end
 
 desc 'Install jars to local m2 directory'
 task :'maven-install' do
-  JAVA_RELEASE_TARGETS.each do |p|
+  java_release_targets.each do |p|
     Bazel.execute('run',
                   ['--stamp',
                    '--define',
@@ -826,7 +852,7 @@ namespace :java do
   desc 'Build Java Client Jars'
   task :build do |_task, arguments|
     args = arguments.to_a.compact
-    JAVA_RELEASE_TARGETS.each { |target| Bazel.execute('build', args, target) }
+    java_release_targets.each { |target| Bazel.execute('build', args, target) }
   end
 
   desc 'Build Grid Server'
@@ -873,7 +899,7 @@ namespace :java do
     Rake::Task['java:package'].invoke('--config=release')
     Rake::Task['java:build'].invoke('--config=release')
     # Because we want to `run` things, we can't use the `release` config
-    JAVA_RELEASE_TARGETS.each { |target| Bazel.execute('run', ['--config=release'], target) }
+    java_release_targets.each { |target| Bazel.execute('run', ['--config=release'], target) }
   end
 
   desc 'Install jars to local m2 directory'
@@ -894,22 +920,19 @@ namespace :java do
 
     file_path = 'MODULE.bazel'
     content = File.read(file_path)
-    # For some reason ./go wrapper is not outputting from Open3, so cannot use Bazel class directly
-    output = `bazel run @maven//:outdated`
-
-    output.scan(/\S+ \[\S+-alpha\]/).each do |match|
-      puts "WARNING — Cannot automatically update alpha version of: #{match}"
+    output = nil
+    Bazel.execute('run', [], '@maven//:outdated') do |out|
+      output = out
     end
 
     versions = output.scan(/(\S+) \[\S+ -> (\S+)\]/).to_h
     versions.each do |artifact, version|
       if artifact.match?('graphql')
+        # https://github.com/graphql-java/graphql-java/discussions/3187
         puts 'WARNING — Cannot automatically update graphql'
         next
       end
-
-      replacement = artifact.include?('googlejavaformat') ? "#{artifact}:jar:#{version}" : "#{artifact}:#{version}"
-      content.gsub!(/#{artifact}:(jar:)?\d+\.\d+[^\\"]+/, replacement)
+      content.sub!(/#{Regexp.escape(artifact)}:([\d.-]+(?:[-.]?[A-Za-z0-9]+)*)/, "#{artifact}:#{version}")
     end
     File.write(file_path, content)