Make Java 21 minimum version to build Arrow

Change miminum java build version to 21. This doesn't change the minimum version to use Arrow which is still Java 8
laurentgo · May 21, 2024 · 3464538 · 3464538
1 parent 7799be7
commit 3464538
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 63 deletions.
diff --git a/ci/docker/conda-python-jpype.dockerfile b/ci/docker/conda-python-jpype.dockerfile
@@ -20,7 +20,7 @@ ARG arch=amd64
 ARG python=3.8
 FROM ${repo}:${arch}-conda-python-${python}
 
-ARG jdk=11
+ARG jdk=21
 ARG maven=3.8.7
 RUN mamba install -q -y \
         maven=${maven} \

diff --git a/ci/docker/java-jni-manylinux-201x.dockerfile b/ci/docker/java-jni-manylinux-201x.dockerfile
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -169,8 +169,8 @@ x-hierarchy:
   - impala
   - postgres
   - python-wheel-manylinux-2014:
-    - java-jni-manylinux-2014
   - python-wheel-manylinux-2-28
+    - java-jni-manylinux-2-28
   - python-wheel-manylinux-test-imports
   - python-wheel-manylinux-test-unittests
   - python-wheel-windows-vs2019
@@ -1163,22 +1163,22 @@ services:
         target: "C:/arrow"
     command: arrow\\ci\\scripts\\python_wheel_windows_test.bat
 
-  java-jni-manylinux-2014:
-    image: ${REPO}:${ARCH}-java-jni-manylinux-2014-vcpkg-${VCPKG}
+  java-jni-manylinux-2-28:
+    image: ${REPO}:${ARCH}-java-jni-manylinux-2_28-vcpkg-${VCPKG}
     build:
       args:
         base: ${REPO}:${ARCH}-python-${PYTHON}-wheel-manylinux-2014-vcpkg-${VCPKG}
-        java: 1.8.0
+        java: 21
       context: .
-      dockerfile: ci/docker/java-jni-manylinux-201x.dockerfile
+      dockerfile: ci/docker/java-jni-manylinux-2_28.dockerfile
       cache_from:
-        - ${REPO}:${ARCH}-java-jni-manylinux-2014-vcpkg-${VCPKG}
+        - ${REPO}:${ARCH}-java-jni-manylinux-2_28-vcpkg-${VCPKG}
     environment:
       <<: [*common, *ccache]
     volumes:
       - .:/arrow:delegated
       - ${DOCKER_VOLUME_PREFIX}maven-cache:/root/.m2:delegated
-      - ${DOCKER_VOLUME_PREFIX}python-wheel-manylinux2014-ccache:/ccache:delegated
+      - ${DOCKER_VOLUME_PREFIX}python-wheel-manylinux2_28-ccache:/ccache:delegated
     command:
       ["pip install -e /arrow/dev/archery && \
         /arrow/ci/scripts/java_jni_manylinux_build.sh /arrow /build /arrow/java-dist && \

diff --git a/java/bom/pom.xml b/java/bom/pom.xml
@@ -27,6 +27,16 @@
 
   <properties>
     <arrow.vector.classifier></arrow.vector.classifier>
+    <!-- org.apache:apache overrides -->
+    <minimalJavaBuildVersion>21</minimalJavaBuildVersion>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.release>8</maven.compiler.release>
+    <!--
+      Downgrade maven-jar-plugin until https://github.com/codehaus-plexus/plexus-archiver/issues/332
+      is addressed
+    -->
+    <version.maven-jar-plugin>3.2.2</version.maven-jar-plugin>
   </properties>
 
   <dependencyManagement>

diff --git a/java/maven/pom.xml b/java/maven/pom.xml
@@ -35,9 +35,15 @@
   <properties>
     <checkstyle.failOnViolation>true</checkstyle.failOnViolation>
     <!-- org.apache:apache overrides -->
+    <minimalJavaBuildVersion>21</minimalJavaBuildVersion>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
     <maven.compiler.release>8</maven.compiler.release>
+    <!--
+      Downgrade maven-jar-plugin until https://github.com/codehaus-plexus/plexus-archiver/issues/332
+      is addressed
+    -->
+    <version.maven-jar-plugin>3.2.2</version.maven-jar-plugin>
   </properties>
 
   <build>

diff --git a/java/pom.xml b/java/pom.xml
@@ -103,6 +103,7 @@
     <!-- List of add-opens arg line arguments if tests are running on JDK 11 or higher -->
     <surefire.add-opens.argLine>--add-opens=java.base/java.nio=org.apache.arrow.memory.core,ALL-UNNAMED</surefire.add-opens.argLine>
     <!-- org.apache:apache overrides -->
+    <minimalJavaBuildVersion>21</minimalJavaBuildVersion>
     <maven.compiler.source>1.8</maven.compiler.source>
     <maven.compiler.target>1.8</maven.compiler.target>
     <maven.compiler.release>8</maven.compiler.release>