Skip to content

Commit

Permalink
apacheGH-39265: [Java] Make it run well with the netty newest version…
Browse files Browse the repository at this point in the history 
… 4.1.104 (apache#39266)

When I used `netty arrow memory 14.0.1` and `netty 4.1.104.Final` in Spark, the following error occurred,
After pr: netty/netty#13613, `PoolArena` no longer extends `SizeClasses`, but instead uses it as one of its fields, as follows:
<img width="1051" alt="image" src="https://github.com/apache/arrow/assets/15246973/6112757b-b2b7-42aa-b4c1-6ab473b91a09">
in order to ensure that `netty arrow memory 14.0.1` works well with `netty 4.1.104.Final` version, I suggest making similar modifications here.
1.Compilation errors are as follows:
https://github.com/panbingkun/spark/actions/runs/7237466030/job/19717162391
<img width="1005" alt="image" src="https://github.com/apache/arrow/assets/15246973/98edb6a1-f0e6-4d4e-b568-fbdbffe612f0">

2.Some bugs have been fixed in `netty 4.1.104.Final` as follows:
<img width="862" alt="image" src="https://github.com/apache/arrow/assets/15246973/12354a1e-cddd-4ab8-b168-e92712d84cea">
<img width="861" alt="image" src="https://github.com/apache/arrow/assets/15246973/bd7d27e1-3953-451c-8c9b-24ecb0d61efd">

4.1.104.Final release note: https://netty.io/news/2023/12/15/4-1-104-Final.html
4.1.103.Final release note: https://netty.io/news/2023/12/13/4-1-103-Final.html
4.1.101.Final release note: https://netty.io/news/2023/11/09/4-1-101-Final.html

Java
* Closes: apache#39265

Authored-by: panbingkun <[email protected]>
Signed-off-by: David Li <[email protected]>

apacheGH-38537: [Java] upgrade to netty 4.1.100.Final (apache#38538)

<img width="938" alt="Screenshot 2023-11-01 at 14 58 19" src="https://github.com/apache/arrow/assets/30110721/7bc749de-ddfc-48d5-a291-522506ceddf3">
<img width="911" alt="Screenshot 2023-11-01 at 14 58 36" src="https://github.com/apache/arrow/assets/30110721/74973933-0caa-4ab3-926b-993adce57403">

new version of netty.

no

* Closes: apache#38537

Authored-by: Ivan Chesnov <[email protected]>
Signed-off-by: David Li <[email protected]>

apacheGH-38996: [Java] Update dependencies and plugins for JPMS modules (apache#38994)

Update dependencies and plugins to versions that work correctly with JPMS modules.

* Update several plugins to use module-enabled versions:
  * maven-compiler-plugin is updated to 3.11.0
  * maven-shade-plugin is updated to 3.2.4
  * maven-dependency-plugin is updated to 3.1.2
  * CycloneDX is updated to 2.7.10
* Update grpc-java to 1.59 for module support
* Update jackson to 2.16.0 as 2.15.1 had corrupt module-info.class files that broke module support.

Existing tests only

Users may need to update their own dependencies if they have the same ones.
* Closes: apache#38996

Authored-by: James Duong <[email protected]>
Signed-off-by: Sutou Kouhei <[email protected]>

MINOR: [Java] Bump dep.junit.jupiter.version from 5.9.0 to 5.10.1 in /java (apache#39102)

Bumps `dep.junit.jupiter.version` from 5.9.0 to 5.10.1.
Updates `org.junit.jupiter:junit-jupiter-engine` from 5.9.0 to 5.10.1
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/junit-team/junit5/releases">org.junit.jupiter:junit-jupiter-engine's releases</a>.</em></p>
<blockquote>
<p>JUnit 5.10.1 = Platform 1.10.1 + Jupiter 5.10.1 + Vintage 5.10.1</p>
<p>See <a href="http://junit.org/junit5/docs/5.10.1/release-notes/">Release Notes</a>.</p>
<p><strong>Full Changelog</strong>: <a href="https://github.com/junit-team/junit5/compare/r5.10.0...r5.10.1">https://github.com/junit-team/junit5/compare/r5.10.0...r5.10.1</a></p>
<p>JUnit 5.10.0 = Platform 1.10.0 + Jupiter 5.10.0 + Vintage 5.10.0</p>
<p>See <a href="http://junit.org/junit5/docs/5.10.0/release-notes/">Release Notes</a>.</p>
<p><strong>Full Changelog</strong>: <a href="https://github.com/junit-team/junit5/compare/r5.10.0-RC2...r5.10.0">https://github.com/junit-team/junit5/compare/r5.10.0-RC2...r5.10.0</a></p>
<p>JUnit 5.10.0-RC2 = Platform 1.10.0-RC2+ Jupiter 5.10.0-RC2 + Vintage 5.10.0-RC2</p>
<p>See <a href="http://junit.org/junit5/docs/5.10.0-RC2/release-notes/">Release Notes</a>.</p>
<p>JUnit 5.10.0-RC1 = Platform 1.10.0-RC1 + Jupiter 5.10.0-RC1 + Vintage 5.10.0-RC1</p>
<p>See <a href="http://junit.org/junit5/docs/5.10.0-RC1/release-notes/">Release Notes</a>.</p>
<p>JUnit 5.10.0-M1 = Platform 1.10.0-M1 + Jupiter 5.10.0-M1 + Vintage 5.10.0-M1</p>
<p>See <a href="http://junit.org/junit5/docs/5.10.0-M1/release-notes/">Release Notes</a>.</p>
<p>JUnit 5.9.3 = Platform 1.9.3 + Jupiter 5.9.3 + Vintage 5.9.3</p>
<p>See <a href="http://junit.org/junit5/docs/5.9.3/release-notes/">Release Notes</a>.</p>
<p>JUnit 5.9.2 = Platform 1.9.2 + Jupiter 5.9.2 + Vintage 5.9.2</p>
<p>See <a href="http://junit.org/junit5/docs/5.9.2/release-notes/">Release Notes</a>.</p>
<p>JUnit 5.9.1 = Platform 1.9.1 + Jupiter 5.9.1 + Vintage 5.9.1</p>
<p>See <a href="http://junit.org/junit5/docs/5.9.1/release-notes/">Release Notes</a>.</p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/junit-team/junit5/commit/e5f50d8720741623915979ac154b65bcbcd6a577"><code>e5f50d8</code></a> Release 5.10.1</li>
<li><a href="https://github.com/junit-team/junit5/commit/ac86d18e9b15dbebe046e82743ac7f9534a17582"><code>ac86d18</code></a> Fix typo in AfterAll documentation</li>
<li><a href="https://github.com/junit-team/junit5/commit/388c5beaf42944961ab5b455c900d958a6e15588"><code>388c5be</code></a> Harmonize application of method and field filters in search algorithms</li>
<li><a href="https://github.com/junit-team/junit5/commit/f82dd1e716f8717e012152b1d1d5cc0da10d33cd"><code>f82dd1e</code></a> Apply field predicate before searching type hierarchy</li>
<li><a href="https://github.com/junit-team/junit5/commit/1d1eb8571552bbf28e578241965010de6c8ee779"><code>1d1eb85</code></a> Polishing</li>
<li><a href="https://github.com/junit-team/junit5/commit/5ce280eff69b43759a3cb0c176207abe0a41b579"><code>5ce280e</code></a> Update picocli to 4.7.5 and enable help width computation</li>
<li><a href="https://github.com/junit-team/junit5/commit/fea05c3aa80de76686f326b5ce26ddf7f153ff5a"><code>fea05c3</code></a> Fix ConsoleLauncherTests and StandaloneTests</li>
<li><a href="https://github.com/junit-team/junit5/commit/c5567354c2556e772f8a0035ef7647161011d1c0"><code>c556735</code></a> Use same expected files for all JDK versions</li>
<li><a href="https://github.com/junit-team/junit5/commit/808493ab09b30970b506a48fda3d616ac1ba4fff"><code>808493a</code></a> Run StandaloneTests for Java 8 under Java 8</li>
<li><a href="https://github.com/junit-team/junit5/commit/9ec57661c78c3889db004ab6a89416e56a2fb2e0"><code>9ec5766</code></a> Unify messages about exit codes in StandaloneTests</li>
<li>Additional commits viewable in <a href="https://github.com/junit-team/junit5/compare/r5.9.0...r5.10.1">compare view</a></li>
</ul>
</details>
<br />

Updates `org.junit.jupiter:junit-jupiter-api` from 5.9.0 to 5.10.1
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/junit-team/junit5/releases">org.junit.jupiter:junit-jupiter-api's releases</a>.</em></p>
<blockquote>
<p>JUnit 5.10.1 = Platform 1.10.1 + Jupiter 5.10.1 + Vintage 5.10.1</p>
<p>See <a href="http://junit.org/junit5/docs/5.10.1/release-notes/">Release Notes</a>.</p>
<p><strong>Full Changelog</strong>: <a href="https://github.com/junit-team/junit5/compare/r5.10.0...r5.10.1">https://github.com/junit-team/junit5/compare/r5.10.0...r5.10.1</a></p>
<p>JUnit 5.10.0 = Platform 1.10.0 + Jupiter 5.10.0 + Vintage 5.10.0</p>
<p>See <a href="http://junit.org/junit5/docs/5.10.0/release-notes/">Release Notes</a>.</p>
<p><strong>Full Changelog</strong>: <a href="https://github.com/junit-team/junit5/compare/r5.10.0-RC2...r5.10.0">https://github.com/junit-team/junit5/compare/r5.10.0-RC2...r5.10.0</a></p>
<p>JUnit 5.10.0-RC2 = Platform 1.10.0-RC2+ Jupiter 5.10.0-RC2 + Vintage 5.10.0-RC2</p>
<p>See <a href="http://junit.org/junit5/docs/5.10.0-RC2/release-notes/">Release Notes</a>.</p>
<p>JUnit 5.10.0-RC1 = Platform 1.10.0-RC1 + Jupiter 5.10.0-RC1 + Vintage 5.10.0-RC1</p>
<p>See <a href="http://junit.org/junit5/docs/5.10.0-RC1/release-notes/">Release Notes</a>.</p>
<p>JUnit 5.10.0-M1 = Platform 1.10.0-M1 + Jupiter 5.10.0-M1 + Vintage 5.10.0-M1</p>
<p>See <a href="http://junit.org/junit5/docs/5.10.0-M1/release-notes/">Release Notes</a>.</p>
<p>JUnit 5.9.3 = Platform 1.9.3 + Jupiter 5.9.3 + Vintage 5.9.3</p>
<p>See <a href="http://junit.org/junit5/docs/5.9.3/release-notes/">Release Notes</a>.</p>
<p>JUnit 5.9.2 = Platform 1.9.2 + Jupiter 5.9.2 + Vintage 5.9.2</p>
<p>See <a href="http://junit.org/junit5/docs/5.9.2/release-notes/">Release Notes</a>.</p>
<p>JUnit 5.9.1 = Platform 1.9.1 + Jupiter 5.9.1 + Vintage 5.9.1</p>
<p>See <a href="http://junit.org/junit5/docs/5.9.1/release-notes/">Release Notes</a>.</p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/junit-team/junit5/commit/e5f50d8720741623915979ac154b65bcbcd6a577"><code>e5f50d8</code></a> Release 5.10.1</li>
<li><a href="https://github.com/junit-team/junit5/commit/ac86d18e9b15dbebe046e82743ac7f9534a17582"><code>ac86d18</code></a> Fix typo in AfterAll documentation</li>
<li><a href="https://github.com/junit-team/junit5/commit/388c5beaf42944961ab5b455c900d958a6e15588"><code>388c5be</code></a> Harmonize application of method and field filters in search algorithms</li>
<li><a href="https://github.com/junit-team/junit5/commit/f82dd1e716f8717e012152b1d1d5cc0da10d33cd"><code>f82dd1e</code></a> Apply field predicate before searching type hierarchy</li>
<li><a href="https://github.com/junit-team/junit5/commit/1d1eb8571552bbf28e578241965010de6c8ee779"><code>1d1eb85</code></a> Polishing</li>
<li><a href="https://github.com/junit-team/junit5/commit/5ce280eff69b43759a3cb0c176207abe0a41b579"><code>5ce280e</code></a> Update picocli to 4.7.5 and enable help width computation</li>
<li><a href="https://github.com/junit-team/junit5/commit/fea05c3aa80de76686f326b5ce26ddf7f153ff5a"><code>fea05c3</code></a> Fix ConsoleLauncherTests and StandaloneTests</li>
<li><a href="https://github.com/junit-team/junit5/commit/c5567354c2556e772f8a0035ef7647161011d1c0"><code>c556735</code></a> Use same expected files for all JDK versions</li>
<li><a href="https://github.com/junit-team/junit5/commit/808493ab09b30970b506a48fda3d616ac1ba4fff"><code>808493a</code></a> Run StandaloneTests for Java 8 under Java 8</li>
<li><a href="https://github.com/junit-team/junit5/commit/9ec57661c78c3889db004ab6a89416e56a2fb2e0"><code>9ec5766</code></a> Unify messages about exit codes in StandaloneTests</li>
<li>Additional commits viewable in <a href="https://github.com/junit-team/junit5/compare/r5.9.0...r5.10.1">compare view</a></li>
</ul>
</details>
<br />

Updates `org.junit.vintage:junit-vintage-engine` from 5.9.0 to 5.10.1
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/junit-team/junit5/releases">org.junit.vintage:junit-vintage-engine's releases</a>.</em></p>
<blockquote>
<p>JUnit 5.10.1 = Platform 1.10.1 + Jupiter 5.10.1 + Vintage 5.10.1</p>
<p>See <a href="http://junit.org/junit5/docs/5.10.1/release-notes/">Release Notes</a>.</p>
<p><strong>Full Changelog</strong>: <a href="https://github.com/junit-team/junit5/compare/r5.10.0...r5.10.1">https://github.com/junit-team/junit5/compare/r5.10.0...r5.10.1</a></p>
<p>JUnit 5.10.0 = Platform 1.10.0 + Jupiter 5.10.0 + Vintage 5.10.0</p>
<p>See <a href="http://junit.org/junit5/docs/5.10.0/release-notes/">Release Notes</a>.</p>
<p><strong>Full Changelog</strong>: <a href="https://github.com/junit-team/junit5/compare/r5.10.0-RC2...r5.10.0">https://github.com/junit-team/junit5/compare/r5.10.0-RC2...r5.10.0</a></p>
<p>JUnit 5.10.0-RC2 = Platform 1.10.0-RC2+ Jupiter 5.10.0-RC2 + Vintage 5.10.0-RC2</p>
<p>See <a href="http://junit.org/junit5/docs/5.10.0-RC2/release-notes/">Release Notes</a>.</p>
<p>JUnit 5.10.0-RC1 = Platform 1.10.0-RC1 + Jupiter 5.10.0-RC1 + Vintage 5.10.0-RC1</p>
<p>See <a href="http://junit.org/junit5/docs/5.10.0-RC1/release-notes/">Release Notes</a>.</p>
<p>JUnit 5.10.0-M1 = Platform 1.10.0-M1 + Jupiter 5.10.0-M1 + Vintage 5.10.0-M1</p>
<p>See <a href="http://junit.org/junit5/docs/5.10.0-M1/release-notes/">Release Notes</a>.</p>
<p>JUnit 5.9.3 = Platform 1.9.3 + Jupiter 5.9.3 + Vintage 5.9.3</p>
<p>See <a href="http://junit.org/junit5/docs/5.9.3/release-notes/">Release Notes</a>.</p>
<p>JUnit 5.9.2 = Platform 1.9.2 + Jupiter 5.9.2 + Vintage 5.9.2</p>
<p>See <a href="http://junit.org/junit5/docs/5.9.2/release-notes/">Release Notes</a>.</p>
<p>JUnit 5.9.1 = Platform 1.9.1 + Jupiter 5.9.1 + Vintage 5.9.1</p>
<p>See <a href="http://junit.org/junit5/docs/5.9.1/release-notes/">Release Notes</a>.</p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/junit-team/junit5/commit/e5f50d8720741623915979ac154b65bcbcd6a577"><code>e5f50d8</code></a> Release 5.10.1</li>
<li><a href="https://github.com/junit-team/junit5/commit/ac86d18e9b15dbebe046e82743ac7f9534a17582"><code>ac86d18</code></a> Fix typo in AfterAll documentation</li>
<li><a href="https://github.com/junit-team/junit5/commit/388c5beaf42944961ab5b455c900d958a6e15588"><code>388c5be</code></a> Harmonize application of method and field filters in search algorithms</li>
<li><a href="https://github.com/junit-team/junit5/commit/f82dd1e716f8717e012152b1d1d5cc0da10d33cd"><code>f82dd1e</code></a> Apply field predicate before searching type hierarchy</li>
<li><a href="https://github.com/junit-team/junit5/commit/1d1eb8571552bbf28e578241965010de6c8ee779"><code>1d1eb85</code></a> Polishing</li>
<li><a href="https://github.com/junit-team/junit5/commit/5ce280eff69b43759a3cb0c176207abe0a41b579"><code>5ce280e</code></a> Update picocli to 4.7.5 and enable help width computation</li>
<li><a href="https://github.com/junit-team/junit5/commit/fea05c3aa80de76686f326b5ce26ddf7f153ff5a"><code>fea05c3</code></a> Fix ConsoleLauncherTests and StandaloneTests</li>
<li><a href="https://github.com/junit-team/junit5/commit/c5567354c2556e772f8a0035ef7647161011d1c0"><code>c556735</code></a> Use same expected files for all JDK versions</li>
<li><a href="https://github.com/junit-team/junit5/commit/808493ab09b30970b506a48fda3d616ac1ba4fff"><code>808493a</code></a> Run StandaloneTests for Java 8 under Java 8</li>
<li><a href="https://github.com/junit-team/junit5/commit/9ec57661c78c3889db004ab6a89416e56a2fb2e0"><code>9ec5766</code></a> Unify messages about exit codes in StandaloneTests</li>
<li>Additional commits viewable in <a href="https://github.com/junit-team/junit5/compare/r5.9.0...r5.10.1">compare view</a></li>
</ul>
</details>
<br />

Updates `org.junit.jupiter:junit-jupiter-params` from 5.9.0 to 5.10.1
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a href="https://github.com/junit-team/junit5/releases">org.junit.jupiter:junit-jupiter-params's releases</a>.</em></p>
<blockquote>
<p>JUnit 5.10.1 = Platform 1.10.1 + Jupiter 5.10.1 + Vintage 5.10.1</p>
<p>See <a href="http://junit.org/junit5/docs/5.10.1/release-notes/">Release Notes</a>.</p>
<p><strong>Full Changelog</strong>: <a href="https://github.com/junit-team/junit5/compare/r5.10.0...r5.10.1">https://github.com/junit-team/junit5/compare/r5.10.0...r5.10.1</a></p>
<p>JUnit 5.10.0 = Platform 1.10.0 + Jupiter 5.10.0 + Vintage 5.10.0</p>
<p>See <a href="http://junit.org/junit5/docs/5.10.0/release-notes/">Release Notes</a>.</p>
<p><strong>Full Changelog</strong>: <a href="https://github.com/junit-team/junit5/compare/r5.10.0-RC2...r5.10.0">https://github.com/junit-team/junit5/compare/r5.10.0-RC2...r5.10.0</a></p>
<p>JUnit 5.10.0-RC2 = Platform 1.10.0-RC2+ Jupiter 5.10.0-RC2 + Vintage 5.10.0-RC2</p>
<p>See <a href="http://junit.org/junit5/docs/5.10.0-RC2/release-notes/">Release Notes</a>.</p>
<p>JUnit 5.10.0-RC1 = Platform 1.10.0-RC1 + Jupiter 5.10.0-RC1 + Vintage 5.10.0-RC1</p>
<p>See <a href="http://junit.org/junit5/docs/5.10.0-RC1/release-notes/">Release Notes</a>.</p>
<p>JUnit 5.10.0-M1 = Platform 1.10.0-M1 + Jupiter 5.10.0-M1 + Vintage 5.10.0-M1</p>
<p>See <a href="http://junit.org/junit5/docs/5.10.0-M1/release-notes/">Release Notes</a>.</p>
<p>JUnit 5.9.3 = Platform 1.9.3 + Jupiter 5.9.3 + Vintage 5.9.3</p>
<p>See <a href="http://junit.org/junit5/docs/5.9.3/release-notes/">Release Notes</a>.</p>
<p>JUnit 5.9.2 = Platform 1.9.2 + Jupiter 5.9.2 + Vintage 5.9.2</p>
<p>See <a href="http://junit.org/junit5/docs/5.9.2/release-notes/">Release Notes</a>.</p>
<p>JUnit 5.9.1 = Platform 1.9.1 + Jupiter 5.9.1 + Vintage 5.9.1</p>
<p>See <a href="http://junit.org/junit5/docs/5.9.1/release-notes/">Release Notes</a>.</p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a href="https://github.com/junit-team/junit5/commit/e5f50d8720741623915979ac154b65bcbcd6a577"><code>e5f50d8</code></a> Release 5.10.1</li>
<li><a href="https://github.com/junit-team/junit5/commit/ac86d18e9b15dbebe046e82743ac7f9534a17582"><code>ac86d18</code></a> Fix typo in AfterAll documentation</li>
<li><a href="https://github.com/junit-team/junit5/commit/388c5beaf42944961ab5b455c900d958a6e15588"><code>388c5be</code></a> Harmonize application of method and field filters in search algorithms</li>
<li><a href="https://github.com/junit-team/junit5/commit/f82dd1e716f8717e012152b1d1d5cc0da10d33cd"><code>f82dd1e</code></a> Apply field predicate before searching type hierarchy</li>
<li><a href="https://github.com/junit-team/junit5/commit/1d1eb8571552bbf28e578241965010de6c8ee779"><code>1d1eb85</code></a> Polishing</li>
<li><a href="https://github.com/junit-team/junit5/commit/5ce280eff69b43759a3cb0c176207abe0a41b579"><code>5ce280e</code></a> Update picocli to 4.7.5 and enable help width computation</li>
<li><a href="https://github.com/junit-team/junit5/commit/fea05c3aa80de76686f326b5ce26ddf7f153ff5a"><code>fea05c3</code></a> Fix ConsoleLauncherTests and StandaloneTests</li>
<li><a href="https://github.com/junit-team/junit5/commit/c5567354c2556e772f8a0035ef7647161011d1c0"><code>c556735</code></a> Use same expected files for all JDK versions</li>
<li><a href="https://github.com/junit-team/junit5/commit/808493ab09b30970b506a48fda3d616ac1ba4fff"><code>808493a</code></a> Run StandaloneTests for Java 8 under Java 8</li>
<li><a href="https://github.com/junit-team/junit5/commit/9ec57661c78c3889db004ab6a89416e56a2fb2e0"><code>9ec5766</code></a> Unify messages about exit codes in StandaloneTests</li>
<li>Additional commits viewable in <a href="https://github.com/junit-team/junit5/compare/r5.9.0...r5.10.1">compare view</a></li>
</ul>
</details>
<br />

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@ dependabot rebase`.

[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
  • Loading branch information
@panbingkun @DenisTarasyuk
panbingkun authored and DenisTarasyuk committed Jan 18, 2024
1 parent 55c0c39 commit 30212e4
Show file tree
Hide file tree
Showing 11 changed files with 56 additions and 31 deletions.
1 change: 1 addition & 0 deletions java/algorithm/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
<artifactId>arrow-vector</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.arrow</groupId>
Expand Down
12 changes: 7 additions & 5 deletions java/flight/flight-core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,6 @@
<groupId>io.grpc</groupId>
<artifactId>grpc-core</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-context</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-protobuf</artifactId>
Expand Down Expand Up @@ -153,7 +149,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.1.1</version>
<!--
Downgrade maven-shade-plugin specifically for this module.
Using a newer version up to at least 3.5.1 will cause
issues in the arrow-tools tests looking up FlatBuffer
dependencies.
-->
<version>3.2.4</version>
<executions>
<execution>
<id>shade-main</id>
Expand Down
11 changes: 6 additions & 5 deletions java/flight/flight-grpc/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,13 @@
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-core</artifactId>
<artifactId>grpc-stub</artifactId>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-inprocess</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.grpc</groupId>
<artifactId>grpc-stub</artifactId>
</dependency>
<dependency>
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-memory-core</artifactId>
Expand Down
1 change: 0 additions & 1 deletion java/flight/flight-sql-jdbc-driver/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.4.1</version>
<executions>
<execution>
<phase>package</phase>
Expand Down
2 changes: 2 additions & 0 deletions java/flight/flight-sql/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-jdbc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
Expand All @@ -74,6 +75,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.derby</groupId>
Expand Down
2 changes: 1 addition & 1 deletion java/memory/memory-netty/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>1.2.12</version>
<version>1.3.14</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
7 changes: 2 additions & 5 deletions java/memory/memory-netty/src/main/java/io/netty/buffer/PooledByteBufAllocatorL.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public UnsafeDirectLittleEndian allocate(long size) {
}

public int getChunkSize() {
return allocator.chunkSize;
return allocator.chunkSize();
}

public long getHugeBufferSize() {
Expand Down Expand Up @@ -137,7 +137,6 @@ private class InnerAllocator extends PooledByteBufAllocator {

private final PoolArena<ByteBuffer>[] directArenas;
private final MemoryStatusThread statusThread;
private final int chunkSize;

public InnerAllocator() {
super(true);
Expand All @@ -150,8 +149,6 @@ public InnerAllocator() {
throw new RuntimeException("Failure while initializing allocator. Unable to retrieve direct arenas field.", e);
}

this.chunkSize = directArenas[0].chunkSize;

if (memoryLogger.isTraceEnabled()) {
statusThread = new MemoryStatusThread(this);
statusThread.start();
Expand All @@ -166,7 +163,7 @@ private UnsafeDirectLittleEndian newDirectBufferL(int initialCapacity, int maxCa

if (directArena != null) {

if (initialCapacity > directArena.chunkSize) {
if (initialCapacity > chunkSize()) {
// This is beyond chunk size so we'll allocate separately.
ByteBuf buf = UnpooledByteBufAllocator.DEFAULT.directBuffer(initialCapacity, maxCapacity);

Expand Down
7 changes: 6 additions & 1 deletion java/performance/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
<groupId>org.openjdk.jmh</groupId>
<artifactId>jmh-core</artifactId>
<version>${jmh.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.openjdk.jmh</groupId>
Expand All @@ -38,11 +39,13 @@
<artifactId>arrow-vector</artifactId>
<version>${project.version}</version>
<classifier>${arrow.vector.classifier}</classifier>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-memory-core</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.arrow</groupId>
Expand All @@ -54,11 +57,13 @@
<groupId>org.apache.avro</groupId>
<artifactId>avro</artifactId>
<version>${dep.avro.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-avro</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
Expand All @@ -70,6 +75,7 @@
<groupId>org.apache.arrow</groupId>
<artifactId>arrow-jdbc</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.arrow</groupId>
Expand Down Expand Up @@ -109,7 +115,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.2</version>
<executions>
<execution>
<phase>package</phase>
Expand Down
33 changes: 22 additions & 11 deletions java/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@
<properties>
<target.gen.source.path>${project.build.directory}/generated-sources</target.gen.source.path>
<dep.junit.platform.version>1.9.0</dep.junit.platform.version>
<dep.junit.jupiter.version>5.9.0</dep.junit.jupiter.version>
<dep.slf4j.version>1.7.25</dep.slf4j.version>
<dep.guava-bom.version>31.1-jre</dep.guava-bom.version>
<dep.netty-bom.version>4.1.96.Final</dep.netty-bom.version>
<dep.grpc-bom.version>1.56.0</dep.grpc-bom.version>
<dep.junit.jupiter.version>5.10.1</dep.junit.jupiter.version>
<dep.slf4j.version>2.0.9</dep.slf4j.version>
<dep.guava-bom.version>33.0.0-jre</dep.guava-bom.version>
<dep.netty-bom.version>4.1.104.Final</dep.netty-bom.version>
<dep.grpc-bom.version>1.60.0</dep.grpc-bom.version>
<dep.protobuf-bom.version>3.23.1</dep.protobuf-bom.version>
<dep.jackson-bom.version>2.15.1</dep.jackson-bom.version>
<dep.jackson-bom.version>2.16.0</dep.jackson-bom.version>
<dep.hadoop.version>2.7.1</dep.hadoop.version>
<dep.fbs.version>1.12.0</dep.fbs.version>
<dep.avro.version>1.10.0</dep.avro.version>
Expand All @@ -45,7 +45,7 @@
<checkstyle.failOnViolation>true</checkstyle.failOnViolation>
<errorprone.javac.version>9+181-r4173-1</errorprone.javac.version>
<error_prone_core.version>2.22.0</error_prone_core.version>
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
<maven-compiler-plugin.version>3.11.0</maven-compiler-plugin.version>
<mockito.core.version>5.5.0</mockito.core.version>
<mockito.inline.version>5.2.0</mockito.inline.version>
</properties>
Expand Down Expand Up @@ -308,7 +308,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>1.7.5</version>
<version>${dep.slf4j.version}</version>
</dependency>
</dependencies>
<executions>
Expand Down Expand Up @@ -361,7 +361,7 @@
<plugin>
<groupId>org.cyclonedx</groupId>
<artifactId>cyclonedx-maven-plugin</artifactId>
<version>2.7.6</version>
<version>2.7.10</version>
<executions>
<execution>
<phase>package</phase>
Expand All @@ -378,7 +378,12 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<version>3.0.1</version>
<!--
This appears to report a false positive with versions
greater than 3.1.2 (tested up to 3.6.0) when compiling
arrow-tools about Jackson being only used for tests.
-->
<version>3.1.2</version>
</plugin>
<plugin>
<groupId>org.apache.rat</groupId>
Expand All @@ -395,6 +400,7 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>${maven-compiler-plugin.version}</version>
<configuration>
<useModulePath>false</useModulePath>
<annotationProcessorPaths>
<path>
<groupId>org.immutables</groupId>
Expand All @@ -408,6 +414,11 @@
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.0.0-M2</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.5.1</version>
</plugin>
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<version>3.0.0-M7</version>
Expand Down Expand Up @@ -679,7 +690,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.3</version>
<version>1.3.14</version>
<scope>test</scope>
</dependency>
<dependency>
Expand Down
3 changes: 2 additions & 1 deletion java/tools/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
Expand All @@ -49,7 +50,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>1.2.3</version>
<version>1.3.14</version>
<scope>runtime</scope>
</dependency>
<dependency>
Expand Down
8 changes: 7 additions & 1 deletion java/vector/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,13 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.1.1</version>
<!--
Downgrade maven-shade-plugin specifically for this module.
Using a newer version up to at least 3.5.1 will cause
issues in the arrow-tools tests looking up FlatBuffer
dependencies.
-->
<version>3.2.4</version>
<executions>
<execution>
<phase>package</phase>
Expand Down

0 comments on commit 30212e4

Please sign in to comment.