This is an automated email from the ASF dual-hosted git repository.
zhangduo pushed a commit to branch branch-2.6
in repository https://gitbox.apache.org/repos/asf/hbase.git
The following commit(s) were added to refs/heads/branch-2.6 by this push:
new 63cb08b776f HBASE-28314 Enable maven-source-plugin for all modules
(#5752)
63cb08b776f is described below
commit 63cb08b776fa7bf91059db64e9575d82ca938bc1
Author: Istvan Toth <st...@apache.org>
AuthorDate: Fri Mar 22 04:57:26 2024 +0100
HBASE-28314 Enable maven-source-plugin for all modules (#5752)
Signed-off-by: Duo Zhang <zhang...@apache.org>
---
hbase-asyncfs/pom.xml | 5 -----
hbase-backup/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 +++++
23 files changed, 30 insertions(+), 100 deletions(-)
diff --git a/hbase-asyncfs/pom.xml b/hbase-asyncfs/pom.xml
index a57f77e7029..23841641c29 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 07f45aeaf2b..0c581d47447 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-checkstyle/pom.xml b/hbase-checkstyle/pom.xml
index 177430b46f7..bd8d5f7e80b 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 9b7dff9225e..8f476fd4815 100644
--- a/hbase-client/pom.xml
+++ b/hbase-client/pom.xml
@@ -209,11 +209,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 d51aa90a1f0..fccac50eea8 100644
--- a/hbase-endpoint/pom.xml
+++ b/hbase-endpoint/pom.xml
@@ -219,11 +219,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 9018dc776a7..aa84fdf3ceb 100644
--- a/hbase-examples/pom.xml
+++ b/hbase-examples/pom.xml
@@ -203,11 +203,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 746111aa99e..f04c7e2bed4 100644
--- a/hbase-external-blockcache/pom.xml
+++ b/hbase-external-blockcache/pom.xml
@@ -148,11 +148,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 a6e11c8102b..059ad7b1c1f 100644
--- a/hbase-hadoop-compat/pom.xml
+++ b/hbase-hadoop-compat/pom.xml
@@ -110,11 +110,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 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 78ceb6f509f..aba4efc7b81 100644
--- a/hbase-it/pom.xml
+++ b/hbase-it/pom.xml
@@ -223,11 +223,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 6e7cb16e672..40b6cae60da 100644
--- a/hbase-mapreduce/pom.xml
+++ b/hbase-mapreduce/pom.xml
@@ -270,11 +270,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 e06078959b3..caa037c2151 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 217e09b846a..a1cb280df76 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 6e8a7b5a495..ecb71eb4fd0 100644
--- a/hbase-replication/pom.xml
+++ b/hbase-replication/pom.xml
@@ -150,11 +150,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 44612ebe55f..c139f2c7443 100644
--- a/hbase-rest/pom.xml
+++ b/hbase-rest/pom.xml
@@ -293,11 +293,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 fdc50a03966..5d2202723a5 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 e9d501f3af2..30e51776df1 100644
--- a/hbase-shell/pom.xml
+++ b/hbase-shell/pom.xml
@@ -155,11 +155,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 43aa2cc1191..ea005e4cd30 100644
--- a/hbase-thrift/pom.xml
+++ b/hbase-thrift/pom.xml
@@ -257,11 +257,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 60bb40861ef..2840fe8f54a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2377,6 +2377,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) -->
