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

stoty pushed a commit to branch branch-2.5
in repository https://gitbox.apache.org/repos/asf/hbase.git


The following commit(s) were added to refs/heads/branch-2.5 by this push:
     new df85333d0aa HBASE-29162 Fix Maven build warnings (#6744)
df85333d0aa is described below

commit df85333d0aa11cf9e883f31eedb92f0b7078a0b2
Author: Dávid Paksy <[email protected]>
AuthorDate: Tue Mar 18 17:30:12 2025 +0100

    HBASE-29162 Fix Maven build warnings (#6744)
    
    Merged the executions of two usages of the build-helper-maven-plugin.
    Removed duplicated log4j-1.2-api dependency in hbase-examples.
    
    Signed-off-by: Duo Zhang <[email protected]>
    Signed-off-by: Istvan Toth <[email protected]>
    (cherry picked from commit b0070b486f928e27a1d6a88e70930c5ce965de4e)
---
 hbase-server/pom.xml | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index 36ec9fc2f9e..1698c2f6058 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -457,6 +457,20 @@
               </resources>
             </configuration>
           </execution>
+          <execution>
+            <!-- Add the generated sources -->
+            <id>jspcSource-packageInfo-source</id>
+            <goals>
+              <goal>add-source</goal>
+            </goals>
+            <phase>generate-sources</phase>
+            <configuration>
+              <sources>
+                <source>${project.build.directory}/generated-jamon</source>
+                
<source>${project.build.directory}/generated-sources/java</source>
+              </sources>
+            </configuration>
+          </execution>
         </executions>
       </plugin>
       <plugin>
@@ -548,26 +562,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <executions>
-          <!-- Add the generated sources -->
-          <execution>
-            <id>jspcSource-packageInfo-source</id>
-            <goals>
-              <goal>add-source</goal>
-            </goals>
-            <phase>generate-sources</phase>
-            <configuration>
-              <sources>
-                <source>${project.build.directory}/generated-jamon</source>
-                
<source>${project.build.directory}/generated-sources/java</source>
-              </sources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.jamon</groupId>
         <artifactId>jamon-maven-plugin</artifactId>

Reply via email to