diff --git a/Makefile b/Makefile index 8c35394279..8d36cb6c7e 100644 --- a/Makefile +++ b/Makefile @@ -1,26 +1,9 @@ # # Copyright SecureKey Technologies Inc. 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 # -# -# This MakeFile assumes that fabric, and fabric-ca were cloned and their docker -# images were created using the make docker command in the respective directories -# # Supported Targets: # all : runs unit and integration tests # depend: installs test dependencies diff --git a/README.md b/README.md index b89b94e61b..b44601459e 100644 --- a/README.md +++ b/README.md @@ -151,5 +151,7 @@ cd $GOPATH/src/github.com/hyperledger/fabric-sdk-go/test/fixtures/ ``` ## License +Hyperledger Fabric SDK Go software is licensed under the [Apache License Version 2.0](LICENSE) license. -This project uses the [Apache License Version 2.0](LICENSE). +--- +This document is licensed under a Creative Commons Attribution 4.0 International License. \ No newline at end of file diff --git a/config/test.yaml b/config/test.yaml index ec88a475da..622d1f0fc1 100644 --- a/config/test.yaml +++ b/config/test.yaml @@ -1,2 +1,7 @@ +# +# Copyright SecureKey Technologies Inc. All Rights Reserved. +# +# SPDX-License-Identifier: Apache-2.0 +# test: testkey: testvalue diff --git a/test/fixtures/.env b/test/fixtures/.env index a2e36abab6..431eca20e9 100644 --- a/test/fixtures/.env +++ b/test/fixtures/.env @@ -1,24 +1,11 @@ # # Copyright SecureKey Technologies Inc. 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 # # This file contains the default images and tags used in the docker-based -# Fabric fixtures. The images and tags can be overriden using environment +# Fabric fixtures. The images and tags can be overridden using environment # variables. See docker compose documentation. FABRIC_CA_FIXTURE_TAG=x86_64-1.0.0-beta diff --git a/test/fixtures/config/config_test.yaml b/test/fixtures/config/config_test.yaml index 090ae9ee73..a175b586f0 100755 --- a/test/fixtures/config/config_test.yaml +++ b/test/fixtures/config/config_test.yaml @@ -1,3 +1,8 @@ +# +# Copyright SecureKey Technologies Inc. All Rights Reserved. +# +# SPDX-License-Identifier: Apache-2.0 +# client: peers: # peer0 diff --git a/test/fixtures/docker-compose.yaml b/test/fixtures/docker-compose.yaml index 7bb5c85107..9a7318946a 100644 --- a/test/fixtures/docker-compose.yaml +++ b/test/fixtures/docker-compose.yaml @@ -1,3 +1,8 @@ +# +# Copyright IBM Corp, SecureKey Technologies Inc. All Rights Reserved. +# +# SPDX-License-Identifier: Apache-2.0 +# version: '2' services: diff --git a/test/fixtures/latest-env.sh b/test/fixtures/latest-env.sh index 0573b29109..d5164e0930 100644 --- a/test/fixtures/latest-env.sh +++ b/test/fixtures/latest-env.sh @@ -2,20 +2,7 @@ # # Copyright SecureKey Technologies Inc. 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 # export FABRIC_CA_FIXTURE_TAG="latest" diff --git a/test/scripts/check_license.sh b/test/scripts/check_license.sh index 503ecccb1c..91bc400ef9 100755 --- a/test/scripts/check_license.sh +++ b/test/scripts/check_license.sh @@ -6,11 +6,15 @@ # CHECK=$(git diff --name-only HEAD * | grep -v .png$ | grep -v .rst$ | grep -v .git \ + | grep -v .pem$ | grep -v .block$ | grep -v .tx$ | grep -v ^LICENSE$ | grep -v _sk$ \ + | grep -v .key$ \ | grep -v .md$ | grep -v ^vendor/ | grep -v ^build/ | grep -v .pb.go$ | 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 .pem$ | grep -v .block$ | grep -v .tx$ | grep -v ^LICENSE$ | grep -v _sk$ \ + | grep -v .key$ \ | grep -v .md$ | grep -v ^vendor/ | grep -v ^build/ | grep -v .pb.go$ | sort -u) fi diff --git a/test/scripts/check_lint.sh b/test/scripts/check_lint.sh index 31bf39574e..8488c34931 100755 --- a/test/scripts/check_lint.sh +++ b/test/scripts/check_lint.sh @@ -1,6 +1,10 @@ #!/bin/bash +# +# Copyright Greg Haskins, IBM Corp, SecureKey Technologies Inc. All Rights Reserved. +# +# SPDX-License-Identifier: Apache-2.0 +# # This script runs Go linting and vetting tools -# Original script from Hyperledger Fabric and Fabric CA projects set -e diff --git a/test/scripts/dependencies.sh b/test/scripts/dependencies.sh index 45a20845e2..b6dd32be09 100755 --- a/test/scripts/dependencies.sh +++ b/test/scripts/dependencies.sh @@ -1,4 +1,9 @@ #!/bin/bash +# +# Copyright SecureKey Technologies Inc. All Rights Reserved. +# +# SPDX-License-Identifier: Apache-2.0 +# # This script installs dependencies for testing tools echo "Installing dependencies..." diff --git a/test/scripts/fabric_test_commitlevel.sh b/test/scripts/fabric_test_commitlevel.sh index 0ff0272794..8c41dbd6ac 100755 --- a/test/scripts/fabric_test_commitlevel.sh +++ b/test/scripts/fabric_test_commitlevel.sh @@ -1,4 +1,9 @@ #!/usr/bin/env bash +# +# Copyright SecureKey Technologies Inc. All Rights Reserved. +# +# SPDX-License-Identifier: Apache-2.0 +# # This variable can be altered to test against prebuilt fabric and fabric-ca images # If set to false, CI will build images from scratch for the commit levels specified below diff --git a/test/scripts/unit.sh b/test/scripts/unit.sh index 2316eba5b2..6b36803c30 100755 --- a/test/scripts/unit.sh +++ b/test/scripts/unit.sh @@ -1,4 +1,9 @@ #!/bin/bash +# +# Copyright SecureKey Technologies Inc. All Rights Reserved. +# +# SPDX-License-Identifier: Apache-2.0 +# set -e