Merge branch 'trunk' into local-value

Author: RenderMichael

.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

.github/workflows/update-documentation.yml

@@ -3,227 +3,89 @@ name: Update Documentation
 on:
   workflow_dispatch:
     inputs:
-      tag:
-        description: Release tag (e.g. selenium-4.21.0)
+      version:
+        description: Release version (e.g., 4.21.0)
         required: true
         type: string
+      language:
+        description: language documentation
+        required: true
+        type: choice
+        default: "all"
+        options:
+          - java
+          - rb
+          - py
+          - dotnet
+          - node
+          - all
 
   workflow_call:
     inputs:
-      tag:
+      version:
+        required: true
+        type: string
+      sha:
         required: true
         type: string
+      language:
+        required: false
+        type: string
+        default: "all"
 
 env:
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
 jobs:
-  determine-language:
-    runs-on: ubuntu-latest
-    outputs:
-      language: ${{ steps.get-language.outputs.language }}
-    steps:
-      - name: Parse language from tag
-        id: get-language
-        run: |
-          tag=${{ inputs.tag }}
-          language=$(echo $tag | awk -F'-' '{print $NF}')
-          if [[ ! "$language" =~ ^(java|ruby|python|dotnet|node)$ ]]; then
-            language="all"
-          fi
-          echo "language=$language" > $GITHUB_OUTPUT
-
-  java-docs:
-    runs-on: ubuntu-latest
-    needs: determine-language
-    steps:
-      - name: Checkout the tag
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.tag }}
-      - name: Prep git
-        run: |
-          git config --local user.email "[email protected]"
-          git config --local user.name "Selenium CI Bot"
-      - name: Setup Java
-        uses: actions/setup-java@v4
-        with:
-          java-version: 17
-          distribution: 'temurin'
-      - name: Update Documentation
-        if: needs.determine-language.outputs.language == 'all' || needs.determine-language.outputs.language == 'java'
-        run: ./go java:docs
-      - name: Create patch for changes
-        run: |
-          git format-patch -1 HEAD --stdout > java-docs.patch
-      - name: Upload patch
-        if: needs.determine-language.outputs.language == 'all' || needs.determine-language.outputs.language == 'java'
-        uses: actions/upload-artifact@v4
-        with:
-          name: java-docs-patch
-          path: java-docs.patch
-
-  ruby-docs:
+  build-docs:
     runs-on: ubuntu-latest
-    needs: determine-language
     steps:
-      - name: Checkout the tag
+      - name: Checkout repository
         uses: actions/checkout@v4
         with:
-          ref: ${{ inputs.tag }}
-      - name: Prep git
+          ref: ${{ github.event_name == 'workflow_dispatch' && github.ref || inputs.sha }}
+      - name: Fetch gh-pages branch
+        run: git fetch origin gh-pages
+      - name: Setup git
         run: |
           git config --local user.email "[email protected]"
           git config --local user.name "Selenium CI Bot"
+      - name: Setup curl for Ubuntu
+        run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
       - name: Setup Java
         uses: actions/setup-java@v4
         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: Update Documentation
-        if: needs.determine-language.outputs.language == 'all' || needs.determine-language.outputs.language == 'ruby'
-        run: ./go rb:docs
-      - name: Create patch for changes
-        run: |
-          git format-patch -1 HEAD --stdout > ruby-docs.patch
-      - name: Upload patch
-        if: needs.determine-language.outputs.language == 'all' || needs.determine-language.outputs.language == 'ruby'
-        uses: actions/upload-artifact@v4
-        with:
-          name: ruby-docs-patch
-          path: ruby-docs.patch
-
-  python-docs:
-    needs: determine-language
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout the tag
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.tag }}
-      - name: Prep git
-        run: |
-          git config --local user.email "[email protected]"
-          git config --local user.name "Selenium CI Bot"
       - name: Set up Python 3.9
+        if: ${{ inputs.language == 'all' || inputs.language == 'py' }}
         uses: actions/setup-python@v5
         with:
           python-version: 3.9
       - name: Install dependencies
+        if: ${{ inputs.language == 'all' || inputs.language == 'py' }}
         run: |
           python -m pip install --upgrade pip
           pip install tox
-      - name: Update Documentation
-        if: needs.determine-language.outputs.language == 'all' || needs.determine-language.outputs.language == 'python'
-        run: ./go py:docs
-      - name: Create patch for changes
-        run: |
-          git format-patch -1 HEAD --stdout > python-docs.patch
-      - name: Upload patch
-        if: needs.determine-language.outputs.language == 'all' || needs.determine-language.outputs.language == 'python'
-        uses: actions/upload-artifact@v4
-        with:
-          name: python-docs-patch
-          path: python-docs.patch
-
-  dotnet-docs:
-    needs: determine-language
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout the tag
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.tag }}
-      - name: Prep git
-        run: |
-          git config --local user.email "[email protected]"
-          git config --local user.name "Selenium CI Bot"
-      - name: Update Documentation
-        if: needs.determine-language.outputs.language == 'all' || needs.determine-language.outputs.language == 'dotnet'
-        run: ./go dotnet:docs
-      - name: Create patch for changes
-        run: |
-          git format-patch -1 HEAD --stdout > dotnet-docs.patch
-      - name: Upload patch
-        if: needs.determine-language.outputs.language == 'all' || needs.determine-language.outputs.language == 'dotnet'
-        uses: actions/upload-artifact@v4
-        with:
-          name: dotnet-docs-patch
-          path: dotnet-docs.patch
-
-  node-docs:
-    needs: determine-language
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout the tag
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ inputs.tag }}
-      - name: Prep git
-        run: |
-          git config --local user.email "[email protected]"
-          git config --local user.name "Selenium CI Bot"
       - name: Install npm dependencies
+        if: ${{ inputs.language == 'all' || inputs.language == 'node' }}
         run: |
           npm install
           npm install --prefix javascript/node/selenium-webdriver
       - name: Update Documentation
-        if: needs.determine-language.outputs.language == 'all' || needs.determine-language.outputs.language == 'node'
-        run: ./go node:docs
-      - name: Create patch for changes
-        run: |
-          git format-patch -1 HEAD --stdout > node-docs.patch
-      - name: Upload patch
-        if: needs.determine-language.outputs.language == 'all' || needs.determine-language.outputs.language == 'node'
-        uses: actions/upload-artifact@v4
-        with:
-          name: node-docs-patch
-          path: node-docs.patch
+        run: ./go ${{ inputs.language }}:docs
 
-  merge-patches:
-    runs-on: ubuntu-latest
-    needs: [java-docs, ruby-docs, python-docs, dotnet-docs, node-docs]
-    steps:
-      - name: Checkout  documentation branch
-        uses: actions/checkout@v4
-        with:
-          ref: 'gh-pages'
-          fetch-depth: 0
-          fetch-tags: true
-      - name: Create and checkout new branch
-        run: |
-          git config --local user.email "[email protected]"
-          git config --local user.name "Selenium CI Bot"
-          git checkout -b api-docs-${{ inputs.tag }}
-      - name: Download all patches
-        uses: actions/download-artifact@v4
-        with:
-          path: patches/
-          merge-multiple: true
-      - name: Show downloaded patches
-        run: ls -lah patches/
-      - name: Apply patches
-        run: |
-          for patch in patches/*.patch; do
-            git am < "$patch"
-          done
-          rm -rf patches/
-      - name: Push Branch
-        run: git push origin api-docs-${{ inputs.tag }}
       - name: Documentation Pull Request
         uses: peter-evans/create-pull-request@v6
         with:
           token: ${{ secrets.SELENIUM_CI_TOKEN }}
           author: Selenium CI Bot <[email protected]>
           delete-branch: true
-          branch: api-docs-${{ inputs.tag }}
+          branch: api-docs-${{ inputs.version }}-${{ inputs.language }}
           base: gh-pages
-          title: Update documentation for ${{ inputs.tag }}
+          title: Update documentation for Selenium ${{ inputs.version }} (${{ inputs.language }})
           body: |
-            This PR updates the API documentation for all bindings
-            based on the provided tag name.
+            This PR updates the API documentation for **${{ inputs.language }}** language bindings to version **${{ inputs.version }}**.
 
             - Auto-generated by [create-pull-request][1]
 

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

@@ -176,7 +176,7 @@ maven.install(
         "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",
@@ -219,7 +219,7 @@ maven.install(
         "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.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",

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