From e5f4a777b94ba871628531dff325bd56346d6040 Mon Sep 17 00:00:00 2001 From: Dane Pitkin Date: Tue, 13 Aug 2024 11:57:51 -0400 Subject: [PATCH 1/7] Revert to older head --- java/.mvn/extensions.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/.mvn/extensions.xml b/java/.mvn/extensions.xml index 716e2f9e81c..d6e80695e22 100644 --- a/java/.mvn/extensions.xml +++ b/java/.mvn/extensions.xml @@ -23,7 +23,7 @@ com.gradle develocity-maven-extension - 1.21.6 + 1.21.5 com.gradle From ae3b5cad5cc22e1d8fc7214f2ed09c41604f192b Mon Sep 17 00:00:00 2001 From: Dane Pitkin Date: Tue, 13 Aug 2024 13:50:31 -0400 Subject: [PATCH 2/7] Revert "Revert to older head" This reverts commit e5f4a777b94ba871628531dff325bd56346d6040. --- java/.mvn/extensions.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/.mvn/extensions.xml b/java/.mvn/extensions.xml index d6e80695e22..716e2f9e81c 100644 --- a/java/.mvn/extensions.xml +++ b/java/.mvn/extensions.xml @@ -23,7 +23,7 @@ com.gradle develocity-maven-extension - 1.21.5 + 1.21.6 com.gradle From 5c0bfc686316cf59dcb6134dd83e458ee2bf9bbd Mon Sep 17 00:00:00 2001 From: Dane Pitkin Date: Tue, 13 Aug 2024 13:52:17 -0400 Subject: [PATCH 3/7] Try removing multithreaded config --- ci/scripts/java_build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/scripts/java_build.sh b/ci/scripts/java_build.sh index 0fa1edab429..39455b83f57 100755 --- a/ci/scripts/java_build.sh +++ b/ci/scripts/java_build.sh @@ -73,7 +73,7 @@ if [ $ARROW_JAVA_SKIP_GIT_PLUGIN ]; then fi # Use `2 * ncores` threads -mvn="${mvn} -T 2C" +# mvn="${mvn} -T 2C" # https://github.com/apache/arrow/issues/41429 # TODO: We want to out-of-source build. This is a workaround. We copy From 9fd0026eededf543ee960797ad95f3dad40b83eb Mon Sep 17 00:00:00 2001 From: Dane Pitkin Date: Tue, 13 Aug 2024 14:30:06 -0400 Subject: [PATCH 4/7] Upgrade maven --- .env | 2 +- .github/workflows/java.yml | 2 +- ci/docker/conda-integration.dockerfile | 2 +- ci/docker/conda-python-hdfs.dockerfile | 2 +- ci/docker/conda-python-jpype.dockerfile | 2 +- ci/docker/conda-python-spark.dockerfile | 2 +- ci/docker/java-jni-manylinux-201x.dockerfile | 2 +- ci/docker/linux-apt-docs.dockerfile | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.env b/.env index 1358aafe824..867cc101016 100644 --- a/.env +++ b/.env @@ -65,7 +65,7 @@ JDK=11 KARTOTHEK=latest # LLVM 12 and GCC 11 reports -Wmismatched-new-delete. LLVM=14 -MAVEN=3.8.7 +MAVEN=3.9.8 NODE=18 NUMBA=latest NUMPY=latest diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index d4211c2c81c..a291c7dbc2b 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -59,7 +59,7 @@ jobs: fail-fast: false matrix: jdk: [11, 17, 21, 22] - maven: [3.9.6] + maven: [3.9.8] image: [java] env: JDK: ${{ matrix.jdk }} diff --git a/ci/docker/conda-integration.dockerfile b/ci/docker/conda-integration.dockerfile index c602490d6b7..f39fdc4c25f 100644 --- a/ci/docker/conda-integration.dockerfile +++ b/ci/docker/conda-integration.dockerfile @@ -20,7 +20,7 @@ ARG arch=amd64 FROM ${repo}:${arch}-conda-cpp ARG arch=amd64 -ARG maven=3.8.7 +ARG maven=3.9.8 ARG node=16 ARG yarn=1.22 ARG jdk=11 diff --git a/ci/docker/conda-python-hdfs.dockerfile b/ci/docker/conda-python-hdfs.dockerfile index 4e5e1a402e2..a58bb5cc8e4 100644 --- a/ci/docker/conda-python-hdfs.dockerfile +++ b/ci/docker/conda-python-hdfs.dockerfile @@ -21,7 +21,7 @@ ARG python=3.8 FROM ${repo}:${arch}-conda-python-${python} ARG jdk=11 -ARG maven=3.8.7 +ARG maven=3.9.8 RUN mamba install -q -y \ maven=${maven} \ openjdk=${jdk} \ diff --git a/ci/docker/conda-python-jpype.dockerfile b/ci/docker/conda-python-jpype.dockerfile index d9b43afdaec..0e982ffe851 100644 --- a/ci/docker/conda-python-jpype.dockerfile +++ b/ci/docker/conda-python-jpype.dockerfile @@ -21,7 +21,7 @@ ARG python=3.8 FROM ${repo}:${arch}-conda-python-${python} ARG jdk=11 -ARG maven=3.8.7 +ARG maven=3.9.8 RUN mamba install -q -y \ maven=${maven} \ openjdk=${jdk} \ diff --git a/ci/docker/conda-python-spark.dockerfile b/ci/docker/conda-python-spark.dockerfile index d95fe58b529..68fe78293c2 100644 --- a/ci/docker/conda-python-spark.dockerfile +++ b/ci/docker/conda-python-spark.dockerfile @@ -21,7 +21,7 @@ ARG python=3.8 FROM ${repo}:${arch}-conda-python-${python} ARG jdk=11 -ARG maven=3.8.7 +ARG maven=3.9.8 ARG numpy=latest COPY ci/scripts/install_numpy.sh /arrow/ci/scripts/ diff --git a/ci/docker/java-jni-manylinux-201x.dockerfile b/ci/docker/java-jni-manylinux-201x.dockerfile index 479f4aa598b..2b5c92229df 100644 --- a/ci/docker/java-jni-manylinux-201x.dockerfile +++ b/ci/docker/java-jni-manylinux-201x.dockerfile @@ -34,7 +34,7 @@ RUN vcpkg install \ # Install Java ARG java=11 -ARG maven=3.9.3 +ARG maven=3.9.8 RUN yum install -y java-$java-openjdk-devel && \ yum clean all && \ curl \ diff --git a/ci/docker/linux-apt-docs.dockerfile b/ci/docker/linux-apt-docs.dockerfile index 0804f3543c2..f22324057b0 100644 --- a/ci/docker/linux-apt-docs.dockerfile +++ b/ci/docker/linux-apt-docs.dockerfile @@ -82,7 +82,7 @@ RUN apt-get update -y && \ ENV JAVA_HOME=/usr/lib/jvm/java-${jdk}-openjdk-amd64 -ARG maven=3.8.7 +ARG maven=3.9.8 COPY ci/scripts/util_download_apache.sh /arrow/ci/scripts/ RUN /arrow/ci/scripts/util_download_apache.sh \ "maven/maven-3/${maven}/binaries/apache-maven-${maven}-bin.tar.gz" /opt From 938a0702b2d720f7671bff02c90c5946cae0f5ab Mon Sep 17 00:00:00 2001 From: Dane Pitkin Date: Tue, 13 Aug 2024 15:31:09 -0400 Subject: [PATCH 5/7] Revert "Upgrade maven" This reverts commit 9fd0026eededf543ee960797ad95f3dad40b83eb. --- .env | 2 +- .github/workflows/java.yml | 2 +- ci/docker/conda-integration.dockerfile | 2 +- ci/docker/conda-python-hdfs.dockerfile | 2 +- ci/docker/conda-python-jpype.dockerfile | 2 +- ci/docker/conda-python-spark.dockerfile | 2 +- ci/docker/java-jni-manylinux-201x.dockerfile | 2 +- ci/docker/linux-apt-docs.dockerfile | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.env b/.env index 867cc101016..1358aafe824 100644 --- a/.env +++ b/.env @@ -65,7 +65,7 @@ JDK=11 KARTOTHEK=latest # LLVM 12 and GCC 11 reports -Wmismatched-new-delete. LLVM=14 -MAVEN=3.9.8 +MAVEN=3.8.7 NODE=18 NUMBA=latest NUMPY=latest diff --git a/.github/workflows/java.yml b/.github/workflows/java.yml index a291c7dbc2b..d4211c2c81c 100644 --- a/.github/workflows/java.yml +++ b/.github/workflows/java.yml @@ -59,7 +59,7 @@ jobs: fail-fast: false matrix: jdk: [11, 17, 21, 22] - maven: [3.9.8] + maven: [3.9.6] image: [java] env: JDK: ${{ matrix.jdk }} diff --git a/ci/docker/conda-integration.dockerfile b/ci/docker/conda-integration.dockerfile index f39fdc4c25f..c602490d6b7 100644 --- a/ci/docker/conda-integration.dockerfile +++ b/ci/docker/conda-integration.dockerfile @@ -20,7 +20,7 @@ ARG arch=amd64 FROM ${repo}:${arch}-conda-cpp ARG arch=amd64 -ARG maven=3.9.8 +ARG maven=3.8.7 ARG node=16 ARG yarn=1.22 ARG jdk=11 diff --git a/ci/docker/conda-python-hdfs.dockerfile b/ci/docker/conda-python-hdfs.dockerfile index a58bb5cc8e4..4e5e1a402e2 100644 --- a/ci/docker/conda-python-hdfs.dockerfile +++ b/ci/docker/conda-python-hdfs.dockerfile @@ -21,7 +21,7 @@ ARG python=3.8 FROM ${repo}:${arch}-conda-python-${python} ARG jdk=11 -ARG maven=3.9.8 +ARG maven=3.8.7 RUN mamba install -q -y \ maven=${maven} \ openjdk=${jdk} \ diff --git a/ci/docker/conda-python-jpype.dockerfile b/ci/docker/conda-python-jpype.dockerfile index 0e982ffe851..d9b43afdaec 100644 --- a/ci/docker/conda-python-jpype.dockerfile +++ b/ci/docker/conda-python-jpype.dockerfile @@ -21,7 +21,7 @@ ARG python=3.8 FROM ${repo}:${arch}-conda-python-${python} ARG jdk=11 -ARG maven=3.9.8 +ARG maven=3.8.7 RUN mamba install -q -y \ maven=${maven} \ openjdk=${jdk} \ diff --git a/ci/docker/conda-python-spark.dockerfile b/ci/docker/conda-python-spark.dockerfile index 68fe78293c2..d95fe58b529 100644 --- a/ci/docker/conda-python-spark.dockerfile +++ b/ci/docker/conda-python-spark.dockerfile @@ -21,7 +21,7 @@ ARG python=3.8 FROM ${repo}:${arch}-conda-python-${python} ARG jdk=11 -ARG maven=3.9.8 +ARG maven=3.8.7 ARG numpy=latest COPY ci/scripts/install_numpy.sh /arrow/ci/scripts/ diff --git a/ci/docker/java-jni-manylinux-201x.dockerfile b/ci/docker/java-jni-manylinux-201x.dockerfile index 2b5c92229df..479f4aa598b 100644 --- a/ci/docker/java-jni-manylinux-201x.dockerfile +++ b/ci/docker/java-jni-manylinux-201x.dockerfile @@ -34,7 +34,7 @@ RUN vcpkg install \ # Install Java ARG java=11 -ARG maven=3.9.8 +ARG maven=3.9.3 RUN yum install -y java-$java-openjdk-devel && \ yum clean all && \ curl \ diff --git a/ci/docker/linux-apt-docs.dockerfile b/ci/docker/linux-apt-docs.dockerfile index f22324057b0..0804f3543c2 100644 --- a/ci/docker/linux-apt-docs.dockerfile +++ b/ci/docker/linux-apt-docs.dockerfile @@ -82,7 +82,7 @@ RUN apt-get update -y && \ ENV JAVA_HOME=/usr/lib/jvm/java-${jdk}-openjdk-amd64 -ARG maven=3.9.8 +ARG maven=3.8.7 COPY ci/scripts/util_download_apache.sh /arrow/ci/scripts/ RUN /arrow/ci/scripts/util_download_apache.sh \ "maven/maven-3/${maven}/binaries/apache-maven-${maven}-bin.tar.gz" /opt From ac61ffd93c448b8e2f3328c7fae189a291115f34 Mon Sep 17 00:00:00 2001 From: Dane Pitkin Date: Tue, 13 Aug 2024 15:44:04 -0400 Subject: [PATCH 6/7] Try reenabling http pooling --- ci/scripts/java_build.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ci/scripts/java_build.sh b/ci/scripts/java_build.sh index 39455b83f57..c5398f49c3c 100755 --- a/ci/scripts/java_build.sh +++ b/ci/scripts/java_build.sh @@ -73,7 +73,7 @@ if [ $ARROW_JAVA_SKIP_GIT_PLUGIN ]; then fi # Use `2 * ncores` threads -# mvn="${mvn} -T 2C" +mvn="${mvn} -T 2C" # https://github.com/apache/arrow/issues/41429 # TODO: We want to out-of-source build. This is a workaround. We copy @@ -101,9 +101,8 @@ fi ${mvn} clean install if [ "${BUILD_DOCS_JAVA}" == "ON" ]; then - # HTTP pooling is turned of to avoid download issues https://issues.apache.org/jira/browse/ARROW-11633 mkdir -p ${build_dir}/docs/java/reference - ${mvn} -Dcheckstyle.skip=true -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false clean install site + ${mvn} -Dcheckstyle.skip=true clean install site rsync -a target/site/apidocs/ ${build_dir}/docs/java/reference fi From f3b761162c2c0db235897c381c3a440ceea7645c Mon Sep 17 00:00:00 2001 From: Dane Pitkin Date: Tue, 13 Aug 2024 17:30:23 -0400 Subject: [PATCH 7/7] Don't use multithreading for maven site --- ci/scripts/java_build.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ci/scripts/java_build.sh b/ci/scripts/java_build.sh index c5398f49c3c..212ec6eb114 100755 --- a/ci/scripts/java_build.sh +++ b/ci/scripts/java_build.sh @@ -72,9 +72,6 @@ if [ $ARROW_JAVA_SKIP_GIT_PLUGIN ]; then mvn="${mvn} -Dmaven.gitcommitid.skip=true" fi -# Use `2 * ncores` threads -mvn="${mvn} -T 2C" - # https://github.com/apache/arrow/issues/41429 # TODO: We want to out-of-source build. This is a workaround. We copy # all needed files to the build directory from the source directory @@ -98,11 +95,14 @@ if [ "${ARROW_JAVA_JNI}" = "ON" ]; then mvn="${mvn} -Darrow.cpp.build.dir=${java_jni_dist_dir} -Parrow-jni" fi -${mvn} clean install +# Use `2 * ncores` threads +${mvn} -T 2C clean install if [ "${BUILD_DOCS_JAVA}" == "ON" ]; then + # HTTP pooling is turned of to avoid download issues https://issues.apache.org/jira/browse/ARROW-11633 + # GH-43378: Maven site plugins not compatible with multithreading mkdir -p ${build_dir}/docs/java/reference - ${mvn} -Dcheckstyle.skip=true clean install site + ${mvn} -Dcheckstyle.skip=true -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false clean install site rsync -a target/site/apidocs/ ${build_dir}/docs/java/reference fi