Skip to content

Conversation

@guohao-rosicky
Copy link
Contributor

What changes were proposed in this pull request?

Update ratis version to 2.3.0-94db58b-SNAPSHOT version

What is the link to the Apache JIRA

https://issues.apache.org/jira/browse/HDDS-6281

@guohao-rosicky
Copy link
Contributor Author

https://github.com/apache/ozone/runs/5119767427?check_suite_focus=true

dependency fail, src/main/license/update-jar-report.sh has Regular expression error.

Change perl -wpl -e 's/-[0-9]+(\[0-9]+)*(-([0-9a-z]+-)?SNAPSHOT)?+//g; s/\.v\d+\.jar/.jar/g;' to

perl -wpl -e 's/-[0-9]+(\.[0-9]+)*(-([0-9a-z]+-)?SNAPSHOT)?+//g; s/\.v\d+\.jar/.jar/g;'

@adoroszlai
Copy link
Contributor

https://github.com/apache/ozone/runs/5119767427?check_suite_focus=true

dependency fail, src/main/license/update-jar-report.sh has Regular expression error.

Change perl -wpl -e 's/-[0-9]+(\[0-9]+)*(-([0-9a-z]+-)?SNAPSHOT)?+//g; s/\.v\d+\.jar/.jar/g;' to

perl -wpl -e 's/-[0-9]+(\.[0-9]+)*(-([0-9a-z]+-)?SNAPSHOT)?+//g; s/\.v\d+\.jar/.jar/g;'

Thanks for finding this. In other words, the . needs to be escaped to make it a literal . instead of "any char". (I think the "from" expression is not correct above, it has a \ instead of ..)

diff --git hadoop-ozone/dist/src/main/license/update-jar-report.sh hadoop-ozone/dist/src/main/license/update-jar-report.sh
index dfd68a264..6cc6238f4 100755
--- hadoop-ozone/dist/src/main/license/update-jar-report.sh
+++ 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]+)*(-([0-9a-z]+-)?SNAPSHOT)?+//g; s/\.v\d+\.jar/.jar/g;' | grep -v -e jacoco -e hdds-test-utils | sort > "$SCRIPTDIR"/$REPORT_NAME
+find . -type f -name "*.jar" | cut -c3- | perl -wpl -e 's/-[0-9]+(\.[0-9]+)*(-([0-9a-z]+-)?SNAPSHOT)?+//g; s/\.v\d+\.jar/.jar/g;' | grep -v -e jacoco -e hdds-test-utils | sort > "$SCRIPTDIR"/$REPORT_NAME

@captainzmc
Copy link
Member

Thanks @guohao-rosicky for the fix. Failed CI I see passed on your personal branch.. Since HDDS-6138 relies on this, I will merge the PR first. Thanks @adoroszlai for the review.

@captainzmc captainzmc merged commit d147da2 into apache:HDDS-4454 Feb 10, 2022
@captainzmc captainzmc self-requested a review February 10, 2022 01:04
captainzmc pushed a commit to captainzmc/hadoop-ozone that referenced this pull request Jul 4, 2022
szetszwo pushed a commit that referenced this pull request Oct 25, 2022
)

(cherry picked from commit 84728e0)
(cherry picked from commit fdd7b641562377404c2bfe4080d2b56c789b261e)
szetszwo pushed a commit that referenced this pull request Nov 7, 2022
)

(cherry picked from commit 84728e0)
(cherry picked from commit fdd7b641562377404c2bfe4080d2b56c789b261e)
(cherry picked from commit b3ec548)
szetszwo pushed a commit that referenced this pull request Dec 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants