Merge branch 'master' into actor_ttl

Signed-off-by: Artur Souza <[email protected]>

Author: artursouza

.github/scripts/update_sdk_version.sh

@@ -4,14 +4,23 @@ set -uex
 
 DAPR_JAVA_SDK_VERSION=$1
 
-# The workflows sdk tracks the regular SDK minor and patch versions, just not the major.
-# Replaces the workflows SDK major version to 0 until it is stable.
-DAPR_JAVA_WORKFLOWS_SDK_VERSION=`echo $DAPR_JAVA_SDK_VERSION | sed 's/^[0-9]*\./0./'`
+# Alpha artifacts of the sdk tracks the regular SDK minor and patch versions, just not the major.
+# 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-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 -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
 
-mvn versions:set -DnewVersion=$DAPR_JAVA_WORKFLOWS_SDK_VERSION -f sdk-workflows/pom.xml
-mvn versions:set-property -Dproperty=dapr.sdk-workflows.version -DnewVersion=$DAPR_JAVA_WORKFLOWS_SDK_VERSION
+###################
+# Alpha artifacts #
+###################
+
+# sdk-workflows
+mvn versions:set -DnewVersion=$DAPR_JAVA_SDK_ALPHA_VERSION -f sdk-workflows/pom.xml
+
+# testcontainers-dapr
+mvn versions:set -DnewVersion=$DAPR_JAVA_SDK_ALPHA_VERSION -f testcontainers-dapr/pom.xml
 
 git clean -f

.github/workflows/build.yml

@@ -99,7 +99,7 @@ jobs:
         ./dist/linux_amd64/release/placement &
     - name: Spin local environment
       run: |
-        docker-compose -f ./sdk-tests/deploy/local-test.yml up -d mongo kafka mysql
+        docker compose -f ./sdk-tests/deploy/local-test.yml up -d mongo kafka mysql
         docker ps
     - name: Install local ToxiProxy to simulate connectivity issues to Dapr sidecar
       run: |

README.md

@@ -237,13 +237,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.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.yml down
+docker compose -f ./sdk-tests/deploy/local-test.yml down
 ```
 
 

examples/pom.xml

@@ -113,7 +113,7 @@
     <dependency>
       <groupId>io.dapr</groupId>
       <artifactId>dapr-sdk-workflows</artifactId>
-      <version>${dapr.sdk-workflows.version}</version>
+      <version>${dapr.sdk.alpha.version}</version>
     </dependency>
     <dependency>
       <groupId>io.dapr</groupId>

examples/src/main/java/io/dapr/examples/bindings/http/README.md

@@ -58,13 +58,11 @@ Before getting into the application code, follow these steps in order to set up
 
 <!-- STEP
 name: Setup kafka container
-expected_stderr_lines:
-  - 'Creating network "http_default" with the default driver'
 sleep: 20
 -->
 
 ```bash
-docker-compose -f ./src/main/java/io/dapr/examples/bindings/http/docker-compose-single-kafka.yml up -d
+docker compose -f ./src/main/java/io/dapr/examples/bindings/http/docker-compose-single-kafka.yml up -d
 ```
 
 <!-- END_STEP -->
@@ -248,7 +246,7 @@ name: Cleanup Kafka containers
 -->
 
 ```bash
-docker-compose -f ./src/main/java/io/dapr/examples/bindings/http/docker-compose-single-kafka.yml down
+docker compose -f ./src/main/java/io/dapr/examples/bindings/http/docker-compose-single-kafka.yml down
 ```
 
 <!-- END_STEP -->

examples/src/main/java/io/dapr/examples/bindings/http/docker-compose-single-kafka.yml

@@ -1,4 +1,3 @@
-version: '3'
 services:
   zookeeper:
     image: confluentinc/cp-zookeeper:7.4.4

examples/src/main/java/io/dapr/examples/querystate/README.md

@@ -44,7 +44,7 @@ sleep: 5
 -->
 
 ```bash
-docker-compose -f ./src/main/java/io/dapr/examples/querystate/docker-compose-single-mongo.yml up -d
+docker compose -f ./src/main/java/io/dapr/examples/querystate/docker-compose-single-mongo.yml up -d
 ```
 
 <!-- END_STEP -->
@@ -305,7 +305,7 @@ name: Cleanup MongoDB containers
 -->
 
 ```bash
-docker-compose -f ./src/main/java/io/dapr/examples/querystate/docker-compose-single-mongo.yml down
+docker compose -f ./src/main/java/io/dapr/examples/querystate/docker-compose-single-mongo.yml down
 ```
 
 <!-- END_STEP -->

examples/src/main/java/io/dapr/examples/querystate/docker-compose-single-mongo.yml

@@ -1,4 +1,3 @@
-version: '3'
 services:
   mongo:
     image: mongo

examples/src/main/java/io/dapr/examples/state/README.md

@@ -44,7 +44,7 @@ sleep: 5
 -->
 
 ```bash
-docker-compose -f ./src/main/java/io/dapr/examples/state/docker-compose-single-mongo.yml up -d
+docker compose -f ./src/main/java/io/dapr/examples/state/docker-compose-single-mongo.yml up -d
 ```
 
 <!-- END_STEP -->
@@ -227,7 +227,7 @@ name: Cleanup MongoDB container
 -->
 
 ```bash
-docker-compose -f ./src/main/java/io/dapr/examples/state/docker-compose-single-mongo.yml down
+docker compose -f ./src/main/java/io/dapr/examples/state/docker-compose-single-mongo.yml down
 ```
 
 <!-- END_STEP -->

examples/src/main/java/io/dapr/examples/state/docker-compose-single-mongo.yml

@@ -1,4 +1,3 @@
-version: '3'
 services:
   mongo:
     image: mongo