From 75448b1c045216920aed6795d5cd431163ebf9d0 Mon Sep 17 00:00:00 2001 From: vibhatha Date: Fri, 19 Jan 2024 07:49:32 +0530 Subject: [PATCH 1/6] feat: initial changes for upgrade --- .env | 2 +- java/performance/pom.xml | 2 +- java/pom.xml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.env b/.env index 6746892fd4e..427a4ab0bf3 100644 --- a/.env +++ b/.env @@ -65,7 +65,7 @@ JDK=8 KARTOTHEK=latest # LLVM 12 and GCC 11 reports -Wmismatched-new-delete. LLVM=14 -MAVEN=3.5.4 +MAVEN=3.6.3 NODE=18 NUMBA=latest NUMPY=latest diff --git a/java/performance/pom.xml b/java/performance/pom.xml index a1d53171f54..ba5a6616dca 100644 --- a/java/performance/pom.xml +++ b/java/performance/pom.xml @@ -139,7 +139,7 @@ org.codehaus.mojo exec-maven-plugin - 1.6.0 + 3.1.1 run-java-benchmarks diff --git a/java/pom.xml b/java/pom.xml index 3951f1c1bc8..19c2d11baf7 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -1038,7 +1038,7 @@ org.codehaus.mojo exec-maven-plugin - 3.1.0 + 3.1.1 cdata-cmake @@ -1099,7 +1099,7 @@ org.codehaus.mojo exec-maven-plugin - 3.1.0 + 3.1.1 jni-cpp-cmake @@ -1214,7 +1214,7 @@ org.codehaus.mojo exec-maven-plugin - 3.1.0 + 3.1.1 jni-cpp-cmake From df9543261f3418d042dc451e6201f3937fabf8cf Mon Sep 17 00:00:00 2001 From: vibhatha Date: Tue, 23 Jan 2024 12:18:00 +0530 Subject: [PATCH 2/6] test: maven version in ci --- ci/scripts/java_build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ci/scripts/java_build.sh b/ci/scripts/java_build.sh index 77dd1ccdafa..83d33d394f8 100755 --- a/ci/scripts/java_build.sh +++ b/ci/scripts/java_build.sh @@ -89,6 +89,9 @@ if [ "${ARROW_JAVA_JNI}" = "ON" ]; then mvn="${mvn} -Darrow.cpp.build.dir=${java_jni_dist_dir} -Parrow-jni" fi +echo "Maven Version" +echo $(mvn -v) + ${mvn} install if [ "${BUILD_DOCS_JAVA}" == "ON" ]; then From 7a1e1c0858569f1bb0d2f94cc0d579361178d8cc Mon Sep 17 00:00:00 2001 From: vibhatha Date: Tue, 23 Jan 2024 13:17:31 +0530 Subject: [PATCH 3/6] testing maven version issue --- docker-compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index a08345c198f..250fee09570 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1711,7 +1711,7 @@ services: jdk: 17 # conda-forge doesn't have 3.5.4 so pinning explicitly, but this should # be set to ${MAVEN} - maven: 3.5 + maven: 3.6.3 node: ${NODE} go: ${GO} volumes: *conda-volumes @@ -1845,7 +1845,7 @@ services: jdk: ${JDK} # conda-forge doesn't have 3.5.4 so pinning explicitly, but this should # be set to ${MAVEN} - maven: 3.5 + maven: 3.6.3 hdfs: ${HDFS} links: - impala:impala @@ -1888,7 +1888,7 @@ services: jdk: ${JDK} # conda-forge doesn't have 3.5.4 so pinning explicitly, but this should # be set to ${MAVEN} - maven: 3.5 + maven: 3.6.3 spark: ${SPARK} numpy: ${NUMPY} shm_size: *shm-size From 6ea7e1fbfdc0436700bf2521544c42b67cc6e084 Mon Sep 17 00:00:00 2001 From: vibhatha Date: Wed, 24 Jan 2024 07:07:49 +0530 Subject: [PATCH 4/6] fix: using maven from config across docker-compose.yml --- docker-compose.yml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 250fee09570..0252c4ec8a8 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1709,9 +1709,7 @@ services: arch: ${ARCH} # Use a newer JDK as it seems to improve stability jdk: 17 - # conda-forge doesn't have 3.5.4 so pinning explicitly, but this should - # be set to ${MAVEN} - maven: 3.6.3 + maven: ${MAVEN} node: ${NODE} go: ${GO} volumes: *conda-volumes @@ -1843,9 +1841,7 @@ services: arch: ${ARCH} python: ${PYTHON} jdk: ${JDK} - # conda-forge doesn't have 3.5.4 so pinning explicitly, but this should - # be set to ${MAVEN} - maven: 3.6.3 + maven: ${MAVEN} hdfs: ${HDFS} links: - impala:impala @@ -1886,9 +1882,7 @@ services: arch: ${ARCH} python: ${PYTHON} jdk: ${JDK} - # conda-forge doesn't have 3.5.4 so pinning explicitly, but this should - # be set to ${MAVEN} - maven: 3.6.3 + maven: ${MAVEN} spark: ${SPARK} numpy: ${NUMPY} shm_size: *shm-size From 6ed73c8eed86d42f2a416b266c4c6cf9c75c3911 Mon Sep 17 00:00:00 2001 From: vibhatha Date: Wed, 24 Jan 2024 09:07:11 +0530 Subject: [PATCH 5/6] fix: cleanup --- ci/scripts/java_build.sh | 3 --- java/dev/checkstyle/suppressions.xml | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/ci/scripts/java_build.sh b/ci/scripts/java_build.sh index 83d33d394f8..77dd1ccdafa 100755 --- a/ci/scripts/java_build.sh +++ b/ci/scripts/java_build.sh @@ -89,9 +89,6 @@ if [ "${ARROW_JAVA_JNI}" = "ON" ]; then mvn="${mvn} -Darrow.cpp.build.dir=${java_jni_dist_dir} -Parrow-jni" fi -echo "Maven Version" -echo $(mvn -v) - ${mvn} install if [ "${BUILD_DOCS_JAVA}" == "ON" ]; then diff --git a/java/dev/checkstyle/suppressions.xml b/java/dev/checkstyle/suppressions.xml index 585985bf32d..a3536e2ca92 100644 --- a/java/dev/checkstyle/suppressions.xml +++ b/java/dev/checkstyle/suppressions.xml @@ -40,5 +40,5 @@ - + From 4b059acf0007f8e1c52f875b4cd4407a2c97daa3 Mon Sep 17 00:00:00 2001 From: vibhatha Date: Wed, 24 Jan 2024 09:08:44 +0530 Subject: [PATCH 6/6] fix: cleanup --- java/dev/checkstyle/suppressions.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/java/dev/checkstyle/suppressions.xml b/java/dev/checkstyle/suppressions.xml index a3536e2ca92..585985bf32d 100644 --- a/java/dev/checkstyle/suppressions.xml +++ b/java/dev/checkstyle/suppressions.xml @@ -40,5 +40,5 @@ - +