csantanapr closed pull request #40: add asf license headers URL: https://github.com/apache/incubator-openwhisk-runtime-go/pull/40
This is a PR merged from a forked repository. As GitHub hides the original diff on merge, it is displayed below for the sake of provenance: As this is a foreign pull request (from a fork), the diff is supplied below (as it won't show otherwise due to GitHub magic): diff --git a/.gitignore b/.gitignore index 5b0205c..16ffbc9 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,6 @@ tests/bin/ *.iml tests/out/ +# VSCode +.vscode + diff --git a/.travis.yml b/.travis.yml index 72184fc..a240ad2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,18 +1,5 @@ -# # Licensed to the Apache Software Foundation (ASF) under one or more contributor -# license agreements. See the NOTICE file distributed with this work for additional -# information regarding copyright ownership. The ASF licenses this file to you -# under the Apache License, Version 2.0 (the # "License"); you may not use this -# file except in compliance with the License. You may obtain a copy of the License -# at: -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software distributed -# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR -# CONDITIONS OF ANY KIND, either express or implied. See the License for the -# specific language governing permissions and limitations under the License. -# +# license agreements; and to You under the Apache License, Version 2.0. sudo: required language: go @@ -26,7 +13,7 @@ before_install: - "./tools/travis/setup.sh" install: true script: -- "./tools/travis/build.sh && ./tools/travis/test.sh" +- "./tools/travis/scan.sh && ./tools/travis/build.sh && ./tools/travis/test.sh" after_failure: cat .gogradle/reports/test/index.html deploy: - provider: script diff --git a/actionProxyLoop/build.gradle b/actionProxyLoop/build.gradle index b69ec48..b0586ce 100644 --- a/actionProxyLoop/build.gradle +++ b/actionProxyLoop/build.gradle @@ -1,2 +1,19 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + ext.dockerImageName = 'actionloop' apply from: '../gradle/docker.gradle' diff --git a/build.gradle b/build.gradle index 05d7c31..d3748e5 100644 --- a/build.gradle +++ b/build.gradle @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + buildscript { repositories { jcenter() diff --git a/golang1.10/build.gradle b/golang1.10/build.gradle index 3244c03..9db4e57 100644 --- a/golang1.10/build.gradle +++ b/golang1.10/build.gradle @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + ext.dockerImageName = 'actionloop-golang-v1.10' apply from: '../gradle/docker.gradle' diff --git a/gradle/docker.gradle b/gradle/docker.gradle index f716c7b..6ad6850 100644 --- a/gradle/docker.gradle +++ b/gradle/docker.gradle @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + import groovy.time.* /** diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f16d266..d7cc33f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,3 +1,6 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more contributor +# license agreements; and to You under the Apache License, Version 2.0. + distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index b7aff17..4a24586 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,20 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + include 'actionProxyLoop' include 'golang1.10' diff --git a/test/swift/hello/hello.swift b/test/swift/hello/hello.swift index 7120aa7..4a1dee1 100644 --- a/test/swift/hello/hello.swift +++ b/test/swift/hello/hello.swift @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - + func hello(args: [String:Any]) -> [String:Any] { if let name = args["name"] as? String { print(name) diff --git a/tools/scancode/ASF-Release.cfg b/tools/scancode/ASF-Release.cfg new file mode 100644 index 0000000..4263ea7 --- /dev/null +++ b/tools/scancode/ASF-Release.cfg @@ -0,0 +1,90 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more contributor +# license agreements; and to You under the Apache License, Version 2.0. + +# scanCode.py configuration file + +# List of filenames containing the text of valid license (headers) +# These files SHOULD be in the same directory path where scanCode.py +# resides. +[Licenses] +ASFLicenseHeader.txt +ASFLicenseHeaderBash.txt +ASFLicenseHeaderHash.txt +ASFLicenseHeaderLua.txt +ASFMinifiedLicenseHashHeader.txt +ASFMinifiedLicenseHeader.txt +ASFMinifiedLicenseHeaderREM.txt + +# Filters (path/filename) with wildcards and associated scan checks +# that are to be run against them. The checks are actual valid +# function names found in scanCode.py. +[Includes] +*=is_not_symlink, regex_check +*.conf=has_block_license, no_trailing_spaces, eol_at_eof, regex_check +*.go=has_block_license, no_trailing_spaces, eol_at_eof, regex_check +*.gradle=has_block_license, no_trailing_spaces, eol_at_eof, regex_check +*.groovy=has_block_license, no_trailing_spaces, eol_at_eof, regex_check +*.html=has_block_license, no_trailing_spaces, eol_at_eof, regex_check +*.java=no_tabs, has_block_license, no_trailing_spaces, eol_at_eof, regex_check +*.js=no_tabs, has_block_license, no_trailing_spaces, eol_at_eof, regex_check +*.lua=has_block_license, no_trailing_spaces, eol_at_eof, regex_check +*.md=no_tabs, has_block_license, no_trailing_spaces, eol_at_eof, regex_check +*.properties=no_tabs, has_block_license, no_trailing_spaces, eol_at_eof, regex_check +*.py=no_tabs, has_block_license, no_trailing_spaces, eol_at_eof, regex_check +*.scala=has_block_license, no_tabs, no_trailing_spaces, eol_at_eof, regex_check +*.sh=has_block_license, no_trailing_spaces, eol_at_eof, regex_check +*.swift=no_tabs, has_block_license, no_trailing_spaces, eol_at_eof, regex_check +*.yaml=has_block_license, no_trailing_spaces, eol_at_eof, regex_check +*.yml=has_block_license, no_trailing_spaces, eol_at_eof, regex_check + +# Sanity check files not required to have ASF headers because either they +# are excluded or are not packaged with the Apache source release. +*.cfg=regex_check +*.ini=regex_check +*.j2=regex_check +*.json=regex_check +*.txt=regex_check +*.xml=regex_check + +# List of paths (inclusive of subdirectories) to exclude from code scanning +[Excludes] + +# General tooling & binary file exclusions +.bin +.dockerignore +.git +.gitattributes +.github +.gitignore +.jshintrc +.profiling.* +.pydevproject +.rat-excludes +.gogradle +vendor +.gradle/ + +# Exclude performance test files (no significant content) +incubator-openwhisk/tests/performance/wrk_tests +incubator-openwhisk/tests/dat/actions +incubator-openwhisk/docs/images +incubator-openwhisk/bin + +# incubator-openwhisk-client-go, incubator-openwhisk-wskdeploy autogenerated Go files +# NOTE: we SHOULD make this more granular, there are many .go files that can have +# ASF license headers +incubator-openwhisk-wskdeploy/specification/images +wski18n + +# Exclude scancode tests that test for bad license headers +incubator-openwhisk-utilities/scancode/tests/exclude + +[Options] +# Not all code files allow licenses to appear starting at the first character +# of the file. This option tells the scan to allow licenses to appear starting +# within the first 'x' characters of each code file (as provided by this option's +# value). +LICENSE_SLACK_LENGTH=500 + +# List of regular expressions for forbidden strings, e.g. \[email protected] +[Regex] diff --git a/tools/travis/scan.sh b/tools/travis/scan.sh new file mode 100755 index 0000000..ac00de9 --- /dev/null +++ b/tools/travis/scan.sh @@ -0,0 +1,30 @@ +#!/bin/bash +# +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +set -ex + +# Build script for Travis-CI. + +SCRIPTDIR=$(cd $(dirname "$0") && pwd) +ROOTDIR="$SCRIPTDIR/../.." +UTILDIR="$ROOTDIR/../incubator-openwhisk-utilities" + +# run scancode using the ASF Release configuration +pushd $UTILDIR +scancode/scanCode.py --config $ROOTDIR/tools/scancode/ASF-Release.cfg $ROOTDIR +popd ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected] With regards, Apache Git Services
