Merge branch 'master' into feature/2pc

tikv · Jun 3, 2024 · 877ab03 · 877ab03
2 parents 5d22be4 + ca8a622
commit 877ab03
Show file tree

Hide file tree

Showing 17 changed files with 18 additions and 10,546 deletions.
diff --git a/metrics/grafana/client_java_summary.json b/metrics/grafana/client_java_summary.json
diff --git a/pom.xml b/pom.xml
@@ -57,14 +57,14 @@
         <protobuf.version>3.18.0</protobuf.version>
         <log4j.version>1.2.17</log4j.version>
         <slf4j.version>1.7.16</slf4j.version>
-        <grpc.version>1.48.0</grpc.version>
+        <grpc.version>1.60.0</grpc.version>
         <netty.tcnative.version>2.0.34.Final</netty.tcnative.version>
         <gson.version>2.8.9</gson.version>
         <powermock.version>1.6.6</powermock.version>
         <jackson-annotations.version>2.13.2</jackson-annotations.version>
         <jackson.version>2.13.4.2</jackson.version>
         <trove4j.version>3.0.1</trove4j.version>
-        <jetcd.version>0.4.1</jetcd.version>
+        <jetcd.version>0.7.7</jetcd.version>
         <joda-time.version>2.9.9</joda-time.version>
         <joda-convert.version>1.9.2</joda-convert.version>
         <proto.folder>${basedir}/proto</proto.folder>
@@ -188,20 +188,6 @@
         <dependency>
             <groupId>io.etcd</groupId>
             <artifactId>jetcd-core</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>io.etcd</groupId>
-                    <artifactId>jetcd-resolver</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>io.etcd</groupId>
-                    <artifactId>jetcd-common</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>io.grpc</groupId>
-                    <artifactId>grpc-grpclb</artifactId>
-                </exclusion>
-            </exclusions>
             <version>${jetcd.version}</version>
         </dependency>
         <dependency>