Merge branch 'main' into md/config-stream-dir

Author: michaelklishin

.github/DISCUSSION_TEMPLATE/ideas.yml

@@ -16,8 +16,8 @@ body:
     attributes:
       label: RabbitMQ series
       options:
-        - 4.0.x
         - 4.1.x
+        - 4.2.x
     validations:
       required: true
   - type: input

.github/DISCUSSION_TEMPLATE/other.yml

@@ -23,6 +23,7 @@ body:
     attributes:
       label: RabbitMQ version used
       options:
+        - 4.2.x
         - 4.1.x
         - 4.0.x
         - 3.13.x or older

.github/dependabot.yaml

@@ -126,3 +126,46 @@ updates:
         versions: [ "[6.0,)" ]
       - dependency-name: "org.junit.jupiter:*"
         versions: [ "[6.0,)" ]
+  - package-ecosystem: "npm"
+    directory: "/selenium"
+    schedule:
+      interval: "daily"
+    target-branch: "main"
+    cooldown:
+      semver-minor-days: 3
+      semver-major-days: 3
+    groups:
+      minor-patch-updates:
+        applies-to: version-updates
+        update-types:
+          - "minor"
+          - "patch"
+  - package-ecosystem: "npm"
+    directory: "/selenium"
+    schedule:
+      interval: "daily"
+    target-branch: "v4.2.x"
+    cooldown:
+      semver-minor-days: 3
+      semver-major-days: 3
+    groups:
+      minor-patch-updates:
+        applies-to: version-updates
+        update-types:
+          - "minor"
+          - "patch"
+  - package-ecosystem: "npm"
+    directory: "/selenium"
+    schedule:
+      interval: "daily"
+    target-branch: "v4.1.x"
+    cooldown:
+      semver-minor-days: 3
+      semver-major-days: 3
+    groups:
+      minor-patch-updates:
+        applies-to: version-updates
+        update-types:
+          - "minor"
+          - "patch"
+

.github/workflows/authorization-server-make.yaml

@@ -21,7 +21,7 @@ jobs:
     steps:
 
       - name: CHECKOUT REPOSITORY
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Login to Docker Hub
         uses: docker/login-action@v3

.github/workflows/ibm-mq-make.yaml

@@ -9,23 +9,23 @@ on:
   pull_request:
     paths:
       - '.github/workflows/ibm-mq-make.yaml'
-  
+
 env:
   REGISTRY_IMAGE: pivotalrabbitmq/ibm-mqadvanced-server-dev
   IBM_MQ_REPOSITORY: ibm-messaging/mq-container
   IBM_MQ_BRANCH_NAME: 9.4.0
-  IMAGE_TAG: 9.4.0.12-amd64
+  IMAGE_TAG: 9.4.0.16-amd64
 jobs:
   docker:
     runs-on: ubuntu-latest
     steps:
-      
+
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY_IMAGE }}
-          
+
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -34,14 +34,14 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Checkout ibm-mqadvanced-server-dev
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: ${{ env.IBM_MQ_REPOSITORY }}
           ref: ${{ env.IBM_MQ_BRANCH_NAME }}
 
-      - name: Prepare image        
+      - name: Prepare image
         run: |
-          ls        
+          ls
           echo "Enabling AMQP capability"
           sed -i -e 's/genmqpkg_incamqp=0/genmqpkg_incamqp=1/g' Dockerfile-server
           echo "AMQP Bootstrap instructions"
@@ -54,8 +54,8 @@ jobs:
           START SERVICE(SYSTEM.AMQP.SERVICE)
           START CHANNEL(SYSTEM.DEF.AMQP)
           EOF
-          make build-devserver    
-          docker tag ibm-mqadvanced-server-dev:${{ env.IMAGE_TAG }} ${{ env.REGISTRY_IMAGE }}:${{ env.IMAGE_TAG }} 
+          make build-devserver
+          docker tag ibm-mqadvanced-server-dev:${{ env.IMAGE_TAG }} ${{ env.REGISTRY_IMAGE }}:${{ env.IMAGE_TAG }}
       -
         name: Login to Docker Hub
         uses: docker/login-action@v3
@@ -64,4 +64,4 @@ jobs:
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
       - name: Push
         run: |
-          docker push ${{ env.REGISTRY_IMAGE }}:${{ env.IMAGE_TAG }}
+          docker push ${{ env.REGISTRY_IMAGE }}:${{ env.IMAGE_TAG }}

.github/workflows/oci-make-nightly.yaml

@@ -17,22 +17,22 @@ concurrency:
 jobs:
   build-package-generic-unix:
     strategy:
+      fail-fast: false
       matrix:
         otp_version:
           - '27'
         branch:
           - main
           - v4.2.x
           - v4.1.x
-          - v4.0.x
         include:
           - branch: main
             project_version: 4.3.0
 
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ matrix.branch }}
           fetch-tags: true
@@ -66,7 +66,7 @@ jobs:
           make package-generic-unix PROJECT_VERSION=${{ matrix.project_version || steps.tag.outputs.project_version }}+${{ steps.sha.outputs.current_sha }}
 
       - name: Upload package-generic-unix
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: package-generic-unix-otp${{ matrix.otp_version }}-${{ matrix.branch }}
           path: PACKAGES/rabbitmq-server-*.tar.xz
@@ -81,13 +81,12 @@ jobs:
           - main
           - v4.2.x
           - v4.1.x
-          - v4.0.x
 
     needs: build-package-generic-unix
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ matrix.branch }}
 
@@ -99,7 +98,7 @@ jobs:
           printf "current_sha=%s\n" "$sha" | tee -a "$GITHUB_OUTPUT"
 
       - name: Download package-generic-unix
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: package-generic-unix-otp${{ matrix.otp_version }}-${{ matrix.branch }}
           path: PACKAGES

.github/workflows/oci-make.yaml

@@ -53,7 +53,7 @@ jobs:
           fi
       - name: Checkout
         if: steps.authorized.outputs.authorized == 'true'
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Configure Erlang
         if: steps.authorized.outputs.authorized == 'true'
         uses: erlef/setup-beam@v1
@@ -66,7 +66,7 @@ jobs:
           make package-generic-unix PROJECT_VERSION=${{ env.VERSION }}
       - name: Upload package-generic-unix
         if: steps.authorized.outputs.authorized == 'true'
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: package-generic-unix-otp${{ matrix.otp_version }}
           path: PACKAGES/rabbitmq-server-*.tar.xz
@@ -82,9 +82,9 @@ jobs:
     if: ${{ needs.build-package-generic-unix.outputs.authorized == 'true' }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
       - name: Download package-generic-unix
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v6
         with:
           name: package-generic-unix-otp${{ matrix.otp_version }}
           path: PACKAGES

.github/workflows/peer-discovery-aws.yaml

@@ -30,7 +30,7 @@ jobs:
         fi
     - name: CHECKOUT REPOSITORY
       if: steps.authorized.outputs.authorized == 'true'
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
     - uses: docker/metadata-action@v5
       if: steps.authorized.outputs.authorized == 'true'
       id: metadata
@@ -72,7 +72,7 @@ jobs:
         make -C deps/rabbitmq_peer_discovery_aws ct-integration
     - name: UPLOAD TEST LOGS
       if: always()
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: CT logs
         path: "logs/"

.github/workflows/test-authnz.yaml

@@ -41,7 +41,7 @@ jobs:
       DOCKER_NETWORK: rabbitmq_net
     steps:
     - name: Checkout
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
 
     - name: Configure OTP & Elixir
       uses: erlef/setup-beam@v1
@@ -86,7 +86,7 @@ jobs:
                 
     - name: Upload Test Artifacts
       if: ${{ failure() && steps.tests.outcome == 'failure' }}
-      uses: actions/upload-artifact@v4.3.2
+      uses: actions/upload-artifact@v5
       with:
         name: test-artifacts-${{ matrix.browser }}-${{ matrix.erlang_version }}        
         path: ${{ env.SELENIUM_ARTIFACTS }}/*

.github/workflows/test-make-target.yaml

@@ -17,7 +17,6 @@ on:
         type: boolean
       previous_version:
         required: false
-        default: 'tags/v4.0.9'
         type: string
       make_target:
         required: true
@@ -40,7 +39,7 @@ jobs:
     timeout-minutes: 60
     steps:
     - name: CHECKOUT REPOSITORY
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       with:
         ref: ${{ inputs.ref }}
 
@@ -66,7 +65,7 @@ jobs:
 
     # We install Erlang problem matchers from ci.erlang.mk.
     - name: CHECKOUT ERLANG PROBLEM MATCHERS
-      uses: actions/checkout@v5
+      uses: actions/checkout@v6
       with:
         repository: ninenines/ci.erlang.mk
         path: ci.erlang.mk
@@ -159,7 +158,7 @@ jobs:
 
     - name: UPLOAD TEST LOGS
       if: always()
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: CT logs (${{ inputs.plugin }} ${{ inputs.make_target }} OTP-${{ inputs.erlang_version }} ${{ inputs.metadata_store }}${{ inputs.mixed_clusters && ' mixed' || '' }})
         path: |