Merge branch 'master' into 1584-middleware

Author: siri-varma

.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

@@ -8,27 +8,11 @@ DAPR_JAVA_SDK_VERSION=$1
 # Replaces the SDK major version to 0 for alpha artifacts.
 DAPR_JAVA_SDK_ALPHA_VERSION=`echo $DAPR_JAVA_SDK_VERSION | sed 's/^[0-9]*\./0./'`
 
-mvn versions:set -DnewVersion=$DAPR_JAVA_SDK_VERSION
+mvn versions:set -DnewVersion=$DAPR_JAVA_SDK_VERSION -DprocessDependencies=true
 mvn versions:set-property -Dproperty=dapr.sdk.alpha.version -DnewVersion=$DAPR_JAVA_SDK_ALPHA_VERSION
 mvn versions:set-property -Dproperty=dapr.sdk.version -DnewVersion=$DAPR_JAVA_SDK_VERSION
 mvn versions:set-property -Dproperty=dapr.sdk.version -DnewVersion=$DAPR_JAVA_SDK_VERSION -f sdk-tests/pom.xml
 mvn versions:set-property -Dproperty=dapr.sdk.alpha.version -DnewVersion=$DAPR_JAVA_SDK_ALPHA_VERSION -f sdk-tests/pom.xml
 
-###################
-# Alpha artifacts #
-###################
-
-# sdk-workflows
-mvn versions:set -DnewVersion=$DAPR_JAVA_SDK_VERSION -f sdk-workflows/pom.xml
-
-# testcontainers-dapr
-mvn versions:set -DnewVersion=$DAPR_JAVA_SDK_VERSION -f testcontainers-dapr/pom.xml
-
-# dapr-spring
-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_VERSION -f spring-boot-examples/pom.xml
 
 git clean -f

.github/workflows/build.yml

@@ -32,7 +32,7 @@ jobs:
       - name: Run tests
         run: ./mvnw clean install -B -q -DskipITs=true
       - name: Codecov
-        uses: codecov/codecov-action@v5.5.1
+        uses: codecov/codecov-action@v5.5.2
       - name: Upload test report for sdk
         uses: actions/upload-artifact@v5
         with:
@@ -44,10 +44,58 @@ jobs:
           name: report-dapr-java-sdk-actors-jdk${{ env.JDK_VER }}
           path: sdk-actors/target/jacoco-report/
 
+  build-durabletask:
+    name: "Durable Task build & 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: Checkout Durable Task Sidecar
+      uses: actions/checkout@v4
+      with:
+        repository: dapr/durabletask-go
+        path: durabletask-sidecar
+
+    # TODO: Move the sidecar into a central image repository
+    - name: Initialize Durable Task Sidecar
+      run: docker run -d --name durabletask-sidecar -p 4001:4001 --rm -i $(docker build -q ./durabletask-sidecar)
+
+    - name: Display Durable Task Sidecar Logs
+      run: nohup docker logs --since=0 durabletask-sidecar > durabletask-sidecar.log 2>&1 &
+
+      # wait for 10 seconds, so sidecar container can be fully up, this will avoid intermittent failing issues for integration tests causing by failed to connect to sidecar
+    - name: Wait for 10 seconds
+      run: sleep 10
+
+    - name: Integration Tests For Durable Tasks
+      run: ./mvnw -B -pl durabletask-client -Pintegration-tests dependency:copy-dependencies verify || echo "TEST_FAILED=true" >> $GITHUB_ENV
+      continue-on-error: true
+
+    - name: Kill Durable Task Sidecar
+      run: docker kill durabletask-sidecar
+
+    - name: Upload Durable Task Sidecar Logs
+      uses: actions/upload-artifact@v4
+      with:
+        name: Durable Task Sidecar Logs
+        path: durabletask-sidecar.log
+
+    - name: Fail the job if tests failed
+      if: env.TEST_FAILED == 'true'
+      run: exit 1
+
   build:
     name: "Build jdk:${{ matrix.java }} sb:${{ matrix.spring-boot-display-version }} exp:${{ matrix.experimental }}"
     runs-on: ubuntu-latest
-    timeout-minutes: 30
+    timeout-minutes: 45
     continue-on-error: ${{ matrix.experimental }}
     strategy:
       fail-fast: false
@@ -74,12 +122,9 @@ jobs:
       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   
-    - name: Check Docker version
-      run: docker version     
     - uses: actions/checkout@v5
+    - name: Check Docker version
+      run: docker version
     - name: Set up OpenJDK ${{ env.JDK_VER }}
       uses: actions/setup-java@v5
       with:
@@ -152,9 +197,7 @@ jobs:
       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 dependency:copy-dependencies verify
-      env:
-          DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
+      run: PRODUCT_SPRING_BOOT_VERSION=${{ matrix.spring-boot-version }} ./mvnw -B -pl !durabletask-client -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@v5
@@ -168,9 +211,10 @@ jobs:
         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, test ]
+    needs: [ build, test, build-durabletask ]
     timeout-minutes: 30
     env:
       JDK_VER: 17

.github/workflows/validate.yml

@@ -49,9 +49,6 @@ jobs:
         with:
           distribution: 'temurin'
           java-version: ${{ env.JDK_VER }}
-      - name: Install Stable Docker
-        id: setup_docker
-        uses: docker/setup-docker-action@v4   
       - name: Check Docker version
         run: docker version   
       - name: Set up Dapr CLI
@@ -116,114 +113,76 @@ jobs:
         run: sleep 30 && docker logs dapr_scheduler && nc -vz localhost 50006
       - name: Install jars
         run: ./mvnw clean install -DskipTests -q
-        env:
-          DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
       - name: Validate workflows example
         working-directory: ./examples
         run: |
           mm.py ./src/main/java/io/dapr/examples/workflows/README.md
-        env:
-          DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
       - name: Validate Spring Boot examples
         working-directory: ./spring-boot-examples
         run: |
           mm.py README.md
-        env:
-          DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
       - name: Validate Spring Boot Workflow Patterns examples
         working-directory: ./spring-boot-examples/workflows/patterns
         run: |
           mm.py README.md
-        env:
-          DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
       - name: Validate Jobs example
         working-directory: ./examples
         run: |
           mm.py ./src/main/java/io/dapr/examples/jobs/README.md
-        env:
-          DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
       - name: Validate conversation ai example
         working-directory: ./examples
         run: |
           mm.py ./src/main/java/io/dapr/examples/conversation/README.md
-        env:
-          DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
       - name: Validate invoke http example
         working-directory: ./examples
         run: |
           mm.py ./src/main/java/io/dapr/examples/invoke/http/README.md
-        env:
-          DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}  
       - name: Validate invoke grpc example
         working-directory: ./examples
         run: |
           mm.py ./src/main/java/io/dapr/examples/invoke/grpc/README.md
-        env:
-          DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}  
       - name: Validate tracing example
         working-directory: ./examples
         run: |
           mm.py ./src/main/java/io/dapr/examples/tracing/README.md
-        env:
-          DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}  
       - name: Validate expection handling example
         working-directory: ./examples
         run: |
           mm.py ./src/main/java/io/dapr/examples/exception/README.md
-        env:
-          DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}  
       - name: Validate state example
         working-directory: ./examples
         run: |
           mm.py ./src/main/java/io/dapr/examples/state/README.md
-        env:
-          DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}  
       - name: Validate pubsub example
         working-directory: ./examples
         run: |
           mm.py ./src/main/java/io/dapr/examples/pubsub/README.md
-        env:
-          DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}  
       - name: Validate bindings HTTP example
         working-directory: ./examples
         run: |
           mm.py ./src/main/java/io/dapr/examples/bindings/http/README.md
-        env:
-          DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}  
       - name: Validate secrets example
         working-directory: ./examples
         run: |
           mm.py ./src/main/java/io/dapr/examples/secrets/README.md
-        env:
-          DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}  
       - name: Validate unit testing example
         working-directory: ./examples
         run: |
           mm.py ./src/main/java/io/dapr/examples/unittesting/README.md
-        env:
-          DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}  
       - name: Validate Configuration API example
         working-directory: ./examples
         run: |
             mm.py ./src/main/java/io/dapr/examples/configuration/README.md
-        env:
-          DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}    
       - name: Validate actors example
         working-directory: ./examples
         run: |
             mm.py ./src/main/java/io/dapr/examples/actors/README.md
-        env:
-          DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}    
       - name: Validate query state HTTP example
         working-directory: ./examples
         run: |
             mm.py ./src/main/java/io/dapr/examples/querystate/README.md
-        env:
-          DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}    
       - name: Validate streaming subscription example
         working-directory: ./examples
         run: |
           mm.py ./src/main/java/io/dapr/examples/pubsub/stream/README.md
-        env:
-          DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}  
 

.mise.toml

@@ -0,0 +1,5 @@
+[tools]
+java = "temurin-17"
+
+[env]
+JAVA_HOME = "{{exec(command='mise where java')}}"

dapr-spring/dapr-spring-boot-autoconfigure/pom.xml

@@ -7,6 +7,7 @@
     <groupId>io.dapr.spring</groupId>
     <artifactId>dapr-spring-parent</artifactId>
     <version>1.17.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>dapr-spring-boot-autoconfigure</artifactId>

dapr-spring/dapr-spring-boot-tests/pom.xml

@@ -7,6 +7,7 @@
     <groupId>io.dapr.spring</groupId>
     <artifactId>dapr-spring-parent</artifactId>
     <version>1.17.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>dapr-spring-boot-tests</artifactId>

dapr-spring/dapr-spring-data/pom.xml

@@ -7,6 +7,7 @@
     <groupId>io.dapr.spring</groupId>
     <artifactId>dapr-spring-parent</artifactId>
     <version>1.17.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>dapr-spring-data</artifactId>

dapr-spring/dapr-spring-messaging/pom.xml

@@ -7,6 +7,7 @@
     <groupId>io.dapr.spring</groupId>
     <artifactId>dapr-spring-parent</artifactId>
     <version>1.17.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>dapr-spring-messaging</artifactId>

dapr-spring/dapr-spring-workflows/pom.xml

@@ -7,6 +7,7 @@
     <groupId>io.dapr.spring</groupId>
     <artifactId>dapr-spring-parent</artifactId>
     <version>1.17.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
   </parent>
 
   <artifactId>dapr-spring-workflows</artifactId>