Skip to content
This repository was archived by the owner on Apr 25, 2025. It is now read-only.

Commit 70e7a26

Browse files
committed
[FAB-4634] Update license headers
This patch adds missing SPDX license headers. Change-Id: I5712c24a2dc396b0cd248be11230f52f876cbf62 Signed-off-by: Troy Ronda <troy.ronda@securekey.com>
1 parent ab0ba8f commit 70e7a26

File tree

12 files changed

+46
-49
lines changed

12 files changed

+46
-49
lines changed

Makefile

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

20-
#
21-
# This MakeFile assumes that fabric, and fabric-ca were cloned and their docker
22-
# images were created using the make docker command in the respective directories
23-
#
247
# Supported Targets:
258
# all : runs unit and integration tests
269
# depend: installs test dependencies

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,5 +151,7 @@ cd $GOPATH/src/github.com/hyperledger/fabric-sdk-go/test/fixtures/
151151
```
152152

153153
## License
154+
Hyperledger Fabric SDK Go software is licensed under the [Apache License Version 2.0](LICENSE) license.
154155

155-
This project uses the [Apache License Version 2.0](LICENSE).
156+
---
157+
This document is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.

config/test.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,7 @@
1+
#
2+
# Copyright SecureKey Technologies Inc. All Rights Reserved.
3+
#
4+
# SPDX-License-Identifier: Apache-2.0
5+
#
16
test:
27
testkey: testvalue

test/fixtures/.env

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

207
# This file contains the default images and tags used in the docker-based
21-
# Fabric fixtures. The images and tags can be overriden using environment
8+
# Fabric fixtures. The images and tags can be overridden using environment
229
# variables. See docker compose documentation.
2310

2411
FABRIC_CA_FIXTURE_TAG=x86_64-1.0.0-beta

test/fixtures/config/config_test.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
#
2+
# Copyright SecureKey Technologies Inc. All Rights Reserved.
3+
#
4+
# SPDX-License-Identifier: Apache-2.0
5+
#
16
client:
27
peers:
38
# peer0

test/fixtures/docker-compose.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
#
2+
# Copyright IBM Corp, SecureKey Technologies Inc. All Rights Reserved.
3+
#
4+
# SPDX-License-Identifier: Apache-2.0
5+
#
16
version: '2'
27

38
services:

test/fixtures/latest-env.sh

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

218
export FABRIC_CA_FIXTURE_TAG="latest"

test/scripts/check_license.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,15 @@
66
#
77

88
CHECK=$(git diff --name-only HEAD * | grep -v .png$ | grep -v .rst$ | grep -v .git \
9+
| grep -v .pem$ | grep -v .block$ | grep -v .tx$ | grep -v ^LICENSE$ | grep -v _sk$ \
10+
| grep -v .key$ \
911
| grep -v .md$ | grep -v ^vendor/ | grep -v ^build/ | grep -v .pb.go$ | sort -u)
1012

1113
if [[ -z "$CHECK" ]]; then
1214
CHECK=$(git diff-tree --no-commit-id --name-only -r $(git log -2 \
1315
--pretty=format:"%h") | grep -v .png$ | grep -v .rst$ | grep -v .git \
16+
| grep -v .pem$ | grep -v .block$ | grep -v .tx$ | grep -v ^LICENSE$ | grep -v _sk$ \
17+
| grep -v .key$ \
1418
| grep -v .md$ | grep -v ^vendor/ | grep -v ^build/ | grep -v .pb.go$ | sort -u)
1519
fi
1620

test/scripts/check_lint.sh

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
#!/bin/bash
2+
#
3+
# Copyright Greg Haskins, IBM Corp, SecureKey Technologies Inc. All Rights Reserved.
4+
#
5+
# SPDX-License-Identifier: Apache-2.0
6+
#
27
# This script runs Go linting and vetting tools
3-
# Original script from Hyperledger Fabric and Fabric CA projects
48

59
set -e
610

test/scripts/dependencies.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
#!/bin/bash
2+
#
3+
# Copyright SecureKey Technologies Inc. All Rights Reserved.
4+
#
5+
# SPDX-License-Identifier: Apache-2.0
6+
#
27
# This script installs dependencies for testing tools
38

49
echo "Installing dependencies..."

0 commit comments

Comments
 (0)