Upgrade grpc-java to 1.44.0 (helidon-io#3856)

fryp · Feb 3, 2022 · 19a64c0 · 19a64c0
1 parent eb365be
commit 19a64c0
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -54,11 +54,12 @@
         <version.lib.google-api-client>1.32.2</version.lib.google-api-client>
         <version.lib.google-oauth-client>1.32.1</version.lib.google-oauth-client>
         <version.lib.google-error-prone>2.3.3</version.lib.google-error-prone>
-        <version.lib.google-protobuf>3.18.2</version.lib.google-protobuf>
+        <version.lib.google-protobuf>3.19.2</version.lib.google-protobuf>
         <version.lib.graalvm>21.3.0</version.lib.graalvm>
         <version.lib.graphql-java>15.0</version.lib.graphql-java>
         <version.lib.graphql-java.extended.scalars>15.0.0</version.lib.graphql-java.extended.scalars>
-        <version.lib.grpc>1.41.2</version.lib.grpc>
+        <version.lib.gson>2.8.9</version.lib.gson>
+        <version.lib.grpc>1.44.0</version.lib.grpc>
         <version.lib.guava>30.0-jre</version.lib.guava>
         <version.lib.h2>2.0.206</version.lib.h2>
         <version.lib.hamcrest>1.3</version.lib.hamcrest>
@@ -479,12 +480,20 @@
                 <artifactId>grpc-netty</artifactId>
                 <version>${version.lib.grpc}</version>
             </dependency>
+
             <!-- Dependency convergence. Should align with version used by io.grpc -->
             <dependency>
                 <groupId>com.google.protobuf</groupId>
                 <artifactId>protobuf-java</artifactId>
                 <version>${version.lib.google-protobuf}</version>
             </dependency>
+            <!-- Dependency convergence. Should align with version used by io.grpc -->
+            <dependency>
+                <groupId>com.google.code.gson</groupId>
+                <artifactId>gson</artifactId>
+                <version>${version.lib.gson}</version>
+            </dependency>
+
             <dependency>
               <groupId>io.opentracing.contrib</groupId>
               <artifactId>opentracing-grpc</artifactId>

diff --git a/...egration/grpc/src/test/java/io/helidon/security/integration/grpc/TestCallCredentials.java b/...egration/grpc/src/test/java/io/helidon/security/integration/grpc/TestCallCredentials.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, 2021 Oracle and/or its affiliates.
+ * Copyright (c) 2019, 2022 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,15 +21,15 @@
 
 import io.helidon.grpc.core.ContextKeys;
 
-import io.grpc.CallCredentials2;
+import io.grpc.CallCredentials;
 import io.grpc.Metadata;
 
 /**
- * A {@link io.grpc.CallCredentials2} that add a basic auth
+ * A {@link io.grpc.CallCredentials} that add a basic auth
  * authorization header to a request.
  */
 public class TestCallCredentials
-        extends CallCredentials2 {
+        extends CallCredentials {
     /**
      * The basic auth encoded user name and password.
      */