diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 544295dd09..5f5ff7bcf9 100644 --- a/.github/workflows/build.yml +++ b/.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.2 DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.15.0/install/install.sh DAPR_CLI_REF: DAPR_REF: diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 0fac7f971d..349c61b932 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -38,7 +38,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.2 DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.15.0/install/install.sh DAPR_CLI_REF: DAPR_REF: diff --git a/daprdocs/content/en/java-sdk-docs/spring-boot/_index.md b/daprdocs/content/en/java-sdk-docs/spring-boot/_index.md index d4aa3887bd..31f4bb9c12 100644 --- a/daprdocs/content/en/java-sdk-docs/spring-boot/_index.md +++ b/daprdocs/content/en/java-sdk-docs/spring-boot/_index.md @@ -95,7 +95,7 @@ public class DaprTestContainersConfig { @ServiceConnection public DaprContainer daprContainer(Network daprNetwork, PostgreSQLContainer postgreSQLContainer){ - return new DaprContainer("daprio/daprd:1.15.7") + return new DaprContainer("daprio/daprd:1.16.0-rc.2") .withAppName("producer-app") .withNetwork(daprNetwork) .withComponent(new Component("kvstore", "state.postgresql", "v1", STATE_STORE_PROPERTIES)) @@ -250,7 +250,7 @@ Finally, because Dapr PubSub requires a bidirectional connection between your ap @ServiceConnection public DaprContainer daprContainer(Network daprNetwork, PostgreSQLContainer postgreSQLContainer, RabbitMQContainer rabbitMQContainer){ - return new DaprContainer("daprio/daprd:1.15.7") + return new DaprContainer("daprio/daprd:1.16.0-rc.2") .withAppName("producer-app") .withNetwork(daprNetwork) .withComponent(new Component("kvstore", "state.postgresql", "v1", STATE_STORE_PROPERTIES)) diff --git a/sdk-tests/src/test/java/io/dapr/it/testcontainers/jobs/DaprJobsIT.java b/sdk-tests/src/test/java/io/dapr/it/testcontainers/jobs/DaprJobsIT.java index f3b37a3a4a..2ea07fb010 100644 --- a/sdk-tests/src/test/java/io/dapr/it/testcontainers/jobs/DaprJobsIT.java +++ b/sdk-tests/src/test/java/io/dapr/it/testcontainers/jobs/DaprJobsIT.java @@ -102,6 +102,9 @@ public void testJobScheduleCreationWithDueTime() { GetJobResponse getJobResponse = daprPreviewClient.getJob(new GetJobRequest("Job")).block(); + + daprPreviewClient.deleteJob(new DeleteJobRequest("Job")).block(); + assertEquals(iso8601Formatter.format(currentTime), getJobResponse.getDueTime().toString()); assertEquals("Job", getJobResponse.getName()); } @@ -117,6 +120,9 @@ public void testJobScheduleCreationWithSchedule() { GetJobResponse getJobResponse = daprPreviewClient.getJob(new GetJobRequest("Job")).block(); + + daprPreviewClient.deleteJob(new DeleteJobRequest("Job")).block(); + assertEquals(iso8601Formatter.format(currentTime), getJobResponse.getDueTime().toString()); assertEquals(JobSchedule.hourly().getExpression(), getJobResponse.getSchedule().getExpression()); assertEquals("Job", getJobResponse.getName()); @@ -138,6 +144,9 @@ public void testJobScheduleCreationWithAllParameters() { GetJobResponse getJobResponse = daprPreviewClient.getJob(new GetJobRequest("Job")).block(); + + daprPreviewClient.deleteJob(new DeleteJobRequest("Job")).block(); + assertEquals(iso8601Formatter.format(currentTime), getJobResponse.getDueTime().toString()); assertEquals("2 * 3 * * FRI", getJobResponse.getSchedule().getExpression()); assertEquals("Job", getJobResponse.getName()); @@ -164,6 +173,9 @@ public void testJobScheduleCreationWithDropFailurePolicy() { GetJobResponse getJobResponse = daprPreviewClient.getJob(new GetJobRequest("Job")).block(); + + daprPreviewClient.deleteJob(new DeleteJobRequest("Job")).block(); + assertEquals(FailurePolicyType.DROP, getJobResponse.getFailurePolicy().getFailurePolicyType()); } @@ -185,6 +197,9 @@ public void testJobScheduleCreationWithConstantFailurePolicy() { GetJobResponse getJobResponse = daprPreviewClient.getJob(new GetJobRequest("Job")).block(); + + daprPreviewClient.deleteJob(new DeleteJobRequest("Job")).block(); + ConstantFailurePolicy jobFailurePolicyConstant = (ConstantFailurePolicy) getJobResponse.getFailurePolicy(); assertEquals(FailurePolicyType.CONSTANT, getJobResponse.getFailurePolicy().getFailurePolicyType()); assertEquals(3, (int)jobFailurePolicyConstant.getMaxRetries()); diff --git a/spring-boot-examples/kubernetes/README.md b/spring-boot-examples/kubernetes/README.md index 67bc1290a3..106747e94e 100644 --- a/spring-boot-examples/kubernetes/README.md +++ b/spring-boot-examples/kubernetes/README.md @@ -30,7 +30,7 @@ Once you have the cluster up and running you can install Dapr: helm repo add dapr https://dapr.github.io/helm-charts/ helm repo update helm upgrade --install dapr dapr/dapr \ ---version=1.15.7 \ +--version=1.16.0-rc.2 \ --namespace dapr-system \ --create-namespace \ --wait diff --git a/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainerConstants.java b/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainerConstants.java index 5db64d83ff..acfc811d8d 100644 --- a/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainerConstants.java +++ b/testcontainers-dapr/src/main/java/io/dapr/testcontainers/DaprContainerConstants.java @@ -14,7 +14,7 @@ package io.dapr.testcontainers; public interface DaprContainerConstants { - String DAPR_VERSION = "1.15.7"; + String DAPR_VERSION = "1.16.0-rc.2"; String DAPR_RUNTIME_IMAGE_TAG = "daprio/daprd:" + DAPR_VERSION; String DAPR_PLACEMENT_IMAGE_TAG = "daprio/placement:" + DAPR_VERSION; String DAPR_SCHEDULER_IMAGE_TAG = "daprio/scheduler:" + DAPR_VERSION;