Skip to content

Commit

Permalink
[FAB-4634] Update license headers
Browse files Browse the repository at this point in the history
This patch adds missing SPDX license headers.

Change-Id: I5712c24a2dc396b0cd248be11230f52f876cbf62
Signed-off-by: Troy Ronda <troy.ronda@securekey.com>
  • Loading branch information
troyronda committed Jun 15, 2017
1 parent ab0ba8f commit 70e7a26
Show file tree
Hide file tree
Showing 12 changed files with 46 additions and 49 deletions.
19 changes: 1 addition & 18 deletions Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.
5 changes: 5 additions & 0 deletions config/test.yaml
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
#
# Copyright SecureKey Technologies Inc. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
test:
testkey: testvalue
17 changes: 2 additions & 15 deletions test/fixtures/.env
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 5 additions & 0 deletions test/fixtures/config/config_test.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
#
# Copyright SecureKey Technologies Inc. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
client:
peers:
# peer0
Expand Down
5 changes: 5 additions & 0 deletions test/fixtures/docker-compose.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
#
# Copyright IBM Corp, SecureKey Technologies Inc. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#
version: '2'

services:
Expand Down
15 changes: 1 addition & 14 deletions test/fixtures/latest-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 4 additions & 0 deletions test/scripts/check_license.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 5 additions & 1 deletion test/scripts/check_lint.sh
Original file line number Diff line number Diff line change
@@ -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

Expand Down
5 changes: 5 additions & 0 deletions test/scripts/dependencies.sh
Original file line number Diff line number Diff line change
@@ -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..."
Expand Down
5 changes: 5 additions & 0 deletions test/scripts/fabric_test_commitlevel.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
5 changes: 5 additions & 0 deletions test/scripts/unit.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
#!/bin/bash
#
# Copyright SecureKey Technologies Inc. All Rights Reserved.
#
# SPDX-License-Identifier: Apache-2.0
#

set -e

Expand Down

0 comments on commit 70e7a26

Please sign in to comment.