Merge branch 'main' into DOC-4757-list-async-examples

.github/wordlist.txt

@@ -272,4 +272,9 @@ bom
 ubuntu
 behaviour
 databind
-jackson
+jackson
+ACR
+AMR
+Entra
+authx
+entraid

.github/workflows/benchmarks.yml

@@ -41,25 +41,24 @@ jobs:
       - name: Install missing dependencies to container
         run: |
           sudo apt update
-          sudo apt install -y stunnel make git gcc
-      - name: Maven offline
-        run: |
-          mvn -q dependency:go-offline
-      - name: Clean environment
+      - name: Set up Docker Compose environment
         run: |
-          make cleanup
+          mkdir -m 777 $REDIS_ENV_WORK_DIR
+          make docker-start
         env:
-          JVM_OPTS: -Xmx3200m
-          TERM: dumb
-      - name: Start servers
+          REDIS_ENV_WORK_DIR: ${{ github.workspace }}/work
+      - name: Maven offline
         run: |
-          make start
+          mvn -q dependency:go-offline
       - name: Run benchmarks
         run: |
           mvn -Pjmh clean test
         env:
           JVM_OPTS: -Xmx3200m
           TERM: dumb
+      - name: Tear down Docker Compose environment
+        run: |
+          docker compose $COMPOSE_ENV_FILES -f src/test/resources/docker-env/docker-compose.yml down
       # Download previous benchmark result from cache (if exists)
       - name: Download previous benchmark data
         uses: actions/cache@v4

.github/workflows/integration.yml

@@ -24,26 +24,27 @@ jobs:
       fail-fast: false
       matrix:
         redis_version:
-          - "unstable"
           - "8.0"
           - "7.4"
           - "7.2"
+    env:
+      REDIS_ENV_WORK_DIR: ${{ github.workspace }}/work
 
     steps:
       - name: Test Redis Server Version
         id: map-tags
         run: |
           # Map requested version to github or  tag
           case "${{ matrix.redis_version }}" in
-            "unstable") redis_branch="unstable" stack_version="8.0-M04-pre" ;;
-            "8.0") redis_branch="8.0" stack_version="8.0-M04-pre" ;;
-            "7.4") redis_branch="7.4" stack_version="rs-7.4.0-v2" ;;
-            "7.2") redis_branch="7.2" stack_version="rs-7.2.0-v14" ;;
+            "8.0") redis_branch="8.0" stack_version="8.0-M04-pre" redis_test_version="8.0-M04-pre";;
+            "7.4") redis_branch="7.4" stack_version="rs-7.4.0-v2" redis_test_version="7.4.2";;
+            "7.2") redis_branch="7.2" stack_version="rs-7.2.0-v14" redis_test_version="7.2.7";;
             *) echo "Unsupported version: ${{ matrix.redis_version }}" && exit 1 ;;
           esac
           # Save them as outputs for later use
           echo "redis_branch=$redis_branch" >> $GITHUB_OUTPUT
           echo "redis_stack_version=$stack_version" >> $GITHUB_OUTPUT
+          echo "redis_test_version=$redis_test_version" >> $GITHUB_OUTPUT
       - name: Checkout project
         uses: actions/checkout@v4
       - name: Set Java up in the runner
@@ -59,24 +60,28 @@ jobs:
       - name: Install missing dependencies to container
         run: |
           sudo apt update
-          sudo apt install -y stunnel make git gcc
+      - name: Set up Docker Compose environment
+        run: |
+          mkdir -m 777 $REDIS_ENV_WORK_DIR
+          export REDIS_VERSION="${{ steps.map-tags.outputs.redis_test_version }}"
+          make docker-start version=$REDIS_VERSION
       - name: Maven offline
         run: |
           mvn -q dependency:go-offline
-      - name: Clean environment
-        run: |
-          make cleanup
-        env:
-          JVM_OPTS: -Xmx3200m
-          TERM: dumb
+        continue-on-error: true
       - name: Run tests
         run: |
+          export TEST_WORK_FOLDER=$REDIS_ENV_WORK_DIR
+          echo $TEST_WORK_FOLDER
+          ls -la $TEST_WORK_FOLDER
           make test-coverage
         env:
-          REDIS: ${{ steps.map-tags.outputs.redis_branch }}
           REDIS_STACK_VERSION: ${{ steps.map-tags.outputs.redis_stack_version }}
           JVM_OPTS: -Xmx3200m
           TERM: dumb
+      - name: Tear down Docker Compose environment
+        run: |
+          docker compose $COMPOSE_ENV_FILES -f src/test/resources/docker-env/docker-compose.yml down
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v4
         with:

.github/workflows/stale-issues.yml

@@ -12,15 +12,15 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v3
+      - uses: actions/stale@v9
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           stale-issue-message: 'If you would like us to look at this issue, please provide the requested information. If the information is not provided within the next 30 days this issue will be closed.'
           stale-pr-message: 'Closing due to lack of requested feedback. If you would like us to look at this issue, please provide the requested information and we will re-open the issue.'
-          days-before-stale: 365
-          days-before-close: 30
+          days-before-stale: 30
+          days-before-close: 14
           stale-issue-label: "status: feedback-reminder"
           stale-pr-label: "status: feedback-reminder"
-          operations-per-run: 10
-          remove-stale-when-updated: false
+          operations-per-run: 30
+          remove-stale-when-updated: true
           only-labels: "status: waiting-for-feedback"

.gitignore

@@ -15,3 +15,5 @@ work/
 dependency-reduced-pom.xml
 .idea
 .flattened-pom.xml
+*.java-version
+*.DS_Store