This is an automated email from the ASF dual-hosted git repository.
zhangduo 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 42ddb17e106 HBASE-28314 Enable maven-source-plugin for all modules
(#5748)
42ddb17e106 is described below
commit 42ddb17e1063da40bfb9ebb0902b6987856f6033
Author: Istvan Toth <st...@apache.org>
AuthorDate: Fri Mar 22 04:56:40 2024 +0100
HBASE-28314 Enable maven-source-plugin for all modules (#5748)
Signed-off-by: Duo Zhang <zhang...@apache.org>
---
hbase-asyncfs/pom.xml | 5 -----
hbase-backup/pom.xml | 5 -----
hbase-balancer/pom.xml | 5 -----
hbase-checkstyle/pom.xml | 8 +++++++-
hbase-client/pom.xml | 5 -----
hbase-endpoint/pom.xml | 5 -----
hbase-examples/pom.xml | 5 -----
hbase-extensions/hbase-openssl/pom.xml | 11 +++++++++++
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 +++++
24 files changed, 30 insertions(+), 105 deletions(-)
diff --git a/hbase-asyncfs/pom.xml b/hbase-asyncfs/pom.xml
index 08d619e46cb..d0df0ba9e65 100644
--- a/hbase-asyncfs/pom.xml
+++ b/hbase-asyncfs/pom.xml
@@ -132,11 +132,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-backup/pom.xml b/hbase-backup/pom.xml
index 77d033d67fe..24c4ca4390f 100644
--- a/hbase-backup/pom.xml
+++ b/hbase-backup/pom.xml
@@ -173,11 +173,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-balancer/pom.xml b/hbase-balancer/pom.xml
index 4009fa1b375..5946e4add7d 100644
--- a/hbase-balancer/pom.xml
+++ b/hbase-balancer/pom.xml
@@ -118,11 +118,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-checkstyle/pom.xml b/hbase-checkstyle/pom.xml
index 23ee2272557..14f5b30cb36 100644
--- a/hbase-checkstyle/pom.xml
+++ b/hbase-checkstyle/pom.xml
@@ -35,7 +35,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 d4ee67f0511..dba79ff07ee 100644
--- a/hbase-client/pom.xml
+++ b/hbase-client/pom.xml
@@ -197,11 +197,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 ed17e8e48f1..4b3e54418b5 100644
--- a/hbase-endpoint/pom.xml
+++ b/hbase-endpoint/pom.xml
@@ -203,11 +203,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 731d9ae1df6..696e4b1b566 100644
--- a/hbase-examples/pom.xml
+++ b/hbase-examples/pom.xml
@@ -209,11 +209,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-extensions/hbase-openssl/pom.xml
b/hbase-extensions/hbase-openssl/pom.xml
index 7158c2f4197..bbe161921cc 100644
--- a/hbase-extensions/hbase-openssl/pom.xml
+++ b/hbase-extensions/hbase-openssl/pom.xml
@@ -40,4 +40,15 @@
</dependency>
</dependencies>
+ <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>
+ </plugins>
+ </build>
</project>
diff --git a/hbase-external-blockcache/pom.xml
b/hbase-external-blockcache/pom.xml
index 2a1e62a185a..2661b3a02c2 100644
--- a/hbase-external-blockcache/pom.xml
+++ b/hbase-external-blockcache/pom.xml
@@ -149,11 +149,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 9bb7eee26a8..c901ed04e4b 100644
--- a/hbase-hadoop-compat/pom.xml
+++ b/hbase-hadoop-compat/pom.xml
@@ -117,11 +117,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>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/hbase-hbtop/pom.xml b/hbase-hbtop/pom.xml
index 90150da15a1..370b17074f7 100644
--- a/hbase-hbtop/pom.xml
+++ b/hbase-hbtop/pom.xml
@@ -96,13 +96,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 96033b15129..d4228b51772 100644
--- a/hbase-it/pom.xml
+++ b/hbase-it/pom.xml
@@ -213,11 +213,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 c819e6e4440..dd79fb394c9 100644
--- a/hbase-logging/pom.xml
+++ b/hbase-logging/pom.xml
@@ -96,11 +96,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 798250600e3..86ab6d38bf4 100644
--- a/hbase-mapreduce/pom.xml
+++ b/hbase-mapreduce/pom.xml
@@ -246,11 +246,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 8e31b1f1611..9c8d9dc79b4 100644
--- a/hbase-metrics-api/pom.xml
+++ b/hbase-metrics-api/pom.xml
@@ -107,11 +107,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 d360b07ab88..5fe3d26147f 100644
--- a/hbase-metrics/pom.xml
+++ b/hbase-metrics/pom.xml
@@ -121,11 +121,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 905b384e26e..67c15fed366 100644
--- a/hbase-procedure/pom.xml
+++ b/hbase-procedure/pom.xml
@@ -120,11 +120,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 39ecccc0015..1cbda8b543f 100644
--- a/hbase-protocol-shaded/pom.xml
+++ b/hbase-protocol-shaded/pom.xml
@@ -53,11 +53,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 2fc4e304ee8..a4b6c38bc4b 100644
--- a/hbase-replication/pom.xml
+++ b/hbase-replication/pom.xml
@@ -160,11 +160,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>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml
index 0368e713bdc..8dc893e16ca 100644
--- a/hbase-rest/pom.xml
+++ b/hbase-rest/pom.xml
@@ -292,11 +292,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 d87a8c381c5..9dae4218cca 100644
--- a/hbase-shaded/pom.xml
+++ b/hbase-shaded/pom.xml
@@ -80,6 +80,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 7e6278c37a4..06caf29cbe5 100644
--- a/hbase-shell/pom.xml
+++ b/hbase-shell/pom.xml
@@ -150,11 +150,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 720eecb3b4c..df17ebcfb3a 100644
--- a/hbase-thrift/pom.xml
+++ b/hbase-thrift/pom.xml
@@ -248,11 +248,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/pom.xml b/pom.xml
index ad7e6dbaada..dbb1a608cb8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2614,6 +2614,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) -->
