diff --git a/ci/docker/conda-python-spark.dockerfile b/ci/docker/conda-python-spark.dockerfile index a20f1ff3521..d3f0a224582 100644 --- a/ci/docker/conda-python-spark.dockerfile +++ b/ci/docker/conda-python-spark.dockerfile @@ -36,10 +36,6 @@ ARG spark=master COPY ci/scripts/install_spark.sh /arrow/ci/scripts/ RUN /arrow/ci/scripts/install_spark.sh ${spark} /spark -# patch spark to build with current Arrow Java -COPY ci/etc/integration_spark_ARROW-9438.patch /arrow/ci/etc/ -RUN patch -d /spark -p1 -i /arrow/ci/etc/integration_spark_ARROW-9438.patch - # build cpp with tests ENV CC=gcc \ CXX=g++ \ diff --git a/ci/etc/integration_spark_ARROW-9438.patch b/ci/etc/integration_spark_ARROW-9438.patch deleted file mode 100644 index 2baed303717..00000000000 --- a/ci/etc/integration_spark_ARROW-9438.patch +++ /dev/null @@ -1,72 +0,0 @@ -From 0b5388a945a7e5c5706cf00d0754540a6c68254d Mon Sep 17 00:00:00 2001 -From: Bryan Cutler -Date: Mon, 13 Jul 2020 23:12:25 -0700 -Subject: [PATCH] Update Arrow Java for 1.0.0 - ---- - pom.xml | 17 ++++++++++++++--- - sql/catalyst/pom.xml | 4 ++++ - 2 files changed, 18 insertions(+), 3 deletions(-) - -diff --git a/pom.xml b/pom.xml -index 08ca13bfe9..6619fca200 100644 ---- a/pom.xml -+++ b/pom.xml -@@ -199,7 +199,7 @@ - If you are changing Arrow version specification, please check ./python/pyspark/sql/utils.py, - and ./python/setup.py too. - --> -- 0.15.1 -+ 1.0.0-SNAPSHOT - - org.fusesource.leveldbjni - -@@ -2288,7 +2288,7 @@ - - - com.fasterxml.jackson.core -- jackson-databind -+ jackson-core - - - io.netty -@@ -2298,9 +2298,20 @@ - io.netty - netty-common - -+ -+ -+ -+ org.apache.arrow -+ arrow-memory-netty -+ ${arrow.version} -+ - - io.netty -- netty-handler -+ netty-buffer -+ -+ -+ io.netty -+ netty-common - - - -diff --git a/sql/catalyst/pom.xml b/sql/catalyst/pom.xml -index 9edbb7fec9..6b79eb722f 100644 ---- a/sql/catalyst/pom.xml -+++ b/sql/catalyst/pom.xml -@@ -117,6 +117,10 @@ - org.apache.arrow - arrow-vector - -+ -+ org.apache.arrow -+ arrow-memory-netty -+ - - - target/scala-${scala.binary.version}/classes --- -2.17.1 -