This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2.4
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.4 by this push:
new 584a5c24723 HBASE-28314 Enable maven-source-plugin for all modules
(#5754)
584a5c24723 is described below
commit 584a5c24723bbff932b30e1b56f41eaa0fa04486
Author: Istvan Toth <st...@apache.org>
AuthorDate: Fri Mar 22 04:58:31 2024 +0100
HBASE-28314 Enable maven-source-plugin for all modules (#5754)
Signed-off-by: Duo Zhang <zhang...@apache.org>
---
hbase-asyncfs/pom.xml | 5 -----
hbase-checkstyle/pom.xml | 8 +++++++-
hbase-client/pom.xml | 5 -----
hbase-endpoint/pom.xml | 5 -----
hbase-examples/pom.xml | 5 -----
hbase-external-blockcache/pom.xml | 5 -----
hbase-hadoop-compat/pom.xml | 5 -----
hbase-hbtop/pom.xml | 9 ---------
hbase-it/pom.xml | 5 -----
hbase-logging/pom.xml | 5 -----
hbase-mapreduce/pom.xml | 5 -----
hbase-metrics-api/pom.xml | 5 -----
hbase-metrics/pom.xml | 5 -----
hbase-procedure/pom.xml | 5 -----
hbase-protocol-shaded/pom.xml | 5 -----
hbase-replication/pom.xml | 5 -----
hbase-rest/pom.xml | 5 -----
hbase-shaded/pom.xml | 7 +++++++
hbase-shell/pom.xml | 5 -----
hbase-thrift/pom.xml | 5 -----
pom.xml | 5 +++++
21 files changed, 19 insertions(+), 95 deletions(-)
diff --git a/hbase-asyncfs/pom.xml b/hbase-asyncfs/pom.xml
index 4c24b64a08d..d02c7441128 100644
--- a/hbase-asyncfs/pom.xml
+++ b/hbase-asyncfs/pom.xml
@@ -133,11 +133,6 @@
</dependencies>
<build>
<plugins>
- <!-- Make a jar and put the sources in the jar -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
<plugin>
<!--Make it so assembly:single does nothing in here-->
<artifactId>maven-assembly-plugin</artifactId>
diff --git a/hbase-checkstyle/pom.xml b/hbase-checkstyle/pom.xml
index 25585bbad1f..18f30dcba70 100644
--- a/hbase-checkstyle/pom.xml
+++ b/hbase-checkstyle/pom.xml
@@ -36,7 +36,13 @@
<build>
<plugins>
-
+ <plugin>
+ <!--Disable source plugin as this module does not contain source files
-->
+ <artifactId>maven-source-plugin</artifactId>
+ <configuration>
+ <skipSource>true</skipSource>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-site-plugin</artifactId>
diff --git a/hbase-client/pom.xml b/hbase-client/pom.xml
index 40373b5ca5b..223fa65da05 100644
--- a/hbase-client/pom.xml
+++ b/hbase-client/pom.xml
@@ -189,11 +189,6 @@
<skipAssembly>true</skipAssembly>
</configuration>
</plugin>
- <!-- Make a jar and put the sources in the jar -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
<plugin>
<groupId>net.revelc.code</groupId>
<artifactId>warbucks-maven-plugin</artifactId>
diff --git a/hbase-endpoint/pom.xml b/hbase-endpoint/pom.xml
index e4326049a31..83854d6882b 100644
--- a/hbase-endpoint/pom.xml
+++ b/hbase-endpoint/pom.xml
@@ -195,11 +195,6 @@
</dependencies>
<build>
<plugins>
- <!-- Make a jar and put the sources in the jar -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
<plugin>
<!--Make it so assembly:single does nothing in here-->
<artifactId>maven-assembly-plugin</artifactId>
diff --git a/hbase-examples/pom.xml b/hbase-examples/pom.xml
index 6a8dd2d9745..b68449009c3 100644
--- a/hbase-examples/pom.xml
+++ b/hbase-examples/pom.xml
@@ -204,11 +204,6 @@
<groups>${surefire.firstPartGroups}</groups>
</configuration>
</plugin>
- <!-- Make a jar and put the sources in the jar -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
<plugin>
<groupId>org.xolstice.maven.plugins</groupId>
<artifactId>protobuf-maven-plugin</artifactId>
diff --git a/hbase-external-blockcache/pom.xml
b/hbase-external-blockcache/pom.xml
index 76a8b37c5d9..27f50e057d3 100644
--- a/hbase-external-blockcache/pom.xml
+++ b/hbase-external-blockcache/pom.xml
@@ -97,11 +97,6 @@
</execution>
</executions>
</plugin>
- <!-- Make a jar and put the sources in the jar -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/hbase-hadoop-compat/pom.xml b/hbase-hadoop-compat/pom.xml
index cbe954e959d..94992c2781a 100644
--- a/hbase-hadoop-compat/pom.xml
+++ b/hbase-hadoop-compat/pom.xml
@@ -100,11 +100,6 @@
<skipAssembly>true</skipAssembly>
</configuration>
</plugin>
- <!-- Make a jar and put the sources in the jar -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
<plugin>
<groupId>net.revelc.code</groupId>
<artifactId>warbucks-maven-plugin</artifactId>
diff --git a/hbase-hbtop/pom.xml b/hbase-hbtop/pom.xml
index 40e509684b8..06be55405d3 100644
--- a/hbase-hbtop/pom.xml
+++ b/hbase-hbtop/pom.xml
@@ -91,13 +91,4 @@
<scope>test</scope>
</dependency>
</dependencies>
- <build>
- <plugins>
- <!-- Make a jar and put the sources in the jar -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
</project>
diff --git a/hbase-it/pom.xml b/hbase-it/pom.xml
index cec429b16fc..032b9b01840 100644
--- a/hbase-it/pom.xml
+++ b/hbase-it/pom.xml
@@ -203,11 +203,6 @@
</testResources>
<pluginManagement>
<plugins>
- <!-- Make a jar and put the sources in the jar -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
<plugin>
<!--Make it so assembly:single does nothing in here-->
<artifactId>maven-assembly-plugin</artifactId>
diff --git a/hbase-logging/pom.xml b/hbase-logging/pom.xml
index c10f1ee6499..fb3d34d9ae9 100644
--- a/hbase-logging/pom.xml
+++ b/hbase-logging/pom.xml
@@ -81,11 +81,6 @@
<skipAssembly>true</skipAssembly>
</configuration>
</plugin>
- <!-- Make a jar and put the sources in the jar -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
<plugin>
<groupId>net.revelc.code</groupId>
<artifactId>warbucks-maven-plugin</artifactId>
diff --git a/hbase-mapreduce/pom.xml b/hbase-mapreduce/pom.xml
index deed5f7de36..30c70502b65 100644
--- a/hbase-mapreduce/pom.xml
+++ b/hbase-mapreduce/pom.xml
@@ -302,11 +302,6 @@
</archive>
</configuration>
</plugin>
- <!-- Make a jar and put the sources in the jar -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
<plugin>
<groupId>net.revelc.code</groupId>
<artifactId>warbucks-maven-plugin</artifactId>
diff --git a/hbase-metrics-api/pom.xml b/hbase-metrics-api/pom.xml
index 4b6fd291d05..d4c90acb9a5 100644
--- a/hbase-metrics-api/pom.xml
+++ b/hbase-metrics-api/pom.xml
@@ -102,11 +102,6 @@
<build>
<plugins>
- <!-- Make a jar and put the sources in the jar -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
<plugin>
<!--Make it so assembly:single does nothing in here-->
<artifactId>maven-assembly-plugin</artifactId>
diff --git a/hbase-metrics/pom.xml b/hbase-metrics/pom.xml
index fdf08c89dd7..7c58124367c 100644
--- a/hbase-metrics/pom.xml
+++ b/hbase-metrics/pom.xml
@@ -116,11 +116,6 @@
<build>
<plugins>
- <!-- Make a jar and put the sources in the jar -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
<plugin>
<!--Make it so assembly:single does nothing in here-->
<artifactId>maven-assembly-plugin</artifactId>
diff --git a/hbase-procedure/pom.xml b/hbase-procedure/pom.xml
index d6f3ae9fb2e..4670ada0971 100644
--- a/hbase-procedure/pom.xml
+++ b/hbase-procedure/pom.xml
@@ -115,11 +115,6 @@
<build>
<plugins>
- <!-- Make a jar and put the sources in the jar -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
<plugin>
<!--Make it so assembly:single does nothing in here-->
<artifactId>maven-assembly-plugin</artifactId>
diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml
index 7f4979fdfff..b36d7b837c5 100644
--- a/hbase-protocol-shaded/pom.xml
+++ b/hbase-protocol-shaded/pom.xml
@@ -57,11 +57,6 @@
</dependencies>
<build>
<plugins>
- <!-- Make a jar and put the sources in the jar -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
<plugin>
<!--Make it so assembly:single does nothing in here-->
<artifactId>maven-assembly-plugin</artifactId>
diff --git a/hbase-replication/pom.xml b/hbase-replication/pom.xml
index 4e5a3cf597c..7fec638c2ff 100644
--- a/hbase-replication/pom.xml
+++ b/hbase-replication/pom.xml
@@ -129,11 +129,6 @@
<skipAssembly>true</skipAssembly>
</configuration>
</plugin>
- <!-- Make a jar and put the sources in the jar -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
<plugin>
<groupId>net.revelc.code</groupId>
<artifactId>warbucks-maven-plugin</artifactId>
diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml
index 2a295d3cd5a..c380a3e3266 100644
--- a/hbase-rest/pom.xml
+++ b/hbase-rest/pom.xml
@@ -288,11 +288,6 @@
<skipAssembly>true</skipAssembly>
</configuration>
</plugin>
- <!-- Make a jar and put the sources in the jar -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
<!-- General ant tasks, bound to different build phases -->
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
diff --git a/hbase-shaded/pom.xml b/hbase-shaded/pom.xml
index 85943124f13..4a555147960 100644
--- a/hbase-shaded/pom.xml
+++ b/hbase-shaded/pom.xml
@@ -75,6 +75,13 @@
<skipAssembly>true</skipAssembly>
</configuration>
</plugin>
+ <plugin>
+ <!--Disable source plugin for shaded modules-->
+ <artifactId>maven-source-plugin</artifactId>
+ <configuration>
+ <skipSource>true</skipSource>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
diff --git a/hbase-shell/pom.xml b/hbase-shell/pom.xml
index 329b646ab90..4b3621949f1 100644
--- a/hbase-shell/pom.xml
+++ b/hbase-shell/pom.xml
@@ -145,11 +145,6 @@
</archive>
</configuration>
</plugin>
- <!-- Make a jar and put the sources in the jar -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
<!-- General plugins -->
<plugin>
<groupId>net.revelc.code</groupId>
diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml
index bfac0e2443c..b0919ed6998 100644
--- a/hbase-thrift/pom.xml
+++ b/hbase-thrift/pom.xml
@@ -247,11 +247,6 @@
</execution>
</executions>
</plugin>
- <!-- Make a jar and put the sources in the jar -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-source-plugin</artifactId>
- </plugin>
<plugin>
<groupId>net.revelc.code</groupId>
<artifactId>warbucks-maven-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index d2d5b69d170..3464eb5a811 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2154,6 +2154,11 @@
</execution>
</executions>
</plugin>
+ <!-- Make a jar and put the sources in the jar -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-source-plugin</artifactId>
+ </plugin>
<!-- parent-module only plugins -->
<!-- Special configuration for spotbugs just in the parent so
the filter file location can be more general (see definition in
pluginManagement) -->
