This is an automated email from the ASF dual-hosted git repository.

hongze pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git


The following commit(s) were added to refs/heads/main by this push:
     new eefdb18176 [CORE][VL] Minor cleanups for pom.xml (#10217)
eefdb18176 is described below

commit eefdb181762d4b8a9729fbf97328b810ef732c5a
Author: Hongze Zhang <[email protected]>
AuthorDate: Mon Jul 21 13:59:04 2025 +0800

    [CORE][VL] Minor cleanups for pom.xml (#10217)
---
 backends-velox/pom.xml |   4 +-
 pom.xml                | 164 +++++++++++++++++++++++--------------------------
 2 files changed, 79 insertions(+), 89 deletions(-)

diff --git a/backends-velox/pom.xml b/backends-velox/pom.xml
index 3a52c733f3..4f1907213a 100755
--- a/backends-velox/pom.xml
+++ b/backends-velox/pom.xml
@@ -337,11 +337,11 @@
       <groupId>org.apache.spark</groupId>
       <artifactId>spark-core_${scala.binary.version}</artifactId>
       <type>test-jar</type>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.spark</groupId>
       <artifactId>spark-hive_${scala.binary.version}</artifactId>
-      <version>${spark.version}</version>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>
@@ -349,11 +349,13 @@
       <groupId>org.apache.spark</groupId>
       <artifactId>spark-sql_${scala.binary.version}</artifactId>
       <type>test-jar</type>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.spark</groupId>
       <artifactId>spark-catalyst_${scala.binary.version}</artifactId>
       <type>test-jar</type>
+      <scope>test</scope>
     </dependency>
     <!-- Fasterxml -->
     <dependency>
diff --git a/pom.xml b/pom.xml
index c7c70f5ac2..3407691cbb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1696,6 +1696,82 @@
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>build-helper-maven-plugin</artifactId>
           <version>${build-helper-maven-plugin.version}</version>
+          <!--We use build-helper-maven-plugin rather than 
maven-resources-plugin-->
+          <!--to add base resources (generated-resources and other common 
extended resource folders).-->
+          <!--So submodules could easily add their own resources through 
maven-resources-plugin-->
+          <!--which is more compatible with Intellij IDEA (E.g., `targetPath` 
can be respected by-->
+          <!--IDEA with maven-resources-plugin while it is not working with 
build-helper-maven-plugin).-->
+          <executions>
+            <execution>
+              <id>add-common-sources</id>
+              <phase>generate-sources</phase>
+              <goals>
+                <goal>add-source</goal>
+              </goals>
+              <configuration>
+                <sources>
+                  
<source>${project.basedir}/src-spark${spark.plain.version}/main/java</source>
+                  
<source>${project.basedir}/src-spark${spark.plain.version}/main/scala</source>
+                </sources>
+              </configuration>
+            </execution>
+            <execution>
+              <id>add-common-resources</id>
+              <phase>generate-resources</phase>
+              <goals>
+                <goal>add-resource</goal>
+              </goals>
+              <configuration>
+                <resources>
+                  <resource>
+                    
<directory>${project.basedir}/src-spark${spark.plain.version}/main/resources</directory>
+                  </resource>
+                </resources>
+              </configuration>
+            </execution>
+            <execution>
+              <id>add-common-test-sources</id>
+              <phase>generate-test-sources</phase>
+              <goals>
+                <goal>add-test-source</goal>
+              </goals>
+              <configuration>
+                <sources>
+                  
<source>${project.basedir}/src-spark${spark.plain.version}/test/scala</source>
+                  
<source>${project.basedir}/src-spark${spark.plain.version}/test/java</source>
+                </sources>
+              </configuration>
+            </execution>
+            <execution>
+              <id>add-common-test-resources</id>
+              <phase>generate-test-resources</phase>
+              <goals>
+                <goal>add-test-resource</goal>
+              </goals>
+              <configuration>
+                <resources>
+                  <resource>
+                    
<directory>${project.basedir}/src-spark${spark.plain.version}/test/resources</directory>
+                  </resource>
+                </resources>
+              </configuration>
+            </execution>
+            <execution>
+              <id>add-generated-resources</id>
+              <phase>generate-resources</phase>
+              <goals>
+                <goal>add-resource</goal>
+              </goals>
+              <configuration>
+                <resources>
+                  <resource>
+                    <!-- Include the properties file to provide the build 
information. -->
+                    
<directory>${project.build.directory}/generated-resources</directory>
+                  </resource>
+                </resources>
+              </configuration>
+            </execution>
+          </executions>
         </plugin>
         <plugin>
           <groupId>org.xolstice.maven.plugins</groupId>
@@ -1753,34 +1829,6 @@
         <artifactId>versions-maven-plugin</artifactId>
         <version>2.15.0</version>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <!--We use build-helper-maven-plugin rather than 
maven-resources-plugin-->
-        <!--to add base resources (generated-resources and other common 
extended resource folders).-->
-        <!--So submodules could easily add their own resources through 
maven-resources-plugin-->
-        <!--which is more compatible with Intellij IDEA (E.g., `targetPath` 
can be respected by-->
-        <!--IDEA with maven-resources-plugin while it is not working with 
build-helper-maven-plugin).-->
-        <executions>
-          <execution>
-          </execution>
-          <execution>
-            <id>add-generated-resources</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>add-resource</goal>
-            </goals>
-            <configuration>
-              <resources>
-                <resource>
-                  <!-- Include the properties file to provide the build 
information. -->
-                  
<directory>${project.build.directory}/generated-resources</directory>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-surefire-plugin</artifactId>
@@ -1789,66 +1837,6 @@
         <groupId>com.diffplug.spotless</groupId>
         <artifactId>spotless-maven-plugin</artifactId>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>add-common-sources</id>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>add-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                
<source>${project.basedir}/src-spark${spark.plain.version}/main/java</source>
-                
<source>${project.basedir}/src-spark${spark.plain.version}/main/scala</source>
-              </sources>
-            </configuration>
-          </execution>
-          <execution>
-            <id>add-common-resources</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>add-resource</goal>
-            </goals>
-            <configuration>
-              <resources>
-                <resource>
-                  
<directory>${project.basedir}/src-spark${spark.plain.version}/main/resources</directory>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-          <execution>
-            <id>add-common-test-sources</id>
-            <phase>generate-test-sources</phase>
-            <goals>
-              <goal>add-test-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                
<source>${project.basedir}/src-spark${spark.plain.version}/test/scala</source>
-                
<source>${project.basedir}/src-spark${spark.plain.version}/test/java</source>
-              </sources>
-            </configuration>
-          </execution>
-          <execution>
-            <id>add-common-test-resources</id>
-            <phase>generate-test-resources</phase>
-            <goals>
-              <goal>add-test-resource</goal>
-            </goals>
-            <configuration>
-              <resources>
-                <resource>
-                  
<directory>${project.basedir}/src-spark${spark.plain.version}/test/resources</directory>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to