Merge branch 'master' into users/svegiraju/add-cryptography

Author: siri-varma

.github/workflows/build.yml

@@ -34,12 +34,12 @@ jobs:
       - name: Codecov
         uses: codecov/codecov-action@v5.5.1
       - name: Upload test report for sdk
-        uses: actions/upload-artifact@v4
+        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@v4
+        uses: actions/upload-artifact@v5
         with:
           name: report-dapr-java-sdk-actors-jdk${{ env.JDK_VER }}
           path: sdk-actors/target/jacoco-report/
@@ -74,12 +74,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:
@@ -153,17 +150,15 @@ jobs:
     - 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}}
     - 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

.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')}}"

README.md

@@ -13,6 +13,25 @@ This is the Dapr SDK for Java, including the following features:
 
 ## Getting Started
 
+### Architecture Overview
+
+The diagram below shows how a Java application interacts with the Dapr runtime through the Java SDK:
+
+```mermaid
+flowchart LR
+    A[End User Application] -->|HTTP or gRPC| B[Dapr Java SDK]
+    B -->|Dapr API calls| C[Dapr Sidecar]
+    C -->|Components| D[State Stores, Pub/Sub, Services, etc.]
+
+    %% Optional grouping for clarity
+    subgraph R[Dapr Runtime]
+        C
+        D
+    end
+```
+
+For the full list of available APIs, see the [Dapr API reference](https://docs.dapr.io/reference/api/)
+
 ### Pre-Requisites
 * SDKMAN! installed (recommended):
     * [SDKMAN!](https://sdkman.io)
@@ -278,4 +297,4 @@ Once the project has been imported, the individual tests can be run normally as
 
 > Sometimes when the `sdk-tests` project does not build correctly, try `File > Invalidate Caches...`  and try restarting IntelliJ.
 
-You should be able to set breakpoints and Debug the test directly from IntelliJ itself as seen from the above image. 
+You should be able to set breakpoints and Debug the test directly from IntelliJ itself as seen from the above image. 

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>
@@ -85,6 +86,7 @@
     <dependency>
       <groupId>org.springframework.boot</groupId>
       <artifactId>spring-boot-starter-test</artifactId>
+      <scope>test</scope>
     </dependency>
   </dependencies>
   <build>

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>