This is an automated email from the ASF dual-hosted git repository.
zhangduo 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 7f2ae00324a HBASE-28314 Enable maven-source-plugin for all modules
(#5753)
7f2ae00324a is described below
commit 7f2ae00324ab09bbbd91d511faf5799777284bec
Author: Istvan Toth <st...@apache.org>
AuthorDate: Fri Mar 22 04:58:22 2024 +0100
HBASE-28314 Enable maven-source-plugin for all modules (#5753)
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 e8308d5a361..83df649bf2b 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-checkstyle/pom.xml b/hbase-checkstyle/pom.xml
index 7a5ee669e9e..b32925ee07b 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 bf837a7a026..35692b10598 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 14c5a5e7261..bdcbc58789a 100644
--- a/hbase-endpoint/pom.xml
+++ b/hbase-endpoint/pom.xml
@@ -223,11 +223,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 30e00a8c8f5..b6e85f09a9b 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-external-blockcache/pom.xml
b/hbase-external-blockcache/pom.xml
index aa2d77d06f4..c6fd0fd578a 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 de2750ddfeb..784be78330b 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 77596277026..cf1232f7112 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 ccd3802ce75..694cfd730df 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 3043914121c..1b71f6c5daf 100644
--- a/hbase-mapreduce/pom.xml
+++ b/hbase-mapreduce/pom.xml
@@ -264,11 +264,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 0d2ac1bf2c1..8e1af5034da 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 7c7df75d9a3..970369e875b 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 f99782576c4..72057f11555 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 ff349def392..b607d051dc8 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 da0b6cedf0b..0a82393327b 100644
--- a/hbase-replication/pom.xml
+++ b/hbase-replication/pom.xml
@@ -139,11 +139,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 0fe6c145d57..d276048dd61 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 0f1bd5c8147..0bdf4a1223e 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 656ab249026..85e735660de 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 a8a71bf8b09..0052b351083 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 c2eeee35730..2b7781ebee1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2343,6 +2343,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) -->
