From ef359a7040bf8482a36e38ded9e2bf800c8c90c1 Mon Sep 17 00:00:00 2001
From: Artem Barger <bartem@il.ibm.com>
Date: Wed, 12 Jul 2017 02:03:20 +0300
Subject: [PATCH] [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>
---
 orderer/multichain/manager.go      | 15 ++-------------
 orderer/multichain/manager_test.go | 14 ++------------
 scripts/check_license.sh           |  4 ++--
 3 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/orderer/multichain/manager.go b/orderer/multichain/manager.go
index 3c2467d6078..ee28978dcb2 100644
--- a/orderer/multichain/manager.go
+++ b/orderer/multichain/manager.go
@@ -1,19 +1,8 @@
 /*
-Copyright IBM Corp. 2016 All Rights Reserved.
+Copyright IBM Corp. All Rights Reserved.
 
-Licensed 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.
+SPDX-License-Identifier: Apache-2.0
 */
-
 package multichain
 
 import (
diff --git a/orderer/multichain/manager_test.go b/orderer/multichain/manager_test.go
index b5b6de413d8..1f5a8751941 100644
--- a/orderer/multichain/manager_test.go
+++ b/orderer/multichain/manager_test.go
@@ -1,17 +1,7 @@
 /*
-Copyright IBM Corp. 2016 All Rights Reserved.
+Copyright IBM Corp. All Rights Reserved.
 
-Licensed 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.
+SPDX-License-Identifier: Apache-2.0
 */
 
 package multichain
diff --git a/scripts/check_license.sh b/scripts/check_license.sh
index 503ecccb1c9..95c8c2a913d 100755
--- a/scripts/check_license.sh
+++ b/scripts/check_license.sh
@@ -6,12 +6,12 @@
 #
 
 CHECK=$(git diff --name-only HEAD * | grep -v .png$ | grep -v .rst$ | grep -v .git \
-  | grep -v .md$ | grep -v ^vendor/ | grep -v ^build/ | grep -v .pb.go$ | sort -u)
+  | grep -v .md$ | grep -v ^vendor/ | grep -v ^build/ | grep -v .pb.go$ | grep -v .txt | sort -u)
 
 if [[ -z "$CHECK" ]]; then
   CHECK=$(git diff-tree --no-commit-id --name-only -r $(git log -2 \
     --pretty=format:"%h") | grep -v .png$ | grep -v .rst$ | grep -v .git \
-    | grep -v .md$ | grep -v ^vendor/ | grep -v ^build/ | grep -v .pb.go$ | sort -u)
+    | grep -v .md$ | grep -v ^vendor/ | grep -v ^build/ | grep -v .pb.go$ | grep -v .txt | sort -u)
 fi
 
 echo "Checking committed files for SPDX-License-Identifier headers ..."