4.x: Upgrade grpc-java to 1.57.1 and remove repackaging of io.grpc (#…

…7304)
helidon-io · Aug 7, 2023 · 8b5eafd · 8b5eafd
1 parent c34adae
commit 8b5eafd
Show file tree

Hide file tree

Showing 29 changed files with 15 additions and 775 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -72,12 +72,6 @@
                 <artifactId>helidon-jersey-media-jsonp</artifactId>
                 <version>${helidon.version}</version>
             </dependency>
-            <!-- gRPC -->
-            <dependency>
-                <groupId>io.helidon.grpc</groupId>
-                <artifactId>io.grpc</artifactId>
-                <version>${helidon.version}</version>
-            </dependency>
             <!-- graphQL -->
             <dependency>
                 <groupId>io.helidon.graphql</groupId>

diff --git a/config/etcd/pom.xml b/config/etcd/pom.xml
@@ -57,8 +57,8 @@
         </dependency>
         <!-- etcd v3 -->
         <dependency>
-            <groupId>io.helidon.grpc</groupId>
-            <artifactId>io.grpc</artifactId>
+            <groupId>io.grpc</groupId>
+            <artifactId>grpc-api</artifactId>
         </dependency>
         <dependency>
             <groupId>io.grpc</groupId>

diff --git a/config/etcd/src/main/java/module-info.java b/config/etcd/src/main/java/module-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017, 2022 Oracle and/or its affiliates.
+ * Copyright (c) 2017, 2023 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.
@@ -26,11 +26,11 @@
     requires etcd4j;
     requires grpc.protobuf;
     requires grpc.stub;
+    requires grpc.api;
     requires com.google.protobuf;
     requires com.google.common;
     requires io.helidon.common;
     requires io.helidon.common.media.type;
-    requires io.grpc;
     requires static java.annotation;
 
     exports io.helidon.config.etcd;

diff --git a/dependencies/pom.xml b/dependencies/pom.xml
@@ -56,7 +56,7 @@
         <version.lib.graphql-java>18.6</version.lib.graphql-java>
         <version.lib.graphql-java.extended.scalars>18.3</version.lib.graphql-java.extended.scalars>
         <version.lib.gson>2.9.0</version.lib.gson>
-        <version.lib.grpc>1.56.0</version.lib.grpc>
+        <version.lib.grpc>1.57.1</version.lib.grpc>
         <version.lib.guava>32.0.1-jre</version.lib.guava>
         <version.lib.h2>2.2.220</version.lib.h2>
         <version.lib.hamcrest>1.3</version.lib.hamcrest>
@@ -397,75 +397,6 @@
                 <artifactId>etcd4j</artifactId>
                 <version>${version.lib.etcd4j}</version>
             </dependency>
-            <dependency>
-                <groupId>io.grpc</groupId>
-                <artifactId>grpc-core</artifactId>
-                <version>${version.lib.grpc}</version>
-                <exclusions>
-                    <exclusion>
-                        <!-- Used for compilation of "their" sources -->
-                        <groupId>com.google.code.findbugs</groupId>
-                        <artifactId>jsr305</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <!-- Used for compilation of "their" sources -->
-                        <groupId>com.google.errorprone</groupId>
-                        <artifactId>error_prone_annotations</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>io.grpc</groupId>
-                <artifactId>grpc-api</artifactId>
-                <version>${version.lib.grpc}</version>
-                <exclusions>
-                    <exclusion>
-                        <!-- Used for compilation of "their" sources -->
-                        <groupId>org.codehaus.mojo</groupId>
-                        <artifactId>animal-sniffer-annotations</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <!-- Used for compilation of "their" sources -->
-                        <groupId>com.google.errorprone</groupId>
-                        <artifactId>error_prone_annotations</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <!-- Used for compilation of "their" sources -->
-                        <groupId>com.google.code.findbugs</groupId>
-                        <artifactId>jsr305</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <!-- Used for compilation of "their" sources -->
-                        <groupId>com.google.j2objc</groupId>
-                        <artifactId>j2objc-annotations</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            <dependency>
-                <groupId>io.grpc</groupId>
-                <artifactId>grpc-context</artifactId>
-                <version>${version.lib.grpc}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.grpc</groupId>
-                <artifactId>grpc-protobuf</artifactId>
-                <version>${version.lib.grpc}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.grpc</groupId>
-                <artifactId>grpc-stub</artifactId>
-                <version>${version.lib.grpc}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.grpc</groupId>
-                <artifactId>grpc-services</artifactId>
-                <version>${version.lib.grpc}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.grpc</groupId>
-                <artifactId>grpc-netty</artifactId>
-                <version>${version.lib.grpc}</version>
-            </dependency>
 
             <!-- Dependency convergence. Should align with version used by io.grpc -->
             <dependency>
@@ -1445,6 +1376,13 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
+            <dependency>
+                <groupId>io.grpc</groupId>
+                <artifactId>grpc-bom</artifactId>
+                <version>${version.lib.grpc}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <dependency>
                 <groupId>com.oracle.database.jdbc</groupId>
                 <artifactId>ojdbc-bom</artifactId>

diff --git a/grpc/io.grpc/pom.xml b/grpc/io.grpc/pom.xml
diff --git a/grpc/io.grpc/src/main/java/io/grpc/LoadBalancerProvider.java b/grpc/io.grpc/src/main/java/io/grpc/LoadBalancerProvider.java
diff --git a/grpc/io.grpc/src/main/java/io/grpc/ManagedChannelProvider.java b/grpc/io.grpc/src/main/java/io/grpc/ManagedChannelProvider.java
diff --git a/grpc/io.grpc/src/main/java/io/grpc/NameResolverProvider.java b/grpc/io.grpc/src/main/java/io/grpc/NameResolverProvider.java
diff --git a/grpc/io.grpc/src/main/java/io/grpc/ServerProvider.java b/grpc/io.grpc/src/main/java/io/grpc/ServerProvider.java