Skip to content

Commit 708334a

Browse files
alicejgibbonsalicejgibbons
authored
Merge pull request #1241 from dapr/alicejgibbons/rc5
Chore: RC8 and java rc2
2 parents eb75dd3 + 196a567 commit 708334a

File tree

13 files changed

+55
-35
lines changed

13 files changed

+55
-35
lines changed

‎.github/env/global.env‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
DAPR_CLI_VERSION: 1.16.0-rc.1
2-
DAPR_RUNTIME_VERSION: 1.16.0-rc.4
2+
DAPR_RUNTIME_VERSION: 1.16.0-rc.8
33
DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v${DAPR_CLI_VERSION}/install/
44
DAPR_DEFAULT_IMAGE_REGISTRY: ghcr
55

‎bindings/java/sdk/batch/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@
2828
<dependency>
2929
<groupId>io.dapr</groupId>
3030
<artifactId>dapr-sdk-springboot</artifactId>
31-
<version>1.16.0-rc-1</version>
31+
<version>1.16.0-rc-2</version>
3232
</dependency>
3333
<dependency>
3434
<groupId>io.dapr</groupId>
3535
<artifactId>dapr-sdk</artifactId>
36-
<version>1.16.0-rc-1</version>
36+
<version>1.16.0-rc-2</version>
3737
</dependency>
3838
<dependency>
3939
<groupId>org.projectlombok</groupId>

‎configuration/java/sdk/order-processor/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<dependency>
1818
<groupId>io.dapr</groupId>
1919
<artifactId>dapr-sdk</artifactId>
20-
<version>1.16.0-rc-1</version>
20+
<version>1.16.0-rc-2</version>
2121
</dependency>
2222
<dependency>
2323
<groupId>io.projectreactor</groupId>

‎conversation/java/sdk/conversation/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<dependency>
1515
<groupId>io.dapr</groupId>
1616
<artifactId>dapr-sdk</artifactId>
17-
<version>1.15.0</version>
17+
<version>1.16.0-rc-2</version>
1818
</dependency>
1919
</dependencies>
2020

@@ -23,7 +23,7 @@
2323
<dependency>
2424
<groupId>io.dapr</groupId>
2525
<artifactId>dapr-sdk</artifactId>
26-
<version>1.15.0</version>
26+
<version>1.16.0-rc-2</version>
2727
</dependency>
2828
</dependencies>
2929
</dependencyManagement>

‎jobs/java/sdk/README.md‎

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -48,18 +48,21 @@ cd ..
4848
<!-- STEP
4949
name: Run multi app run template
5050
expected_stdout_lines:
51-
- '== APP - job-scheduler-sdk == Job Scheduled: {"name":"R2-D2","data":"T2lsIENoYW5nZQ==","schedule":{"expression":"0/5 * * * * *"},"dueTime":null,"repeats":null,"ttl":null}'
52-
- '== APP - job-service-sdk == Starting Droid: R2-D2'
53-
- '== APP - job-scheduler-sdk == Scheduling a Job with name C-3PO'
54-
- '== APP - job-scheduler-sdk == Job Scheduled: {"name":"C-3PO","data":"TGltYiBDYWxpYnJhdGlvbg==","schedule":{"expression":"0/5 * * * * *"},"dueTime":null,"repeats":null,"ttl":null}'
51+
- '== APP - job-scheduler-sdk == Job Scheduled: {"name":"R2-D2","data":"T2lsIENoYW5nZQ==","schedule":{"expression":"0/5 * * * * *"},"dueTime":null,"repeats":null,"ttl":null,"failurePolicy":null,"overwrite":false}'
5552
- '== APP - job-service-sdk == Starting Droid: R2-D2'
5653
- '== APP - job-service-sdk == Executing Maintenance: Oil Change'
54+
- '== APP - job-scheduler-sdk == Getting Job: R2-D2'
55+
- '== APP - job-scheduler-sdk == Job Details: {"name":"R2-D2","data":"T2lsIENoYW5nZQ==","schedule":{"expression":"0/5 * * * * *"},"dueTime":null,"repeats":null,"ttl":null,"failurePolicy":{"maxRetries":3,"durationBetweenRetries":0.0,"failurePolicyType":"CONSTANT"}}'
56+
- '== APP - job-scheduler-sdk == Scheduling a Job with name C-3PO'
57+
- '== APP - job-scheduler-sdk == Job Scheduled: {"name":"C-3PO","data":"TGltYiBDYWxpYnJhdGlvbg==","schedule":{"expression":"0/5 * * * * *"},"dueTime":null,"repeats":null,"ttl":null,"failurePolicy":null,"overwrite":false}'
5758
- '== APP - job-service-sdk == Starting Droid: C-3PO'
5859
- '== APP - job-service-sdk == Executing Maintenance: Limb Calibration'
5960
- '== APP - job-scheduler-sdk == Getting Job: C-3PO'
60-
- '== APP - job-scheduler-sdk == Job Details: {"name":"C-3PO","data":"TGltYiBDYWxpYnJhdGlvbg==","schedule":{"expression":"0/5 * * * * *"},"dueTime":null,"repeats":null,"ttl":null}'
61+
- '== APP - job-scheduler-sdk == Job Details: {"name":"C-3PO","data":"TGltYiBDYWxpYnJhdGlvbg==","schedule":{"expression":"0/5 * * * * *"},"dueTime":null,"repeats":null,"ttl":null,"failurePolicy":{"maxRetries":3,"durationBetweenRetries":0.0,"failurePolicyType":"CONSTANT"}}'
6162
- '== APP - job-scheduler-sdk == Deleting Job: C-3PO'
6263
- '== APP - job-scheduler-sdk == Deleted Job: C-3PO'
64+
- '== APP - job-scheduler-sdk == Deleting Job: R2-D2'
65+
- '== APP - job-scheduler-sdk == Deleted Job: R2-D2'
6366
expected_stderr_lines:
6467
output_match_mode: substring
6568
match_order: none
@@ -82,22 +85,25 @@ The terminal console output should look similar to this, where:
8285
- The `C-3PO` job is being retrieved.
8386
- The `C-3PO` job is being deleted.
8487
- The `C-3PO` job is deleted.
88+
- The `R2-D2` job is being deleted.
89+
- The `R2-D2` job is deleted.
8590

8691
```text
87-
== APP - job-scheduler-sdk == Job Scheduled: {"name":"R2-D2","data":"T2lsIENoYW5nZQ==","schedule":{"expression":"0/5 * * * * *"},"dueTime":null,"repeats":null,"ttl":null}
88-
== APP - job-service-sdk == Starting Droid: R2-D2
89-
== APP - job-scheduler-sdk == Scheduling a Job with name C-3PO
90-
== APP - job-scheduler-sdk == Job Scheduled: {"name":"C-3PO","data":"TGltYiBDYWxpYnJhdGlvbg==","schedule":{"expression":"0/5 * * * * *"},"dueTime":null,"repeats":null,"ttl":null}
92+
== APP - job-scheduler-sdk == Job Scheduled: {"name":"R2-D2","data":"T2lsIENoYW5nZQ==","schedule":{"expression":"0/5 * * * * *"},"dueTime":null,"repeats":null,"ttl":null,"failurePolicy":null,"overwrite":false}
9193
== APP - job-service-sdk == Starting Droid: R2-D2
9294
== APP - job-service-sdk == Executing Maintenance: Oil Change
95+
== APP - job-scheduler-sdk == Getting Job: R2-D2
96+
== APP - job-scheduler-sdk == Job Details: {"name":"R2-D2","data":"T2lsIENoYW5nZQ==","schedule":{"expression":"0/5 * * * * *"},"dueTime":null,"repeats":null,"ttl":null,"failurePolicy":{"maxRetries":3,"durationBetweenRetries":0.0,"failurePolicyType":"CONSTANT"}}
97+
== APP - job-scheduler-sdk == Scheduling a Job with name C-3PO
98+
== APP - job-scheduler-sdk == Job Scheduled: {"name":"C-3PO","data":"TGltYiBDYWxpYnJhdGlvbg==","schedule":{"expression":"0/5 * * * * *"},"dueTime":null,"repeats":null,"ttl":null,"failurePolicy":null,"overwrite":false}
9399
== APP - job-service-sdk == Starting Droid: C-3PO
94100
== APP - job-service-sdk == Executing Maintenance: Limb Calibration
95101
== APP - job-scheduler-sdk == Getting Job: C-3PO
96-
== APP - job-scheduler-sdk == Job Details: {"name":"C-3PO","data":"TGltYiBDYWxpYnJhdGlvbg==","schedule":{"expression":"0/5 * * * * *"},"dueTime":null,"repeats":null,"ttl":null}
102+
== APP - job-scheduler-sdk == Job Details: {"name":"C-3PO","data":"TGltYiBDYWxpYnJhdGlvbg==","schedule":{"expression":"0/5 * * * * *"},"dueTime":null,"repeats":null,"ttl":null,"failurePolicy":{"maxRetries":3,"durationBetweenRetries":0.0,"failurePolicyType":"CONSTANT"}}
97103
== APP - job-scheduler-sdk == Deleting Job: C-3PO
98104
== APP - job-scheduler-sdk == Deleted Job: C-3PO
99-
== APP - job-service-sdk == Starting Droid: R2-D2
100-
105+
== APP - job-scheduler-sdk == Deleting Job: R2-D2
106+
== APP - job-scheduler-sdk == Deleted Job: R2-D2
101107
```
102108
<!-- END_STEP -->
103109

@@ -123,7 +129,7 @@ mvn clean install
123129
```
124130

125131
```bash
126-
dapr run --app-id job-scheduler-sdk --app-port 8080 --dapr-grpc-port 6200 --dapr-http-port 6390 --log-level debug -- java -jar target/JobService-0.0.1-SNAPSHOT.jar com.service.JobServiceStartup
132+
dapr run --app-id job-service-sdk --app-port 8080 --dapr-grpc-port 6200 --dapr-http-port 6390 --log-level debug -- java -jar target/JobService-0.0.1-SNAPSHOT.jar com.service.JobServiceStartup
127133
```
128134

129135
This makes sure we receive triggers as part of the scheduled jobs.
@@ -136,7 +142,8 @@ mvn clean install
136142
```
137143

138144
```bash
139-
java -jar "target/JobsScheduler-0.0.1-SNAPSHOT.jar"
145+
#java -jar "target/JobsScheduler-0.0.1-SNAPSHOT.jar"
146+
dapr run --app-id job-scheduler-sdk --app-port 8080 --dapr-grpc-port 6200 --dapr-http-port 6390 --log-level debug -- java -jar target/JobScheduler-0.0.1-SNAPSHOT.jar
140147
```
141148

142149
This step is responsible for scheduling, getting and deleting jobs.
@@ -146,11 +153,11 @@ This step is responsible for scheduling, getting and deleting jobs.
146153
In the `job-scheduler` terminal window, the output should be:
147154

148155
```text
149-
== APP - job-scheduler-sdk == Job Scheduled: {"name":"R2-D2","data":"T2lsIENoYW5nZQ==","schedule":{"expression":"0/5 * * * * *"},"dueTime":null,"repeats":null,"ttl":null}
156+
== APP - job-scheduler-sdk == Job Scheduled: {"name":"R2-D2","data":"T2lsIENoYW5nZQ==","schedule":{"expression":"0/5 * * * * *"},"dueTime":null,"repeats":null,"ttl":null,"failurePolicy":null,"overwrite":false}
150157
== APP - job-scheduler-sdk == Scheduling a Job with name C-3PO
151-
== APP - job-scheduler-sdk == Job Scheduled: {"name":"C-3PO","data":"TGltYiBDYWxpYnJhdGlvbg==","schedule":{"expression":"0/5 * * * * *"},"dueTime":null,"repeats":null,"ttl":null}
158+
== APP - job-scheduler-sdk == Job Scheduled: {"name":"C-3PO","data":"TGltYiBDYWxpYnJhdGlvbg==","schedule":{"expression":"0/5 * * * * *"},"dueTime":null,"repeats":null,"ttl":null,"failurePolicy":null,"overwrite":false}
152159
== APP - job-scheduler-sdk == Getting Job: C-3PO
153-
== APP - job-scheduler-sdk == Job Details: {"name":"C-3PO","data":"TGltYiBDYWxpYnJhdGlvbg==","schedule":{"expression":"0/5 * * * * *"},"dueTime":null,"repeats":null,"ttl":null}
160+
== APP - job-scheduler-sdk == Job Details: {"name":"C-3PO","data":"TGltYiBDYWxpYnJhdGlvbg==","schedule":{"expression":"0/5 * * * * *"},"dueTime":null,"repeats":null,"ttl":null,"failurePolicy":null,"overwrite":false}
154161
== APP - job-scheduler-sdk == Deleting Job: C-3PO
155162
== APP - job-scheduler-sdk == Deleted Job: C-3PO
156163
```

‎jobs/java/sdk/job-scheduler/pom.xml‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,23 @@
1515
<groupId>io.dapr</groupId>
1616
<artifactId>dapr-sdk</artifactId>
1717
</dependency>
18+
<dependency>
19+
<groupId>com.fasterxml.jackson.datatype</groupId>
20+
<artifactId>jackson-datatype-jsr310</artifactId>
21+
</dependency>
1822
</dependencies>
1923

2024
<dependencyManagement>
2125
<dependencies>
2226
<dependency>
2327
<groupId>io.dapr</groupId>
2428
<artifactId>dapr-sdk</artifactId>
25-
<version>1.15.0</version>
29+
<version>1.16.0-rc-2</version>
30+
</dependency>
31+
<dependency>
32+
<groupId>com.fasterxml.jackson.datatype</groupId>
33+
<artifactId>jackson-datatype-jsr310</artifactId>
34+
<version>2.17.2</version>
2635
</dependency>
2736
</dependencies>
2837
</dependencyManagement>

‎jobs/java/sdk/job-scheduler/src/main/java/com/service/JobScheduler.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.fasterxml.jackson.core.JsonProcessingException;
44
import com.fasterxml.jackson.databind.ObjectMapper;
5+
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
56
import io.dapr.client.DaprClientBuilder;
67
import io.dapr.client.DaprPreviewClient;
78
import io.dapr.client.domain.DeleteJobRequest;
@@ -25,7 +26,6 @@ public static void main(String[] args) throws Exception {
2526
Properties.HTTP_PORT, "6390",
2627
Properties.GRPC_PORT, "6200"
2728
);
28-
2929
try (DaprPreviewClient client = new DaprClientBuilder().withPropertyOverrides(overrides).buildPreviewClient()) {
3030

3131
// Schedule R2-D2 Job.
@@ -49,6 +49,8 @@ public static void main(String[] args) throws Exception {
4949

5050
// Delete the C-3PO Job
5151
deleteJob(client, c3POJobName);
52+
// Delete the R2-D2 Job
53+
deleteJob(client, r2D2JobName);
5254
}
5355
}
5456

@@ -60,6 +62,7 @@ private static void scheduleJob(DaprPreviewClient client, String jobName, String
6062
client.scheduleJob(request).block();
6163

6264
ObjectMapper mapper = new ObjectMapper();
65+
mapper.registerModule(new JavaTimeModule());
6366
System.out.println("Job Scheduled: " + mapper.writeValueAsString(request));
6467
}
6568

@@ -68,6 +71,7 @@ private static void retrieveJob(DaprPreviewClient client, String jobName) throws
6871
GetJobResponse response = client.getJob(new GetJobRequest(jobName)).block();
6972

7073
ObjectMapper mapper = new ObjectMapper();
74+
mapper.registerModule(new JavaTimeModule());
7175
System.out.println("Job Details: " + mapper.writeValueAsString(response));
7276
}
7377

‎jobs/java/sdk/job-service/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<properties>
1313
<springframework.version>3.5.0</springframework.version>
1414
<springweb.version>6.2.7</springweb.version>
15-
<dapr-sdk.version>1.15.0</dapr-sdk.version>
15+
<dapr-sdk.version>1.16.0-rc-2</dapr-sdk.version>
1616
</properties>
1717

1818
<dependencies>

‎jobs/python/http/README.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ This quickstart includes two apps:
1818
## Environment Variables
1919

2020
- `JOB_SERVICE_DAPR_HTTP_PORT`: The Dapr HTTP port of the job-service (default: 6280)
21-
- `DAPR_HOST`: The Dapr host address (default: http://localhost)
21+
- `DAPR_HOST`: The Dapr host address (default: "http://localhost")
2222

2323
## Run all apps with multi-app run template file
2424

@@ -44,22 +44,22 @@ expected_stdout_lines:
4444
- '== APP - job-scheduler == Sending request to schedule job: R2-D2'
4545
- '== APP - job-scheduler == Job scheduled: R2-D2'
4646
- '== APP - job-scheduler == Sending request to retrieve job: R2-D2'
47-
- '== APP - job-scheduler == Job details for R2-D2: {"name":"R2-D2", "dueTime":"15s", "data":{"@type":"type.googleapis.com/google.protobuf.Value", "value":{"@type":"type.googleapis.com/google.protobuf.StringValue", "value":"R2-D2:Oil Change"}}, "failurePolicy":{"constant":{"interval":"1s", "maxRetries":3}}}'
47+
- '== APP - job-scheduler == Job details for R2-D2:'
4848
- '== APP - job-scheduler == Sending request to schedule job: C-3PO'
4949
- '== APP - job-scheduler == Job scheduled: C-3PO'
5050
- '== APP - job-service == Received job request...'
5151
- '== APP - job-service == Starting droid: R2-D2'
5252
- '== APP - job-service == Executing maintenance job: Oil Change'
5353
- '== APP - job-scheduler == Sending request to retrieve job: C-3PO'
54-
- '== APP - job-scheduler == Job details for C-3PO: {"name":"C-3PO", "dueTime":"20s", "data":{"@type":"type.googleapis.com/google.protobuf.Value", "value":{"@type":"type.googleapis.com/google.protobuf.StringValue", "value":"C-3PO:Limb Calibration"}}, "failurePolicy":{"constant":{"interval":"1s", "maxRetries":3}}}'
54+
- '== APP - job-scheduler == Job details for C-3PO:'
5555
- '== APP - job-service == Received job request...'
5656
- '== APP - job-service == Starting droid: C-3PO'
5757
- '== APP - job-service == Executing maintenance job: Limb Calibration'
5858
expected_stderr_lines: []
5959
output_match_mode: substring
6060
match_order: none
6161
background: true
62-
sleep: 60
62+
sleep: 70
6363
timeout_seconds: 120
6464
-->
6565

‎pub_sub/java/sdk/checkout/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<dependency>
1818
<groupId>io.dapr</groupId>
1919
<artifactId>dapr-sdk</artifactId>
20-
<version>1.16.0-rc-1</version>
20+
<version>1.16.0-rc-2</version>
2121
</dependency>
2222
<dependency>
2323
<groupId>com.squareup.okhttp3</groupId>

0 commit comments

Comments
 (0)