Skip to content

HDDS-11769. Add tools folder into ozone src package. #7466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
smengcl merged 2 commits into from
Nov 22, 2024
Merged

HDDS-11769. Add tools folder into ozone src package. #7466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ac5a17
HDDS-11769. Add tools folder into ozone src package.
ChenSammi Nov 21, 2024
5ab24f2
address comments
ChenSammi Nov 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 22 additions & 20 deletions hadoop-ozone/dist/src/main/assemblies/ozone-src.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
6 changes: 3 additions & 3 deletions hadoop-ozone/dist/src/main/license/src/licenses/IMPORTANT.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
* copy the dependency to ../../bin/licenses (if it's included in the bin tar)
Loading