From b2ae485d7dbf067ec6033952e4adfa7b08fbda77 Mon Sep 17 00:00:00 2001
From: Benjamin Prud'homme <bprudhomme@gradcenter.cuny.edu>
Date: Wed, 9 Oct 2024 16:22:26 -0400
Subject: [PATCH 1/3] Update JDK in Dockerfiles

---
 ci/docker/conda-cpp.dockerfile         | 2 ++
 ci/docker/conda-integration.dockerfile | 2 +-
 ci/docker/conda.dockerfile             | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ci/docker/conda-cpp.dockerfile b/ci/docker/conda-cpp.dockerfile
index f0084894e19dc..5e9552acc9e55 100644
--- 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
index bc268e484d019..67c3b9eef6870 100644
--- 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
index fbd81903b0a3a..b6f8f18756dd9 100644
--- 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 && \

From 82f1aaccb0e998c948ee9f9d01da123e8d28b263 Mon Sep 17 00:00:00 2001
From: Benjamin Prud'homme <139664105+bgprudhomme@users.noreply.github.com>
Date: Wed, 9 Oct 2024 16:47:38 -0400
Subject: [PATCH 2/3] Update pom.xml

---
 java/bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/bom/pom.xml b/java/bom/pom.xml
index 03b4eefd02355..75e18a98ac7e0 100644
--- 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>

From f980645893c1b7bdb4642508d1052903637f5a30 Mon Sep 17 00:00:00 2001
From: Benjamin Prud'homme <139664105+bgprudhomme@users.noreply.github.com>
Date: Wed, 9 Oct 2024 16:47:50 -0400
Subject: [PATCH 3/3] Update pom.xml

---
 java/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/pom.xml b/java/pom.xml
index a4f0f98f04d6d..e82af62756f28 100644
--- 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>