diff --git a/.github/scripts/update_sdk_version.sh b/.github/scripts/update_sdk_version.sh index 4bf194d13..6d07850a9 100755 --- a/.github/scripts/update_sdk_version.sh +++ b/.github/scripts/update_sdk_version.sh @@ -26,6 +26,7 @@ mvn versions:set -DnewVersion=$DAPR_JAVA_SDK_ALPHA_VERSION -f testcontainers-dap # dapr-spring 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 diff --git a/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml b/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml index 240ab9fe0..ee2a65906 100644 --- a/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml +++ b/dapr-spring/dapr-spring-boot-autoconfigure/pom.xml @@ -6,7 +6,7 @@ io.dapr.spring dapr-spring-parent - 0.16.0-SNAPSHOT + 0.17.0-SNAPSHOT dapr-spring-boot-autoconfigure diff --git a/dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter-test/pom.xml b/dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter-test/pom.xml index 2bca355e8..ee3a53ee2 100644 --- a/dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter-test/pom.xml +++ b/dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter-test/pom.xml @@ -6,7 +6,7 @@ io.dapr.spring dapr-spring-parent - 0.16.0-SNAPSHOT + 0.17.0-SNAPSHOT ../../pom.xml diff --git a/dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter/pom.xml b/dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter/pom.xml index ff916ac25..b6ed660bb 100644 --- a/dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter/pom.xml +++ b/dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter/pom.xml @@ -6,7 +6,7 @@ io.dapr.spring dapr-spring-parent - 0.16.0-SNAPSHOT + 0.17.0-SNAPSHOT ../../pom.xml diff --git a/dapr-spring/dapr-spring-boot-tests/pom.xml b/dapr-spring/dapr-spring-boot-tests/pom.xml index e0e3425f6..fc7404557 100644 --- a/dapr-spring/dapr-spring-boot-tests/pom.xml +++ b/dapr-spring/dapr-spring-boot-tests/pom.xml @@ -6,7 +6,7 @@ io.dapr.spring dapr-spring-parent - 0.16.0-SNAPSHOT + 0.17.0-SNAPSHOT dapr-spring-boot-tests diff --git a/dapr-spring/dapr-spring-data/pom.xml b/dapr-spring/dapr-spring-data/pom.xml index bf7b8b3be..63617e4e0 100644 --- a/dapr-spring/dapr-spring-data/pom.xml +++ b/dapr-spring/dapr-spring-data/pom.xml @@ -6,7 +6,7 @@ io.dapr.spring dapr-spring-parent - 0.16.0-SNAPSHOT + 0.17.0-SNAPSHOT dapr-spring-data diff --git a/dapr-spring/dapr-spring-messaging/pom.xml b/dapr-spring/dapr-spring-messaging/pom.xml index 6ab4ce230..81a312137 100644 --- a/dapr-spring/dapr-spring-messaging/pom.xml +++ b/dapr-spring/dapr-spring-messaging/pom.xml @@ -6,7 +6,7 @@ io.dapr.spring dapr-spring-parent - 0.16.0-SNAPSHOT + 0.17.0-SNAPSHOT dapr-spring-messaging diff --git a/dapr-spring/dapr-spring-workflows/pom.xml b/dapr-spring/dapr-spring-workflows/pom.xml index bac4ab7d2..73af8d632 100644 --- a/dapr-spring/dapr-spring-workflows/pom.xml +++ b/dapr-spring/dapr-spring-workflows/pom.xml @@ -6,7 +6,7 @@ io.dapr.spring dapr-spring-parent - 0.16.0-SNAPSHOT + 0.17.0-SNAPSHOT dapr-spring-workflows diff --git a/dapr-spring/pom.xml b/dapr-spring/pom.xml index 4e1738394..e1cc1e937 100644 --- a/dapr-spring/pom.xml +++ b/dapr-spring/pom.xml @@ -7,13 +7,13 @@ io.dapr dapr-sdk-parent - 1.16.0-SNAPSHOT + 1.17.0-SNAPSHOT io.dapr.spring dapr-spring-parent pom - 0.16.0-SNAPSHOT + 0.17.0-SNAPSHOT dapr-spring-parent SDK extension for Spring and Spring Boot @@ -33,7 +33,8 @@ 11 1.19.8 5.11.2 - 0.16.0-SNAPSHOT + + 0.17.0-SNAPSHOT diff --git a/examples/pom.xml b/examples/pom.xml index 8e5965471..bba7fc43d 100644 --- a/examples/pom.xml +++ b/examples/pom.xml @@ -7,12 +7,12 @@ io.dapr dapr-sdk-parent - 1.16.0-SNAPSHOT + 1.17.0-SNAPSHOT dapr-sdk-examples jar - 1.16.0-SNAPSHOT + 1.17.0-SNAPSHOT dapr-sdk-examples diff --git a/pom.xml b/pom.xml index faa2b3588..4deee5105 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ io.dapr dapr-sdk-parent pom - 1.16.0-SNAPSHOT + 1.17.0-SNAPSHOT dapr-sdk-parent SDK for Dapr. https://dapr.io @@ -18,8 +18,8 @@ 3.25.5 protoc https://raw.githubusercontent.com/dapr/dapr/v1.16.0-rc.3/dapr/proto - 1.16.0-SNAPSHOT - 0.16.0-SNAPSHOT + 1.17.0-SNAPSHOT + 0.17.0-SNAPSHOT 1.7.1 3.1.1 1.8 diff --git a/sdk-actors/pom.xml b/sdk-actors/pom.xml index 9c0a81694..fe475b7a2 100644 --- a/sdk-actors/pom.xml +++ b/sdk-actors/pom.xml @@ -7,12 +7,12 @@ io.dapr dapr-sdk-parent - 1.16.0-SNAPSHOT + 1.17.0-SNAPSHOT dapr-sdk-actors jar - 1.16.0-SNAPSHOT + 1.17.0-SNAPSHOT dapr-sdk-actors SDK for Actors on Dapr diff --git a/sdk-autogen/pom.xml b/sdk-autogen/pom.xml index 5fb453960..4c7dd6e30 100644 --- a/sdk-autogen/pom.xml +++ b/sdk-autogen/pom.xml @@ -7,12 +7,12 @@ io.dapr dapr-sdk-parent - 1.16.0-SNAPSHOT + 1.17.0-SNAPSHOT dapr-sdk-autogen jar - 1.16.0-SNAPSHOT + 1.17.0-SNAPSHOT dapr-sdk-autogen Auto-generated SDK for Dapr diff --git a/sdk-springboot/pom.xml b/sdk-springboot/pom.xml index b43d63e8e..0fa023720 100644 --- a/sdk-springboot/pom.xml +++ b/sdk-springboot/pom.xml @@ -7,12 +7,12 @@ io.dapr dapr-sdk-parent - 1.16.0-SNAPSHOT + 1.17.0-SNAPSHOT dapr-sdk-springboot jar - 1.16.0-SNAPSHOT + 1.17.0-SNAPSHOT dapr-sdk-springboot SDK extension for Springboot diff --git a/sdk-tests/pom.xml b/sdk-tests/pom.xml index 17146622a..7a0fca81d 100644 --- a/sdk-tests/pom.xml +++ b/sdk-tests/pom.xml @@ -7,11 +7,11 @@ io.dapr dapr-sdk-parent - 1.16.0-SNAPSHOT + 1.17.0-SNAPSHOT dapr-sdk-tests - 1.16.0-SNAPSHOT + 1.17.0-SNAPSHOT dapr-sdk-tests Tests for Dapr's Java SDK - not to be published as a jar. @@ -22,8 +22,8 @@ 17 17 true - 1.16.0-SNAPSHOT - 0.16.0-SNAPSHOT + 1.17.0-SNAPSHOT + 0.17.0-SNAPSHOT ${project.build.directory}/generated-sources ${project.basedir}/proto diff --git a/sdk-workflows/pom.xml b/sdk-workflows/pom.xml index 883489fd0..286df3c19 100644 --- a/sdk-workflows/pom.xml +++ b/sdk-workflows/pom.xml @@ -7,12 +7,12 @@ io.dapr dapr-sdk-parent - 1.16.0-SNAPSHOT + 1.17.0-SNAPSHOT dapr-sdk-workflows jar - 0.16.0-SNAPSHOT + 0.17.0-SNAPSHOT dapr-sdk-workflows SDK for Workflows on Dapr diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowContext.java b/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowContext.java index 9994cb779..8608e9693 100644 --- a/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowContext.java +++ b/sdk-workflows/src/main/java/io/dapr/workflows/WorkflowContext.java @@ -526,4 +526,12 @@ public interface WorkflowContext { default UUID newUuid() { throw new RuntimeException("No implementation found."); } + + /** + * Set a custom status to a workflow execution. + * + * @param status to be set to the current execution + */ + void setCustomStatus(Object status); + } diff --git a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowContext.java b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowContext.java index d11e1fe77..d12346ca0 100644 --- a/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowContext.java +++ b/sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowContext.java @@ -59,7 +59,7 @@ public class DefaultWorkflowContext implements WorkflowContext { * @throws IllegalArgumentException if context or logger is null */ public DefaultWorkflowContext(TaskOrchestrationContext context, Logger logger) - throws IllegalArgumentException { + throws IllegalArgumentException { if (context == null) { throw new IllegalArgumentException("Context cannot be null"); } @@ -114,7 +114,7 @@ public class DefaultWorkflowContext implements WorkflowContext { */ @Override public Task waitForExternalEvent(String name, Duration timeout, Class dataType) - throws TaskCanceledException { + throws TaskCanceledException { return this.innerContext.waitForExternalEvent(name, timeout, dataType); } @@ -130,7 +130,7 @@ public class DefaultWorkflowContext implements WorkflowContext { * @param timeout the amount of time to wait before canceling the returned * {@code Task} * @return a new {@link Task} that completes when the external event is received - * or when {@code timeout} expires + * or when {@code timeout} expires * @throws TaskCanceledException if the specified {@code timeout} value expires * before the event is received */ @@ -294,4 +294,13 @@ public class DefaultWorkflowContext implements WorkflowContext { return workflowTaskRetryHandler.handle(workflowRetryContext); }; } + + /** + * Set custom status to a workflow execution. + * + * @param status to set to the execution + */ + public void setCustomStatus(Object status) { + innerContext.setCustomStatus(status); + } } diff --git a/sdk-workflows/src/test/java/io/dapr/workflows/DefaultWorkflowContextTest.java b/sdk-workflows/src/test/java/io/dapr/workflows/DefaultWorkflowContextTest.java index f0eaa9ee1..837bf4c7d 100644 --- a/sdk-workflows/src/test/java/io/dapr/workflows/DefaultWorkflowContextTest.java +++ b/sdk-workflows/src/test/java/io/dapr/workflows/DefaultWorkflowContextTest.java @@ -135,6 +135,11 @@ public class DefaultWorkflowContextTest { @Override public void continueAsNew(Object input, boolean preserveUnprocessedEvents) { } + + @Override + public void setCustomStatus(Object status) { + + } }; } @@ -403,6 +408,15 @@ public class DefaultWorkflowContextTest { verify(mockInnerContext, times(1)).callSubOrchestrator(expectedName, expectedInput, null, null, String.class); } + @Test + public void setCustomStatusWorkflow() { + String customStatus = "CustomStatus"; + + context.setCustomStatus(customStatus); + verify(mockInnerContext, times(1)).setCustomStatus(customStatus); + + } + @Test public void newUuidTest() { context.newUuid(); diff --git a/sdk/pom.xml b/sdk/pom.xml index 14cb9e08d..57154623c 100644 --- a/sdk/pom.xml +++ b/sdk/pom.xml @@ -7,12 +7,12 @@ io.dapr dapr-sdk-parent - 1.16.0-SNAPSHOT + 1.17.0-SNAPSHOT dapr-sdk jar - 1.16.0-SNAPSHOT + 1.17.0-SNAPSHOT dapr-sdk SDK for Dapr diff --git a/spring-boot-examples/consumer-app/pom.xml b/spring-boot-examples/consumer-app/pom.xml index 8bb5e715d..1351e3fc4 100644 --- a/spring-boot-examples/consumer-app/pom.xml +++ b/spring-boot-examples/consumer-app/pom.xml @@ -5,7 +5,7 @@ io.dapr spring-boot-examples - 0.16.0-SNAPSHOT + 0.17.0-SNAPSHOT consumer-app diff --git a/spring-boot-examples/pom.xml b/spring-boot-examples/pom.xml index fe63ac9f3..80a0c2bd5 100644 --- a/spring-boot-examples/pom.xml +++ b/spring-boot-examples/pom.xml @@ -6,11 +6,11 @@ io.dapr dapr-sdk-parent - 1.16.0-SNAPSHOT + 1.17.0-SNAPSHOT spring-boot-examples - 0.16.0-SNAPSHOT + 0.17.0-SNAPSHOT pom diff --git a/spring-boot-examples/producer-app/pom.xml b/spring-boot-examples/producer-app/pom.xml index 73fbedeac..970472cb3 100644 --- a/spring-boot-examples/producer-app/pom.xml +++ b/spring-boot-examples/producer-app/pom.xml @@ -6,7 +6,7 @@ io.dapr spring-boot-examples - 0.16.0-SNAPSHOT + 0.17.0-SNAPSHOT producer-app diff --git a/spring-boot-examples/workflows/pom.xml b/spring-boot-examples/workflows/pom.xml index f28c48c0f..7b1757b84 100644 --- a/spring-boot-examples/workflows/pom.xml +++ b/spring-boot-examples/workflows/pom.xml @@ -6,7 +6,7 @@ io.dapr spring-boot-examples - 0.16.0-SNAPSHOT + 0.17.0-SNAPSHOT workflows diff --git a/testcontainers-dapr/pom.xml b/testcontainers-dapr/pom.xml index f404849df..429306524 100644 --- a/testcontainers-dapr/pom.xml +++ b/testcontainers-dapr/pom.xml @@ -5,13 +5,13 @@ io.dapr dapr-sdk-parent - 1.16.0-SNAPSHOT + 1.17.0-SNAPSHOT testcontainers-dapr testcontainers-dapr Testcontainers Dapr Module - 0.16.0-SNAPSHOT + 0.17.0-SNAPSHOT jar