From 8b26696dd58014769346836c731b16680952a8a8 Mon Sep 17 00:00:00 2001
From: Lari Hotari <lari@hotari.net>
Date: Fri, 23 Oct 2020 16:52:28 +0300
Subject: [PATCH] Use grpc-bom and protoc-gen-grpc-java version match
 grpc.version

- CI fails currently because of grpc version incompatibilities
---
 pom.xml | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index a0ad9562f68e4..ed9b50d1e15d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,7 +126,7 @@ flexible messaging model and an intuitive client API.</description>
     <protobuf3.version>3.11.4</protobuf3.version>
     <protoc3.version>3.11.4</protoc3.version>
     <grpc.version>1.31.0</grpc.version>
-    <protoc-gen-grpc-java.version>1.12.0</protoc-gen-grpc-java.version>
+    <protoc-gen-grpc-java.version>${grpc.version}</protoc-gen-grpc-java.version>
     <gson.version>2.8.2</gson.version>
     <sketches.version>0.8.3</sketches.version>
     <hbc-core.version>2.2.0</hbc-core.version>
@@ -787,20 +787,10 @@ flexible messaging model and an intuitive client API.</description>
 
       <dependency>
         <groupId>io.grpc</groupId>
-        <artifactId>grpc-core</artifactId>
-        <version>${grpc.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.grpc</groupId>
-        <artifactId>grpc-stub</artifactId>
-        <version>${grpc.version}</version>
-      </dependency>
-
-      <dependency>
-        <groupId>io.grpc</groupId>
-        <artifactId>grpc-protobuf-lite</artifactId>
+        <artifactId>grpc-bom</artifactId>
         <version>${grpc.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
       </dependency>
 
       <dependency>