You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ki...@apache.org on 2021/02/09 05:42:08 UTC

[incubator-dolphinscheduler] branch dev updated: chore: fix license checker to allow nested directories (#4748)

This is an automated email from the ASF dual-hosted git repository.

kirs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new 725e386  chore: fix license checker to allow nested directories (#4748)
725e386 is described below

commit 725e386af45223e1ddbd367851c47409346599c7
Author: Zhenxu Ke <ke...@apache.org>
AuthorDate: Tue Feb 9 13:41:51 2021 +0800

    chore: fix license checker to allow nested directories (#4748)
    
    * chore: fix license checker to allow nested directories
    
    * chore: fix license checker to allow nested directories
---
 tools/dependencies/check-LICENSE.sh | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/tools/dependencies/check-LICENSE.sh b/tools/dependencies/check-LICENSE.sh
index 0072554..00048e9 100755
--- a/tools/dependencies/check-LICENSE.sh
+++ b/tools/dependencies/check-LICENSE.sh
@@ -25,12 +25,10 @@ tar -zxf dolphinscheduler-dist/target/apache-dolphinscheduler*-bin.tar.gz --stri
 # licenses
 echo '=== Self modules: ' && ./mvnw --batch-mode --quiet -Dexec.executable='echo' -Dexec.args='${project.artifactId}-${project.version}.jar' exec:exec | tee self-modules.txt
 
-echo '=== Distributed dependencies: ' && find dist/lib -name "*.jar" | tee all-dependencies.txt
-# The prefix "dist/lib/" (9 chars) should be stripped to be ready to compare
-sed -i 's/.\{9\}//' all-dependencies.txt
+echo '=== Distributed dependencies: ' && find dist/lib -name "*.jar" -exec basename {} \; | uniq | sort | tee all-dependencies.txt
 
 # Exclude all self modules(jars) to generate all third-party dependencies
-echo '=== Third party dependencies: ' && grep -vf self-modules.txt all-dependencies.txt | tee third-party-dependencies.txt
+echo '=== Third party dependencies: ' && grep -vf self-modules.txt all-dependencies.txt | uniq | sort | tee third-party-dependencies.txt
 
 # 1. Compare the third-party dependencies with known dependencies, expect that all third-party dependencies are KNOWN
 # and the exit code of the command is 0, otherwise we should add its license to LICENSE file and add the dependency to