You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2022/08/08 10:31:35 UTC

[camel] branch main updated: CAMEL-18361: Upgrade gRPC to 1.48.1

This is an automated email from the ASF dual-hosted git repository.

jamesnetherton pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new d6cbe159dd4 CAMEL-18361: Upgrade gRPC to 1.48.1
d6cbe159dd4 is described below

commit d6cbe159dd4bf3478948524e0519ef7a9a5f66dd
Author: James Netherton <ja...@gmail.com>
AuthorDate: Mon Aug 8 09:13:33 2022 +0100

    CAMEL-18361: Upgrade gRPC to 1.48.1
---
 camel-dependencies/pom.xml                                        | 8 ++++----
 .../apache/camel/component/grpc/GrpcConsumerPropagationTest.java  | 1 +
 .../org/apache/camel/component/grpc/GrpcConsumerSecurityTest.java | 2 ++
 parent/pom.xml                                                    | 8 ++++----
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/camel-dependencies/pom.xml b/camel-dependencies/pom.xml
index 3c0a80bbb46..d2b7f6e05da 100644
--- a/camel-dependencies/pom.xml
+++ b/camel-dependencies/pom.xml
@@ -237,10 +237,10 @@
     <graphql-java-version>18.2</graphql-java-version>
     <grizzly-websockets-version>2.4.4</grizzly-websockets-version>
     <grpc-google-auth-library-version>1.5.3</grpc-google-auth-library-version>
-    <grpc-guava-version>28.2-jre</grpc-guava-version>
-    <grpc-java-jwt-version>3.18.3</grpc-java-jwt-version>
-    <grpc-netty-tcnative-boringssl-static-version>2.0.52.Final</grpc-netty-tcnative-boringssl-static-version>
-    <grpc-version>1.45.0</grpc-version>
+    <grpc-guava-version>31.1-jre</grpc-guava-version>
+    <grpc-java-jwt-version>3.19.2</grpc-java-jwt-version>
+    <grpc-netty-tcnative-boringssl-static-version>2.0.53.Final</grpc-netty-tcnative-boringssl-static-version>
+    <grpc-version>1.48.1</grpc-version>
     <gson-version>2.9.0</gson-version>
     <guava-eventbus-version>28.2-jre</guava-eventbus-version>
     <guice3-version>3.0</guice3-version>
diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerPropagationTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerPropagationTest.java
index dc17e9bdffd..c275ffe1e27 100644
--- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerPropagationTest.java
+++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerPropagationTest.java
@@ -81,6 +81,7 @@ public class GrpcConsumerPropagationTest extends CamelTestSupport {
 
         StreamObserver<PingRequest> requestObserver = asyncOnNextStub.pingAsyncSync(responseObserver);
         requestObserver.onNext(pingRequest);
+        requestObserver.onCompleted();
         latch.await(5, TimeUnit.SECONDS);
 
         MockEndpoint mockEndpoint = getMockEndpoint("mock:async-on-next-propagation");
diff --git a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerSecurityTest.java b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerSecurityTest.java
index 9900ec5dd4c..001c3df033c 100644
--- a/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerSecurityTest.java
+++ b/components/camel-grpc/src/test/java/org/apache/camel/component/grpc/GrpcConsumerSecurityTest.java
@@ -119,6 +119,7 @@ public class GrpcConsumerSecurityTest extends CamelTestSupport {
 
         StreamObserver<PingRequest> requestObserver = tlsAsyncStub.pingAsyncSync(responseObserver);
         requestObserver.onNext(pingRequest);
+        requestObserver.onCompleted();
         latch.await(5, TimeUnit.SECONDS);
 
         MockEndpoint mockEndpoint = getMockEndpoint("mock:tls-enable");
@@ -145,6 +146,7 @@ public class GrpcConsumerSecurityTest extends CamelTestSupport {
 
         StreamObserver<PingRequest> requestObserver = jwtCorrectAsyncStub.pingAsyncSync(responseObserver);
         requestObserver.onNext(pingRequest);
+        requestObserver.onCompleted();
         latch.await(5, TimeUnit.SECONDS);
 
         MockEndpoint mockEndpoint = getMockEndpoint("mock:jwt-correct-secret");
diff --git a/parent/pom.xml b/parent/pom.xml
index 70ac90fb84f..a4aa89573cf 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -216,12 +216,12 @@
         <graaljs-version>22.1.0</graaljs-version>
         <graphql-java-version>18.2</graphql-java-version>
         <grizzly-websockets-version>2.4.4</grizzly-websockets-version>
-        <grpc-version>1.45.0</grpc-version>
+        <grpc-version>1.48.1</grpc-version>
         <!-- keep grpc-google-auth-library-version in sync with that used by grpc-auth -->
         <grpc-google-auth-library-version>1.5.3</grpc-google-auth-library-version>
-        <grpc-guava-version>28.2-jre</grpc-guava-version>
-        <grpc-java-jwt-version>3.18.3</grpc-java-jwt-version>
-        <grpc-netty-tcnative-boringssl-static-version>2.0.52.Final</grpc-netty-tcnative-boringssl-static-version>
+        <grpc-guava-version>31.1-jre</grpc-guava-version>
+        <grpc-java-jwt-version>3.19.2</grpc-java-jwt-version>
+        <grpc-netty-tcnative-boringssl-static-version>2.0.53.Final</grpc-netty-tcnative-boringssl-static-version>
         <gson-version>2.9.0</gson-version>
         <guava-eventbus-version>28.2-jre</guava-eventbus-version>
         <guice3-version>3.0</guice3-version>