diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 2bebb7c..7bd987f 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -1,5 +1,4 @@ # Contributing to clj-symphony -:+1: First off, thanks for taking the time to contribute! :+1: # Contributor License Agreement (CLA) A CLA is a document that specifies how a project is allowed to use your @@ -10,9 +9,13 @@ contribution; they are commonly used in many open source projects. a [Foundation CLA](https://finosfoundation.atlassian.net/wiki/spaces/FINOS/pages/75530375/Legal+Requirements#LegalRequirements-ContributorLicenseAgreement) in place, and there are [additional legal requirements](https://finosfoundation.atlassian.net/wiki/spaces/FINOS/pages/75530375/Legal+Requirements) that must also be met.** +_NOTE:_ Commits and pull requests to FINOS repositories will only be accepted from those contributors with an active, executed Individual Contributor License Agreement (ICLA) with FINOS OR who are covered under an existing and active Corporate Contribution License Agreement (CCLA) executed with FINOS. Commits from individuals not covered under an ICLA or CCLA will be flagged and blocked by the FINOS Clabot tool. Please note that some CCLAs require individuals/employees to be explicitly named on the CCLA. + PRs submitted to the clj-symphony project will be automatically scanned for a FINOS CLA. If a CLA is not found, you will be prompted to complete one. Further details on this process are described [here](https://www.finos.org/blog/meet-cla-bot-our-ip-compliance-minion). +*Need an ICLA? Unsure if you are covered under an existing CCLA? Email [help@finos.org](mailto:help@finos.org)* + # Contributing Issues ## Prerequisites @@ -56,7 +59,7 @@ For now, deployment of release versions (i.e. from `master`, when a new version * For documentation contributions, follow the general structure, language, and tone of the [existing docs](https://github.com/symphonyoss/clj-symphony/wiki). * Keep commits small and cohesive - if you have multiple contributions, please submit them as independent commits (and ideally as independent PRs too). * Reference issue #s if your PR has anything to do with an issue (even if it doesn't address it). - * Minimise non-functional changes (e.g. whitespace shenanigans). + * Minimise non-functional changes (e.g. whitespace). * Ensure all new files include a header comment block containing the [Apache License v2.0 and your copyright information](http://www.apache.org/licenses/LICENSE-2.0#apply). * If necessary (e.g. due to 3rd party dependency licensing requirements), update the [NOTICE file](https://github.com/symphonyoss/clj-symphony/blob/master/NOTICE) with any new attribution or other notices * If your PR adds dependencies, please call attention to that in the description of the PR. diff --git a/NOTICE b/NOTICE index 1288c92..4b475b8 100644 --- a/NOTICE +++ b/NOTICE @@ -1,4 +1,4 @@ -clj-symphony -Copyright 2016 Fintech Open Source Foundation +clj-symphony - FINOS +Copyright 2016-2019 Symphony LLC This product includes software developed at the Fintech Open Source Foundation (https://www.finos.org/). diff --git a/README.md b/README.md index 38b1e05..9b40175 100644 --- a/README.md +++ b/README.md @@ -86,6 +86,15 @@ clj-symphony is [tested on](https://travis-ci.org/symphonyoss/clj-symphony): ## Contributor Information +## Contributing + +1. Fork it () +2. Create your feature branch (`git checkout -b feature/fooBar`) +3. Read our [contribution guidelines](.github/CONTRIBUTING.md) and [Community Code of Conduct](https://www.finos.org/code-of-conduct) +4. Commit your changes (`git commit -am 'Add some fooBar'`) +5. Push to the branch (`git push origin feature/fooBar`) +6. Create a new Pull Request + [Contributing Guidelines](https://github.com/symphonyoss/bot-unfurl/blob/master/.github/CONTRIBUTING.md) [GitHub project](https://github.com/symphonyoss/clj-symphony) @@ -94,9 +103,9 @@ clj-symphony is [tested on](https://travis-ci.org/symphonyoss/clj-symphony): ## License -Copyright 2016 Fintech Open Source Foundation +The code in this repository is distributed under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0). -Distributed under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0). +Copyright 2016-2019 Symphony LLC ### 3rd Party Licenses