Skip to content

Commit

Permalink
adding license checking (hyperledger-archives#3788)
Browse files Browse the repository at this point in the history
Signed-off-by: awjh-ibm <[email protected]>

adding md licenses

Signed-off-by: awjh-ibm <[email protected]>

njk fix

Signed-off-by: awjh-ibm <[email protected]>
  • Loading branch information
awjh-ibm authored and nklincoln committed Apr 9, 2018
1 parent 934949b commit af58a53
Show file tree
Hide file tree
Showing 184 changed files with 2,170 additions and 738 deletions.
14 changes: 14 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
#
# 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.
#

*.*ignore text eol=lf
*.acl text eol=lf
*.cfg text eol=lf
Expand Down
3 changes: 3 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,6 @@ In order to assist anybody starting from scratch, we have produced guides on set
Start with the [Step-by-step development environment setup](./contrib-notes/getting-started.md)

Everything installed and ready code? Great! Issues are tracked in GitHub, if you are looking for a place to start with the code then it might be worth tackling a [bug](https://github.com/hyperledger/composer/issues?q=is%3Aissue+is%3Aopen+label%3Abug) or look for those issues tagged with [*help wanted*](https://github.com/hyperledger/composer/issues?q=is%3Aissue+label%3A%22help+wanted%22).

## License <a name="license"></a>
Hyperledger Project source code files are made available under the Apache License, Version 2.0 (Apache-2.0), located in the [LICENSE](LICENSE) file. Hyperledger Project documentation files are made available under the Creative Commons Attribution 4.0 International License (CC-BY-4.0), available at http://creativecommons.org/licenses/by/4.0/.
5 changes: 4 additions & 1 deletion MAINTAINERS.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,7 @@ The maintainers are listed in alphabetical order.

- Caroline Church ([caroline-church](https://github.com/caroline-church))
- Daniel Selman ([dselman](https://github.com/dselman))
- Simon Stone ([sstone1](https://github.com/sstone1))
- Simon Stone ([sstone1](https://github.com/sstone1))

## License <a name="license"></a>
Hyperledger Project source code files are made available under the Apache License, Version 2.0 (Apache-2.0), located in the [LICENSE](LICENSE) file. Hyperledger Project documentation files are made available under the Creative Commons Attribution 4.0 International License (CC-BY-4.0), available at http://creativecommons.org/licenses/by/4.0/.
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,6 @@ If you have found a defect or want to raise a feature requests
If you want to contribute to the develop of Hyperledger Composer
- Come introduce yourself on the contributors [RocketChat channel](https://chat.hyperledger.org/channel/composer-dev)
- Please read the [contributing guide](./CONTRIBUTING.md)

## License <a name="license"></a>
Hyperledger Project source code files are made available under the Apache License, Version 2.0 (Apache-2.0), located in the [LICENSE](LICENSE) file. Hyperledger Project documentation files are made available under the Creative Commons Attribution 4.0 International License (CC-BY-4.0), available at http://creativecommons.org/licenses/by/4.0/.
5 changes: 4 additions & 1 deletion contrib-notes/cip-template.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,7 @@ Exit Criteria
- Zero P1/P2 issues
- No manual tests
```
```

## License <a name="license"></a>
Hyperledger Project source code files are made available under the Apache License, Version 2.0 (Apache-2.0), located in the [LICENSE](LICENSE) file. Hyperledger Project documentation files are made available under the Creative Commons Attribution 4.0 International License (CC-BY-4.0), available at http://creativecommons.org/licenses/by/4.0/.
3 changes: 3 additions & 0 deletions contrib-notes/coding-guidelines.md
Original file line number Diff line number Diff line change
Expand Up @@ -190,3 +190,6 @@ node composer-cli/cli.js network start --card PeerAdmin@hlfv1 -networkAdmin admi

# Next step
Move on to read [Pull Request Guidelines](./submitting-pull-request.md)

## License <a name="license"></a>
Hyperledger Project source code files are made available under the Apache License, Version 2.0 (Apache-2.0), located in the [LICENSE](LICENSE) file. Hyperledger Project documentation files are made available under the Creative Commons Attribution 4.0 International License (CC-BY-4.0), available at http://creativecommons.org/licenses/by/4.0/.
3 changes: 3 additions & 0 deletions contrib-notes/diagnostic-logging.md
Original file line number Diff line number Diff line change
Expand Up @@ -204,3 +204,6 @@ and in a configuration file - where the logger is a reference to the code above.
}
}
```

## License <a name="license"></a>
Hyperledger Project source code files are made available under the Apache License, Version 2.0 (Apache-2.0), located in the [LICENSE](LICENSE) file. Hyperledger Project documentation files are made available under the Creative Commons Attribution 4.0 International License (CC-BY-4.0), available at http://creativecommons.org/licenses/by/4.0/.
3 changes: 3 additions & 0 deletions contrib-notes/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -138,3 +138,6 @@ Moving on to read

* [Suggested IDE setup](./ide-setup.md)
* [Coding Guidelines](./coding-guidelines.md)

## License <a name="license"></a>
Hyperledger Project source code files are made available under the Apache License, Version 2.0 (Apache-2.0), located in the [LICENSE](LICENSE) file. Hyperledger Project documentation files are made available under the Creative Commons Attribution 4.0 International License (CC-BY-4.0), available at http://creativecommons.org/licenses/by/4.0/.
3 changes: 3 additions & 0 deletions contrib-notes/ide-setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,6 @@ _to do_
# Next step

Move on to read [Coding Guidelines](./coding-guidelines.md)

## License <a name="license"></a>
Hyperledger Project source code files are made available under the Apache License, Version 2.0 (Apache-2.0), located in the [LICENSE](LICENSE) file. Hyperledger Project documentation files are made available under the Creative Commons Attribution 4.0 International License (CC-BY-4.0), available at http://creativecommons.org/licenses/by/4.0/.
7 changes: 5 additions & 2 deletions contrib-notes/misc.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@

Hyperledger Composer provides its programming interfaces in JavaScript, and also has the ability to uses JavaScript to express user processing rules which are executed as smart contracts. [acorn](https://www.npmjs.com/package/acorn) is a JavaScript parsing library that significantly assists this process.

## Checking of files for Hyperledger Composer license agreement using license-check
## Checking of files for Hyperledger Composer license agreement using license-check-and-add

Hyperledger Composer source files are is provided under a license agreement which provides the appropriate level of intellectual property protection, and [license-check](https://www.npmjs.com/package/license-check) is used to enforce that the same agreement terms are in every Hyperledger Composer file. These license terms may change during the development lifecycle of Hyperledger Composer.
Hyperledger Composer source files are is provided under a license agreement which provides the appropriate level of intellectual property protection, and [license-check-and-add](https://www.npmjs.com/package/license-check-and-add) is used to enforce that the same agreement terms are in every Hyperledger Composer file. These license terms may change during the development lifecycle of Hyperledger Composer.

## License <a name="license"></a>
Hyperledger Project source code files are made available under the Apache License, Version 2.0 (Apache-2.0), located in the [LICENSE](LICENSE) file. Hyperledger Project documentation files are made available under the Creative Commons Attribution 4.0 International License (CC-BY-4.0), available at http://creativecommons.org/licenses/by/4.0/.
3 changes: 3 additions & 0 deletions contrib-notes/prerequisites-ubuntu.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,3 +69,6 @@ Extensions may be installed into VS Code by searching the Extensions repository
* TSLint. Integrates the tslint linter for the TypeScript language into VS Code.

* EditorConfig for VS Code. Enables the definition and maintainance of consistent coding styles between different editors and IDEs.

## License <a name="license"></a>
Hyperledger Project source code files are made available under the Apache License, Version 2.0 (Apache-2.0), located in the [LICENSE](LICENSE) file. Hyperledger Project documentation files are made available under the Creative Commons Attribution 4.0 International License (CC-BY-4.0), available at http://creativecommons.org/licenses/by/4.0/.
5 changes: 4 additions & 1 deletion contrib-notes/prerequisites.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,7 @@ Extensions may be installed into VS Code by searching the Extensions repository

* TSLint. Integrates the tslint linter for the TypeScript language into VS Code.

* EditorConfig for VS Code. Enables the definition and maintainance of consistent coding styles between different editors and IDEs.
* EditorConfig for VS Code. Enables the definition and maintainance of consistent coding styles between different editors and IDEs.

## License <a name="license"></a>
Hyperledger Project source code files are made available under the Apache License, Version 2.0 (Apache-2.0), located in the [LICENSE](LICENSE) file. Hyperledger Project documentation files are made available under the Creative Commons Attribution 4.0 International License (CC-BY-4.0), available at http://creativecommons.org/licenses/by/4.0/.
5 changes: 4 additions & 1 deletion contrib-notes/raising-issues.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,7 @@ Before you submit an issue, please search to see if your issue has already been

If you are unable to identify your issue within the above, then please raise a new issue using the provided [template form](../ISSUE_TEMPLATE.md). Please try to use the template as fully as possible; once completed it will provide us with all the information needed to reproduce, confirm and subsequently fix an identified issue. This is particularly important since certain issues may only manifest themselves on a specific operating system / browser combination.

Unfortunately, we are not able to investigate / fix bugs that are not documented sufficiently enough to be reproducible. We will contact you if we require more information, but if you do not respond we will close the issue.
Unfortunately, we are not able to investigate / fix bugs that are not documented sufficiently enough to be reproducible. We will contact you if we require more information, but if you do not respond we will close the issue.

## License <a name="license"></a>
Hyperledger Project source code files are made available under the Apache License, Version 2.0 (Apache-2.0), located in the [LICENSE](LICENSE) file. Hyperledger Project documentation files are made available under the Creative Commons Attribution 4.0 International License (CC-BY-4.0), available at http://creativecommons.org/licenses/by/4.0/.
2 changes: 2 additions & 0 deletions contrib-notes/submitting-pull-request.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@
- Commit any changes using a descriptive commit message.
- Pull requests that have associated builds that are not 100% clean will be closed.

## License <a name="license"></a>
Hyperledger Project source code files are made available under the Apache License, Version 2.0 (Apache-2.0), located in the [LICENSE](LICENSE) file. Hyperledger Project documentation files are made available under the Creative Commons Attribution 4.0 International License (CC-BY-4.0), available at http://creativecommons.org/licenses/by/4.0/.
2 changes: 2 additions & 0 deletions markdown-license.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
## License <a name="license"></a>
Hyperledger Project source code files are made available under the Apache License, Version 2.0 (Apache-2.0), located in the [LICENSE](LICENSE) file. Hyperledger Project documentation files are made available under the Creative Commons Attribution 4.0 International License (CC-BY-4.0), available at http://creativecommons.org/licenses/by/4.0/.
54 changes: 49 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@
"licensecheck": "1.3.0",
"semver": "5.3.0",
"moment": "2.19.3",
"sleep-promise": "2.0.0"
"sleep-promise": "2.0.0",
"license-check-and-add": "2.3.1"
},
"name": "composer",
"description": "You must install [Lerna](https://lernajs.io) to build this multi-package repository.",
Expand All @@ -16,9 +17,9 @@
"postinstall": "npm run pkgcheck && npm run bootstrap",
"repoclean": "lerna clean",
"bootstrap": "lerna bootstrap",
"pretest": "npm run depcheck",
"pretest": "npm run depcheck & npm run licchk",
"licchk": "license-check-and-add",
"test": "lerna run test",
"scanlicenses": "./scripts/scan-all-licenses.sh",
"pkgcheck": "node ./scripts/pkgcheck.js",
"pkgstamp": "node ./scripts/pkgstamp.js",
"pkgbump": "node ./scripts/pkgbump.js && node ./scripts/pkgcheck.js --fix",
Expand All @@ -35,5 +36,48 @@
],
"author": "Hyperledger Composer",
"license": "Apache-2.0",
"dependencies": {}
}
"dependencies": {},
"license-check-and-add-config": {
"folder": ".",
"license": "LICENSE.txt",
"exact_paths_method": "EXCLUDE",
"exact_paths": [
".git",
"node_modules",
"packages",
"softhsm",
"ISSUE_TEMPLATE.md",
"NOTICES.md",
"PULL_REQUEST_TEMPLATE.md",
"contrib-notes/QA-CHECKLIST-TEMPLATE.md",
"markdown-license.txt"
],
"file_type_method": "EXCLUDE",
"file_types": [
".yml",
".log",
".enc",
".cfg",
".xmind",
".deb"
],
"insert_license": false,
"license_formats": {
"js": {
"prepend": "/*",
"append": " */",
"eachLine": {
"prepend": " * "
}
},
"gitattributes": {
"eachLine": {
"prepend": "# "
}
},
"md": {
"file": "markdown-license.txt"
}
}
}
}
14 changes: 14 additions & 0 deletions packages/composer-admin/.npmrc
Original file line number Diff line number Diff line change
@@ -1 +1,15 @@
#
# 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.
#

save-exact=true
3 changes: 3 additions & 0 deletions packages/composer-admin/README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# Composer-Admin
Hyperledger Composer administration API. The admin API allows users to deploy/undeploy/update BusinessNetworkDefinitions to a Hyperledger Fabric instance.

## License <a name="license"></a>
Hyperledger Project source code files are made available under the Apache License, Version 2.0 (Apache-2.0), located in the [LICENSE](LICENSE) file. Hyperledger Project documentation files are made available under the Creative Commons Attribution 4.0 International License (CC-BY-4.0), available at http://creativecommons.org/licenses/by/4.0/.
13 changes: 0 additions & 13 deletions packages/composer-admin/header.txt

This file was deleted.

51 changes: 39 additions & 12 deletions packages/composer-admin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"test": "node ./scripts/api-changelog.js && nyc mocha --recursive -t 10000",
"lint": "eslint .",
"postlint": "npm run licchk",
"licchk": "license-check",
"licchk": "license-check-and-add",
"postlicchk": "npm run doc",
"doc": "jsdoc --pedantic --recurse -c jsdoc.json",
"mocha": "mocha --recursive -t 10000",
Expand All @@ -37,7 +37,7 @@
"chai-things": "0.2.0",
"eslint": "3.17.1",
"jsdoc": "3.5.5",
"license-check": "1.1.5",
"license-check-and-add": "2.3.1",
"mocha": "3.4.2",
"nyc": "11.1.0",
"sinon": "2.3.8"
Expand All @@ -48,17 +48,44 @@
"composer-wallet-filesystem": "0.19.1",
"composer-wallet-inmemory": "0.19.1"
},
"license-check-config": {
"src": [
"**/*.js",
"!./coverage/**/*",
"!./node_modules/**/*",
"!./out/**/*"
"license-check-and-add-config": {
"folder": ".",
"license": "LICENSE.txt",
"exact_paths_method": "EXCLUDE",
"exact_paths": [
"api.txt",
"changelog.txt",
"composer-logs",
"coverage",
"index.d.ts",
"node_modules",
".nyc-output",
"out",
".tern-project"
],
"path": "header.txt",
"blocking": true,
"logInfo": false,
"logError": true
"file_type_method": "EXCLUDE",
"file_types": [
".yml",
".zip"
],
"insert_license": false,
"license_formats": {
"js|cto": {
"prepend": "/*",
"append": " */",
"eachLine": {
"prepend": " * "
}
},
"npmrc|editorconfig": {
"eachLine": {
"prepend": "# "
}
},
"md": {
"file": "../../markdown-license.txt"
}
}
},
"nyc": {
"exclude": [
Expand Down
14 changes: 14 additions & 0 deletions packages/composer-cli/.npmrc
Original file line number Diff line number Diff line change
@@ -1 +1,15 @@
#
# 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.
#

save-exact=true
3 changes: 3 additions & 0 deletions packages/composer-cli/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,6 @@ Options:
--enrollId, -i The enrollment ID of the user [string] [required]
--enrollSecret, -s The enrollment secret of the user [string]
```

## License <a name="license"></a>
Hyperledger Project source code files are made available under the Apache License, Version 2.0 (Apache-2.0), located in the [LICENSE](LICENSE) file. Hyperledger Project documentation files are made available under the Creative Commons Attribution 4.0 International License (CC-BY-4.0), available at http://creativecommons.org/licenses/by/4.0/.
13 changes: 0 additions & 13 deletions packages/composer-cli/header.txt

This file was deleted.

Loading

0 comments on commit af58a53

Please sign in to comment.