This is an automated email from the ASF dual-hosted git repository. nihaljain pushed a commit to branch revert-6368-HBASE-28921 in repository https://gitbox.apache.org/repos/asf/hbase.git
commit ece0fdb0834b72bd2795d1038c63bf51d2e8bddc Author: Nihal Jain <[email protected]> AuthorDate: Tue Oct 22 03:26:18 2024 +0530 Revert "HBASE-28921 Skip bundling hbase-webapps folder in jars (#6368)" This reverts commit 836630422df2776287a860eff9d7104c3eca0582. --- hbase-rest/pom.xml | 9 --------- hbase-server/pom.xml | 1 - hbase-thrift/pom.xml | 9 --------- 3 files changed, 19 deletions(-) diff --git a/hbase-rest/pom.xml b/hbase-rest/pom.xml index 734f8db0b5b..cf629b62991 100644 --- a/hbase-rest/pom.xml +++ b/hbase-rest/pom.xml @@ -289,15 +289,6 @@ <skipAssembly>true</skipAssembly> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/hbase-webapps/**</exclude> - </excludes> - </configuration> - </plugin> <!-- Make a jar and put the sources in the jar --> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/hbase-server/pom.xml b/hbase-server/pom.xml index cb47a8ea7df..92b696d2fec 100644 --- a/hbase-server/pom.xml +++ b/hbase-server/pom.xml @@ -453,7 +453,6 @@ <exclude>log4j.properties</exclude> <exclude>mapred-queues.xml</exclude> <exclude>mapred-site.xml</exclude> - <exclude>**/hbase-webapps/**</exclude> </excludes> </configuration> </plugin> diff --git a/hbase-thrift/pom.xml b/hbase-thrift/pom.xml index fd21b18db5c..b75b288c878 100644 --- a/hbase-thrift/pom.xml +++ b/hbase-thrift/pom.xml @@ -194,15 +194,6 @@ <skipAssembly>true</skipAssembly> </configuration> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <excludes> - <exclude>**/hbase-webapps/**</exclude> - </excludes> - </configuration> - </plugin> <!-- General ant tasks, bound to different build phases --> <plugin> <artifactId>maven-antrun-plugin</artifactId>
