Skip to content

Commit

Permalink
[KYUUBI #6293] Upgrade Arrow from 12.0.0 to 15.0.2
Browse files Browse the repository at this point in the history
# 🔍 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 🔖

- [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 ⚰️

#### Behavior With This Pull Request 🎉

#### 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

e858a1c [dupeng] Merge remote-tracking branch 'origin/issue-arrow' into issue-arrow
205d905 [Perl Du] Merge branch 'apache:master' into issue-arrow
238ef7a [dupeng] Merge branch 'master' into issue-arrow
14a53f2 [dupeng] update kyuubi-hive-jdbc-shaded pom
62968d2 [dupeng] Update the license information for Eclipse Collections.
323136e [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]>
  • Loading branch information
2 people authored and pan3793 committed Apr 15, 2024
1 parent 9086cfe commit 3133b59
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 6 deletions.
2 changes: 2 additions & 0 deletions LICENSE-binary
Original file line number Diff line number Diff line change
Expand Up @@ -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
--------------------------------
Expand Down
8 changes: 8 additions & 0 deletions NOTICE-binary
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 7 additions & 5 deletions dev/dependencyList
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions kyuubi-hive-jdbc-shaded/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 6 additions & 0 deletions kyuubi-hive-jdbc-shaded/src/main/resources/META-INF/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -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

2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down

0 comments on commit 3133b59

Please sign in to comment.