Merge branch 'trunk' into handle_deprecations

Author: zodac-personal

.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

.github/workflows/pre-release.yml

@@ -97,17 +97,19 @@ jobs:
             **Warning: Manually update the changelogs before merging**
 
             This PR:
-              * Updates Rust version for Selenium Manager release
               * Updates Pinned browser version to coincide with new CDP release
               * Adds support for new CDP version and removes old CDP version
               * Selenium Manager references the new Selenium Manager release
               * Updates Maven Dependencies
               * Adds new authors to authors file
               * Updates all versions for all bindings
               * Generates *rough* change logs for each bindings (please tidy them up before merging this)
+                  * Not all commits need to be in the change log — users do not need to see anything about building or testing Selenium
+                  * Remove references to updating versions including nightly
+                  * The code now outputs the complete body of the commit message; make sure the changelog message is complete and correct
 
-            - Auto-generated by [create-pull-request][1]
+            - This PR was auto-generated by workflow run: [release-preparation][1]
 
-            [1]: https://github.com/peter-evans/create-pull-request
+            [1]: https://github.com/SeleniumHQ/selenium/actions/runs/${{ github.run_id }}
           labels: C-build
           draft: true

AUTHORS

@@ -11,6 +11,7 @@ abidema <[email protected]>
 Adam Dangoor <[email protected]>
 Adam Demuri <[email protected]>
 Adam Goucher <[email protected]>
+Adam Halbrock <[email protected]>
 Adam Smith <[email protected]>
 AdamPDotty <[email protected]>
 Adi Roiban <[email protected]>
@@ -282,6 +283,7 @@ EwaMarek <[email protected]>
 Fan <[email protected]>
 Felipe Knorr Kuhn <[email protected]>
 Fenil Mehta <[email protected]>
+FloKNetcare <[email protected]>
 Florian Apolloner <[email protected]>
 Florian LOPES <[email protected]>
 Florian Mutter <[email protected]>
@@ -454,6 +456,7 @@ John J. Barton <[email protected]>
 John Pelly <[email protected]>
 Johnny.H <[email protected]>
 Johnson <[email protected]>
+Jolyon Pawlyn <[email protected]>
 joma74 <[email protected]>
 Jon Dufresne <[email protected]>
 Jon Spalding
@@ -685,6 +688,7 @@ orangeudav <[email protected]>
 Oscar Devora <[email protected]>
 Outsider <[email protected]>
 Paladin Wang <[email protected]>
+Pallavi <[email protected]>
 Palmer Bandy <[email protected]>
 Pat Tullmann <[email protected]>
 Patrice Jaton <[email protected]>
@@ -744,6 +748,7 @@ Robert Fletcher <[email protected]>
 Roberto Rivera <[email protected]>
 Robin Stocker <[email protected]>
 Rod McNew <[email protected]>
+Romain Tartière <[email protected]>
 Roman Yurchak <[email protected]>
 Roman Yurchak <[email protected]>
 Roman Zoller <[email protected]>

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.guava:guava:33.4.5-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.1",
+        "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

@@ -201,7 +201,7 @@ for Maven to use locally by deploying to your local maven repository (`~/.m2/rep
 
 #### Updating Dependencies
 
-Dependencies are defined in the file [maven_deps.bzl](https://github.com/SeleniumHQ/selenium/blob/trunk/java/maven_deps.bzl).
+Dependencies are defined in the file [MODULE.bazel](https://github.com/SeleniumHQ/selenium/blob/trunk/MODULE.bazel).
 To automatically update and pin new dependencies, run:
 
 ```shell
@@ -314,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?).select { |line| line.start_with?('//') }
+  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)
 
@@ -1087,34 +1110,38 @@ namespace :all do
     commit!('Update selenium manager version', ['common/selenium_manager.bzl'])
 
     Rake::Task['java:update'].invoke
-    commit!('Update Maven Dependencies', ['java/maven_deps.bzl', 'java/maven_install.json'])
+    commit!('Update Maven Dependencies', ['MODULE.bazel', 'java/maven_install.json'])
 
     Rake::Task['authors'].invoke
     commit!('Update authors file', ['AUTHORS'])
 
     # Note that this does not include Rust version changes that are handled in separate rake:version task
     # TODO: These files are all defined in other tasks; remove duplication
     Rake::Task['all:version'].invoke(version)
-    commit!("FIX CHANGELOGS BEFORE MERGING!\n\nUpdate versions and change logs to release Selenium #{java_version}",
-            ['dotnet/CHANGELOG',
-             'dotnet/selenium-dotnet-version.bzl',
-             'java/CHANGELOG',
+    commit!("Update Version in all bindings to #{java_version}",
+            ['dotnet/selenium-dotnet-version.bzl',
              'java/version.bzl',
-             'javascript/node/selenium-webdriver/CHANGES.md',
+             'javascript/node/selenium-webdriver/BUILD.bazel',
              'javascript/node/selenium-webdriver/package.json',
              'py/docs/source/conf.py',
+             'py/pyproject.toml',
              'py/selenium/__init__.py',
              'py/selenium/webdriver/__init__.py',
              'py/BUILD.bazel',
-             'py/CHANGES',
              'rb/lib/selenium/webdriver/version.rb',
-             'rb/CHANGES',
              'rb/Gemfile.lock',
-             'rust/CHANGELOG.md',
              'rust/BUILD.bazel',
              'rust/Cargo.Bazel.lock',
              'rust/Cargo.toml',
              'rust/Cargo.lock'])
+
+    commit!("FIX CHANGELOGS BEFORE MERGING! #{java_version}",
+            ['dotnet/CHANGELOG',
+             'java/CHANGELOG',
+             'javascript/node/selenium-webdriver/CHANGES.md',
+             'py/CHANGES',
+             'rb/CHANGES',
+             'rust/CHANGELOG.md'])
   end
 
   desc 'Update all versions'
@@ -1191,16 +1218,25 @@ end
 
 def update_changelog(version, language, path, changelog, header)
   tag = previous_tag(version, language)
-  log = if language == 'javascript'
-          `git --no-pager log #{tag}...HEAD --pretty=format:"- %s" --reverse #{path}`
-        else
-          `git --no-pager log #{tag}...HEAD --pretty=format:"* %s" --reverse #{path}`
-        end
-  commits = log.split('>>>').map { |entry|
-    lines = entry.split("\n")
-    lines.reject! { |line| line.match?(/^(----|Co-authored|Signed-off)/) || line.empty? }
-    lines.join("\n")
-  }.join("\n>>>")
+  bullet = language == 'javascript' ? '- ' : '* '
+  commit_delimiter = '===DELIM==='
+  tags_to_remove = /\[(dotnet|rb|py|java|js|rust)\]:?\s?/
+
+  command = "git --no-pager log #{tag}...HEAD --pretty=format:\"%s%n%b#{commit_delimiter}\" --reverse #{path}"
+  puts "Executing git command: #{command}"
+
+  log = `#{command}`
+
+  commits = log.split(commit_delimiter).map { |commit|
+    lines = commit.gsub(tags_to_remove, '').strip.lines.map(&:chomp)
+    subject = "#{bullet}#{lines[0]}"
+
+    body = lines[1..]
+           .reject { |line| line.match?(/^(----|Co-authored|Signed-off)/) || line.empty? }
+           .map { |line| "    > #{line}" }
+           .join("\n")
+    body.empty? ? subject : "#{subject}\n#{body}"
+  }.join("\n")
 
   File.open(changelog, 'r+') do |file|
     new_content = "#{header}\n#{commits}\n\n#{file.read}"