[ZEPPELIN-5857] Bump gRPC and protobuf to support build on macOS M1 c…

…hips (#4523) * [ZEPPELIN-5857] Bump gRPC and protobuf to support build on macOS M1 chips * fix * nit
apache · Dec 29, 2022 · 09bd938 · 09bd938
1 parent fad3b01
commit 09bd938
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 17 deletions.
diff --git a/pom.xml b/pom.xml
@@ -154,8 +154,9 @@
     <quartz.scheduler.version>2.3.2</quartz.scheduler.version>
     <jettison.version>1.4.0</jettison.version>
     <jsoup.version>1.13.1</jsoup.version>
-    <protoc.version>3.5.0</protoc.version>
-    <grpc.version>1.26.0</grpc.version>
+    <protobuf.version>3.21.7</protobuf.version>
+    <grpc.version>1.51.0</grpc.version>
+    <google.errorprone.version>2.14.0</google.errorprone.version>
 
     <!-- test library versions -->
     <junit.jupiter.version>5.7.1</junit.jupiter.version>
@@ -198,6 +199,7 @@
     <plugin.shade.version>3.2.2</plugin.shade.version>
     <plugin.source.version>3.2.1</plugin.source.version>
     <plugin.surefire.version>2.22.2</plugin.surefire.version>
+    <plugin.os.version>1.4.1.Final</plugin.os.version>
 
     <testcontainers.version>1.15.1</testcontainers.version>
 

diff --git a/python/pom.xml b/python/pom.xml
@@ -34,7 +34,6 @@
   <properties>
     <interpreter.name>python</interpreter.name>
     <python.py4j.version>0.10.7</python.py4j.version>
-    <grpc.version>1.15.0</grpc.version>
     <interpreter.jar.name>python-interpreter-with-py4j</interpreter.jar.name>
   </properties>
 
@@ -92,7 +91,7 @@
       <extension>
         <groupId>kr.motd.maven</groupId>
         <artifactId>os-maven-plugin</artifactId>
-        <version>1.4.1.Final</version>
+        <version>${plugin.os.version}</version>
       </extension>
     </extensions>
 

diff --git a/zeppelin-distribution/src/bin_license/LICENSE b/zeppelin-distribution/src/bin_license/LICENSE
@@ -302,18 +302,18 @@ The text of each license is also included at licenses/LICENSE-[project]-[version
     (BSD Style) JLine v2.14.3 (https://github.com/jline/jline2) - https://github.com/jline/jline2/blob/master/LICENSE.txt
     (BSD New license) Google Auth Library for Java - Credentials (com.google.auth:google-auth-library-credentials:0.4.0 - https://github.com/google/google-auth-library-java/google-auth-library-credentials)
     (BSD New license) Google Auth Library for Java - OAuth2 HTTP (com.google.auth:google-auth-library-oauth2-http:0.4.0 - https://github.com/google/google-auth-library-java/google-auth-library-oauth2-http)
-    (New BSD license) Protocol Buffer Java API (com.google.protobuf:protobuf-java-util:3.0.0-beta-2 - https://developers.google.com/protocol-buffers/)
-    (New BSD license) Protocol Buffer JavaNano API (com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5 - https://developers.google.com/protocol-buffers/)
+    (New BSD license) Protocol Buffer Java API (com.google.protobuf:protobuf-java-util:3.21.7 - https://developers.google.com/protocol-buffers/)
+    (New BSD license) Protocol Buffer JavaNano API (com.google.protobuf.nano:protobuf-javanano:3.21.7 - https://developers.google.com/protocol-buffers/)
     (BSD) JSch (com.jcraft:jsch:0.1.42 - http://www.jcraft.com/jsch/)
-    (BSD 3-Clause) io.grpc:grpc-all (io.grpc:grpc-all:0.14.1 - https://github.com/grpc/grpc-java)
-    (BSD 3-Clause) io.grpc:grpc-auth (io.grpc:grpc-auth:0.14.1 - https://github.com/grpc/grpc-java)
-    (BSD 3-Clause) io.grpc:grpc-core (io.grpc:grpc-core:0.14.1 - https://github.com/grpc/grpc-java)
-    (BSD 3-Clause) io.grpc:grpc-netty (io.grpc:grpc-netty:0.14.1 - https://github.com/grpc/grpc-java)
-    (BSD 3-Clause) io.grpc:grpc-okhttp (io.grpc:grpc-okhttp:0.14.1 - https://github.com/grpc/grpc-java)
-    (BSD 3-Clause) io.grpc:grpc-protobuf (io.grpc:grpc-protobuf:0.14.1 - https://github.com/grpc/grpc-java)
-    (BSD 3-Clause) io.grpc:grpc-protobuf-lite (io.grpc:grpc-protobuf-lite:0.14.1 - https://github.com/grpc/grpc-java)
-    (BSD 3-Clause) io.grpc:grpc-protobuf-nano (io.grpc:grpc-protobuf-nano:0.14.1 - https://github.com/grpc/grpc-java)
-    (BSD 3-Clause) io.grpc:grpc-stub (io.grpc:grpc-stub:0.14.1 - https://github.com/grpc/grpc-java)
+    (BSD 3-Clause) io.grpc:grpc-all (io.grpc:grpc-all:1.51.0 - https://github.com/grpc/grpc-java)
+    (BSD 3-Clause) io.grpc:grpc-auth (io.grpc:grpc-auth:1.51.0 - https://github.com/grpc/grpc-java)
+    (BSD 3-Clause) io.grpc:grpc-core (io.grpc:grpc-core:1.51.0 - https://github.com/grpc/grpc-java)
+    (BSD 3-Clause) io.grpc:grpc-netty (io.grpc:grpc-netty:1.51.0 - https://github.com/grpc/grpc-java)
+    (BSD 3-Clause) io.grpc:grpc-okhttp (io.grpc:grpc-okhttp:1.51.0 - https://github.com/grpc/grpc-java)
+    (BSD 3-Clause) io.grpc:grpc-protobuf (io.grpc:grpc-protobuf:1.51.0 - https://github.com/grpc/grpc-java)
+    (BSD 3-Clause) io.grpc:grpc-protobuf-lite (io.grpc:grpc-protobuf-lite:1.51.0 - https://github.com/grpc/grpc-java)
+    (BSD 3-Clause) io.grpc:grpc-protobuf-nano (io.grpc:grpc-protobuf-nano:1.51.0 - https://github.com/grpc/grpc-java)
+    (BSD 3-Clause) io.grpc:grpc-stub (io.grpc:grpc-stub:1.51.0 - https://github.com/grpc/grpc-java)
     (BSD-3-Clause) Kryo 3.0.3 (com.esotericsoftware:kryo-shaded:3.0.3 - https://github.com/EsotericSoftware/kryo)
     (BSD-3-Clause) Minilog 1.3.0 (com.esotericsoftware:minlog:1.3.0 - https://github.com/EsotericSoftware/minlog)
 

diff --git a/zeppelin-jupyter-interpreter-shaded/pom.xml b/zeppelin-jupyter-interpreter-shaded/pom.xml
@@ -36,6 +36,34 @@
       <groupId>${project.groupId}</groupId>
       <artifactId>zeppelin-jupyter-interpreter</artifactId>
       <version>${project.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.google.protobuf</groupId>
+          <artifactId>protobuf-java</artifactId>
+        </exclusion>
+        <exclusion>
+          <groupId>com.google.errorprone</groupId>
+          <artifactId>error_prone_annotations</artifactId>
+        </exclusion>
+      </exclusions>
+    </dependency>
+
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <version>${gson.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+      <version>${protobuf.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>com.google.errorprone</groupId>
+      <artifactId>error_prone_annotations</artifactId>
+      <version>${google.errorprone.version}</version>
     </dependency>
 
   </dependencies>

diff --git a/zeppelin-jupyter-interpreter/pom.xml b/zeppelin-jupyter-interpreter/pom.xml
@@ -54,6 +54,12 @@
       <groupId>io.grpc</groupId>
       <artifactId>grpc-protobuf</artifactId>
       <version>${grpc.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.google.errorprone</groupId>
+          <artifactId>error_prone_annotations</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
 
     <dependency>
@@ -118,7 +124,7 @@
       <extension>
         <groupId>kr.motd.maven</groupId>
         <artifactId>os-maven-plugin</artifactId>
-        <version>1.4.1.Final</version>
+        <version>${plugin.os.version}</version>
       </extension>
     </extensions>
 
@@ -133,7 +139,7 @@
               <goal>run</goal>
             </goals>
             <configuration>
-              <protocArtifact>com.google.protobuf:protoc:${protoc.version}</protocArtifact>
+              <protocArtifact>com.google.protobuf:protoc:${protobuf.version}</protocArtifact>
               <inputDirectories>
                 <include>src/main/proto</include>
               </inputDirectories>