From e1ecbcf26a739006eca6f464d9713dbf6bac6f8f Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Thu, 29 Apr 2021 14:02:02 +0200 Subject: [PATCH 1/2] HDDS-5144. Allow SHA in SNAPSHOT version --- hadoop-ozone/dist/src/main/license/jar-report.txt | 2 +- hadoop-ozone/dist/src/main/license/update-jar-report.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hadoop-ozone/dist/src/main/license/jar-report.txt b/hadoop-ozone/dist/src/main/license/jar-report.txt index ca068a353607..cad4e63939ac 100644 --- a/hadoop-ozone/dist/src/main/license/jar-report.txt +++ b/hadoop-ozone/dist/src/main/license/jar-report.txt @@ -211,7 +211,7 @@ share/ozone/lib/ratis-netty.jar share/ozone/lib/ratis-proto.jar share/ozone/lib/ratis-server-api.jar share/ozone/lib/ratis-server.jar -share/ozone/lib/ratis-thirdparty-misc-a398b19-SNAPSHOT.jar +share/ozone/lib/ratis-thirdparty-misc.jar share/ozone/lib/ratis-tools.jar share/ozone/lib/re2j.jar share/ozone/lib/rocksdbjni.jar diff --git a/hadoop-ozone/dist/src/main/license/update-jar-report.sh b/hadoop-ozone/dist/src/main/license/update-jar-report.sh index 2368ffbcc028..1cae16f01555 100755 --- a/hadoop-ozone/dist/src/main/license/update-jar-report.sh +++ b/hadoop-ozone/dist/src/main/license/update-jar-report.sh @@ -30,4 +30,4 @@ cd "$OZONE_DIST_DIR" #sed expression removes the version. Usually license is not changed with version bumps #jacoco and test dependencies are excluded -find . -type f -name "*.jar" | cut -c3- | perl -wpl -e 's/-[0-9]+(.[0-9]+)*(-SNAPSHOT)?+//g' | grep -v jacoco | grep -v hadoop-hdds-test-utils | sort > "$SCRIPTDIR"/$REPORT_NAME +find . -type f -name "*.jar" | cut -c3- | perl -wpl -e 's/-[0-9]+(.[0-9]+)*(-([0-9a-f]+-)?SNAPSHOT)?+//g' | grep -v jacoco | grep -v hadoop-hdds-test-utils | sort > "$SCRIPTDIR"/$REPORT_NAME From d00041d33d34323f8d61d0b04fc43a42c9bdd7af Mon Sep 17 00:00:00 2001 From: "Doroszlai, Attila" Date: Thu, 29 Apr 2021 15:49:23 +0200 Subject: [PATCH 2/2] trigger new CI check