Merge branch 'master' into 1478-trace-prop

Signed-off-by: salaboy <[email protected]>

Author: salaboy

.github/scripts/update_sdk_version.sh

@@ -25,7 +25,8 @@ mvn versions:set -DnewVersion=$DAPR_JAVA_SDK_ALPHA_VERSION -f sdk-workflows/pom.
 mvn versions:set -DnewVersion=$DAPR_JAVA_SDK_ALPHA_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_ALPHA_VERSION -DprocessDependencies=true -f dapr-spring/pom.xml
+mvn versions:set-property -Dproperty=dapr.spring.version -DnewVersion=$DAPR_JAVA_SDK_ALPHA_VERSION -f dapr-spring/pom.xml
 
 # spring-boot-examples
 mvn versions:set -DnewVersion=$DAPR_JAVA_SDK_ALPHA_VERSION -f spring-boot-examples/pom.xml

.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

@@ -39,7 +39,7 @@ jobs:
       GOPROXY: https://proxy.golang.org
       JDK_VER: ${{ matrix.java }}
       DAPR_CLI_VER: 1.15.0
-      DAPR_RUNTIME_VER: 1.15.7
+      DAPR_RUNTIME_VER: 1.16.0-rc.3
       DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.15.0/install/install.sh
       DAPR_CLI_REF:
       DAPR_REF:
@@ -50,7 +50,7 @@ jobs:
       uses: docker/setup-docker-action@v4   
     - name: Check Docker version
       run: docker version     
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v5
     - name: Set up OpenJDK ${{ env.JDK_VER }}
       uses: actions/setup-java@v4
       with:
@@ -64,14 +64,14 @@ jobs:
       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
@@ -112,18 +112,14 @@ 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: Clean up and install sdk
+      run: ./mvnw clean install -B -q -DskipTests
     - name: Unit tests
       run: ./mvnw test # making it temporarily verbose.
       env:
           DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
     - name: Codecov
-      uses: codecov/[email protected]
-    - name: Install jars
-      run: ./mvnw install -q -B -DskipTests
+      uses: codecov/[email protected]
     - 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
@@ -163,7 +159,7 @@ 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
         with:

.github/workflows/create-release.yml

@@ -29,7 +29,7 @@ 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 }}

.github/workflows/fossa.yml

@@ -32,7 +32,7 @@ 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/[email protected] # Use a specific version if locking is preferred

.github/workflows/validate-docs.yml

@@ -22,7 +22,7 @@ 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
       with:

.github/workflows/validate.yml

@@ -38,12 +38,12 @@ jobs:
       GOPROXY: https://proxy.golang.org
       JDK_VER: ${{ matrix.java }}
       DAPR_CLI_VER: 1.15.0
-      DAPR_RUNTIME_VER: 1.15.7
+      DAPR_RUNTIME_VER: 1.16.0-rc.3
       DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.15.0/install/install.sh
       DAPR_CLI_REF:
       DAPR_REF:
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Set up OpenJDK ${{ env.JDK_VER }}
         uses: actions/setup-java@v4
         with:
@@ -62,14 +62,14 @@ jobs:
         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
@@ -107,12 +107,26 @@ jobs:
           pip3 install mechanical-markdown
       - name: Verify scheduler is listening on port.
         run: sleep 30 && docker logs dapr_scheduler && nc -vz localhost 50006
-      - name: Clean up files
-        run: ./mvnw clean
-      - name: Build sdk
-        run: ./mvnw compile -q
       - name: Install jars
-        run: ./mvnw install -q
+        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 examples
+        working-directory: ./spring-boot-examples/workflows
+        run: |
+          mm.py README.md
         env:
           DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
       - name: Validate Jobs example
@@ -199,27 +213,10 @@ jobs:
             mm.py ./src/main/java/io/dapr/examples/querystate/README.md
         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 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}}  
-      - 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 examples
-        working-directory: ./spring-boot-examples/workflows
-        run: |
-          mm.py README.md
-        env:
-          DOCKER_HOST: ${{steps.setup_docker.outputs.sock}}
+

README.md

@@ -50,19 +50,19 @@ For a Maven project, add the following to your `pom.xml` file:
     <dependency>
       <groupId>io.dapr</groupId>
       <artifactId>dapr-sdk</artifactId>
-      <version>1.14.1</version>
+      <version>1.15.1</version>
     </dependency>
     <!-- Dapr's SDK for Actors (optional). -->
     <dependency>
       <groupId>io.dapr</groupId>
       <artifactId>dapr-sdk-actors</artifactId>
-      <version>1.14.1</version>
+      <version>1.15.1</version>
     </dependency>
     <!-- Dapr's SDK integration with SpringBoot (optional). -->
     <dependency>
       <groupId>io.dapr</groupId>
       <artifactId>dapr-sdk-springboot</artifactId>
-      <version>1.14.1</version>
+      <version>1.15.1</version>
     </dependency>
     ...
   </dependencies>
@@ -76,11 +76,11 @@ For a Gradle project, add the following to your `build.gradle` file:
 dependencies {
 ...
     // Dapr's core SDK with all features, except Actors.
-    compile('io.dapr:dapr-sdk:1.14.1')
+    compile('io.dapr:dapr-sdk:1.15.1')
     // Dapr's SDK for Actors (optional).
-    compile('io.dapr:dapr-sdk-actors:1.14.1')
+    compile('io.dapr:dapr-sdk-actors:1.15.1')
     // Dapr's SDK integration with SpringBoot (optional).
-    compile('io.dapr:dapr-sdk-springboot:1.14.1')
+    compile('io.dapr:dapr-sdk-springboot:1.15.1')
 }
 ```
 

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

@@ -6,7 +6,7 @@
   <parent>
     <groupId>io.dapr.spring</groupId>
     <artifactId>dapr-spring-parent</artifactId>
-    <version>0.16.0-SNAPSHOT</version>
+    <version>0.17.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>dapr-spring-boot-autoconfigure</artifactId>

dapr-spring/dapr-spring-boot-autoconfigure/src/test/java/io/dapr/spring/boot/autoconfigure/client/DaprClientPropertiesTest.java

@@ -83,7 +83,26 @@ public void shouldMapDaprClientProperties() {
       });
 
     });
+  }
 
+  @Test
+  @DisplayName("Should map DaprClient properties correctly (camelCase)")
+  public void shouldMapDaprClientPropertiesCamelCase() {
+    runner.withSystemProperties(
+            "dapr.client.httpEndpoint=http://localhost",
+            "dapr.client.httpPort=3500",
+            "dapr.client.grpcEndpoint=localhost",
+            "dapr.client.grpcPort=50001"
+    ).run(context -> {
+      DaprClientProperties properties = context.getBean(DaprClientProperties.class);
+      SoftAssertions.assertSoftly(softly -> {
+        softly.assertThat(properties.getGrpcEndpoint()).isEqualTo("localhost");
+        softly.assertThat(properties.getHttpEndpoint()).isEqualTo("http://localhost");
+        softly.assertThat(properties.getHttpPort()).isEqualTo(3500);
+        softly.assertThat(properties.getGrpcPort()).isEqualTo(50001);
+      });
+
+    });
   }
 
   @EnableConfigurationProperties(DaprClientProperties.class)