Skip to content

Commit ef359a7

Browse files
committed
[FAB-5282] - fix license headers
Running "make license" fails with error reporting to replace license headers in following files: orderer/multichain/manager.go orderer/multichain/manager_test.go This commit replaces Apache license header with SPDX indentifier. In addition extended skip list of files to check for SPDX license identfier with *.txt files (similar to *.rst). Change-Id: I03aa60464befa853a8542dea5716362b390775af Signed-off-by: Artem Barger <bartem@il.ibm.com>
1 parent f56a82e commit ef359a7

File tree

3 files changed

+6
-27
lines changed

3 files changed

+6
-27
lines changed

orderer/multichain/manager.go

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,8 @@
11
/*
2-
Copyright IBM Corp. 2016 All Rights Reserved.
2+
Copyright IBM Corp. All Rights Reserved.
33
4-
Licensed under the Apache License, Version 2.0 (the "License");
5-
you may not use this file except in compliance with the License.
6-
You may obtain a copy of the License at
7-
8-
http://www.apache.org/licenses/LICENSE-2.0
9-
10-
Unless required by applicable law or agreed to in writing, software
11-
distributed under the License is distributed on an "AS IS" BASIS,
12-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
See the License for the specific language governing permissions and
14-
limitations under the License.
4+
SPDX-License-Identifier: Apache-2.0
155
*/
16-
176
package multichain
187

198
import (

orderer/multichain/manager_test.go

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,7 @@
11
/*
2-
Copyright IBM Corp. 2016 All Rights Reserved.
2+
Copyright IBM Corp. All Rights Reserved.
33
4-
Licensed under the Apache License, Version 2.0 (the "License");
5-
you may not use this file except in compliance with the License.
6-
You may obtain a copy of the License at
7-
8-
http://www.apache.org/licenses/LICENSE-2.0
9-
10-
Unless required by applicable law or agreed to in writing, software
11-
distributed under the License is distributed on an "AS IS" BASIS,
12-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
See the License for the specific language governing permissions and
14-
limitations under the License.
4+
SPDX-License-Identifier: Apache-2.0
155
*/
166

177
package multichain

scripts/check_license.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
#
77

88
CHECK=$(git diff --name-only HEAD * | grep -v .png$ | grep -v .rst$ | grep -v .git \
9-
| grep -v .md$ | grep -v ^vendor/ | grep -v ^build/ | grep -v .pb.go$ | sort -u)
9+
| grep -v .md$ | grep -v ^vendor/ | grep -v ^build/ | grep -v .pb.go$ | grep -v .txt | sort -u)
1010

1111
if [[ -z "$CHECK" ]]; then
1212
CHECK=$(git diff-tree --no-commit-id --name-only -r $(git log -2 \
1313
--pretty=format:"%h") | grep -v .png$ | grep -v .rst$ | grep -v .git \
14-
| grep -v .md$ | grep -v ^vendor/ | grep -v ^build/ | grep -v .pb.go$ | sort -u)
14+
| grep -v .md$ | grep -v ^vendor/ | grep -v ^build/ | grep -v .pb.go$ | grep -v .txt | sort -u)
1515
fi
1616

1717
echo "Checking committed files for SPDX-License-Identifier headers ..."

0 commit comments

Comments
 (0)