From 35e988d1824c7425bf598621f651b593da838fa6 Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Mon, 15 Jan 2024 17:32:15 +0800 Subject: [PATCH] [KYUUBI #5974] Bump jetcd 0.7.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # :mag: Description ## Issue References ๐Ÿ”— It's regular dependency upgrading, and jetcd 0.7.7 may be the latest version that supports Java 8. ## Describe Your Solution ๐Ÿ”ง Upgrading jetcd to 0.7.7, and this upgrading involves the transitive dep `failsafe` major upgrades, the group is changed from `net.jodah` to `dev.failsafe` ## Types of changes :bookmark: - [ ] 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 #5974 from pan3793/jetcd-version. Closes #5974 7c1d815a4 [Cheng Pan] relocation 5eca6cdb4 [Cheng Pan] Bump jetcd 0.7.7 Authored-by: Cheng Pan Signed-off-by: Cheng Pan --- LICENSE-binary | 1 + dev/dependencyList | 13 +++++++------ externals/kyuubi-spark-sql-engine/pom.xml | 16 ++++++++-------- pom.xml | 15 +++++++++++---- 4 files changed, 27 insertions(+), 18 deletions(-) diff --git a/LICENSE-binary b/LICENSE-binary index 0c67e6012..23746db1a 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -214,6 +214,7 @@ commons-logging:commons-logging org.apache.commons:commons-lang3 org.apache.derby:derby com.google.errorprone:error_prone_annotations +dev.failsafe:failsafe net.jodah:failsafe com.jakewharton.fliptables:fliptables com.github.mifmif:generex diff --git a/dev/dependencyList b/dev/dependencyList index 5792fb661..dc2567437 100644 --- a/dev/dependencyList +++ b/dev/dependencyList @@ -35,6 +35,7 @@ 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.20.0//error_prone_annotations-2.20.0.jar failsafe/2.4.4//failsafe-2.4.4.jar +failsafe/3.3.2//failsafe-3.3.2.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 @@ -92,10 +93,10 @@ jersey-hk2/2.39.1//jersey-hk2-2.39.1.jar jersey-media-json-jackson/2.39.1//jersey-media-json-jackson-2.39.1.jar jersey-media-multipart/2.39.1//jersey-media-multipart-2.39.1.jar jersey-server/2.39.1//jersey-server-2.39.1.jar -jetcd-api/0.7.3//jetcd-api-0.7.3.jar -jetcd-common/0.7.3//jetcd-common-0.7.3.jar -jetcd-core/0.7.3//jetcd-core-0.7.3.jar -jetcd-grpc/0.7.3//jetcd-grpc-0.7.3.jar +jetcd-api/0.7.7//jetcd-api-0.7.7.jar +jetcd-common/0.7.7//jetcd-common-0.7.7.jar +jetcd-core/0.7.7//jetcd-core-0.7.7.jar +jetcd-grpc/0.7.7//jetcd-grpc-0.7.7.jar jetty-client/9.4.52.v20230823//jetty-client-9.4.52.v20230823.jar jetty-http/9.4.52.v20230823//jetty-http-9.4.52.v20230823.jar jetty-io/9.4.52.v20230823//jetty-io-9.4.52.v20230823.jar @@ -194,7 +195,7 @@ swagger-jaxrs2/2.2.1//swagger-jaxrs2-2.2.1.jar swagger-models/2.2.1//swagger-models-2.2.1.jar trino-client/363//trino-client-363.jar units/1.6//units-1.6.jar -vertx-core/4.3.2//vertx-core-4.3.2.jar -vertx-grpc/4.3.2//vertx-grpc-4.3.2.jar +vertx-core/4.5.1//vertx-core-4.5.1.jar +vertx-grpc/4.5.1//vertx-grpc-4.5.1.jar zjsonpatch/0.3.0//zjsonpatch-0.3.0.jar zstd-jni/1.5.5-1//zstd-jni-1.5.5-1.jar diff --git a/externals/kyuubi-spark-sql-engine/pom.xml b/externals/kyuubi-spark-sql-engine/pom.xml index 70b8bc6da..e6e678aab 100644 --- a/externals/kyuubi-spark-sql-engine/pom.xml +++ b/externals/kyuubi-spark-sql-engine/pom.xml @@ -237,12 +237,12 @@ com.google.guava:* com.google.j2objc:j2objc-annotations com.google.protobuf:* + dev.failsafe:failsafe io.etcd:* io.grpc:* io.netty:* io.perfmark:perfmark-api io.vertx:* - net.jodah:failsafe org.apache.kyuubi:* org.checkerframework:checker-qual org.codehaus.mojo:animal-sniffer-annotations @@ -268,6 +268,13 @@ + + dev.failsafe + ${kyuubi.shade.packageName}.dev.failsafe + + dev.failsafe.** + + io.etcd ${kyuubi.shade.packageName}.io.etcd @@ -297,13 +304,6 @@ io.vertx.** - - net.jodah - ${kyuubi.shade.packageName}.net.jodah - - net.jodah.** - - android.annotation ${kyuubi.shade.packageName}.android.annotation diff --git a/pom.xml b/pom.xml index e9143c7ba..f92d6aa42 100644 --- a/pom.xml +++ b/pom.xml @@ -133,10 +133,10 @@ 2.11.0 2.6 3.13.0 - 0.7.3 delta-core 2.4.0 - 2.4.4 + 2.4.4 + 3.3.2 0.9.3 0.62.2 1.17.2 @@ -168,6 +168,7 @@ 2.3.2 1.2.2 2.39.1 + 0.7.7 9.4.52.v20230823 0.9.94 4.13.2 @@ -1105,7 +1106,7 @@ io.etcd jetcd-core - ${etcd.version} + ${jetcd.version} javax.annotation @@ -1117,7 +1118,7 @@ io.etcd jetcd-launcher - ${etcd.version} + ${jetcd.version} org.testcontainers @@ -1177,6 +1178,12 @@ net.jodah failsafe + ${failsafe2.verion} + + + + dev.failsafe + failsafe ${failsafe.verion}