From 6ca7230b49c1147da25728a3aa8a5cb656e9550b Mon Sep 17 00:00:00 2001
From: Sammi Chen <sammichen@apache.org>
Date: Sat, 23 Nov 2024 05:35:42 +0800
Subject: [PATCH] HDDS-11769. Add tools folder into ozone src package. (#7466)

---
 .../dist/src/main/assemblies/ozone-src.xml    | 42 ++++++++++---------
 .../main/license/src/licenses/IMPORTANT.md    |  6 +--
 2 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/hadoop-ozone/dist/src/main/assemblies/ozone-src.xml b/hadoop-ozone/dist/src/main/assemblies/ozone-src.xml
index 3450b387393..517d03926fb 100644
--- a/hadoop-ozone/dist/src/main/assemblies/ozone-src.xml
+++ b/hadoop-ozone/dist/src/main/assemblies/ozone-src.xml
@@ -32,28 +32,30 @@
       <source>NOTICE.txt</source>
       <outputDirectory>/</outputDirectory>
     </file>
-    <file>
-      <source>hadoop-ozone/dist/src/main/license/src/licenses/LICENSE-angular-nvd3.txt</source>
-      <outputDirectory>/licenses</outputDirectory>
-    </file>
-    <file>
-      <source>hadoop-ozone/dist/src/main/license/src/licenses/LICENSE-angular.txt</source>
-      <outputDirectory>/licenses</outputDirectory>
-    </file>
-    <file>
-      <source>hadoop-ozone/dist/src/main/license/src/licenses/LICENSE-d3.txt</source>
-      <outputDirectory>/licenses</outputDirectory>
-    </file>
-    <file>
-      <source>hadoop-ozone/dist/src/main/license/src/licenses/LICENSE-nvd3.txt</source>
-      <outputDirectory>/licenses</outputDirectory>
-    </file>
-    <file>
-      <source>hadoop-ozone/dist/src/main/license/src/licenses/LICENSE-jquery.txt</source>
-      <outputDirectory>/licenses</outputDirectory>
-    </file>
   </files>
   <fileSets>
+    <fileSet>
+      <directory>hadoop-ozone/dist/src/main/license/src/licenses</directory>
+      <outputDirectory>/licenses</outputDirectory>
+      <includes>
+        <include>LICENSE-*.txt</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>tools</directory>
+      <outputDirectory>/tools</outputDirectory>
+      <includes>
+        <include>**/*</include>
+      </includes>
+      <useDefaultExcludes>true</useDefaultExcludes>
+      <excludes>
+        <exclude>**/.classpath</exclude>
+        <exclude>**/.project</exclude>
+        <exclude>**/.settings</exclude>
+        <exclude>**/*.iml</exclude>
+        <exclude>**/target/**</exclude>
+      </excludes>
+    </fileSet>
     <fileSet>
       <directory>.</directory>
       <includes>
diff --git a/hadoop-ozone/dist/src/main/license/src/licenses/IMPORTANT.md b/hadoop-ozone/dist/src/main/license/src/licenses/IMPORTANT.md
index 2581412d320..c473ed2fe16 100644
--- a/hadoop-ozone/dist/src/main/license/src/licenses/IMPORTANT.md
+++ b/hadoop-ozone/dist/src/main/license/src/licenses/IMPORTANT.md
@@ -14,8 +14,8 @@
 
 # Important
 
-The files from this directory are not copied by automatically to the source distribution package.
+The files from this directory are copied automatically to the source distribution package
+via the `hadoop-ozone/dist/src/main/assemblies/ozone-src.xml` file.
 
 If you add any of the files to here,
- * please also adjust `hadoop-ozone/dist/src/main/assemblies/ozone-src.xml` file.
- * and copy the dependency to ../../bin/licenses (if it's included in the bin tar)
\ No newline at end of file
+ * copy the dependency to ../../bin/licenses (if it's included in the bin tar)
\ No newline at end of file