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 3133b5911 [KYUUBI #6293] Upgrade Arrow from 12.0.0 to 15.0.2
3133b5911 is described below
commit 3133b5911ce6552b41edbf46e6f51d554fa02d16
Author: dupeng <[email protected]>
AuthorDate: Mon Apr 15 16:20:36 2024 +0800
[KYUUBI #6293] Upgrade Arrow from 12.0.0 to 15.0.2
# :mag: Description
## Issue References ๐
This pull request fixes #6293
## Describe Your Solution ๐ง
Here are my main modifications:
1. In the project POM file, I have updated the Apache Arrow version from
12.0.0 to 15.0.2.
2. After executing `build/dependency.sh --replace`, the
`dev/dependencyList` file was automatically updated.
3. I noticed the addition of the "Eclipse Collections" dependency and
checked its open-source license. Following the existing format, I have
accordingly modified the `NOTICE-binary` and `LICENSE-binary` files.
However, I remain uncertain whether my changes to the LICENSE/NOTICE
sections adhere to the community's standards. I kindly request guidance from
the community regarding this matter.
## Types of changes :bookmark:
- [x] 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 ๐งช
#### Behavior Without This Pull Request :coffin:
#### Behavior With This Pull Request :tada:
#### Related Unit Tests
---
# Checklist ๐
- [ ] This patch was not authored or co-authored using [Generative
Tooling](https://www.apache.org/legal/generative-tooling.html)
**Be nice. Be informative.**
Closes #6304 from dupen01/issue-arrow.
Closes #6293
e858a1c12 [dupeng] Merge remote-tracking branch 'origin/issue-arrow' into
issue-arrow
205d905ef [Perl Du] Merge branch 'apache:master' into issue-arrow
238ef7ac6 [dupeng] Merge branch 'master' into issue-arrow
14a53f293 [dupeng] update kyuubi-hive-jdbc-shaded pom
62968d2e2 [dupeng] Update the license information for Eclipse Collections.
323136ec4 [dupeng] Upgrade Arrow to 15.0.2 and update LICENSE/NOTICE
Lead-authored-by: dupeng <[email protected]>
Co-authored-by: Perl Du <[email protected]>
Signed-off-by: Cheng Pan <[email protected]>
---
LICENSE-binary | 2 ++
NOTICE-binary | 8 ++++++++
dev/dependencyList | 12 +++++++-----
kyuubi-hive-jdbc-shaded/pom.xml | 4 ++++
kyuubi-hive-jdbc-shaded/src/main/resources/META-INF/LICENSE | 6 ++++++
pom.xml | 2 +-
6 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/LICENSE-binary b/LICENSE-binary
index ec004da85..d23ae84d4 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -328,6 +328,8 @@ 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 237fdda56..1d7c2b130 100644
--- a/NOTICE-binary
+++ b/NOTICE-binary
@@ -1090,3 +1090,11 @@ 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 463f8e442..1f6cddea5 100644
--- a/dev/dependencyList
+++ b/dev/dependencyList
@@ -22,20 +22,22 @@ 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/12.0.0//arrow-format-12.0.0.jar
-arrow-memory-core/12.0.0//arrow-memory-core-12.0.0.jar
-arrow-memory-netty/12.0.0//arrow-memory-netty-12.0.0.jar
-arrow-vector/12.0.0//arrow-vector-12.0.0.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
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
-flatbuffers-java/1.12.0//flatbuffers-java-1.12.0.jar
+flatbuffers-java/23.5.26//flatbuffers-java-23.5.26.jar
fliptables/1.0.2//fliptables-1.0.2.jar
grpc-api/1.60.2//grpc-api-1.60.2.jar
grpc-context/1.60.2//grpc-context-1.60.2.jar
diff --git a/kyuubi-hive-jdbc-shaded/pom.xml b/kyuubi-hive-jdbc-shaded/pom.xml
index 6546c6c18..bbf161bb1 100644
--- a/kyuubi-hive-jdbc-shaded/pom.xml
+++ b/kyuubi-hive-jdbc-shaded/pom.xml
@@ -100,6 +100,10 @@
<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 9e1d666a8..148bd8b74 100644
--- a/kyuubi-hive-jdbc-shaded/src/main/resources/META-INF/LICENSE
+++ b/kyuubi-hive-jdbc-shaded/src/main/resources/META-INF/LICENSE
@@ -224,3 +224,9 @@ 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 c82574969..4c482eb3a 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>12.0.0</arrow.version>
+ <arrow.version>15.0.2</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>
