This is an automated email from the ASF dual-hosted git repository.
siyao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git
The following commit(s) were added to refs/heads/master by this push:
new 6ca7230b49 HDDS-11769. Add tools folder into ozone src package. (#7466)
6ca7230b49 is described below
commit 6ca7230b49c1147da25728a3aa8a5cb656e9550b
Author: Sammi Chen <[email protected]>
AuthorDate: Sat Nov 23 05:35:42 2024 +0800
HDDS-11769. Add tools folder into ozone src package. (#7466)
---
.../dist/src/main/assemblies/ozone-src.xml | 42 +++++++++++-----------
.../src/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 3450b38739..517d03926f 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 2581412d32..c473ed2fe1 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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
