Merge branch 'jmh_params' into fibers

ponder-lab · Oct 9, 2024 · 1ddc086 · 1ddc086
2 parents b4dce20 + ab85478
commit 1ddc086
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git a/ci/docker/conda-cpp.dockerfile b/ci/docker/conda-cpp.dockerfile
@@ -19,6 +19,8 @@ ARG repo
 ARG arch
 FROM ${repo}:${arch}-conda
 
+ARG jdk=21
+
 COPY ci/scripts/install_minio.sh /arrow/ci/scripts
 RUN /arrow/ci/scripts/install_minio.sh latest /opt/conda
 

diff --git a/ci/docker/conda-integration.dockerfile b/ci/docker/conda-integration.dockerfile
@@ -23,7 +23,7 @@ ARG arch=amd64
 ARG maven=3.8.7
 ARG node=16
 ARG yarn=1.22
-ARG jdk=11
+ARG jdk=21
 
 # Install Archery and integration dependencies
 COPY ci/conda_env_archery.txt /arrow/ci/

diff --git a/ci/docker/conda.dockerfile b/ci/docker/conda.dockerfile
@@ -18,6 +18,8 @@
 ARG arch=amd64
 FROM ${arch}/ubuntu:22.04
 
+ARG jdk=21
+
 # install build essentials
 RUN export DEBIAN_FRONTEND=noninteractive && \
     apt-get update -y -q && \

diff --git a/java/bom/pom.xml b/java/bom/pom.xml
@@ -80,7 +80,7 @@ under the License.
   <properties>
     <arrow.vector.classifier></arrow.vector.classifier>
     <!-- org.apache:apache overrides -->
-    <minimalJavaBuildVersion>21</minimalJavaBuildVersion>
+    <minimalJavaBuildVersion>11</minimalJavaBuildVersion>
     <maven.compiler.source>21</maven.compiler.source>
     <maven.compiler.target>21</maven.compiler.target>
     <maven.compiler.release>21</maven.compiler.release>

diff --git a/java/pom.xml b/java/pom.xml
@@ -117,7 +117,7 @@ under the License.
     <!-- List of add-opens arg line arguments for tests -->
     <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>
+    <minimalJavaBuildVersion>11</minimalJavaBuildVersion>
     <maven.compiler.source>21</maven.compiler.source>
     <maven.compiler.target>21</maven.compiler.target>
     <maven.compiler.release>21</maven.compiler.release>