Merge branch 'trunk' into sm_check_browser_version

SeleniumHQ · Sep 20, 2024 · db8f912 · db8f912
2 parents e725eeb + aabdb7f
commit db8f912
Show file tree

Hide file tree

Showing 63 changed files with 815 additions and 400 deletions.
diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
@@ -72,6 +72,8 @@ jobs:
         with:
           ruby-version: '3.1'
           working-directory: 'rb'
+      - name: Setup curl for Ubuntu
+        run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
       - name: "Prep git"
         run: |
           git config --local user.email "selenium-ci@users.noreply.github.com"

diff --git a/.github/workflows/stage-release.yml b/.github/workflows/stage-release.yml
@@ -2,7 +2,12 @@ name: Release Staging
 
 on:
   pull_request:
-    types: [closed]
+    types: [ closed ]
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Selenium version to release'
+        required: true
 
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -11,52 +16,74 @@ env:
 jobs:
   github-release:
     if: >
-      github.event.pull_request.merged == true &&
+      (github.event.pull_request.merged == true &&
       github.repository_owner == 'seleniumhq' &&
-      startsWith(github.event.pull_request.head.ref, 'release-preparation-')
+      startsWith(github.event.pull_request.head.ref, 'release-preparation-')) ||
+      (github.event_name == 'workflow_dispatch' && 
+      github.event.inputs.version != '' && 
+      github.repository_owner == 'seleniumhq')
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
         uses: actions/checkout@v4
       - name: Extract version from branch name
-        id: extract_version
+        if: github.event.pull_request.merged == true
         run: |
           VERSION=$(echo $BRANCH_NAME | grep -oE '[0-9]+\.[0-9]+\.[0-9]+')
           echo "VERSION=$VERSION" >> $GITHUB_ENV
+      - name: Extract version from workflow input
+        if: github.event_name == 'workflow_dispatch'
+        run: |
+          VERSION=${{ inputs.version }}
+          echo "VERSION=$VERSION" >> $GITHUB_ENV
       - name: Prep git
         run: |
           git config --local user.email "selenium-ci@users.noreply.github.com"
           git config --local user.name "Selenium CI Bot"
-      - name: Tag Release
-        run: |
-          git tag selenium-${{ env.VERSION }}
-          git push origin selenium-${{ env.VERSION }}
-      - name: Update Nightly Tag to Remove pre-release
-        run: |
-          git fetch --tags
-          git tag -d nightly || echo "Nightly tag not found"
-          git tag nightly
-          git push origin refs/tags/nightly --force
+      #      - name: Tag Release
+      #        run: |
+      #          git tag selenium-${{ env.VERSION }} || echo "Tag already exists"
+      #          git push origin selenium-${{ env.VERSION }} || echo "Tag already exists remotely"
       - name: Setup Java
         uses: actions/setup-java@v3
         with:
           java-version: 17
           distribution: 'temurin'
+      - name: Setup curl for Ubuntu
+        run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
       - name: Build and Stage Packages
         run: ./go all:package[--config=release]
+      #      - name: Update Nightly Tag to Remove pre-release
+      #        run: |
+      #          git fetch --tags
+      #          git tag -d nightly || echo "Nightly tag not found"
+      #          git tag nightly
+      #          git push origin refs/tags/nightly --force
       - name: Generate Draft Release
-        uses: softprops/action-gh-release@v2
+        uses: ncipollo/release-action@v1
         with:
-          name: Selenium ${{ env.VERSION }}
-          body: |
-              ## Detailed Changelogs by Component
-              <img src="https://www.selenium.dev/images/programming/java.svg" width="20" height="20"> **[Java](https://github.com/SeleniumHQ/selenium/blob/trunk/java/CHANGELOG)** &nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;<img src="https://www.selenium.dev/images/programming/python.svg" width="20" height="20"> **[Python](https://github.com/SeleniumHQ/selenium/blob/trunk/py/CHANGES)** &nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;<img src="https://www.selenium.dev/images/programming/csharp.svg" width="20" height="20"> **[DotNet](https://github.com/SeleniumHQ/selenium/blob/trunk/dotnet/CHANGELOG)** &nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;<img src="https://www.selenium.dev/images/programming/ruby.svg" width="20" height="20"> **[Ruby](https://github.com/SeleniumHQ/selenium/blob/trunk/rb/CHANGES)** &nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;<img src="https://www.selenium.dev/images/programming/javascript.svg" width="20" height="20"> **[JavaScript](https://github.com/SeleniumHQ/selenium/blob/trunk/javascript/node/selenium-webdriver/CHANGES.md)** &nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;<img src="https://www.selenium.dev/images/browsers/internet-explorer.svg" width="20" height="20"> **[IEDriver](https://github.com/SeleniumHQ/selenium/blob/trunk/cpp/iedriverserver/CHANGELOG)**
-              <br>
-          tag_name: selenium-${{ env.VERSION }}
+          artifacts: "build/dist/*.*"
+          bodyFile: "scripts/github-actions/release_header.md"
           draft: true
-          generate_release_notes: true
+          generateReleaseNotes: true
+          name: Selenium ${{ env.VERSION }}
           prerelease: false
-          files: build/dist/*.*
+          skipIfReleaseExists: true
+          tag: selenium-${{ env.VERSION }}
+          commit: trunk
+  #      - name: Generate Draft Release
+  #        uses: softprops/action-gh-release@v2
+  #        with:
+  #          name: Selenium ${{ env.VERSION }}
+  #          body: |
+  #            ## Detailed Changelogs by Component
+  #            <img src="https://www.selenium.dev/images/programming/java.svg" width="20" height="20"> **[Java](https://github.com/SeleniumHQ/selenium/blob/trunk/java/CHANGELOG)** &nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;<img src="https://www.selenium.dev/images/programming/python.svg" width="20" height="20"> **[Python](https://github.com/SeleniumHQ/selenium/blob/trunk/py/CHANGES)** &nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;<img src="https://www.selenium.dev/images/programming/csharp.svg" width="20" height="20"> **[DotNet](https://github.com/SeleniumHQ/selenium/blob/trunk/dotnet/CHANGELOG)** &nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;<img src="https://www.selenium.dev/images/programming/ruby.svg" width="20" height="20"> **[Ruby](https://github.com/SeleniumHQ/selenium/blob/trunk/rb/CHANGES)** &nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;<img src="https://www.selenium.dev/images/programming/javascript.svg" width="20" height="20"> **[JavaScript](https://github.com/SeleniumHQ/selenium/blob/trunk/javascript/node/selenium-webdriver/CHANGES.md)** &nbsp;&nbsp;&nbsp; | &nbsp;&nbsp;&nbsp;<img src="https://www.selenium.dev/images/browsers/internet-explorer.svg" width="20" height="20"> **[IEDriver](https://github.com/SeleniumHQ/selenium/blob/trunk/cpp/iedriverserver/CHANGELOG)**
+  #            <br>
+  #          tag_name: selenium-${{ env.VERSION }}
+  #          draft: true
+  #          generate_release_notes: true
+  #          prerelease: false
+  #          files: build/dist/*.*
 
   update-documentation:
     needs: github-release

diff --git a/.gitignore b/.gitignore
@@ -78,6 +78,7 @@ py/docs/source/**/*
 py/build/
 py/LICENSE
 py/pytestdebug.log
+py/python.iml
 selenium.egg-info/
 third_party/java/jetty/jetty-repacked.jar
 *.user

diff --git a/AUTHORS b/AUTHORS
@@ -23,7 +23,6 @@ Ahmed Ashour <asashour@yahoo.com>
 AJ <anandj82@gmail.com>
 Ajay Kemparaj <ajaykemparaj@gmail.com>
 Akhil Lb <akhil.lb1@gmail.com>
-Ákos Lukács <AkosLukacs42@gmail.com>
 Akuli <akuviljanen17@gmail.com>
 Al Sutton <alsutton@users.noreply.github.com>
 Alan Baird <alan.baird@livingsocial.com>
@@ -137,7 +136,6 @@ Carlos Ortega <roh.race@gmail.com>
 Carlos Villela
 Carson McDonald <carson@ioncannon.net>
 ce86f3bb9faf71e <118820152+ce86f3bb9faf71e@users.noreply.github.com>
-Cédric Boutillier <cedric.boutillier@gmail.com>
 Cervac Petru <petru.cervac@gmail.com>
 cezarelnazli <cezarelnazli@users.noreply.github.com>
 ch-saeki <31008335+ch-saeki@users.noreply.github.com>
@@ -174,6 +172,7 @@ Coty Rosenblath <coty@pobox.com>
 Craig Nishina <craig.nishina@gmail.com>
 CsolG <csolg7@gmail.com>
 customcommander <hello@spinjs.com>
+Cédric Boutillier <cedric.boutillier@gmail.com>
 Dakkaron <dak1st@gmx.at>
 Damien Allison <dakkad@users.noreply.github.com>
 Damir <damirz@gmail.com>
@@ -232,6 +231,7 @@ Dmitry Tokarev <dmitrytokarev@users.noreply.github.com>
 Dmytro Shpakovskyi <Marketionist@users.noreply.github.com>
 dnknitro <vova64@gmail.com>
 doctor-house <66467615+doctor-house@users.noreply.github.com>
+Dominic Evans <8060970+dnwe@users.noreply.github.com>
 Dominik Dary <ddary@ebay.com>
 Dominik Rauch <dominik.rauch@rubicon.eu>
 Dominik Stadler <dominik.stadler@gmx.at>
@@ -267,7 +267,6 @@ Eric Plaster <eric.plaster@mutualmobile.com>
 Erik Beans <ebeans@google.com>
 Erik E. Beerepoot <erikbeerepoot@hush.com>
 Erik Kuefler <ekuefler@gmail.com>
-Étienne Barrié <etienne.barrie@gmail.com>
 Evan Sangaline <esangaline@gmail.com>
 Evgeniy Roldukhin <evgeniy@roldukhin.ru>
 EwaMarek <ewa.marek.3.14@gmail.com>
@@ -279,10 +278,10 @@ Florian LOPES <florian.lopes@outlook.com>
 Florian Mutter <32459530+florianmutter@users.noreply.github.com>
 Florian Zipperle <zipperle@users.noreply.github.com>
 Francis Bergin <bergin.francis@gmail.com>
+Franz Liedke <franz@develophp.org>
 François Freitag <francois.freitag@polyconseil.fr>
 François JACQUES <hypnoce@donarproject.org>
 François Reynaud <francois.reynaud@gmail.com>
-Franz Liedke <franz@develophp.org>
 Frederik Carlier <frederik.carlier@quamotion.mobi>
 Fredrik Wollsén <fredrik@neam.se>
 freynaud <francois.reynaud@gmail.com>
@@ -425,7 +424,6 @@ Jim van Musscher <jim.van.musscher@gmail.com>
 jkbzh <3439365+jkbzh@users.noreply.github.com>
 jkohls <johnny@appthwack.com>
 jmuramatsu <jmuramatsu@gmail.com>
-João Luca Ripardo <jlucartc@gmail.com>
 Joaquín Romero <joromerom@gmail.com>
 jochenberger <fooberger@gmail.com>
 Joe Bandenburg <joe@bandenburg.com>
@@ -457,12 +455,12 @@ Jonathan Lipps <jlipps@gmail.com>
 Jonathon Kereliuk <kereliuk.j@gmail.com>
 Jongkuen Hong <dldkfod@naver.com>
 Jordan Mace <jordan.mace@inlogik.com>
-Jörg Sautter <joerg.sautter@gmx.net>
 josephg <josephg@gmail.com>
 Josh Goldberg <joshuakgoldberg@outlook.com>
 Joshua Bruning <joshbruning@gmail.com>
 Joshua Fehler <jsfehler@users.noreply.github.com>
 Joshua Grant <joshua.m.grant@gmail.com>
+João Luca Ripardo <jlucartc@gmail.com>
 JT Archie <jarchie@pivotal.io>
 jugglinmike <mike@mikepennisi.com>
 Julian Didier <did.julian@gmail.com>
@@ -477,6 +475,7 @@ Justin Tulloss <justin.tulloss@gmail.com>
 Justine Tunney <jtunney@gmail.com>
 justinwoolley@gmail.com <jwoolley@netflix.com>
 jwoolley <19597672+jwoolley@users.noreply.github.com>
+Jörg Sautter <joerg.sautter@gmx.net>
 Kamen Litchev <kamenlitchev@users.noreply.github.com>
 Karl Kuehn <kuehn.karl@gmail.com>
 Karl-Philipp Richter <krichter722@aol.de>
@@ -530,10 +529,10 @@ Lucas Diniz <kbelodiniz@hotmail.com>
 Lucas Tierney <lucastierney@gmail.com>
 Luis Correia <luis.f.correia@gmail.com>
 Luis Pflamminger <luis.pflamminger@gmail.com>
-Lukáš Linhart <lukas.linhart.1981@gmail.com>
 Luke Hill <lukehill_uk@hotmail.com>
 Luke Inman-Semerau <luke.semerau@gmail.com>
 lukec <lukec@example.com>
+Lukáš Linhart <lukas.linhart.1981@gmail.com>
 Lyudmil Latinov <llatinov@users.noreply.github.com>
 Machinexa2 <60662297+machinexa2@users.noreply.github.com>
 Maciej Pakulski <pakulski.maciej@gmail.com>
@@ -809,15 +808,16 @@ Stuart Knightly <stuidge@gmail.com>
 sufyanAbbasi <sufyanAbbasi@users.noreply.github.com>
 sugama <sugama@jamadam.com>
 sunnyyukaige <kaige8531917@163.com>
+Swastik Baranwal <swstkbaranwal@gmail.com>
 symonk <jackofspaces@gmail.com>
 Take <takewakamma@gmail.com>
 take0x <89313929+take0x@users.noreply.github.com>
 Takeshi Kishi <takeya0x86@gmail.com>
 Takuho NAKANO <takotakot@users.noreply.github.com>
 Takuma Chiba <hogenoserver@gmail.com>
-Tamás Buka <buka86@gmail.com>
 Tamas Utasi <3823780+utamas@users.noreply.github.com>
 Tamsil Sajid Amani <tamsajama@gmail.com>
+Tamás Buka <buka86@gmail.com>
 Tatsuya Hoshino <tatsuya7.hoshino7@gmail.com>
 Terence Haddock
 thecr8tr <thecr8tr@users.noreply.github.com>
@@ -860,7 +860,6 @@ Ulf Adams <ulfjack@users.noreply.github.com>
 Ulrich Buchgraber <ulrich.b@gmx.at>
 User253489 <user253489@gmail.com>
 V24 <55334829+umarfarouk98@users.noreply.github.com>
-Václav Votípka <enca@enca.cz>
 Valery Yatsynovich <valfirst@yandex.ru>
 Varun Menon <mr.varun.menon@gmail.com>
 varunsurapaneni <67070327+varunsurapaneni@users.noreply.github.com>
@@ -885,6 +884,7 @@ Vladimir Támara Patiño <vtamara@pasosdeJesus.org>
 VladimirPodolyan <36446855+VladimirPodolyan@users.noreply.github.com>
 Vladislav Velichko <111522705+vlad8x8@users.noreply.github.com>
 Vyvyan Codd
+Václav Votípka <enca@enca.cz>
 Werner Robitza <slhck@users.noreply.github.com>
 wiggin15 <wiggin15@yahoo.com>
 wildloop <mariusz@olejnik.net>
@@ -906,4 +906,6 @@ Zhuo Peng <zhuo.peng@vanemy.org>
 Ziyu <odduid@gmail.com>
 Zoltar - Knower of All
 zsong <zsong@example.com>
+Ákos Lukács <AkosLukacs42@gmail.com>
+Étienne Barrié <etienne.barrie@gmail.com>
 保木本将之 <markun@markun.local>
diff --git a/MODULE.bazel b/MODULE.bazel
@@ -1,10 +1,10 @@
 module(name = "selenium")
 
 bazel_dep(name = "apple_rules_lint", version = "0.4.0")
-bazel_dep(name = "aspect_bazel_lib", version = "2.7.9")
-bazel_dep(name = "aspect_rules_esbuild", version = "0.20.1")
-bazel_dep(name = "aspect_rules_js", version = "1.42.3")
-bazel_dep(name = "aspect_rules_ts", version = "2.4.2")
+bazel_dep(name = "aspect_bazel_lib", version = "2.8.1")
+bazel_dep(name = "aspect_rules_esbuild", version = "0.21.0")
+bazel_dep(name = "aspect_rules_js", version = "2.0.1")
+bazel_dep(name = "aspect_rules_ts", version = "3.1.0")
 bazel_dep(name = "bazel_features", version = "1.13.0")
 bazel_dep(name = "bazel_skylib", version = "1.7.1")
 bazel_dep(name = "buildifier_prebuilt", version = "6.4.0")
@@ -18,7 +18,7 @@ bazel_dep(name = "protobuf", version = "21.7", dev_dependency = True, repo_name
 bazel_dep(name = "rules_cc", version = "0.0.9", dev_dependency = True)
 
 bazel_dep(name = "rules_dotnet", version = "0.15.1")
-bazel_dep(name = "rules_java", version = "7.6.3")
+bazel_dep(name = "rules_java", version = "7.11.1")
 bazel_dep(name = "rules_jvm_external", version = "6.3")
 bazel_dep(name = "rules_nodejs", version = "6.2.0")
 bazel_dep(name = "rules_oci", version = "1.7.6")
@@ -169,7 +169,7 @@ maven.install(
     name = "maven",
     artifacts = [
         "com.beust:jcommander:1.82",
-        "com.github.javaparser:javaparser-core:3.26.1",
+        "com.github.javaparser:javaparser-core:3.26.2",
         "com.github.spotbugs:spotbugs:4.8.6",
         "com.github.stephenc.jcip:jcip-annotations:1.0-1",
         "com.google.code.gson:gson:2.11.0",
@@ -183,29 +183,29 @@ maven.install(
         "dev.failsafe:failsafe:3.3.2",
         "io.grpc:grpc-context:1.66.0",
         "io.lettuce:lettuce-core:6.4.0.RELEASE",
-        "io.netty:netty-buffer:4.1.112.Final",
-        "io.netty:netty-codec-http:4.1.112.Final",
-        "io.netty:netty-codec-http2:4.1.112.Final",
-        "io.netty:netty-common:4.1.112.Final",
-        "io.netty:netty-handler:4.1.112.Final",
-        "io.netty:netty-handler-proxy:4.1.112.Final",
-        "io.netty:netty-transport:4.1.112.Final",
-        "io.opentelemetry:opentelemetry-api:1.41.0",
-        "io.opentelemetry:opentelemetry-context:1.41.0",
-        "io.opentelemetry:opentelemetry-exporter-logging:1.41.0",
-        "io.opentelemetry:opentelemetry-sdk:1.41.0",
-        "io.opentelemetry:opentelemetry-sdk-common:1.41.0",
-        "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.41.0",
-        "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.41.0",
-        "io.opentelemetry:opentelemetry-sdk-testing:1.41.0",
-        "io.opentelemetry:opentelemetry-sdk-trace:1.41.0",
+        "io.netty:netty-buffer:4.1.113.Final",
+        "io.netty:netty-codec-http:4.1.113.Final",
+        "io.netty:netty-codec-http2:4.1.113.Final",
+        "io.netty:netty-common:4.1.113.Final",
+        "io.netty:netty-handler:4.1.113.Final",
+        "io.netty:netty-handler-proxy:4.1.113.Final",
+        "io.netty:netty-transport:4.1.113.Final",
+        "io.opentelemetry:opentelemetry-api:1.42.1",
+        "io.opentelemetry:opentelemetry-context:1.42.1",
+        "io.opentelemetry:opentelemetry-exporter-logging:1.42.1",
+        "io.opentelemetry:opentelemetry-sdk:1.42.1",
+        "io.opentelemetry:opentelemetry-sdk-common:1.42.1",
+        "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure:1.42.1",
+        "io.opentelemetry:opentelemetry-sdk-extension-autoconfigure-spi:1.42.1",
+        "io.opentelemetry:opentelemetry-sdk-testing:1.42.1",
+        "io.opentelemetry:opentelemetry-sdk-trace:1.42.1",
         "io.opentelemetry.semconv:opentelemetry-semconv:1.25.0-alpha",
         "io.ous:jtoml:2.0.0",
         "it.ozimov:embedded-redis:0.7.3",
-        "net.bytebuddy:byte-buddy:1.15.0",
+        "net.bytebuddy:byte-buddy:1.15.1",
         "org.htmlunit:htmlunit-core-js:4.4.0",
         "org.apache.commons:commons-exec:1.4.0",
-        "org.apache.logging.log4j:log4j-core:2.23.1",
+        "org.apache.logging.log4j:log4j-core:2.24.0",
         "org.assertj:assertj-core:3.26.3",
         "org.bouncycastle:bcpkix-jdk18on:1.78.1",
         "org.eclipse.mylyn.github:org.eclipse.egit.github.core:2.1.5",
@@ -218,8 +218,8 @@ maven.install(
         "org.junit.platform:junit-platform-reporting:1.11.0",
         "org.junit.platform:junit-platform-commons:1.11.0",
         "org.junit.platform:junit-platform-engine:1.11.0",
-        "org.mockito:mockito-core:5.12.0",
-        "org.redisson:redisson:3.35.0",
+        "org.mockito:mockito-core:5.13.0",
+        "org.redisson:redisson:3.36.0",
         "org.slf4j:slf4j-api:2.0.16",
         "org.slf4j:slf4j-jdk14:2.0.16",
         "org.zeromq:jeromq:0.6.0",

diff --git a/Rakefile b/Rakefile
@@ -98,7 +98,7 @@ 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/v126:v126.publish
+  //java/src/org/openqa/selenium/devtools/v129:v129.publish
   //java/src/org/openqa/selenium/devtools/v127:v127.publish
   //java/src/org/openqa/selenium/devtools/v85:v85.publish
   //java/src/org/openqa/selenium/edge:edge.publish

diff --git a/common/devtools/chromium/v126/BUILD.bazel → common/devtools/chromium/v129/BUILD.bazel b/common/devtools/chromium/v126/BUILD.bazel → common/devtools/chromium/v129/BUILD.bazel