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 2018/05/10 19:19:16 UTC
[GitHub] houshengbo closed pull request #34: Align both versions of release
configuration and remove Hash license with typo.
houshengbo closed pull request #34: Align both versions of release configuration and remove Hash license with typo.
URL: https://github.com/apache/incubator-openwhisk-utilities/pull/34
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/scancode/ASF-Release-v2.cfg b/scancode/ASF-Release-v2.cfg
index adce8d9..be5f995 100644
--- a/scancode/ASF-Release-v2.cfg
+++ b/scancode/ASF-Release-v2.cfg
@@ -7,7 +7,6 @@
ASFLicenseHeader.txt
ASFLicenseHeaderBash.txt
ASFLicenseHeaderHash.txt
-ASFLicenseHeaderHash2.txt
ASFLicenseHeaderLua.txt
ASFMinifiedLicenseHashHeader.txt
ASFMinifiedLicenseHeader.txt
@@ -17,11 +16,12 @@ ASFMinifiedLicenseHeader.txt
# function names found in scanCode.py.
[Includes]
*=is_not_symlink
+*.conf=has_block_license, no_trailing_spaces, eol_at_eof
*.go=has_block_license, no_trailing_spaces, eol_at_eof
*.gradle=no_tabs, no_trailing_spaces, eol_at_eof
-*.java=has_block_license, no_tabs, no_trailing_spaces, eol_at_eof
+*.java=no_tabs, has_block_license, no_trailing_spaces, eol_at_eof
*.js=no_tabs, no_trailing_spaces, eol_at_eof
-*.lua=has_block_license
+*.lua=has_block_license, no_trailing_spaces, eol_at_eof
*.md=no_tabs, has_block_license, no_trailing_spaces, eol_at_eof
*.py=no_tabs, no_trailing_spaces, eol_at_eof
*.scala=has_block_license, no_tabs, no_trailing_spaces, eol_at_eof
diff --git a/scancode/ASF-Release.cfg b/scancode/ASF-Release.cfg
index c33d549..be5f995 100644
--- a/scancode/ASF-Release.cfg
+++ b/scancode/ASF-Release.cfg
@@ -7,7 +7,6 @@
ASFLicenseHeader.txt
ASFLicenseHeaderBash.txt
ASFLicenseHeaderHash.txt
-#ASFLicenseHeaderHash2.txt
ASFLicenseHeaderLua.txt
ASFMinifiedLicenseHashHeader.txt
ASFMinifiedLicenseHeader.txt
@@ -20,10 +19,10 @@ ASFMinifiedLicenseHeader.txt
*.conf=has_block_license, no_trailing_spaces, eol_at_eof
*.go=has_block_license, no_trailing_spaces, eol_at_eof
*.gradle=no_tabs, no_trailing_spaces, eol_at_eof
-*.java=has_block_license, no_tabs, no_trailing_spaces, eol_at_eof
+*.java=no_tabs, has_block_license, no_trailing_spaces, eol_at_eof
*.js=no_tabs, no_trailing_spaces, eol_at_eof
*.lua=has_block_license, no_trailing_spaces, eol_at_eof
-*.md=has_block_license, no_trailing_spaces, eol_at_eof, no_tabs
+*.md=no_tabs, has_block_license, no_trailing_spaces, eol_at_eof
*.py=no_tabs, no_trailing_spaces, eol_at_eof
*.scala=has_block_license, no_tabs, no_trailing_spaces, eol_at_eof
*.sh=has_block_license, no_trailing_spaces, eol_at_eof
diff --git a/scancode/ASFLicenseHeaderHash2.txt b/scancode/ASFLicenseHeaderHash2.txt
deleted file mode 100644
index fb92375..0000000
--- a/scancode/ASFLicenseHeaderHash2.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# 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.
-#
\ No newline at end of file
diff --git a/scancode/scanCode.cfg b/scancode/scanCode.cfg
index f854ef2..4ccff7e 100644
--- a/scancode/scanCode.cfg
+++ b/scancode/scanCode.cfg
@@ -8,7 +8,6 @@ ApacheIBMLicenseHeader.txt
ASFLicenseHeader.txt
ASFLicenseHeaderBash.txt
ASFLicenseHeaderHash.txt
-ASFLicenseHeaderHash2.txt
ASFLicenseHeaderLua.txt
ASFMinifiedLicenseHashHeader.txt
ASFMinifiedLicenseHeader.txt
diff --git a/scancode/travis.cfg b/scancode/travis.cfg
index 3fe4fbd..75fda88 100644
--- a/scancode/travis.cfg
+++ b/scancode/travis.cfg
@@ -7,7 +7,6 @@
ASFLicenseHeader.txt
ASFLicenseHeaderBash.txt
ASFLicenseHeaderHash.txt
-ASFLicenseHeaderHash2.txt
ASFLicenseHeaderLua.txt
ASFMinifiedLicenseHashHeader.txt
ASFMinifiedLicenseHeader.txt
----------------------------------------------------------------
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:
users@infra.apache.org
With regards,
Apache Git Services