This is an automated email from the ASF dual-hosted git repository.
houshengbo pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/incubator-openwhisk-utilities.git
The following commit(s) were added to refs/heads/master by this push:
new 856aab0 Align both versions of release configuration and remove Hash
license with typo. (#34)
856aab0 is described below
commit 856aab084ea6ebc3083bd4cec35ad8d8900ace7b
Author: Matt Rutkowski <[email protected]>
AuthorDate: Thu May 10 14:19:10 2018 -0500
Align both versions of release configuration and remove Hash license with
typo. (#34)
* Align both versions of release configuration and remove Hash license with
typo.
* Align both versions of release configuration and remove Hash license with
typo.
---
scancode/ASF-Release-v2.cfg | 6 +++---
scancode/ASF-Release.cfg | 5 ++---
scancode/ASFLicenseHeaderHash2.txt | 15 ---------------
scancode/scanCode.cfg | 1 -
scancode/travis.cfg | 1 -
5 files changed, 5 insertions(+), 23 deletions(-)
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
--
To stop receiving notification emails like this one, please contact
[email protected].
