Skip to content

Commit

Permalink
[KYUUBI #5973] Bump gRPC from 1.53.0 to 1.60.1
Browse files Browse the repository at this point in the history
# 🔍 Description
## Issue References 🔗

It's a regular dependency upgrading task.

## Describe Your Solution 🔧

Bump gRPC from 1.53.0 to 1.60.1, a new module [grpc-util](https://mvnrepository.com/artifact/io.grpc/grpc-util) was added in 1.58.0, LICENSE files updated accordingly.

https://github.com/grpc/grpc-java/releases

## Types of changes 🔖

- [ ] Bugfix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to change)

## Test Plan 🧪

Pass GA.

---

# Checklist 📝

- [x] This patch was not authored or co-authored using [Generative Tooling](https://www.apache.org/legal/generative-tooling.html)

**Be nice. Be informative.**

Closes #5973 from pan3793/grpc.

Closes #5973

b47c7f2 [Cheng Pan] nit
dd0e966 [Cheng Pan] Bump gRPC from 1.53.0 to 1.60.1

Authored-by: Cheng Pan <chengpan@apache.org>
Signed-off-by: Cheng Pan <chengpan@apache.org>
  • Loading branch information
pan3793 committed Jan 15, 2024
1 parent d54c884 commit f35761b
Show file tree
Hide file tree
Showing 7 changed files with 33 additions and 24 deletions.
1 change: 1 addition & 0 deletions LICENSE-binary
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,7 @@ io.grpc:grpc-netty
io.grpc:grpc-protobuf-lite
io.grpc:grpc-protobuf
io.grpc:grpc-stub
io.grpc:grpc-util
com.google.code.gson:gson
com.google.guava:failureaccess
com.google.guava:guava
Expand Down
27 changes: 14 additions & 13 deletions dev/dependencyList
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

HikariCP/4.0.3//HikariCP-4.0.3.jar
ST4/4.3.4//ST4-4.3.4.jar
animal-sniffer-annotations/1.21//animal-sniffer-annotations-1.21.jar
animal-sniffer-annotations/1.23//animal-sniffer-annotations-1.23.jar
annotations/4.1.1.4//annotations-4.1.1.4.jar
antlr-runtime/3.5.3//antlr-runtime-3.5.3.jar
antlr4-runtime/4.9.3//antlr4-runtime-4.9.3.jar
Expand All @@ -33,20 +33,21 @@ commons-lang/2.6//commons-lang-2.6.jar
commons-lang3/3.13.0//commons-lang3-3.13.0.jar
commons-logging/1.1.3//commons-logging-1.1.3.jar
derby/10.14.2.0//derby-10.14.2.0.jar
error_prone_annotations/2.14.0//error_prone_annotations-2.14.0.jar
error_prone_annotations/2.20.0//error_prone_annotations-2.20.0.jar
failsafe/2.4.4//failsafe-2.4.4.jar
failureaccess/1.0.1//failureaccess-1.0.1.jar
flatbuffers-java/1.12.0//flatbuffers-java-1.12.0.jar
fliptables/1.0.2//fliptables-1.0.2.jar
grpc-api/1.53.0//grpc-api-1.53.0.jar
grpc-context/1.53.0//grpc-context-1.53.0.jar
grpc-core/1.53.0//grpc-core-1.53.0.jar
grpc-grpclb/1.53.0//grpc-grpclb-1.53.0.jar
grpc-netty/1.53.0//grpc-netty-1.53.0.jar
grpc-protobuf-lite/1.53.0//grpc-protobuf-lite-1.53.0.jar
grpc-protobuf/1.53.0//grpc-protobuf-1.53.0.jar
grpc-stub/1.53.0//grpc-stub-1.53.0.jar
gson/2.9.0//gson-2.9.0.jar
grpc-api/1.60.1//grpc-api-1.60.1.jar
grpc-context/1.60.1//grpc-context-1.60.1.jar
grpc-core/1.60.1//grpc-core-1.60.1.jar
grpc-grpclb/1.60.1//grpc-grpclb-1.60.1.jar
grpc-netty/1.60.1//grpc-netty-1.60.1.jar
grpc-protobuf-lite/1.60.1//grpc-protobuf-lite-1.60.1.jar
grpc-protobuf/1.60.1//grpc-protobuf-1.60.1.jar
grpc-stub/1.60.1//grpc-stub-1.60.1.jar
grpc-util/1.60.1//grpc-util-1.60.1.jar
gson/2.10.1//gson-2.10.1.jar
guava/32.0.1-jre//guava-32.0.1-jre.jar
hadoop-client-api/3.3.6//hadoop-client-api-3.3.6.jar
hadoop-client-runtime/3.3.6//hadoop-client-runtime-3.3.6.jar
Expand Down Expand Up @@ -167,8 +168,8 @@ okhttp/3.12.12//okhttp-3.12.12.jar
okio/1.15.0//okio-1.15.0.jar
osgi-resource-locator/1.0.3//osgi-resource-locator-1.0.3.jar
paranamer/2.8//paranamer-2.8.jar
perfmark-api/0.25.0//perfmark-api-0.25.0.jar
proto-google-common-protos/2.9.0//proto-google-common-protos-2.9.0.jar
perfmark-api/0.26.0//perfmark-api-0.26.0.jar
proto-google-common-protos/2.22.0//proto-google-common-protos-2.22.0.jar
protobuf-java-util/3.21.7//protobuf-java-util-3.21.7.jar
protobuf-java/3.21.7//protobuf-java-3.21.7.jar
scala-library/2.12.18//scala-library-2.12.18.jar
Expand Down
5 changes: 5 additions & 0 deletions externals/kyuubi-spark-sql-engine/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,11 @@
<artifactId>grpc-protobuf</artifactId>
</dependency>

<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-util</artifactId>
</dependency>

<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-sql_${scala.binary.version}</artifactId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ io.grpc:grpc-netty
io.grpc:grpc-protobuf
io.grpc:grpc-protobuf-lite
io.grpc:grpc-stub
io.grpc:grpc-util
io.netty:netty-buffer
io.netty:netty-codec
io.netty:netty-codec-dns
Expand Down
5 changes: 5 additions & 0 deletions kyuubi-ha/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,11 @@
<artifactId>grpc-netty</artifactId>
</dependency>

<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-util</artifactId>
</dependency>

<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
Expand Down
10 changes: 0 additions & 10 deletions kyuubi-server/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -337,16 +337,6 @@
<artifactId>kyuubi-spark-sql-engine_${scala.binary.version}</artifactId>
<version>${project.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
<groupId>io.grpc</groupId>
<artifactId>grpc-core</artifactId>
</exclusion>
<exclusion>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down
8 changes: 7 additions & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
<flink.archive.mirror>${apache.archive.dist}/flink/flink-${flink.version}</flink.archive.mirror>
<flink.archive.download.skip>false</flink.archive.download.skip>
<google.jsr305.version>3.0.2</google.jsr305.version>
<grpc.version>1.53.0</grpc.version>
<grpc.version>1.60.1</grpc.version>
<guava.version>32.0.1-jre</guava.version>
<guava.failureaccess.version>1.0.1</guava.failureaccess.version>
<hadoop.version>3.3.6</hadoop.version>
Expand Down Expand Up @@ -1156,6 +1156,12 @@
<version>${grpc.version}</version>
</dependency>

<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-util</artifactId>
<version>${grpc.version}</version>
</dependency>

<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
Expand Down

0 comments on commit f35761b

Please sign in to comment.