Skip to content

GH-36994: [Java] Use JDK 21 in CI #38219

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
raulcd merged 4 commits into from
Oct 17, 2023
Merged

GH-36994: [Java] Use JDK 21 in CI #38219

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2201ec5
Use JDK 21 in CI
Oct 11, 2023
798549e
Suppress warning
Oct 11, 2023
ece3900
update a missing config
Oct 14, 2023
e3e1e58
Undo pinning in verification script
Oct 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/workflows/java.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
strategy:
fail-fast: false
matrix:
jdk: [8, 11, 17, 20]
jdk: [8, 11, 17, 21]
include:
- jdk: 8
title: AMD64 Debian 9 Java JDK 8 Maven 3.5.4
Expand All @@ -68,12 +68,12 @@ jobs:
maven: 3.6.2
image: debian-java
- jdk: 17
title: AMD64 Ubuntu 22.04 Java JDK 17 Maven 3.9.3
maven: 3.9.3
title: AMD64 Ubuntu 22.04 Java JDK 17 Maven 3.9.4
maven: 3.9.4
image: eclipse-java
- jdk: 20
title: AMD64 Ubuntu 22.04 Java JDK 20 Maven 3.9.3
maven: 3.9.3
- jdk: 21
title: AMD64 Ubuntu 22.04 Java JDK 21 Maven 3.9.4
maven: 3.9.4
image: eclipse-java
env:
JDK: ${{ matrix.jdk }}
Expand Down
6 changes: 1 addition & 5 deletions dev/release/verify-release-candidate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -565,11 +565,7 @@ maybe_setup_nodejs() {
test_package_java() {
show_header "Build and test Java libraries"

# Build and test Java (Requires newer Maven -- I used 3.3.9)
# Pin OpenJDK 17 since OpenJDK 20 is incompatible with our versions
# of things like Mockito, and we also can't update Mockito due to
# not supporting Java 8 anymore
maybe_setup_conda maven openjdk=17.0.3 || exit 1
maybe_setup_conda maven openjdk || exit 1

pushd java
if [ ${TEST_JAVA} -gt 0 ]; then
Expand Down
4 changes: 2 additions & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1698,8 +1698,8 @@ services:
# docker-compose build eclipse-java
# docker-compose run eclipse-java
# Parameters:
# MAVEN: 3.9.3
# JDK: 17, 20
# MAVEN: 3.9.4
# JDK: 17, 21
image: ${ARCH}/maven:${MAVEN}-eclipse-temurin-${JDK}
shm_size: *shm-size
volumes: *java-volumes
Expand Down
2 changes: 1 addition & 1 deletion docs/source/java/install.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Java Compatibility
==================

Java modules are compatible with JDK 8 and above.
Currently, JDK 8, 11, 17, and 18 are tested in CI.
Currently, JDK 8, 11, 17, and 21 are tested in CI.

When using Java 9 or later, some JDK internals must be exposed by
adding ``--add-opens=java.base/java.nio=ALL-UNNAMED`` to the ``java`` command:
Expand Down
4 changes: 2 additions & 2 deletions java/flight/flight-sql-jdbc-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,14 +107,14 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>4.11.0</version>
<version>${mockito.core.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>4.11.0</version>
<version>${mockito.inline.version}</version>
<scope>test</scope>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions java/flight/flight-sql-jdbc-driver/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,14 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>4.11.0</version>
<version>${mockito.core.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>4.11.0</version>
<version>${mockito.inline.version}</version>
<scope>test</scope>
</dependency>

Expand Down
13 changes: 13 additions & 0 deletions java/flight/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,17 @@
</plugins>
</pluginManagement>
</build>

<profiles>
Copy link
Member

@raulcd raulcd Oct 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does this change mean we can potentially remove this pinned version for release verification?
https://github.com/apache/arrow/blob/main/dev/release/verify-release-candidate.sh#L569

Copy link
Member Author

@danepitkin danepitkin Oct 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think so! I'll try it out

<profile>
<id>pin-mockito-jdk8</id>
<activation>
<jdk>1.8</jdk>
</activation>
<properties>
<mockito.core.version>4.11.0</mockito.core.version>
<mockito.inline.version>4.11.0</mockito.inline.version>
</properties>
</profile>
</profiles>
</project>
4 changes: 3 additions & 1 deletion java/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,10 @@
<forkCount>2</forkCount>
<checkstyle.failOnViolation>true</checkstyle.failOnViolation>
<errorprone.javac.version>9+181-r4173-1</errorprone.javac.version>
<error_prone_core.version>2.16</error_prone_core.version>
<error_prone_core.version>2.22.0</error_prone_core.version>
<maven-compiler-plugin.version>3.10.1</maven-compiler-plugin.version>
<mockito.core.version>5.5.0</mockito.core.version>
<mockito.inline.version>5.2.0</mockito.inline.version>
</properties>

<scm>
Expand Down
3 changes: 2 additions & 1 deletion java/vector/src/main/java/org/apache/arrow/vector/dictionary/DictionaryEncoder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,13 +112,14 @@ public static ValueVector decode(ValueVector indices, Dictionary dictionary, Buf
* @param valueCount dictionary vector valueCount.
* @return index type.
*/
@SuppressWarnings("ComparisonOutOfRange")
public static ArrowType.Int getIndexType(int valueCount) {
Preconditions.checkArgument(valueCount >= 0);
if (valueCount <= Byte.MAX_VALUE) {
return new ArrowType.Int(8, true);
} else if (valueCount <= Character.MAX_VALUE) {
return new ArrowType.Int(16, true);
} else if (valueCount <= Integer.MAX_VALUE) {
} else if (valueCount <= Integer.MAX_VALUE) { //this comparison will always evaluate to true
return new ArrowType.Int(32, true);
} else {
return new ArrowType.Int(64, true);
Expand Down