You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@openwhisk.apache.org by GitBox <gi...@apache.org> on 2021/05/31 05:55:26 UTC

[GitHub] [openwhisk-release] style95 opened a new pull request #391: Add copyright

style95 opened a new pull request #391:
URL: https://github.com/apache/openwhisk-release/pull/391


   This it to make the copyright year configurable.
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [openwhisk-release] dgrove-oss commented on pull request #391: Add copyright

Posted by GitBox <gi...@apache.org>.
dgrove-oss commented on pull request #391:
URL: https://github.com/apache/openwhisk-release/pull/391#issuecomment-851627645


   What we really should be scanning for is a copyright of the form:
   ```
   Copyright 20NN-2021 The Apache Software Foundation
   ```
   Where NN are any number that is <= the end year (21).
   
   It's important that we check for the end year being the same as the current year; we don't want to make that configurable
   
   
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [openwhisk-release] style95 merged pull request #391: Add copyright

Posted by GitBox <gi...@apache.org>.
style95 merged pull request #391:
URL: https://github.com/apache/openwhisk-release/pull/391


   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [openwhisk-release] style95 merged pull request #391: Add copyright

Posted by GitBox <gi...@apache.org>.
style95 merged pull request #391:
URL: https://github.com/apache/openwhisk-release/pull/391


   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [openwhisk-release] rabbah commented on a change in pull request #391: Add copyright

Posted by GitBox <gi...@apache.org>.
rabbah commented on a change in pull request #391:
URL: https://github.com/apache/openwhisk-release/pull/391#discussion_r645112965



##########
File path: tools/rcverify.sh
##########
@@ -67,14 +64,11 @@ TGZ=$NAME-$V-sources.tar.gz
 # this is a constructed name for the keys file
 KEYS=$RC-$V-KEYS
 
-NOTICE=$(cat << END
-Apache $DESCRIPTION
-Copyright 2016-2021 The Apache Software Foundation
+NOTICE_REGEX='^Apache .+

Review comment:
       This is a positive change - thanks for improving the checks.
   Removing the component description from the check could lead to an error where someone copies the notice file from one repo and forgets to update the name. Will have to be diligent about this.
   
   It's nice to have one fewer argument to rcverify.




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [openwhisk-release] style95 commented on a change in pull request #391: Add copyright

Posted by GitBox <gi...@apache.org>.
style95 commented on a change in pull request #391:
URL: https://github.com/apache/openwhisk-release/pull/391#discussion_r642227684



##########
File path: tools/gen-release-vote.py
##########
@@ -94,7 +96,7 @@ def gitHashes(components):
     return '\n'.join(list(s))
 
 def rcverify(components, version):
-    s = map(lambda r: "./rcverify.sh %s '%s' %s %s" % (r.id, r.name, version.v, version.rc), components)
+    s = map(lambda r: "./rcverify.sh %s '%s' %s %s %s" % (r.id, r.name, version.v, version.rc, r.copyright), components)

Review comment:
       It generates the usage like this:
   
   ```
   Usage:
   curl -s "https://gitbox.apache.org/repos/asf?p=openwhisk-release.git;a=blob_plain;f=tools/rcverify.sh;hb=12cc460" -o rcverify.sh
   chmod +x rcverify.sh
   ./rcverify.sh openwhisk-vscode-extension 'OpenWhisk VSCode Extension' 1.1.0 rc1 2020-2021
   ```

##########
File path: tools/local_verify.sh
##########
@@ -28,5 +28,12 @@ do
     repo_name=$(echo "$repo" | sed -e 's/^"//' -e 's/"$//')
     NAME_KEY=${repo_name//-/_}.name
     NAME=$(json_by_key "$CONFIG" $NAME_KEY)
-    LOCAL_DIR="$OPENWHISK_ARTIFACT_DIR" DL=0 "$SCRIPTDIR"/rcverify.sh $repo_name "$NAME" $version $pre_release_version
+    COPYRIGHT_KEY=${repo_name//-/_}.copyright
+    COPYRIGHT=$(json_by_key "$CONFIG" $COPYRIGHT_KEY)
+    if [ ! -n "$COPYRIGHT" ]
+    then
+        echo "no copyright year provided, fallback to the default: 2016-2020"
+        COPYRIGHT="2016-2020"

Review comment:
       If no copyright year is provided it will be used.
   

##########
File path: tools/rcverify.sh
##########
@@ -69,7 +72,7 @@ KEYS=$RC-$V-KEYS
 
 NOTICE=$(cat << END
 Apache $DESCRIPTION
-Copyright 2016-2021 The Apache Software Foundation
+Copyright $COPYRIGHT The Apache Software Foundation

Review comment:
       This needs to be configurable as IDE plugins use `2020-2021` in the NOTICE.txt.
   https://github.com/apache/openwhisk-intellij-plugin/blob/master/NOTICE.txt#L2
   https://github.com/apache/openwhisk-vscode-extension/blob/master/NOTICE.txt#L2




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [openwhisk-release] style95 commented on pull request #391: Add copyright

Posted by GitBox <gi...@apache.org>.
style95 commented on pull request #391:
URL: https://github.com/apache/openwhisk-release/pull/391#issuecomment-851785706


   @dgrove-oss Now only the starting year is configurable.
   


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [openwhisk-release] style95 commented on a change in pull request #391: Add copyright

Posted by GitBox <gi...@apache.org>.
style95 commented on a change in pull request #391:
URL: https://github.com/apache/openwhisk-release/pull/391#discussion_r643719816



##########
File path: tools/rcverify.sh
##########
@@ -183,6 +177,21 @@ function analyzeKeyImport() {
     fi
 }
 
+function validateNotice() {

Review comment:
       I have tested all `NOTICE.txt` files in all repos, and confirmed it works as expected.
   But it would be great if anyone cross-checks again.
   
   Some of them require changes so I opened a couple of corresponding PRs.
   
   




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [openwhisk-release] rabbah commented on a change in pull request #391: Add copyright

Posted by GitBox <gi...@apache.org>.
rabbah commented on a change in pull request #391:
URL: https://github.com/apache/openwhisk-release/pull/391#discussion_r645112965



##########
File path: tools/rcverify.sh
##########
@@ -67,14 +64,11 @@ TGZ=$NAME-$V-sources.tar.gz
 # this is a constructed name for the keys file
 KEYS=$RC-$V-KEYS
 
-NOTICE=$(cat << END
-Apache $DESCRIPTION
-Copyright 2016-2021 The Apache Software Foundation
+NOTICE_REGEX='^Apache .+

Review comment:
       This is a positive change - thanks for improving the checks.
   Removing the component description from the check could lead to an error where someone copies the notice file from one repo and forgets to update the name. Will have to be diligent about this.
   
   It's nice to have one fewer argument to rcverify.




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org



[GitHub] [openwhisk-release] dgrove-oss commented on a change in pull request #391: Add copyright

Posted by GitBox <gi...@apache.org>.
dgrove-oss commented on a change in pull request #391:
URL: https://github.com/apache/openwhisk-release/pull/391#discussion_r643942605



##########
File path: tools/rcverify.sh
##########
@@ -183,6 +177,21 @@ function analyzeKeyImport() {
     fi
 }
 
+function validateNotice() {

Review comment:
       Nice!  Thank you @style95 




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

For queries about this service, please contact Infrastructure at:
users@infra.apache.org