Merge branch 'trunk' into fix-SeleniumManager-IS2_INCONSISTENT_SYNC

SeleniumHQ · Dec 6, 2024 · 449712e · 449712e
2 parents 8854ea6 + 7a93ff7
commit 449712e
Show file tree

Hide file tree

Showing 239 changed files with 3,008 additions and 2,068 deletions.
diff --git a/.github/workflows/ci-python.yml b/.github/workflows/ci-python.yml
@@ -100,8 +100,6 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - browser: safari
-            os: macos
           - browser: chrome
             os: ubuntu
           - browser: edge
@@ -116,3 +114,21 @@ jobs:
       run: |
         bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:common-${{ matrix.browser }}-bidi
         bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:test-${{ matrix.browser }}
+
+  safari-tests:
+    name: Browser Tests
+    needs: build
+    uses: ./.github/workflows/bazel.yml
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - browser: safari
+            os: macos
+    with:
+      name: Integration Tests (${{ matrix.browser }}, ${{ matrix.os }})
+      browser: ${{ matrix.browser }}
+      os: ${{ matrix.os }}
+      cache-key: py-browser-${{ matrix.browser }}
+      run: |
+        bazel test --local_test_jobs 1 --flaky_test_attempts 3 //py:test-${{ matrix.browser }}
diff --git a/AUTHORS b/AUTHORS
@@ -68,6 +68,7 @@ Andrei <[email protected]>
 Andrei Botalov <[email protected]>
 Andrei Rusu <[email protected]>
 Andrei Solntsev <[email protected]>
+Andrew Nesbitt <[email protected]>
 Andrey Botalov <[email protected]>
 Andrii Rohovets <[email protected]>
 Andy Duncan <[email protected]>
@@ -334,6 +335,7 @@ Harshit Agrawal <[email protected]>
 havja <[email protected]>
 Haw-bin Chai <[email protected]>
 hectorhon <[email protected]>
+HeeJun <[email protected]>
 Heky <[email protected]>
 helen3141 <[email protected]>
 Henrik Skupin <[email protected]>
@@ -458,6 +460,7 @@ Jonathan Lipps <[email protected]>
 Jonathon Kereliuk <[email protected]>
 Jongkuen Hong <[email protected]>
 Jordan Mace <[email protected]>
+Jose D. Gomez R. <[email protected]>
 josephg <[email protected]>
 Josh Goldberg <[email protected]>
 Joshua Bruning <[email protected]>
@@ -633,6 +636,7 @@ MustafaAgamy <[email protected]>
 Muthu Kannan
 MWschutte <[email protected]>
 myslak71 <[email protected]>
+Natalia Pozhidaeva <[email protected]>
 Nate Lowry <[email protected]>
 Nathan Isom <[email protected]>
 native-api <[email protected]>

diff --git a/MODULE.bazel b/MODULE.bazel
@@ -19,7 +19,7 @@ bazel_dep(name = "rules_cc", version = "0.0.9", dev_dependency = True)
 
 bazel_dep(name = "rules_dotnet", version = "0.16.1")
 bazel_dep(name = "rules_java", version = "7.11.1")
-bazel_dep(name = "rules_jvm_external", version = "6.3")
+bazel_dep(name = "rules_jvm_external", version = "6.6")
 bazel_dep(name = "rules_nodejs", version = "6.3.0")
 bazel_dep(name = "rules_oci", version = "1.7.6")
 bazel_dep(name = "rules_pkg", version = "0.10.1")
@@ -177,52 +177,57 @@ maven.install(
         "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.24.0",
+        "com.google.googlejavaformat:google-java-format:jar:1.25.0",
         "com.graphql-java:graphql-java:22.3",
         "dev.failsafe:failsafe:3.3.2",
         "io.grpc:grpc-context:1.68.1",
-        "io.lettuce:lettuce-core:6.4.0.RELEASE",
-        "io.netty:netty-buffer:4.1.114.Final",
-        "io.netty:netty-codec-http:4.1.114.Final",
-        "io.netty:netty-codec-http2:4.1.114.Final",
-        "io.netty:netty-common:4.1.114.Final",
-        "io.netty:netty-handler:4.1.114.Final",
-        "io.netty:netty-handler-proxy:4.1.114.Final",
-        "io.netty:netty-transport:4.1.114.Final",
-        "io.opentelemetry:opentelemetry-api:1.43.0",
-        "io.opentelemetry:opentelemetry-context:1.43.0",
-        "io.opentelemetry:opentelemetry-exporter-logging:1.43.0",
-        "io.opentelemetry:opentelemetry-sdk:1.43.0",
-        "io.opentelemetry:opentelemetry-sdk-common:1.43.0",
-        "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.43.0",
-        "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.43.0",
-        "io.opentelemetry:opentelemetry-sdk-testing:1.43.0",
-        "io.opentelemetry:opentelemetry-sdk-trace:1.43.0",
-        "io.opentelemetry.semconv:opentelemetry-semconv:1.25.0-alpha",
+        "io.lettuce:lettuce-core:6.5.0.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.opentelemetry.semconv:opentelemetry-semconv:1.28.0-alpha",
         "it.ozimov:embedded-redis:0.7.3",
         "net.bytebuddy:byte-buddy:1.15.10",
-        "org.htmlunit:htmlunit-core-js:4.5.0",
+        "org.htmlunit:htmlunit-core-js:4.6.0",
         "org.apache.commons:commons-exec:1.4.0",
         "org.apache.logging.log4j:log4j-core:2.24.1",
         "org.assertj:assertj-core:3.26.3",
-        "org.bouncycastle:bcpkix-jdk18on:1.78.1",
+        "org.bouncycastle:bcpkix-jdk18on:1.79",
         "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:5.11.3",
-        "org.junit.jupiter:junit-jupiter-engine:5.11.3",
-        "org.junit.jupiter:junit-jupiter-params:5.11.3",
-        "org.junit.platform:junit-platform-launcher:1.11.3",
-        "org.junit.platform:junit-platform-reporting:1.11.3",
-        "org.junit.platform:junit-platform-commons:1.11.3",
-        "org.junit.platform:junit-platform-engine:1.11.3",
+        "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.14.2",
-        "org.redisson:redisson:3.37.0",
+        "org.redisson:redisson:3.39.0",
         "org.slf4j:slf4j-api:2.0.16",
         "org.slf4j:slf4j-jdk14:2.0.16",
         "org.tomlj:tomlj:1.1.1",
         "org.zeromq:jeromq:0.6.0",
     ],
+    boms = [
+        "io.opentelemetry:opentelemetry-bom:1.44.1",
+        "io.netty:netty-bom:4.1.115.Final",
+        "org.junit:junit-bom:5.11.3",
+    ],
     excluded_artifacts = [
         "org.hamcrest:hamcrest-all",  # Replaced by hamcrest 2
         "org.hamcrest:hamcrest-core",
@@ -235,6 +240,7 @@ maven.install(
     repositories = [
         "https://repo1.maven.org/maven2",
     ],
+    resolver = "maven",
     strict_visibility = True,
 )
 use_repo(maven, "maven", "unpinned_maven")

diff --git a/Rakefile b/Rakefile
@@ -97,7 +97,7 @@ task '//java/test/org/openqa/selenium/environment/webserver:webserver:uber' => [
 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/v128:v128.publish
+  //java/src/org/openqa/selenium/devtools/v131:v131.publish
   //java/src/org/openqa/selenium/devtools/v129:v129.publish
   //java/src/org/openqa/selenium/devtools/v130:v130.publish
   //java/src/org/openqa/selenium/devtools/v85:v85.publish
@@ -582,10 +582,10 @@ namespace :py do
   desc 'Update Python version'
   task :version, [:version] do |_task, arguments|
     old_version = python_version
-    nightly = ".dev#{Time.now.strftime('%Y%m%d%H%M')}"
+    nightly = ".#{Time.now.strftime('%Y%m%d%H%M')}"
     new_version = updated_version(old_version, arguments[:version], nightly)
 
-    ['py/setup.py',
+    ['py/pyproject.toml',
      'py/BUILD.bazel',
      'py/selenium/__init__.py',
      'py/selenium/webdriver/__init__.py',
@@ -1047,7 +1047,6 @@ namespace :all do
                                            'py/selenium/webdriver/__init__.py',
                                            'py/selenium/__init__.py',
                                            'py/BUILD.bazel',
-                                           'py/setup.py',
                                            'rb/lib/selenium/webdriver/version.rb',
                                            'rb/Gemfile.lock'])
 
@@ -1109,7 +1108,6 @@ namespace :all do
              'py/selenium/webdriver/__init__.py',
              'py/BUILD.bazel',
              'py/CHANGES',
-             'py/setup.py',
              'rb/lib/selenium/webdriver/version.rb',
              'rb/CHANGES',
              'rb/Gemfile.lock',
@@ -1138,7 +1136,7 @@ def updated_version(current, desired = nil, nightly = nil)
     desired.split('.').tap { |v| v << 0 while v.size < 3 }.join('.')
   elsif current.split(/\.|-/).size > 3
     # if current version is already nightly, just need to bump it; this will be noop for some languages
-    pattern = /-?\.?(nightly|SNAPSHOT|dev)\d*$/
+    pattern = /-?\.?(nightly|SNAPSHOT|dev|\d{12})\d*$/
     current.gsub(pattern, nightly)
   elsif current.split(/\.|-/).size == 3
     # if current version is not nightly, need to bump the version and make nightly

diff --git a/common/devtools/chromium/v128/BUILD.bazel → common/devtools/chromium/v131/BUILD.bazel b/common/devtools/chromium/v128/BUILD.bazel → common/devtools/chromium/v131/BUILD.bazel