This is an automated email from the ASF dual-hosted git repository.
chengpan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kyuubi.git
The following commit(s) were added to refs/heads/master by this push:
new 4ee948167 [KYUUBI #6391] Bump Arrow from 15.0.2 to 16.0.0
4ee948167 is described below
commit 4ee9481674dcdbcbe10816b366654dd55998841f
Author: Cheng Pan <[email protected]>
AuthorDate: Mon May 20 19:26:15 2024 +0800
[KYUUBI #6391] Bump Arrow from 15.0.2 to 16.0.0
# :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 <[email protected]>
Signed-off-by: Cheng Pan <[email protected]>
---
LICENSE-binary | 2 --
NOTICE-binary | 8 --------
dev/dependencyList | 11 +++++------
kyuubi-hive-jdbc-shaded/pom.xml | 4 ----
kyuubi-hive-jdbc-shaded/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 d23ae84d4..ec004da85 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 1d7c2b130..237fdda56 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 1e4eae610..34efc1b07 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 bbf161bb1..6546c6c18 100644
--- a/kyuubi-hive-jdbc-shaded/pom.xml
+++ b/kyuubi-hive-jdbc-shaded/pom.xml
@@ -100,10 +100,6 @@
<pattern>org.apache.arrow</pattern>
<shadedPattern>${kyuubi.shade.packageName}.org.apache.arrow</shadedPattern>
</relocation>
- <relocation>
- <pattern>org.eclipse.collections</pattern>
-
<shadedPattern>${kyuubi.shade.packageName}.org.eclipse.collections</shadedPattern>
- </relocation>
<relocation>
<pattern>org.apache.commons</pattern>
<shadedPattern>${kyuubi.shade.packageName}.org.apache.commons</shadedPattern>
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 148bd8b74..9e1d666a8 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 8773caf0f..6292dbc0c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -119,7 +119,7 @@
<scala.binary.version>2.12</scala.binary.version>
<scala-collection-compat.version>2.8.1</scala-collection-compat.version>
- <arrow.version>15.0.2</arrow.version>
+ <arrow.version>16.0.0</arrow.version>
<!-- Please don't upgrade the version to 4.10+, it depends on JDK 11
-->
<antlr4.version>4.9.3</antlr4.version>
<antlr.st4.version>4.3.4</antlr.st4.version>
