Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure we use the same GRPC version everywhere #1137

Merged
merged 8 commits into from
Sep 26, 2024
Merged

Ensure we use the same GRPC version everywhere #1137

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a2eb05f
Ensure we use the same GRPC version everywhere
Sep 24, 2024
60041bf
Fix actors tests assert
Sep 24, 2024
b751cbe
Revert Dapr exception asserts
Sep 24, 2024
15e119c
Increase sleep to allow Spring Context to bootstrap
Sep 25, 2024
e5e5d43
Revert sleep value
Sep 25, 2024
529db5a
Increase the sleep for messaging test
Sep 25, 2024
7b85065
Move sleep before each, to ensure Spring context starts
Sep 25, 2024
299535a
Add more delays to ensure Spring Controller gets the messages
Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,13 @@
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-testing</artifactId>
<version>1.56.1</version>
<version>${grpc.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-inprocess</artifactId>
<version>1.59.0</version>
<version>${grpc.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
Expand Down
1 change: 0 additions & 1 deletion sdk-actors/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

<properties>
<maven.deploy.skip>false</maven.deploy.skip>
<grpc.version>1.59.0</grpc.version>
</properties>

<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion sdk-actors/src/test/java/io/dapr/actors/client/DaprGrpcClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ public void invokeException() {
ExecutionException.class,
"UNKNOWN",
"UNKNOWN: ",
() -> result.block());
result::block);
}

@Test
Expand Down
4 changes: 2 additions & 2 deletions sdk-actors/src/test/java/io/dapr/actors/runtime/DaprGrpcClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public void getActorStateException() {
assertThrowsDaprException(
ExecutionException.class,
"UNKNOWN",
"UNKNOWN: ",
"UNKNOWN: Application error processing RPC",
result::block);
}

Expand All @@ -112,7 +112,7 @@ public void saveActorStateTransactionallyException() {
assertThrowsDaprException(
ExecutionException.class,
"UNKNOWN",
"UNKNOWN: ",
"UNKNOWN: Application error processing RPC",
result::block);
}
@Test
Expand Down
1 change: 0 additions & 1 deletion sdk/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

<properties>
<maven.deploy.skip>false</maven.deploy.skip>
<grpc.version>1.59.0</grpc.version>
<argLine>
--add-opens java.base/java.util=ALL-UNNAMED
</argLine>
Expand Down
Loading