diff --git a/.github/scripts/update_sdk_version.sh b/.github/scripts/update_sdk_version.sh index f51c33474..307a150c0 100755 --- a/.github/scripts/update_sdk_version.sh +++ b/.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 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4585d41bf..44077e121 100644 --- a/.github/workflows/build.yml +++ b/.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 + 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: | diff --git a/README.md b/README.md index 9c0efdd5d..ece881458 100644 --- a/README.md +++ b/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 ``` diff --git a/examples/pom.xml b/examples/pom.xml index ea8d5dda7..566c76504 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -113,7 +113,7 @@ io.dapr dapr-sdk-workflows - ${dapr.sdk-workflows.version} + ${dapr.sdk.alpha.version} io.dapr diff --git a/examples/src/main/java/io/dapr/examples/bindings/http/README.md b/examples/src/main/java/io/dapr/examples/bindings/http/README.md index ad529013e..cd9ce4206 100644 --- a/examples/src/main/java/io/dapr/examples/bindings/http/README.md +++ b/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 ```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 ``` @@ -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 ``` diff --git a/examples/src/main/java/io/dapr/examples/bindings/http/docker-compose-single-kafka.yml b/examples/src/main/java/io/dapr/examples/bindings/http/docker-compose-single-kafka.yml index bf60826b1..949adf234 100644 --- a/examples/src/main/java/io/dapr/examples/bindings/http/docker-compose-single-kafka.yml +++ b/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 diff --git a/examples/src/main/java/io/dapr/examples/querystate/README.md b/examples/src/main/java/io/dapr/examples/querystate/README.md index 2b25909e9..2b5320cd1 100644 --- a/examples/src/main/java/io/dapr/examples/querystate/README.md +++ b/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 ``` @@ -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 ``` diff --git a/examples/src/main/java/io/dapr/examples/querystate/docker-compose-single-mongo.yml b/examples/src/main/java/io/dapr/examples/querystate/docker-compose-single-mongo.yml index bb17176df..a75004c36 100644 --- a/examples/src/main/java/io/dapr/examples/querystate/docker-compose-single-mongo.yml +++ b/examples/src/main/java/io/dapr/examples/querystate/docker-compose-single-mongo.yml @@ -1,4 +1,3 @@ -version: '3' services: mongo: image: mongo diff --git a/examples/src/main/java/io/dapr/examples/state/README.md b/examples/src/main/java/io/dapr/examples/state/README.md index 89c41d952..6038db8fb 100644 --- a/examples/src/main/java/io/dapr/examples/state/README.md +++ b/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 ``` @@ -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 ``` diff --git a/examples/src/main/java/io/dapr/examples/state/docker-compose-single-mongo.yml b/examples/src/main/java/io/dapr/examples/state/docker-compose-single-mongo.yml index bb17176df..a75004c36 100644 --- a/examples/src/main/java/io/dapr/examples/state/docker-compose-single-mongo.yml +++ b/examples/src/main/java/io/dapr/examples/state/docker-compose-single-mongo.yml @@ -1,4 +1,3 @@ -version: '3' services: mongo: image: mongo diff --git a/pom.xml b/pom.xml index 64d9772df..7dc17a866 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ 1.59.0 3.17.3 https://raw.githubusercontent.com/dapr/dapr/v1.13.0-rc.5/dapr/proto - 0.12.0-SNAPSHOT + 0.12.0-SNAPSHOT 1.6.2 3.1.1 1.8 @@ -38,6 +38,8 @@ 3.2.2 3.2.2 5.8.2 + 2.0 + 1.20.0 @@ -330,6 +332,8 @@ sdk-workflows sdk-springboot examples + + testcontainers-dapr