merge master and resolve conflicts

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

Author: MregXN

.github/holopin.yml

@@ -0,0 +1,6 @@
+organization: dapr
+defaultSticker: clmjkxscc122740fl0mkmb7egi
+stickers:
+  -
+    id: clmjkxscc122740fl0mkmb7egi
+    alias: ghc2023

.github/workflows/build.yml

@@ -43,9 +43,9 @@ jobs:
       GOARCH: amd64
       GOPROXY: https://proxy.golang.org
       JDK_VER: ${{ matrix.java }}
-      DAPR_CLI_VER: 1.11.0-rc.1
-      DAPR_RUNTIME_VER: 1.11.0-rc.5
-      DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.11.0-rc.1/install/install.sh
+      DAPR_CLI_VER: 1.12.0-rc.1
+      DAPR_RUNTIME_VER: 1.12.0-rc.5
+      DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.12.0-rc.1/install/install.sh
       DAPR_CLI_REF:
       DAPR_REF:
       TOXIPROXY_URL: https://github.com/Shopify/toxiproxy/releases/download/v2.5.0/toxiproxy-server-linux-amd64
@@ -102,13 +102,9 @@ jobs:
         docker stop dapr_placement
         cd dapr
         ./dist/linux_amd64/release/placement &
-    - name: Install local Kafka using docker-compose
+    - name: Spin local environment
       run: |
-        docker-compose -f ./sdk-tests/deploy/local-test-kafka.yml up -d
-        docker ps
-    - name: Install local Mongo database using docker-compose
-      run: |
-        docker-compose -f ./sdk-tests/deploy/local-test-mongo.yml up -d
+        docker-compose -f ./sdk-tests/deploy/local-test.yml up -d mongo kafka
         docker ps
     - name: Install local ToxiProxy to simulate connectivity issues to Dapr sidecar
       run: |
@@ -117,18 +113,18 @@ jobs:
         chmod +x /home/runner/.local/bin/toxiproxy-server
         /home/runner/.local/bin/toxiproxy-server --version
     - name: Clean up files
-      run: mvn clean -B
+      run: ./mvnw clean -B
     - name: Build sdk
-      run: mvn compile -B -q
+      run: ./mvnw compile -B -q
     - name: Unit tests
-      run: mvn -B test -q
+      run: ./mvnw -B test -q
     - name: Codecov
       uses: codecov/[email protected]
     - name: Install jars
-      run: mvn install -q -B -DskipTests
+      run: ./mvnw install -q -B -DskipTests
     - name: Integration tests using spring boot version ${{ matrix.spring-boot-version }}
       id: integration_tests
-      run: PRODUCT_SPRING_BOOT_VERSION=${{ matrix.spring-boot-version }} mvn -B -f sdk-tests/pom.xml verify
+      run: PRODUCT_SPRING_BOOT_VERSION=${{ matrix.spring-boot-version }} ./mvnw -B -f sdk-tests/pom.xml verify
     - name: Upload test report for sdk
       uses: actions/upload-artifact@master
       with:
@@ -170,7 +166,7 @@ jobs:
           java-version: ${{ env.JDK_VER }}
       - name: Get pom parent version
         run: |
-          PARENT_VERSION=$(mvn -B -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
+          PARENT_VERSION=$(./mvnw -B -q -Dexec.executable=echo -Dexec.args='${project.version}' --non-recursive exec:exec)
           echo "PARENT_VERSION=$PARENT_VERSION" >> $GITHUB_ENV
       - name: Is SNAPSHOT release ?
         if: contains(github.ref, 'master') && contains(env.PARENT_VERSION, '-SNAPSHOT')
@@ -182,11 +178,11 @@ jobs:
           echo "DEPLOY_OSSRH=true" >> $GITHUB_ENV
       - name: Install jars
         if: env.DEPLOY_OSSRH == 'true'
-        run: mvn clean install -B -q
+        run: ./mvnw clean install -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
-          mvn -V -B -Dgpg.skip=false -s settings.xml deploy -pl \!examples
+          ./mvnw -V -B -Dgpg.skip=false -s settings.xml deploy -pl \!examples

.github/workflows/validate.yml

@@ -37,9 +37,9 @@ jobs:
       GOARCH: amd64
       GOPROXY: https://proxy.golang.org
       JDK_VER: ${{ matrix.java }}
-      DAPR_CLI_VER: 1.11.0-rc.1
-      DAPR_RUNTIME_VER: 1.11.0-rc.5
-      DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.11.0-rc.1/install/install.sh
+      DAPR_CLI_VER: 1.12.0-rc.1
+      DAPR_RUNTIME_VER: 1.12.0-rc.5
+      DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.12.0-rc.1/install/install.sh
       DAPR_CLI_REF:
       DAPR_REF:
     steps:
@@ -102,14 +102,14 @@ jobs:
           pip3 install mechanical-markdown
       - name: Install Local mongo database using docker-compose
         run: |
-          docker-compose -f ./sdk-tests/deploy/local-test-mongo.yml up -d
+          docker-compose -f ./sdk-tests/deploy/local-test.yml up -d mongo
           docker ps
       - name: Clean up files
-        run: mvn clean
+        run: ./mvnw clean
       - name: Build sdk
-        run: mvn compile -q
+        run: ./mvnw compile -q
       - name: Install jars
-        run: mvn install -q
+        run: ./mvnw install -q
       - name: Validate invoke http example
         working-directory: ./examples
         run: |

.mvn/wrapper/maven-wrapper.properties

@@ -0,0 +1,18 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.5/apache-maven-3.8.5-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar

.sdkmanrc

@@ -1,3 +1,4 @@
 # Enable auto-env through the sdkman_auto_env config
 # Add key=value pairs of SDKs to use below
-java=11.0.19-tem
+java=11.0.19-tem
+maven=3.8.5

README.md

@@ -53,19 +53,19 @@ For a Maven project, add the following to your `pom.xml` file:
     <dependency>
       <groupId>io.dapr</groupId>
       <artifactId>dapr-sdk</artifactId>
-      <version>1.9.0</version>
+      <version>1.10.0</version>
     </dependency>
     <!-- Dapr's SDK for Actors (optional). -->
     <dependency>
       <groupId>io.dapr</groupId>
       <artifactId>dapr-sdk-actors</artifactId>
-      <version>1.9.0</version>
+      <version>1.10.0</version>
     </dependency>
     <!-- Dapr's SDK integration with SpringBoot (optional). -->
     <dependency>
       <groupId>io.dapr</groupId>
       <artifactId>dapr-sdk-springboot</artifactId>
-      <version>1.9.0</version>
+      <version>1.10.0</version>
     </dependency>
     ...
   </dependencies>
@@ -79,11 +79,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.9.0')
+    compile('io.dapr:dapr-sdk:1.10.0')
     // Dapr's SDK for Actors (optional).
-    compile('io.dapr:dapr-sdk-actors:1.9.0')
+    compile('io.dapr:dapr-sdk-actors:1.10.0')
     // Dapr's SDK integration with SpringBoot (optional).
-    compile('io.dapr:dapr-sdk-springboot:1.9.0')
+    compile('io.dapr:dapr-sdk-springboot:1.10.0')
 }
 ```
 
@@ -98,7 +98,7 @@ Then head over to build the [Maven](https://maven.apache.org/install.html) (Apac
 
 ```sh
 # make sure you are in the `java-sdk` directory.
-mvn clean install
+./mvnw clean install
 ```
 
 Try the following examples to learn more about Dapr's Java SDK:
@@ -195,7 +195,7 @@ Most exceptions thrown from the SDK are instances of `DaprException`. `DaprExcep
 ### Update URL to fetch proto files
 
 Change the `dapr.proto.baseurl` property below in [pom.xml](./pom.xml) to point to the URL for the desired commit hash in Git if you need to target a proto file that is not been merged into master yet. 
-Note: You may need to run `mvn clean` after changing this setting to remove any auto-generated files so that the new proto files get downloaded and compiled.
+Note: You may need to run `./mvnw clean` after changing this setting to remove any auto-generated files so that the new proto files get downloaded and compiled.
 
 ```xml
 <project>
@@ -229,7 +229,7 @@ Along with the pre-requisites for [SDK](#pre-requisites) the following are neede
 The code for the tests are present inside the project [sdk-tests](./sdk-tests). This module alone can be imported as a separate project in IDEs. 
 This project depends on the rest of the JARs built by the other modules in the repo like [sdk](./sdk), [sdk-springboot](./sdk-springboot) etc.
 
-As a starting point for running Integration Tests, first run `mvn clean install` from the root of the repo to build the JARs for the different modules
+As a starting point for running Integration Tests, first run `./mvnw clean install` from the root of the repo to build the JARs for the different modules
 except the `sdk-tests` module.
 
 #### Run all the dependent services spun up during build
@@ -241,17 +241,13 @@ Similarly, all of these need to be run for running the ITs either individually o
 Run the following commands from the root of the repo to start all the docker containers that the tests depend on.
 
 ```bash
-docker-compose -f ./sdk-tests/deploy/local-test-kafka.yml up -d
-docker-compose -f ./sdk-tests/deploy/local-test-mongo.yml up -d
-docker-compose -f ./sdk-tests/deploy/local-test-vault.yml up -d
+docker-compose -f ./sdk-tests/deploy/local-test.yml up -d
 ```
 
 To stop the containers and services, run the following commands.
 
 ```bash
-docker-compose -f ./sdk-tests/deploy/local-test-kafka.yml down
-docker-compose -f ./sdk-tests/deploy/local-test-mongo.yml down
-docker-compose -f ./sdk-tests/deploy/local-test-vault.yml down
+docker-compose -f ./sdk-tests/deploy/local-test.yml down
 ```
 
 
@@ -261,7 +257,7 @@ From the `java-sdk` repo root, change to the `sdk-tests` directory and run the f
 ```bash
 ## with current directory as /java-sdk/sdk-tests/
 
-mvn clean install
+../mvnw clean install
 ```
 
 The above command runs all the integration tests present in the `sdk-tests` project.