diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4585d41bf..c781f11ba 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -38,9 +38,9 @@ jobs:
GOARCH: amd64
GOPROXY: https://proxy.golang.org
JDK_VER: ${{ matrix.java }}
- DAPR_CLI_VER: 1.13.0-rc.1
- DAPR_RUNTIME_VER: 1.13.0-rc.2
- DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.13.0-rc.1/install/install.sh
+ DAPR_CLI_VER: 1.14.0-rc.6
+ DAPR_RUNTIME_VER: 1.14.0-rc.6
+ DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.14.0-rc.4/install/install.sh
DAPR_CLI_REF:
DAPR_REF:
TOXIPROXY_URL: https://github.com/Shopify/toxiproxy/releases/download/v2.5.0/toxiproxy-server-linux-amd64
diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index 897e9bfa0..ffe5a7168 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml
@@ -37,9 +37,9 @@ jobs:
GOARCH: amd64
GOPROXY: https://proxy.golang.org
JDK_VER: ${{ matrix.java }}
- DAPR_CLI_VER: 1.13.0-rc.1
- DAPR_RUNTIME_VER: 1.13.0-rc.5
- DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.13.0-rc.1/install/install.sh
+ DAPR_CLI_VER: 1.14.0-rc.6
+ DAPR_RUNTIME_VER: 1.14.0-rc.6
+ DAPR_INSTALL_URL: https://raw.githubusercontent.com/dapr/cli/v1.14.0-rc.3/install/install.sh
DAPR_CLI_REF:
DAPR_REF:
steps:
@@ -100,6 +100,8 @@ jobs:
echo "PATH=$PATH:$HOME/.local/bin" >> $GITHUB_ENV
pip3 install setuptools wheel
pip3 install mechanical-markdown
+ - name: Verify scheduler is listening on port.
+ run: sleep 30 && docker logs dapr_scheduler && nc -vz localhost 50006
- name: Clean up files
run: ./mvnw clean
- name: Build sdk
diff --git a/pom.xml b/pom.xml
index 64d9772df..124c5ae9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,11 +14,12 @@
UTF-8
- 1.59.0
- 3.17.3
- https://raw.githubusercontent.com/dapr/dapr/v1.13.0-rc.5/dapr/proto
+ 1.64.0
+ 3.25.0
+ protoc
+ https://raw.githubusercontent.com/dapr/dapr/v1.14.0-rc.2/dapr/proto
0.12.0-SNAPSHOT
- 1.6.2
+ 1.7.1
3.1.1
1.8
2.7
@@ -46,7 +47,7 @@
https://oss.sonatype.org/content/repositories/snapshots
- localDocsDirecty
+ localDocsDirectory
file:${maven.multiModuleProjectDirectory}/docs/
diff --git a/sdk-autogen/pom.xml b/sdk-autogen/pom.xml
index a7f778815..4272128c5 100644
--- a/sdk-autogen/pom.xml
+++ b/sdk-autogen/pom.xml
@@ -20,7 +20,9 @@
${project.build.directory}/generated-sources
${project.build.directory}/proto
false
- 1.59.0
+ 1.64.0
+ protoc
+ 3.25.0
@@ -62,29 +64,29 @@
1.6.0
- getCommonProto
+ getDaprProto
initialize
wget
true
- ${dapr.proto.baseurl}/common/v1/common.proto
- common.proto
- ${protobuf.input.directory}/dapr/proto/common/v1
+ ${dapr.proto.baseurl}/runtime/v1/dapr.proto
+ dapr.proto
+ ${protobuf.input.directory}/dapr/proto/runtime/v1
- getDaprProto
+ getCommonProto
initialize
wget
true
- ${dapr.proto.baseurl}/runtime/v1/dapr.proto
- dapr.proto
- ${protobuf.input.directory}
+ ${dapr.proto.baseurl}/common/v1/common.proto
+ common.proto
+ ${protobuf.input.directory}/dapr/proto/common/v1
@@ -97,11 +99,23 @@
true
${dapr.proto.baseurl}/runtime/v1/appcallback.proto
appcallback.proto
- ${protobuf.input.directory}
+ ${protobuf.input.directory}/dapr/proto/runtime/v1
+
+ kr.motd.maven
+ os-maven-plugin
+ 1.7.0
+
+
+
+ detect
+
+
+
+
com.github.os72
protoc-jar-maven-plugin
@@ -113,14 +127,18 @@
run
+ protoc
${protobuf.version}
+ com.google.protobuf:protoc:3.21.1
inputs
direct
true
- ${protobuf.input.directory}/dapr/proto/common/v1
${protobuf.input.directory}
+
+ ${protobuf.input.directory}
+
java
diff --git a/sdk-tests/pom.xml b/sdk-tests/pom.xml
index 48fcdddfe..adbb00b07 100644
--- a/sdk-tests/pom.xml
+++ b/sdk-tests/pom.xml
@@ -18,8 +18,8 @@
1.12.0-SNAPSHOT
${project.build.directory}/generated-sources
${project.basedir}/proto
- 1.59.0
- 3.17.3
+ 1.64.0
+ 3.25.0
1.39.0
3.3.1
diff --git a/sdk-tests/src/test/java/io/dapr/it/methodinvoke/grpc/MethodInvokeIT.java b/sdk-tests/src/test/java/io/dapr/it/methodinvoke/grpc/MethodInvokeIT.java
index 5eac1b2a7..a4d9dd835 100644
--- a/sdk-tests/src/test/java/io/dapr/it/methodinvoke/grpc/MethodInvokeIT.java
+++ b/sdk-tests/src/test/java/io/dapr/it/methodinvoke/grpc/MethodInvokeIT.java
@@ -30,7 +30,6 @@ public class MethodInvokeIT extends BaseIT {
private static final int TIMEOUT_MS = 100;
private static final ResiliencyOptions RESILIENCY_OPTIONS = new ResiliencyOptions()
.setTimeout(Duration.ofMillis(TIMEOUT_MS));
- private static final String EXCEPTION_MARKER = "DEADLINE_EXCEEDED: deadline exceeded after";
/**
* Run of a Dapr application.
@@ -92,7 +91,8 @@ public void testInvokeTimeout() throws Exception {
String message = assertThrows(StatusRuntimeException.class, () -> stub.sleep(req)).getMessage();
long delay = System.currentTimeMillis() - started;
assertTrue(delay >= TIMEOUT_MS, "Delay: " + delay + " is not greater than timeout: " + TIMEOUT_MS);
- assertTrue(message.startsWith(EXCEPTION_MARKER), "Message: " + message + " does not start with: " + EXCEPTION_MARKER);
+ assertTrue(message.contains("DEADLINE_EXCEEDED"));
+ assertTrue(message.contains("CallOptions deadline exceeded after"));
}
}
@@ -112,7 +112,8 @@ public void testInvokeException() throws Exception {
// If this test fails, there might be a regression in runtime (like we had in 1.10.0).
// The expectations below are as per 1.9 release and (later on) hotfixed in 1.10.
assertEquals(Status.UNKNOWN.getCode(), exception.getStatus().getCode());
- assertEquals("", exception.getStatus().getDescription());
+ // The error message below is added starting in Dapr 1.15.0
+ assertEquals("Application error processing RPC", exception.getStatus().getDescription());
}
}