diff --git a/backends-velox/pom.xml b/backends-velox/pom.xml index 4432547a0fe..b8e9f840d48 100644 --- a/backends-velox/pom.xml +++ b/backends-velox/pom.xml @@ -79,6 +79,24 @@ ${project.version} compile + + + org.apache.arrow + arrow-memory-core + ${arrow.version} + provided + + + org.apache.arrow + arrow-vector + ${arrow.version} + provided + com.github.ben-manes.caffeine caffeine diff --git a/dev/build-arrow.sh b/dev/build-arrow.sh index 54c6faaf331..9ff501376f9 100755 --- a/dev/build-arrow.sh +++ b/dev/build-arrow.sh @@ -31,7 +31,6 @@ function prepare_arrow_build() { #wget_and_untar https://archive.apache.org/dist/arrow/arrow-${VELOX_ARROW_BUILD_VERSION}/apache-arrow-${VELOX_ARROW_BUILD_VERSION}.tar.gz arrow_ep cd arrow_ep patch -p1 < $CURRENT_DIR/../ep/build-velox/src/modify_arrow.patch - patch -p1 < $CURRENT_DIR/../ep/build-velox/src/modify_arrow_dataset_scan_option.patch patch -p1 < $CURRENT_DIR/../ep/build-velox/src/cmake-compatibility.patch patch -p1 < $CURRENT_DIR/../ep/build-velox/src/support_ibm_power.patch popd @@ -97,8 +96,6 @@ function build_arrow_java() { export CMAKE_BUILD_PARALLEL_LEVEL=$NPROC pushd $ARROW_PREFIX/java - # Because arrow-bom module need the -DprocessAllModules - ${MVN_CMD} versions:set -DnewVersion=15.0.0-gluten -DprocessAllModules ${MVN_CMD} clean install -pl bom,maven/module-info-compiler-maven-plugin,vector -am \ -DskipTests -Drat.skip -Dmaven.gitcommitid.skip -Dcheckstyle.skip -Dassembly.skipAssembly diff --git a/gluten-arrow/pom.xml b/gluten-arrow/pom.xml index 62d9bd243a7..47404d00b7a 100644 --- a/gluten-arrow/pom.xml +++ b/gluten-arrow/pom.xml @@ -85,17 +85,24 @@ ${spark.version} provided + org.apache.arrow ${arrow-memory.artifact} - ${arrow-gluten.version} - runtime + ${arrow.version} + provided org.apache.arrow arrow-memory-core - ${arrow-gluten.version} - compile + ${arrow.version} + provided io.netty @@ -110,7 +117,8 @@ org.apache.arrow arrow-vector - ${arrow-gluten.version} + ${arrow.version} + provided io.netty @@ -129,7 +137,7 @@ org.apache.arrow arrow-c-data - ${arrow-gluten.version} + ${arrow.version} compile @@ -145,7 +153,7 @@ org.apache.arrow arrow-dataset - ${arrow-gluten.version} + ${arrow.version} compile diff --git a/package/pom.xml b/package/pom.xml index 709170a50fc..0d6b2d62573 100644 --- a/package/pom.xml +++ b/package/pom.xml @@ -118,28 +118,15 @@ com.google.gson.** - - org.apache.arrow - ${gluten.shade.packageName}.org.apache.arrow - - - org.apache.arrow.c.* - org.apache.arrow.c.jni.* - org.apache.arrow.memory.** - org.apache.arrow.vector.** - org.apache.arrow.dataset.** - - + com.google.flatbuffers ${gluten.shade.packageName}.com.google.flatbuffers diff --git a/pom.xml b/pom.xml index 72c5e503aa7..1484e55d4b4 100644 --- a/pom.xml +++ b/pom.xml @@ -81,7 +81,6 @@ 0.6.3 0.10.0 15.0.0 - 15.0.0-gluten arrow-memory-unsafe 2.7.4 4.9.3 @@ -1285,7 +1284,6 @@ 2.24.3 3.17.0 18.1.0 - 18.1.0 4.9.2 @@ -1365,7 +1363,6 @@ 2.24.3 3.17.0 18.1.0 - 18.1.0 4.9.5