Skip to content

Commit 5b6f098

Browse files
committed
use built in durable task
Signed-off-by: salaboy <[email protected]>
1 parent 2100299 commit 5b6f098

File tree

5 files changed

+3
-38
lines changed

5 files changed

+3
-38
lines changed

durabletask-client/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,6 @@
6868
<groupId>org.testcontainers</groupId>
6969
<artifactId>testcontainers</artifactId>
7070
</dependency>
71-
<dependency>
72-
<groupId>io.dapr</groupId>
73-
<artifactId>durabletask-client</artifactId>
74-
</dependency>
7571
</dependencies>
7672
<build>
7773
<plugins>

pom.xml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,6 @@
3333
<maven.compiler.target>11</maven.compiler.target>
3434
<maven.compiler.release>11</maven.compiler.release>
3535
<maven.deploy.skip>true</maven.deploy.skip>
36-
<!--
37-
manually declare durabletask-client's jackson dependencies for workflows sdk
38-
which conflict with dapr-sdk's jackson dependencies
39-
https://github.com/dapr/durabletask-java/blob/main/client/build.gradle#L16
40-
-->
4136
<jackson.version>2.16.2</jackson.version>
4237
<gpg.skip>true</gpg.skip>
4338
<spotbugs.fail>true</spotbugs.fail>
@@ -72,7 +67,6 @@
7267
<junit-vintage-engine.version>5.7.0</junit-vintage-engine.version>
7368
<junit-platform-console.version>1.7.0</junit-platform-console.version>
7469
<reactor.version>3.5.12</reactor.version>
75-
<durabletask-client.version>1.5.10</durabletask-client.version>
7670
<testcontainers-redis.version>2.2.2</testcontainers-redis.version>
7771
<slf4j.version>2.0.9</slf4j.version>
7872
<mockito.version>3.11.2</mockito.version>
@@ -482,11 +476,6 @@
482476
<artifactId>reactor-core</artifactId>
483477
<version>${reactor.version}</version>
484478
</dependency>
485-
<dependency>
486-
<groupId>io.dapr</groupId>
487-
<artifactId>durabletask-client</artifactId>
488-
<version>${durabletask-client.version}</version>
489-
</dependency>
490479
<dependency>
491480
<groupId>com.redis</groupId>
492481
<artifactId>testcontainers-redis</artifactId>

sdk-workflows/pom.xml

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -44,27 +44,7 @@
4444
<dependency>
4545
<groupId>io.dapr</groupId>
4646
<artifactId>durabletask-client</artifactId>
47-
</dependency>
48-
<!--
49-
manually declare durabletask-client's jackson dependencies
50-
which conflict with dapr-sdk's jackson dependencies
51-
https://github.com/dapr/durabletask-java/blob/main/client/build.gradle#L16
52-
-->
53-
<dependency>
54-
<groupId>com.fasterxml.jackson.core</groupId>
55-
<artifactId>jackson-core</artifactId>
56-
</dependency>
57-
<dependency>
58-
<groupId>com.fasterxml.jackson.core</groupId>
59-
<artifactId>jackson-databind</artifactId>
60-
</dependency>
61-
<dependency>
62-
<groupId>com.fasterxml.jackson.core</groupId>
63-
<artifactId>jackson-annotations</artifactId>
64-
</dependency>
65-
<dependency>
66-
<groupId>com.fasterxml.jackson.datatype</groupId>
67-
<artifactId>jackson-datatype-jsr310</artifactId>
47+
<version>${project.parent.version}</version>
6848
</dependency>
6949
</dependencies>
7050

sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ public void continueAsNew(Object input, boolean preserveUnprocessedEvents) {
246246
*/
247247
@Override
248248
public UUID newUuid() {
249-
return this.innerContext.newUUID();
249+
return this.innerContext.newUuid();
250250
}
251251

252252
private TaskOptions toTaskOptions(WorkflowTaskOptions options) {

sdk-workflows/src/test/java/io/dapr/workflows/DefaultWorkflowContextTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ public void setCustomStatusWorkflow() {
422422
@Test
423423
public void newUuidTest() {
424424
context.newUuid();
425-
verify(mockInnerContext, times(1)).newUUID();
425+
verify(mockInnerContext, times(1)).newUuid();
426426
}
427427

428428
@Test

0 commit comments

Comments
 (0)