From dcf442c89f79178e2cc5cd8cb5f41394c02d84a7 Mon Sep 17 00:00:00 2001 From: Nikolay Ganev Date: Fri, 24 May 2019 16:53:33 +0200 Subject: [PATCH] aligning README.md and CONTRIBUTING.md to FINOS project blueprint language --- .github/CONTRIBUTING.md | 61 +++++++++++++++++++++++++++++++++++++++++ CONTRIBUTING.md | 3 -- LICENSE | 2 +- NOTICE | 4 +-- README.md | 21 +++++++++++++- 5 files changed, 84 insertions(+), 7 deletions(-) create mode 100644 .github/CONTRIBUTING.md delete mode 100644 CONTRIBUTING.md diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md new file mode 100644 index 00000000..6dd89e99 --- /dev/null +++ b/.github/CONTRIBUTING.md @@ -0,0 +1,61 @@ +# Contributing to Symphony Java Client + +This project was initiated at [IHS Markit](https://www.ihsmarkit.com) and has been developed as open-source from the very beginning. + +Contributions are accepted via GitHub pull requests. All contributors must be covered by contributor license agreements to comply with the [Code Contribution Process](https://symphonyoss.atlassian.net/wiki/display/FM/Code+Contribution+Process). + +When contributing to this repository, please first discuss the change you wish to make via issue, +email, or any other method with the owners of this repository before making a change. + +Please note we have a code of conduct, please follow it in all your interactions with the project. + +# Contributor License Agreement (CLA) +A CLA is a document that specifies how a project is allowed to use your +contribution; they are commonly used in many open source projects. + +**_All_ contributions to _all_ projects hosted by [FINOS](https://www.finos.org/) +must be made with a +[Foundation CLA](https://finosfoundation.atlassian.net/wiki/spaces/FINOS/pages/83034172/Contribute) +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. + +As a result, PRs submitted to the Symphony Java Client project cannot be accepted until you have a CLA in place with the Foundation. + +*Need an ICLA? Unsure if you are covered under an existing CCLA? Email [help@finos.org](mailto:help@finos.org)* + +# Contributing Issues + +## Prerequisites + +* [ ] Have you [searched for duplicates](https://github.com/symphonyoss/symphony-java-client/issues?utf8=%E2%9C%93&q=)? A simple search for exception error messages or a summary of the unexpected behaviour should suffice. +* [ ] Are you running the latest version? +* [ ] Are you sure this is a bug or missing capability? + +## Raising an Issue +* Create your issue [here](https://github.com/symphonyoss/symphony-java-client/issues/new). +* New issues contain two templates in the description: bug report and enhancement request. Please pick the most appropriate for your issue, **then delete the other**. + * Please also tag the new issue with either "Bug" or "Enhancement". +* Please use [Markdown formatting](https://help.github.com/categories/writing-on-github/) +liberally to assist in readability. + * [Code fences](https://help.github.com/articles/creating-and-highlighting-code-blocks/) for exception stack traces and log entries, for example, massively improve readability. + +# Contributing Pull Requests (Code & Docs) +To make review of PRs easier, please: + + * Please make sure your PRs will merge cleanly - PRs that don't are unlikely to be accepted. + * For code contributions, follow the existing code layout. + * For documentation contributions, follow the general structure, language, and tone of the [existing docs](https://github.com/symphonyoss/symphony-java-client/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). + * 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/symphony-java-client/blob/master/NOTICE) with any new attribution or other notices + +## Commit and PR Messages + +* **Reference issues, wiki pages, and pull requests liberally!** +* Use the present tense ("Add feature" not "Added feature") +* Use the imperative mood ("Move button left..." not "Moves button left...") +* Limit the first line to 72 characters or less diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index 66c449e0..00000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,3 +0,0 @@ -This project was initiated at [IHS Markit](https://www.ihsmarkit.com) and has been developed as open-source from the very beginning. - -Contributions are accepted via GitHub pull requests. All contributors must be covered by contributor license agreements to comply with the [Code Contribution Process](https://symphonyoss.atlassian.net/wiki/display/FM/Code+Contribution+Process). diff --git a/LICENSE b/LICENSE index abf0fe18..9f4fe75c 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright 2016 The Symphony Software Foundation +Copyright 2016-2019 Symphony LLC Apache License diff --git a/NOTICE b/NOTICE index 57354c24..2193c408 100644 --- a/NOTICE +++ b/NOTICE @@ -1,5 +1,5 @@ -Symphony Java Client -Copyright 2016 The Symphony Software Foundation +Symphony Java Client - FINOS +Copyright 2016-2019 Symphony LLC This product includes software developed at The Symphony Software Foundation (http://symphony.foundation). diff --git a/README.md b/README.md index ec140a4b..1cb9afce 100644 --- a/README.md +++ b/README.md @@ -197,7 +197,26 @@ In addition, there is an external project providing samples of use: [see Example ## API Docs [API Documentation](http://symphonyoss.github.io/symphony-java-client/index.html) -## Contribute +## Contributing This project was initiated at [IHS Markit](https://www.ihsmarkit.com) and has been developed as open-source from the very beginning. Contributions are accepted via GitHub pull requests. All contributors must be covered by contributor license agreements to comply with the [Code Contribution Process](https://symphonyoss.atlassian.net/wiki/display/FM/Code+Contribution+Process). + +### Code of Conduct + +Please make sure you read and observe our [Code of Conduct]. + +### Pull Request process + +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 + +## License + +The code in this repository is distributed under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0). + +Copyright 2016-2019 Symphony LLC \ No newline at end of file