Merge branch 'master' into update-github-runner

Author: artur-ciocanu

.github/scripts/update_docs.sh

@@ -11,21 +11,12 @@ DAPR_JAVA_SDK_ALPHA_VERSION=`echo $DAPR_JAVA_SDK_VERSION | sed 's/^[0-9]*\./0./'
 if [[ "$OSTYPE" == "darwin"* ]]; then
   sed -i bak "s/<version>.*<\/version>\$/<version>${DAPR_JAVA_SDK_VERSION}<\/version>/g" README.md
   sed -i bak "s/compile('io.dapr:\(.*\):.*')/compile('io.dapr:\\1:${DAPR_JAVA_SDK_VERSION}')/g" README.md
-  sed -i bak "s/<version>.*<\/version>\$/<version>${DAPR_JAVA_SDK_VERSION}<\/version>/g" daprdocs/content/en/java-sdk-docs/_index.md
-  sed -i bak "s/compile('io.dapr:\(.*\):.*')/compile('io.dapr:\\1:${DAPR_JAVA_SDK_VERSION}')/g" daprdocs/content/en/java-sdk-docs/_index.md
-  sed -i bak "s/<version>.*<\/version>\$/<version>${DAPR_JAVA_SDK_ALPHA_VERSION}<\/version>/g" daprdocs/content/en/java-sdk-docs/spring-boot/_index.md
   rm README.mdbak
 else
   sed -i "s/<version>.*<\/version>\$/<version>${DAPR_JAVA_SDK_VERSION}<\/version>/g" README.md
   sed -i "s/compile('io.dapr:\(.*\):.*')/compile('io.dapr:\\1:${DAPR_JAVA_SDK_VERSION}')/g" README.md
-  sed -i "s/<version>.*<\/version>\$/<version>${DAPR_JAVA_SDK_VERSION}<\/version>/g" daprdocs/content/en/java-sdk-docs/_index.md
-  sed -i "s/compile('io.dapr:\(.*\):.*')/compile('io.dapr:\\1:${DAPR_JAVA_SDK_VERSION}')/g" daprdocs/content/en/java-sdk-docs/_index.md
-  sed -i "s/<version>.*<\/version>\$/<version>${DAPR_JAVA_SDK_ALPHA_VERSION}<\/version>/g" daprdocs/content/en/java-sdk-docs/spring-boot/_index.md
 fi
 
-rm -f daprdocs/content/en/java-sdk-docs/_index.mdbak || echo
-rm -f daprdocs/content/en/java-sdk-docs/spring-boot/_index.md/_index.mdbak || echo
-
 rm -rf docs
 ./mvnw -Dmaven.test.skip=true -Djacoco.skip=true clean install
 ./mvnw -Dmaven.test.skip=true -Djacoco.skip=true site-deploy

.github/scripts/update_sdk_version.sh

@@ -19,15 +19,16 @@ mvn versions:set-property -Dproperty=dapr.sdk.alpha.version -DnewVersion=$DAPR_J
 ###################
 
 # sdk-workflows
-mvn versions:set -DnewVersion=$DAPR_JAVA_SDK_ALPHA_VERSION -f sdk-workflows/pom.xml
+mvn versions:set -DnewVersion=$DAPR_JAVA_SDK_VERSION -f sdk-workflows/pom.xml
 
 # testcontainers-dapr
-mvn versions:set -DnewVersion=$DAPR_JAVA_SDK_ALPHA_VERSION -f testcontainers-dapr/pom.xml
+mvn versions:set -DnewVersion=$DAPR_JAVA_SDK_VERSION -f testcontainers-dapr/pom.xml
 
 # dapr-spring
-mvn versions:set -DnewVersion=$DAPR_JAVA_SDK_ALPHA_VERSION -f dapr-spring/pom.xml
+mvn versions:set -DnewVersion=$DAPR_JAVA_SDK_VERSION -DprocessDependencies=true -f dapr-spring/pom.xml
+mvn versions:set-property -Dproperty=dapr.spring.version -DnewVersion=$DAPR_JAVA_SDK_VERSION -f dapr-spring/pom.xml
 
 # spring-boot-examples
-mvn versions:set -DnewVersion=$DAPR_JAVA_SDK_ALPHA_VERSION -f spring-boot-examples/pom.xml
+mvn versions:set -DnewVersion=$DAPR_JAVA_SDK_VERSION -f spring-boot-examples/pom.xml
 
 git clean -f

.github/workflows/automerge-bot.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Install dependencies
         run: pip install PyGithub
       - name: Automerge and update

.github/workflows/build.yml

@@ -15,6 +15,35 @@ on:
     - release-*
 
 jobs:
+  test:
+    name: "Unit tests"
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    continue-on-error: false
+    env:
+      JDK_VER: 17
+    steps:
+      - uses: actions/checkout@v5
+      - name: Set up OpenJDK ${{ env.JDK_VER }}
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: ${{ env.JDK_VER }}
+      - name: Run tests
+        run: ./mvnw clean install -B -q -DskipITs=true
+      - name: Codecov
+        uses: codecov/codecov-action@v5.5.1
+      - name: Upload test report for sdk
+        uses: actions/upload-artifact@v5
+        with:
+          name: test-dapr-java-sdk-jdk${{ env.JDK_VER }}
+          path: sdk/target/jacoco-report/
+      - name: Upload test report for sdk-actors
+        uses: actions/upload-artifact@v5
+        with:
+          name: report-dapr-java-sdk-actors-jdk${{ env.JDK_VER }}
+          path: sdk-actors/target/jacoco-report/
+
   build:
     name: "Build jdk:${{ matrix.java }} sb:${{ matrix.spring-boot-display-version }} exp:${{ matrix.experimental }}"
     runs-on: ubuntu-latest
@@ -24,13 +53,13 @@ jobs:
       fail-fast: false
       matrix:
         java: [ 17 ]
-        spring-boot-version: [  3.4.3 ]
-        spring-boot-display-version: [ 3.4.x ]
+        spring-boot-version: [  3.5.4 ]
+        spring-boot-display-version: [ 3.5.x ]
         experimental: [ false ]
         include:
           - java: 17
-            spring-boot-version: 3.3.9
-            spring-boot-display-version: 3.3.x
+            spring-boot-version: 3.4.9
+            spring-boot-display-version: 3.4.x
             experimental: false
     env:
       GOVER: "1.20"
@@ -39,39 +68,36 @@ jobs:
       GOPROXY: https://proxy.golang.org
       JDK_VER: ${{ matrix.java }}
       DAPR_CLI_VER: 1.15.0
-      DAPR_RUNTIME_VER: 1.15.4
+      DAPR_RUNTIME_VER: 1.16.0-rc.5
       DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.15.0/install/install.sh
       DAPR_CLI_REF:
       DAPR_REF:
       TOXIPROXY_URL: https://github.com/Shopify/toxiproxy/releases/download/v2.5.0/toxiproxy-server-linux-amd64
     steps:
-    - name: Install Stable Docker
-      id: setup_docker
-      uses: docker/setup-docker-action@v4   
+    - uses: actions/checkout@v5
     - name: Check Docker version
-      run: docker version     
-    - uses: actions/checkout@v4
+      run: docker version
     - name: Set up OpenJDK ${{ env.JDK_VER }}
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         distribution: 'temurin'
         java-version: ${{ env.JDK_VER }}
     - name: Set up Dapr CLI
       run: wget -q ${{ env.DAPR_INSTALL_URL }} -O - | /bin/bash -s ${{ env.DAPR_CLI_VER }}
     - name: Set up Go ${{ env.GOVER }}
       if: env.DAPR_REF != '' || env.DAPR_CLI_REF != ''
-      uses: actions/setup-go@v5
+      uses: actions/setup-go@v6
       with:
         go-version: ${{ env.GOVER }}
     - name: Checkout Dapr CLI repo to override dapr command.
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       if: env.DAPR_CLI_REF != ''
       with:
         repository: dapr/cli
         ref: ${{ env.DAPR_CLI_REF }}
         path: cli
     - name: Checkout Dapr repo to override daprd.
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       if: env.DAPR_REF != ''
       with:
         repository: dapr/dapr
@@ -84,10 +110,17 @@ jobs:
         make
         sudo cp dist/linux_amd64/release/dapr /usr/local/bin/dapr
         cd ..
-    - name: Initialize Dapr runtime ${{ env.DAPR_RUNTIME_VER }}
+    - name: Uninstall Dapr runtime ${{ env.DAPR_RUNTIME_VER }}
+      run: dapr uninstall --all
+    - name: Ensure Dapr runtime uninstalled
       run: |
-        dapr uninstall --all
-        dapr init --runtime-version ${{ env.DAPR_RUNTIME_VER }}
+        while [ "$(docker ps -aq --filter 'name=^/dapr')" ]; do
+          echo "Waiting for Dapr containers to be deleted..."
+          sleep 5
+        done
+        echo "All dapr containers are deleted."
+    - name: Initialize Dapr runtime ${{ env.DAPR_RUNTIME_VER }}
+      run: dapr init --runtime-version ${{ env.DAPR_RUNTIME_VER }}
     - name: Build and override daprd with referenced commit.
       if: env.DAPR_REF != ''
       run: |
@@ -112,49 +145,27 @@ jobs:
         wget -q ${{ env.TOXIPROXY_URL }} -O /home/runner/.local/bin/toxiproxy-server
         chmod +x /home/runner/.local/bin/toxiproxy-server
         /home/runner/.local/bin/toxiproxy-server --version
-    - name: Clean up files
-      run: ./mvnw clean -B
-    - name: Build sdk
-      run: ./mvnw compile -B -q
-    - name: Unit tests
-      run: ./mvnw test # making it temporarily verbose.
-      env:
-          DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
-    - name: Codecov
-      uses: codecov/codecov-action@v5.4.2
-    - name: Install jars
-      run: ./mvnw install -q -B -DskipTests
+    - name: Clean up and install sdk
+      run: ./mvnw clean install -B -q -DskipTests
     - name: Integration tests using spring boot version ${{ matrix.spring-boot-version }}
       id: integration_tests
-      run: PRODUCT_SPRING_BOOT_VERSION=${{ matrix.spring-boot-version }} ./mvnw -B -Pintegration-tests verify
-      env:
-          DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
-    - name: Upload test report for sdk
-      uses: actions/upload-artifact@v4
-      with:
-        name: report-dapr-java-sdk-jdk${{ matrix.java }}-sb${{ matrix.spring-boot-version }}
-        path: sdk/target/jacoco-report/
-    - name: Upload test report for sdk-actors
-      uses: actions/upload-artifact@v4
-      with:
-        name: report-dapr-java-sdk-actors-jdk${{ matrix.java }}-sb${{ matrix.spring-boot-version }}
-        path: sdk-actors/target/jacoco-report/
+      run: PRODUCT_SPRING_BOOT_VERSION=${{ matrix.spring-boot-version }} ./mvnw -B -Pintegration-tests dependency:copy-dependencies verify
     - name: Upload failsafe test report for sdk-tests on failure
       if: ${{ failure() && steps.integration_tests.conclusion == 'failure' }}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: failsafe-report-sdk-tests-jdk${{ matrix.java }}-sb${{ matrix.spring-boot-version }}
         path: sdk-tests/target/failsafe-reports
     - name: Upload surefire test report for sdk-tests on failure
       if: ${{ failure() && steps.integration_tests.conclusion == 'failure' }}
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: surefire-report-sdk-tests-jdk${{ matrix.java }}-sb${{ matrix.spring-boot-version }}
         path: sdk-tests/target/surefire-reports
 
   publish:
     runs-on: ubuntu-latest
-    needs: build
+    needs: [ build, test ]
     timeout-minutes: 30
     env:
       JDK_VER: 17
@@ -163,9 +174,9 @@ jobs:
       GPG_KEY: ${{ secrets.GPG_KEY }}
       GPG_PWD: ${{ secrets.GPG_PWD }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up OpenJDK ${{ env.JDK_VER }}
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: ${{ env.JDK_VER }}
@@ -181,13 +192,11 @@ jobs:
         if: startswith(github.ref, 'refs/tags/v') && !contains(env.PARENT_VERSION, '-SNAPSHOT')
         run: |
           echo "DEPLOY_OSSRH=true" >> $GITHUB_ENV
-      - name: Install jars
-        if: env.DEPLOY_OSSRH == 'true'
-        run: ./mvnw install -DskipTests -B -q
       - name: Publish to ossrh
         if: env.DEPLOY_OSSRH == 'true'
         run: |
           echo ${{ secrets.GPG_PRIVATE_KEY }} | base64 -d > private-key.gpg
           export GPG_TTY=$(tty)
           gpg --batch --import private-key.gpg
-          ./mvnw -V -B -Dgpg.skip=false -s settings.xml deploy
+          ./mvnw -V -B -Dgpg.skip=false -DskipTests -s settings.xml deploy
+          curl -X POST https://ossrh-staging-api.central.sonatype.com/manual/upload/defaultRepository/io.dapr

.github/workflows/create-release.yml

@@ -29,13 +29,13 @@ jobs:
       JDK_VER: '17'
     steps:
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
           token: ${{ secrets.DAPR_BOT_TOKEN }}
           persist-credentials: false
       - name: Set up OpenJDK ${{ env.JDK_VER }}
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin'
           java-version: ${{ env.JDK_VER }}

.github/workflows/dapr_bot.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Comment analyzer
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           github-token: ${{secrets.DAPR_BOT_TOKEN}}
           script: |

.github/workflows/fossa.yml

@@ -32,15 +32,15 @@ jobs:
       FOSSA_API_KEY: b88e1f4287c3108c8751bf106fb46db6 # This is a push-only token that is safe to be exposed.
     steps:
       - name: "Checkout code"
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: "Run FOSSA Scan"
-        uses: fossas/fossa-action@v1.6.0 # Use a specific version if locking is preferred
+        uses: fossas/fossa-action@v1.7.0 # Use a specific version if locking is preferred
         with:
           api-key: ${{ env.FOSSA_API_KEY }}
 
       - name: "Run FOSSA Test"
-        uses: fossas/fossa-action@v1.6.0 # Use a specific version if locking is preferred
+        uses: fossas/fossa-action@v1.7.0 # Use a specific version if locking is preferred
         with:
           api-key: ${{ env.FOSSA_API_KEY }}
           run-tests: true

.github/workflows/validate-docs.yml

@@ -22,9 +22,9 @@ jobs:
     env:
       JDK_VER: 17
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Set up OpenJDK ${{ env.JDK_VER }}
-      uses: actions/setup-java@v4
+      uses: actions/setup-java@v5
       with:
         distribution: 'temurin'
         java-version: ${{ env.JDK_VER }}