fixup

apache · Dec 11, 2024 · 1f69eac · 1f69eac
1 parent bc6ed12
commit 1f69eac
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 46 deletions.
diff --git a/backends-velox/pom.xml b/backends-velox/pom.xml
@@ -215,6 +215,15 @@
   </dependencies>
 
   <build>
+    <resources>
+      <resource>
+        <directory>${project.basedir}/src/main/resources</directory>
+      </resource>
+      <resource>
+        <directory>${cpp.releases.dir}</directory>
+        <targetPath>${platform}/${arch}</targetPath>
+      </resource>
+    </resources>
     <outputDirectory>target/scala-${scala.binary.version}/classes</outputDirectory>
     <testOutputDirectory>target/scala-${scala.binary.version}/test-classes</testOutputDirectory>
     <plugins>
@@ -268,27 +277,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>add-cpp-libraries</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>add-resource</goal>
-            </goals>
-            <configuration>
-              <resources>
-                <resource>
-                  <directory>${cpp.releases.dir}</directory>
-                  <targetPath>${platform}/${arch}</targetPath>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 </project>
diff --git a/gluten-substrait/pom.xml b/gluten-substrait/pom.xml
@@ -198,7 +198,7 @@
                   <arg value="${project.basedir}/../dev/gluten-build-info.sh"/>
                   <arg value="${backend.type}"/>
                   <arg value="${backend.home}"/>
-                  <arg value="${project.build.directory}/extra-resources"/>
+                  <arg value="${project.build.directory}/generated-resources"/>
                   <arg value="${project.version}"/>
                   <arg value="${java.version}"/>
                   <arg value="${scala.version}"/>
@@ -210,30 +210,6 @@
           </execution>
         </executions>
       </plugin>
-      <!-- Should always use build-helper-maven-plugin to assign additional resource folders to
-       make sure the default resource folders, namely src/main/resource is not overridden. -->
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>add-generated-resources</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>add-resource</goal>
-            </goals>
-            <configuration>
-              <resources>
-                <resource>
-                  <filtering>true</filtering>
-                  <!-- Include the properties file to provide the build information. -->
-                  <directory>${project.build.directory}/extra-resources</directory>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <!-- compile proto buffer files using copied protoc binary -->
       <plugin>
         <groupId>org.xolstice.maven.plugins</groupId>

diff --git a/pom.xml b/pom.xml
@@ -1075,6 +1075,16 @@
   </dependencyManagement>
 
   <build>
+    <resources>
+      <resource>
+        <directory>${project.basedir}/src/main/resources</directory>
+      </resource>
+    </resources>
+    <testResources>
+      <testResource>
+        <directory>${project.basedir}/src/test/resources</directory>
+      </testResource>
+    </testResources>
     <extensions>
       <!-- provides os.detected.classifier (i.e. linux-x86_64, osx-x86_64) property -->
       <extension>
@@ -1320,6 +1330,30 @@
           <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 IDE (E.g., `targetPath` can be respected by-->
+          <!-- IDEA with that 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.xolstice.maven.plugins</groupId>