Skip to content

Commit 40660c4

Browse files
siri-varmasiri-varma
authored
Merge branch 'master' into users/svegiraju/spring-pom-update
2 parents f233c8c + ab8e411 commit 40660c4

File tree

52 files changed

+199
-141
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+199
-141
lines changed

‎dapr-spring/dapr-spring-boot-autoconfigure/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.dapr.spring</groupId>
88
<artifactId>dapr-spring-parent</artifactId>
9-
<version>0.15.0-SNAPSHOT</version>
9+
<version>0.16.0-SNAPSHOT</version>
1010
</parent>
1111

1212
<artifactId>dapr-spring-boot-autoconfigure</artifactId>

‎dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter-test/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.dapr.spring</groupId>
88
<artifactId>dapr-spring-parent</artifactId>
9-
<version>0.15.0-SNAPSHOT</version>
9+
<version>0.16.0-SNAPSHOT</version>
1010
<relativePath>../../pom.xml</relativePath>
1111
</parent>
1212

‎dapr-spring/dapr-spring-boot-starters/dapr-spring-boot-starter/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.dapr.spring</groupId>
88
<artifactId>dapr-spring-parent</artifactId>
9-
<version>0.15.0-SNAPSHOT</version>
9+
<version>0.16.0-SNAPSHOT</version>
1010
<relativePath>../../pom.xml</relativePath>
1111
</parent>
1212

‎dapr-spring/dapr-spring-boot-tests/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.dapr.spring</groupId>
88
<artifactId>dapr-spring-parent</artifactId>
9-
<version>0.15.0-SNAPSHOT</version>
9+
<version>0.16.0-SNAPSHOT</version>
1010
</parent>
1111

1212
<artifactId>dapr-spring-boot-tests</artifactId>

‎dapr-spring/dapr-spring-data/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.dapr.spring</groupId>
88
<artifactId>dapr-spring-parent</artifactId>
9-
<version>0.15.0-SNAPSHOT</version>
9+
<version>0.16.0-SNAPSHOT</version>
1010
</parent>
1111

1212
<artifactId>dapr-spring-data</artifactId>

‎dapr-spring/dapr-spring-messaging/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.dapr.spring</groupId>
88
<artifactId>dapr-spring-parent</artifactId>
9-
<version>0.15.0-SNAPSHOT</version>
9+
<version>0.16.0-SNAPSHOT</version>
1010
</parent>
1111

1212
<artifactId>dapr-spring-messaging</artifactId>

‎dapr-spring/dapr-spring-workflows/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<parent>
77
<groupId>io.dapr.spring</groupId>
88
<artifactId>dapr-spring-parent</artifactId>
9-
<version>0.15.0-SNAPSHOT</version>
9+
<version>0.16.0-SNAPSHOT</version>
1010
</parent>
1111

1212
<artifactId>dapr-spring-workflows</artifactId>

‎dapr-spring/dapr-spring-workflows/src/main/java/io/dapr/spring/workflows/config/DaprWorkflowsConfiguration.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,9 @@ private void registerWorkflowsAndActivities(ApplicationContext applicationContex
4646
workflowRuntimeBuilder.registerActivity(activity);
4747
}
4848

49-
try (WorkflowRuntime runtime = workflowRuntimeBuilder.build()) {
50-
LOGGER.info("Starting workflow runtime ... ");
51-
runtime.start(false);
52-
}
49+
WorkflowRuntime runtime = workflowRuntimeBuilder.build();
50+
LOGGER.info("Starting workflow runtime ... ");
51+
runtime.start(false);
5352
}
5453

5554
@Override

‎dapr-spring/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
<parent>
88
<groupId>io.dapr</groupId>
99
<artifactId>dapr-sdk-parent</artifactId>
10-
<version>1.15.0-SNAPSHOT</version>
10+
<version>1.16.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<groupId>io.dapr.spring</groupId>
1414
<artifactId>dapr-spring-parent</artifactId>
1515
<packaging>pom</packaging>
16-
<version>0.15.0-SNAPSHOT</version>
16+
<version>0.16.0-SNAPSHOT</version>
1717
<name>dapr-spring-parent</name>
1818
<description>SDK extension for Spring and Spring Boot</description>
1919

‎examples/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
<parent>
88
<groupId>io.dapr</groupId>
99
<artifactId>dapr-sdk-parent</artifactId>
10-
<version>1.15.0-SNAPSHOT</version>
10+
<version>1.16.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>dapr-sdk-examples</artifactId>
1414
<packaging>jar</packaging>
15-
<version>1.15.0-SNAPSHOT</version>
15+
<version>1.16.0-SNAPSHOT</version>
1616
<name>dapr-sdk-examples</name>
1717

1818
<properties>

‎examples/src/main/java/io/dapr/examples/unittesting/DaprWorkflowExampleTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
package io.dapr.examples.unittesting;
1515

16-
import com.microsoft.durabletask.Task;
17-
import com.microsoft.durabletask.TaskCanceledException;
16+
import io.dapr.durabletask.Task;
17+
import io.dapr.durabletask.TaskCanceledException;
1818
import io.dapr.workflows.Workflow;
1919
import io.dapr.workflows.WorkflowContext;
2020
import io.dapr.workflows.WorkflowStub;

‎examples/src/main/java/io/dapr/examples/workflows/chain/DemoChainWorker.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@ public static void main(String[] args) throws Exception {
2929
builder.registerActivity(ToUpperCaseActivity.class);
3030

3131
// Build and then start the workflow runtime pulling and executing tasks
32-
try (WorkflowRuntime runtime = builder.build()) {
33-
System.out.println("Start workflow runtime");
34-
runtime.start();
35-
}
32+
WorkflowRuntime runtime = builder.build();
33+
System.out.println("Start workflow runtime");
34+
runtime.start();
3635
}
3736
}

‎examples/src/main/java/io/dapr/examples/workflows/childworkflow/DemoChildWorkflowWorker.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@ public static void main(String[] args) throws Exception {
3131
builder.registerActivity(ReverseActivity.class);
3232

3333
// Build and then start the workflow runtime pulling and executing tasks
34-
try (WorkflowRuntime runtime = builder.build()) {
35-
System.out.println("Start workflow runtime");
36-
runtime.start();
37-
}
34+
WorkflowRuntime runtime = builder.build();
35+
System.out.println("Start workflow runtime");
3836
}
3937
}

‎examples/src/main/java/io/dapr/examples/workflows/continueasnew/DemoContinueAsNewWorker.java

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
import io.dapr.workflows.runtime.WorkflowRuntime;
1717
import io.dapr.workflows.runtime.WorkflowRuntimeBuilder;
1818

19+
import java.util.concurrent.ExecutorService;
20+
import java.util.concurrent.Executors;
21+
1922
public class DemoContinueAsNewWorker {
2023
/**
2124
* The main method of this app.
@@ -25,13 +28,14 @@ public class DemoContinueAsNewWorker {
2528
*/
2629
public static void main(String[] args) throws Exception {
2730
// Register the Workflow with the builder.
28-
WorkflowRuntimeBuilder builder = new WorkflowRuntimeBuilder().registerWorkflow(DemoContinueAsNewWorkflow.class);
31+
WorkflowRuntimeBuilder builder = new WorkflowRuntimeBuilder().
32+
registerWorkflow(DemoContinueAsNewWorkflow.class)
33+
.withExecutorService(Executors.newFixedThreadPool(3));
2934
builder.registerActivity(CleanUpActivity.class);
3035

3136
// Build and then start the workflow runtime pulling and executing tasks
32-
try (WorkflowRuntime runtime = builder.build()) {
33-
System.out.println("Start workflow runtime");
34-
runtime.start();
35-
}
37+
WorkflowRuntime runtime = builder.build();
38+
System.out.println("Start workflow runtime");
39+
runtime.start();
3640
}
3741
}

‎examples/src/main/java/io/dapr/examples/workflows/externalevent/DemoExternalEventWorker.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,8 @@ public static void main(String[] args) throws Exception {
3030
builder.registerActivity(DenyActivity.class);
3131

3232
// Build and then start the workflow runtime pulling and executing tasks
33-
try (WorkflowRuntime runtime = builder.build()) {
34-
System.out.println("Start workflow runtime");
35-
runtime.start();
36-
}
33+
WorkflowRuntime runtime = builder.build();
34+
System.out.println("Start workflow runtime");
35+
runtime.start();
3736
}
3837
}

‎examples/src/main/java/io/dapr/examples/workflows/faninout/DemoFanInOutWorker.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,8 @@ public static void main(String[] args) throws Exception {
2929
builder.registerActivity(CountWordsActivity.class);
3030

3131
// Build and then start the workflow runtime pulling and executing tasks
32-
try (WorkflowRuntime runtime = builder.build()) {
33-
System.out.println("Start workflow runtime");
34-
runtime.start();
35-
}
32+
WorkflowRuntime runtime = builder.build();
33+
System.out.println("Start workflow runtime");
34+
runtime.start(false);
3635
}
3736
}

‎examples/src/main/java/io/dapr/examples/workflows/faninout/DemoFanInOutWorkflow.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
package io.dapr.examples.workflows.faninout;
1515

16-
import com.microsoft.durabletask.Task;
16+
import io.dapr.durabletask.Task;
1717
import io.dapr.workflows.Workflow;
1818
import io.dapr.workflows.WorkflowStub;
1919

‎pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<groupId>io.dapr</groupId>
88
<artifactId>dapr-sdk-parent</artifactId>
99
<packaging>pom</packaging>
10-
<version>1.15.0-SNAPSHOT</version>
10+
<version>1.16.0-SNAPSHOT</version>
1111
<name>dapr-sdk-parent</name>
1212
<description>SDK for Dapr.</description>
1313
<url>https://dapr.io</url>
@@ -18,8 +18,8 @@
1818
<protobuf.version>3.25.5</protobuf.version>
1919
<protocCommand>protoc</protocCommand>
2020
<dapr.proto.baseurl>https://raw.githubusercontent.com/dapr/dapr/v1.15.4/dapr/proto</dapr.proto.baseurl>
21-
<dapr.sdk.version>1.15.0-SNAPSHOT</dapr.sdk.version>
22-
<dapr.sdk.alpha.version>0.15.0-SNAPSHOT</dapr.sdk.alpha.version>
21+
<dapr.sdk.version>1.16.0-SNAPSHOT</dapr.sdk.version>
22+
<dapr.sdk.alpha.version>0.16.0-SNAPSHOT</dapr.sdk.alpha.version>
2323
<os-maven-plugin.version>1.7.1</os-maven-plugin.version>
2424
<maven-dependency-plugin.version>3.1.1</maven-dependency-plugin.version>
2525
<maven-antrun-plugin.version>1.8</maven-antrun-plugin.version>
@@ -36,7 +36,7 @@
3636
<!--
3737
manually declare durabletask-client's jackson dependencies for workflows sdk
3838
which conflict with dapr-sdk's jackson dependencies
39-
https://github.com/microsoft/durabletask-java/blob/main/client/build.gradle#L16
39+
https://github.com/dapr/durabletask-java/blob/main/client/build.gradle#L16
4040
-->
4141
<jackson.version>2.16.1</jackson.version>
4242
<gpg.skip>true</gpg.skip>

‎sdk-actors/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
<parent>
88
<groupId>io.dapr</groupId>
99
<artifactId>dapr-sdk-parent</artifactId>
10-
<version>1.15.0-SNAPSHOT</version>
10+
<version>1.16.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>dapr-sdk-actors</artifactId>
1414
<packaging>jar</packaging>
15-
<version>1.15.0-SNAPSHOT</version>
15+
<version>1.16.0-SNAPSHOT</version>
1616
<name>dapr-sdk-actors</name>
1717
<description>SDK for Actors on Dapr</description>
1818

‎sdk-autogen/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
<parent>
88
<groupId>io.dapr</groupId>
99
<artifactId>dapr-sdk-parent</artifactId>
10-
<version>1.15.0-SNAPSHOT</version>
10+
<version>1.16.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>dapr-sdk-autogen</artifactId>
1414
<packaging>jar</packaging>
15-
<version>1.15.0-SNAPSHOT</version>
15+
<version>1.16.0-SNAPSHOT</version>
1616
<name>dapr-sdk-autogen</name>
1717
<description>Auto-generated SDK for Dapr</description>
1818

‎sdk-springboot/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
<parent>
88
<groupId>io.dapr</groupId>
99
<artifactId>dapr-sdk-parent</artifactId>
10-
<version>1.15.0-SNAPSHOT</version>
10+
<version>1.16.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>dapr-sdk-springboot</artifactId>
1414
<packaging>jar</packaging>
15-
<version>1.15.0-SNAPSHOT</version>
15+
<version>1.16.0-SNAPSHOT</version>
1616
<name>dapr-sdk-springboot</name>
1717
<description>SDK extension for Springboot</description>
1818

‎sdk-tests/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
<parent>
88
<groupId>io.dapr</groupId>
99
<artifactId>dapr-sdk-parent</artifactId>
10-
<version>1.15.0-SNAPSHOT</version>
10+
<version>1.16.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>dapr-sdk-tests</artifactId>
14-
<version>1.15.0-SNAPSHOT</version>
14+
<version>1.16.0-SNAPSHOT</version>
1515
<name>dapr-sdk-tests</name>
1616
<description>Tests for Dapr's Java SDK - not to be published as a jar.</description>
1717

@@ -22,8 +22,8 @@
2222
<maven.compiler.source>17</maven.compiler.source>
2323
<maven.compiler.target>17</maven.compiler.target>
2424
<maven.deploy.skip>true</maven.deploy.skip>
25-
<dapr.sdk.version>1.15.0-SNAPSHOT</dapr.sdk.version>
26-
<dapr.sdk.alpha.version>0.15.0-SNAPSHOT</dapr.sdk.alpha.version>
25+
<dapr.sdk.version>1.16.0-SNAPSHOT</dapr.sdk.version>
26+
<dapr.sdk.alpha.version>0.16.0-SNAPSHOT</dapr.sdk.alpha.version>
2727
<protobuf.output.directory>${project.build.directory}/generated-sources</protobuf.output.directory>
2828
<protobuf.input.directory>${project.basedir}/proto</protobuf.input.directory>
2929
<grpc.version>1.69.0</grpc.version>

‎sdk-tests/src/test/java/io/dapr/it/testcontainers/DaprWorkflowsIT.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,9 @@ static void daprProperties(DynamicPropertyRegistry registry) {
9191
*/
9292
@BeforeEach
9393
public void init() {
94-
try (WorkflowRuntime runtime = workflowRuntimeBuilder.build()) {
95-
System.out.println("Start workflow runtime");
96-
runtime.start(false);
97-
}
94+
WorkflowRuntime runtime = workflowRuntimeBuilder.build();
95+
System.out.println("Start workflow runtime");
96+
runtime.start(false);
9897
}
9998

10099
@Test

‎sdk-workflows/pom.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
<parent>
88
<groupId>io.dapr</groupId>
99
<artifactId>dapr-sdk-parent</artifactId>
10-
<version>1.15.0-SNAPSHOT</version>
10+
<version>1.16.0-SNAPSHOT</version>
1111
</parent>
1212

1313
<artifactId>dapr-sdk-workflows</artifactId>
1414
<packaging>jar</packaging>
15-
<version>0.15.0-SNAPSHOT</version>
15+
<version>0.16.0-SNAPSHOT</version>
1616
<name>dapr-sdk-workflows</name>
1717
<description>SDK for Workflows on Dapr</description>
1818

@@ -45,14 +45,14 @@
4545
<scope>test</scope>
4646
</dependency>
4747
<dependency>
48-
<groupId>com.microsoft</groupId>
48+
<groupId>io.dapr</groupId>
4949
<artifactId>durabletask-client</artifactId>
50-
<version>1.5.0</version>
50+
<version>1.5.2</version>
5151
</dependency>
5252
<!--
5353
manually declare durabletask-client's jackson dependencies
5454
which conflict with dapr-sdk's jackson dependencies
55-
https://github.com/microsoft/durabletask-java/blob/main/client/build.gradle#L16
55+
https://github.com/dapr/durabletask-java/blob/main/client/build.gradle#L16
5656
-->
5757
<dependency>
5858
<groupId>com.fasterxml.jackson.core</groupId>

‎sdk-workflows/src/main/java/io/dapr/workflows/WorkflowContext.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313

1414
package io.dapr.workflows;
1515

16-
import com.microsoft.durabletask.CompositeTaskFailedException;
17-
import com.microsoft.durabletask.Task;
18-
import com.microsoft.durabletask.TaskCanceledException;
19-
import com.microsoft.durabletask.TaskFailedException;
16+
import io.dapr.durabletask.CompositeTaskFailedException;
17+
import io.dapr.durabletask.Task;
18+
import io.dapr.durabletask.TaskCanceledException;
19+
import io.dapr.durabletask.TaskFailedException;
2020
import org.slf4j.Logger;
2121

2222
import javax.annotation.Nullable;

‎sdk-workflows/src/main/java/io/dapr/workflows/client/DaprWorkflowClient.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@
1313

1414
package io.dapr.workflows.client;
1515

16-
import com.microsoft.durabletask.DurableTaskClient;
17-
import com.microsoft.durabletask.DurableTaskGrpcClientBuilder;
18-
import com.microsoft.durabletask.NewOrchestrationInstanceOptions;
19-
import com.microsoft.durabletask.OrchestrationMetadata;
20-
import com.microsoft.durabletask.PurgeResult;
2116
import io.dapr.config.Properties;
17+
import io.dapr.durabletask.DurableTaskClient;
18+
import io.dapr.durabletask.DurableTaskGrpcClientBuilder;
19+
import io.dapr.durabletask.NewOrchestrationInstanceOptions;
20+
import io.dapr.durabletask.OrchestrationMetadata;
21+
import io.dapr.durabletask.PurgeResult;
2222
import io.dapr.utils.NetworkUtils;
2323
import io.dapr.workflows.Workflow;
2424
import io.dapr.workflows.internal.ApiTokenClientInterceptor;

‎sdk-workflows/src/main/java/io/dapr/workflows/runtime/DefaultWorkflowActivityContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
package io.dapr.workflows.runtime;
1515

16-
import com.microsoft.durabletask.TaskActivityContext;
16+
import io.dapr.durabletask.TaskActivityContext;
1717
import io.dapr.workflows.WorkflowActivityContext;
1818

1919
/**

0 commit comments

Comments
 (0)