fix ci

apache · May 26, 2024 · 094bf3a · 094bf3a
1 parent 9055643
commit 094bf3a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 26 deletions.
diff --git a/ep/build-velox/src/build_velox.sh b/ep/build-velox/src/build_velox.sh
@@ -282,9 +282,6 @@ function compile_arrow_java_module() {
     ARROW_INSTALL_DIR="${ARROW_HOME}/../../install"
 
     pushd $ARROW_HOME/java
-    # Because arrow-bom module need the -DprocessAllModules
-    mvn versions:set -DnewVersion=15.0.0-gluten -DprocessAllModules
-
     # Arrow C Data Interface CPP libraries
     mvn generate-resources -P generate-libs-cdata-all-os -Darrow.c.jni.dist.dir=$ARROW_INSTALL_DIR \
       -Dmaven.test.skip -Drat.skip -Dmaven.gitcommitid.skip -Dcheckstyle.skip -N
@@ -295,7 +292,8 @@ function compile_arrow_java_module() {
       -DARROW_GANDIVA=OFF -DARROW_JAVA_JNI_ENABLE_GANDIVA=OFF -DARROW_ORC=OFF -DARROW_JAVA_JNI_ENABLE_ORC=OFF \
 	    -Dmaven.test.skip -Drat.skip -Dmaven.gitcommitid.skip -Dcheckstyle.skip -N
 
-    # Arrow Java libraries
+    # Arrow Java libraries, only arrow-dataset module version is 15.0.0-gluten, cannot use mvn version set
+    # because arrow-bom needs many dependency, it will take a very long time to build the dependency
     mvn clean install  -Parrow-jni -P arrow-c-data -pl maven/module-info-compiler-maven-plugin,c,dataset -am \
       -Darrow.c.jni.dist.dir=$ARROW_INSTALL_DIR/lib -Darrow.dataset.jni.dist.dir=$ARROW_INSTALL_DIR/lib -Darrow.cpp.build.dir=$ARROW_INSTALL_DIR/lib \
       -DskipTests -Drat.skip -Dmaven.gitcommitid.skip -Dcheckstyle.skip

diff --git a/ep/build-velox/src/modify_arrow_dataset_scan_option.patch b/ep/build-velox/src/modify_arrow_dataset_scan_option.patch
@@ -148,10 +148,16 @@ index ab749f4a6..6312ec239 100644
  ///
  /// \param[in] buf a buffer containing the protobuf serialization of a Substrait Type
 diff --git a/java/dataset/pom.xml b/java/dataset/pom.xml
-index d4d3e2c0f..ce72eaa1f 100644
+index d4d3e2c0f..8ecae81e8 100644
 --- a/java/dataset/pom.xml
 +++ b/java/dataset/pom.xml
-@@ -25,9 +25,10 @@
+@@ -20,14 +20,16 @@
+     <modelVersion>4.0.0</modelVersion>
+
+     <artifactId>arrow-dataset</artifactId>
++    <version>15.0.0-gluten</version>
+     <name>Arrow Java Dataset</name>
+     <description>Java implementation of Arrow Dataset API/Framework</description>
      <packaging>jar</packaging>
      <properties>
          <arrow.cpp.build.dir>../../../cpp/release-build/</arrow.cpp.build.dir>
@@ -163,7 +169,7 @@ index d4d3e2c0f..ce72eaa1f 100644
      </properties>
 
      <dependencies>
-@@ -47,6 +48,18 @@
+@@ -47,6 +49,18 @@
              <artifactId>arrow-c-data</artifactId>
              <scope>compile</scope>
          </dependency>
@@ -881,22 +887,3 @@ index 000000000..329194609
 +1;Juno;Java
 +2;Peter;Python
 +3;Celin;C++
-diff --git a/java/pom.xml b/java/pom.xml
-index 57f282c6c..0b80c9802 100644
---- a/java/pom.xml
-+++ b/java/pom.xml
-@@ -598,14 +598,6 @@
-
-   <dependencyManagement>
-     <dependencies>
--      <!-- Utilize the bill of materials in sub-modules -->
--      <dependency>
--        <groupId>org.apache.arrow</groupId>
--        <artifactId>arrow-bom</artifactId>
--        <version>${project.version}</version>
--        <type>pom</type>
--        <scope>import</scope>
--      </dependency>
-       <dependency>
-         <groupId>com.google.flatbuffers</groupId>
-         <artifactId>flatbuffers-java</artifactId>