From 4ee9481674dcdbcbe10816b366654dd55998841f Mon Sep 17 00:00:00 2001 From: Cheng Pan Date: Mon, 20 May 2024 19:26:15 +0800 Subject: [PATCH] [KYUUBI #6391] Bump Arrow from 15.0.2 to 16.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # :mag: Description A regular dependency upgrading, additionally, Arrow 15 introduced the eclipse-collections dependencies but removed in Arrow 16. https://github.com/apache/arrow/issues/40896 Note: This PR upgrades Arrow to 16.0.0 instead of 16.1.0 due to https://github.com/apache/arrow/issues/41717 ## 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 GHA --- # 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 #6391 from pan3793/arrow-16. Closes #6391 d8ea702a3 [Cheng Pan] 16.0.0 8a8bc46ab [Cheng Pan] Bump Arrow from 15.0.2 to 16.1.0 Authored-by: Cheng Pan Signed-off-by: Cheng Pan --- LICENSE-binary | 2 -- NOTICE-binary | 8 -------- dev/dependencyList | 11 +++++------ kyuubi-hive-jdbc-shaded/pom.xml | 4 ---- .../src/main/resources/META-INF/LICENSE | 6 ------ pom.xml | 2 +- 6 files changed, 6 insertions(+), 27 deletions(-) diff --git a/LICENSE-binary b/LICENSE-binary index d23ae84d442..ec004da85fe 100644 --- a/LICENSE-binary +++ b/LICENSE-binary @@ -328,8 +328,6 @@ Eclipse Distribution License - v 1.0 ------------------------------------ jakarta.activation:jakarta.activation-api jakarta.xml.bind:jakarta.xml.bind-api -org.eclipse.collections:eclipse-collections-api -org.eclipse.collections:eclipse-collections Eclipse Public License (EPL) 2.0 -------------------------------- diff --git a/NOTICE-binary b/NOTICE-binary index 1d7c2b13041..237fdda56c9 100644 --- a/NOTICE-binary +++ b/NOTICE-binary @@ -1090,11 +1090,3 @@ decompression for Java, which can be obtained at: * license/LICENSE.lz4-java.txt (Apache License 2.0) * HOMEPAGE: * https://github.com/lz4/lz4-java - -This product optionally depends on 'Eclipse Collections', the Java collections framework -ever that brings happiness to your Java development. -It can be obtained at: - * LICENSE: - * licenses-binary/LICENSE-EDL1.0.txt (Eclipse Distribution License 1.0 (BSD)) - * HOMEPAGE: - * https://eclipse.dev/collections/index.html diff --git a/dev/dependencyList b/dev/dependencyList index 1e4eae6108c..34efc1b0756 100644 --- a/dev/dependencyList +++ b/dev/dependencyList @@ -22,18 +22,17 @@ 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 aopalliance-repackaged/2.6.1//aopalliance-repackaged-2.6.1.jar -arrow-format/15.0.2//arrow-format-15.0.2.jar -arrow-memory-core/15.0.2//arrow-memory-core-15.0.2.jar -arrow-memory-netty/15.0.2//arrow-memory-netty-15.0.2.jar -arrow-vector/15.0.2//arrow-vector-15.0.2.jar +arrow-format/16.0.0//arrow-format-16.0.0.jar +arrow-memory-core/16.0.0//arrow-memory-core-16.0.0.jar +arrow-memory-netty-buffer-patch/16.0.0//arrow-memory-netty-buffer-patch-16.0.0.jar +arrow-memory-netty/16.0.0//arrow-memory-netty-16.0.0.jar +arrow-vector/16.0.0//arrow-vector-16.0.0.jar checker-qual/3.42.0//checker-qual-3.42.0.jar classgraph/4.8.138//classgraph-4.8.138.jar commons-codec/1.15//commons-codec-1.15.jar commons-collections/3.2.2//commons-collections-3.2.2.jar commons-lang3/3.13.0//commons-lang3-3.13.0.jar commons-logging/1.1.3//commons-logging-1.1.3.jar -eclipse-collections-api/11.1.0//eclipse-collections-api-11.1.0.jar -eclipse-collections/11.1.0//eclipse-collections-11.1.0.jar error_prone_annotations/2.20.0//error_prone_annotations-2.20.0.jar failsafe/3.3.2//failsafe-3.3.2.jar failureaccess/1.0.1//failureaccess-1.0.1.jar diff --git a/kyuubi-hive-jdbc-shaded/pom.xml b/kyuubi-hive-jdbc-shaded/pom.xml index bbf161bb19d..6546c6c1852 100644 --- a/kyuubi-hive-jdbc-shaded/pom.xml +++ b/kyuubi-hive-jdbc-shaded/pom.xml @@ -100,10 +100,6 @@ org.apache.arrow ${kyuubi.shade.packageName}.org.apache.arrow - - org.eclipse.collections - ${kyuubi.shade.packageName}.org.eclipse.collections - org.apache.commons ${kyuubi.shade.packageName}.org.apache.commons diff --git a/kyuubi-hive-jdbc-shaded/src/main/resources/META-INF/LICENSE b/kyuubi-hive-jdbc-shaded/src/main/resources/META-INF/LICENSE index 148bd8b74fe..9e1d666a8f2 100644 --- a/kyuubi-hive-jdbc-shaded/src/main/resources/META-INF/LICENSE +++ b/kyuubi-hive-jdbc-shaded/src/main/resources/META-INF/LICENSE @@ -224,9 +224,3 @@ MIT License ----------- org.slf4j:slf4j-api org.slf4j:jcl-over-slf4j - -Eclipse Distribution License - v 1.0 ------------------------------------- -org.eclipse.collections:eclipse-collections-api -org.eclipse.collections:eclipse-collections - diff --git a/pom.xml b/pom.xml index 8773caf0f27..6292dbc0ce4 100644 --- a/pom.xml +++ b/pom.xml @@ -119,7 +119,7 @@ 2.12 2.8.1 - 15.0.2 + 16.0.0 4.9.3 4.3.4