This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch branch-3
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-3 by this push:
new d51537c1bb9 HBASE-29162 Fix Maven build warnings (#6744)
d51537c1bb9 is described below
commit d51537c1bb9b5792b837f31046c289a80f00910c
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-examples/pom.xml | 5 -----
hbase-server/pom.xml | 34 ++++++++++++++--------------------
2 files changed, 14 insertions(+), 25 deletions(-)
diff --git a/hbase-examples/pom.xml b/hbase-examples/pom.xml
index 44f6fdff39e..20c3e05b473 100644
--- a/hbase-examples/pom.xml
+++ b/hbase-examples/pom.xml
@@ -53,11 +53,6 @@
<groupId>com.lmax</groupId>
<artifactId>disruptor</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-1.2-api</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml
index f6c7a66d5ff..0ce488ba3c4 100644
--- a/hbase-server/pom.xml
+++ b/hbase-server/pom.xml
@@ -450,6 +450,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>
@@ -541,26 +555,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>
