Skip to content

Commit 1ecbcd0

Browse files
authored
Update documentation according to internal requirements (#66)
* Update CONTRIBUTING.md * Update SECURITY.md * Update README.md * Update README.md * Update LICENSE.txt * Update README.md
1 parent 9b6a5d2 commit 1ecbcd0

File tree

4 files changed

+95
-48
lines changed

4 files changed

+95
-48
lines changed

CONTRIBUTING.md

+46-30
Original file line numberDiff line numberDiff line change
@@ -1,40 +1,56 @@
1-
# Contributing to OLCUT
1+
# Contributing to this repository
22

3-
We welcome your contributions! There are several directions that OLCUT could
4-
be extended in. New config file formats could be added, more classes can be
5-
added for the `@Config` annotation, more classes can be supported by the
6-
`CommandInterpreter`'s `@Command` methods. Have an idea? Talk to us and
7-
let's make it happen. Just file an Issue to get in touch.
3+
We welcome your contributions! There are multiple ways to contribute.
84

9-
## Questions, Bugs, and Features
5+
## Opening issues
106

11-
If you hit a bug or have an enhancement request please file a [GitHub issue](https://github.com/oracle/olcut/issues).
12-
This is also a great way to ask us questions. When filing a bug remember that
13-
the better written the bug is, the more likely it is to be fixed. Please include:
7+
For bugs or enhancement requests, please file a GitHub issue unless it's
8+
security related. When filing a bug remember that the better written the bug is,
9+
the more likely it is to be fixed. If you think you've found a security
10+
vulnerability, do not raise a GitHub issue and follow the instructions in our
11+
[security policy](./SECURITY.md).
1412

15-
1. Version of OLCUT
16-
1. OS
17-
1. Java version
18-
1. As much code as you can provide to reproduce the bug
19-
1. Any relevant configuration file snippets
20-
1. Steps to reproduce
13+
## Contributing code
2114

22-
## Code
15+
We welcome your code contributions. Before submitting code via a pull request,
16+
you will need to have signed the [Oracle Contributor Agreement][OCA] (OCA) and
17+
your commits need to include the following line using the name and e-mail
18+
address you used to sign the OCA:
2319

24-
We welcome code contributions, but we need the contributor to sign the
25-
[Oracle Contributor Agreement (OCA)](https://www.oracle.com/technetwork/community/oca-486395.html)
26-
first.
20+
```text
21+
Signed-off-by: Your Name <[email protected]>
22+
```
2723

28-
The process:
24+
This can be automatically added to pull requests by committing with `--sign-off`
25+
or `-s`, e.g.
2926

30-
1. We encourage you to file an [issue](https://github.com/oracle/olcut/issues) to discuss your idea with us before implementing anything.
31-
1. Sign the [OCA](https://www.oracle.com/technetwork/community/oca-486395.html)
32-
1. Fork the repository and work your magic
33-
1. Create a Pull Request
34-
1. We will review your PR and merge as appropriate.
27+
```text
28+
git commit --signoff
29+
```
3530

36-
## Code of Conduct
31+
Only pull requests from committers that can be verified as having signed the OCA
32+
can be accepted.
33+
34+
## Pull request process
35+
36+
1. Ensure there is an issue created to track and discuss the fix or enhancement
37+
you intend to submit.
38+
1. Fork this repository.
39+
1. Create a branch in your fork to implement the changes. We recommend using
40+
the issue number as part of your branch name, e.g. `1234-fixes`.
41+
1. Ensure that any documentation is updated with the changes that are required
42+
by your change.
43+
1. Ensure that any samples are updated if the base image has been changed.
44+
1. Submit the pull request. *Do not leave the pull request blank*. Explain exactly
45+
what your changes are meant to do and provide simple steps on how to validate.
46+
your changes. Ensure that you reference the issue you created as well.
47+
1. We will assign the pull request to 2-3 people for review before it is merged.
48+
49+
## Code of conduct
50+
51+
Follow the [Golden Rule](https://en.wikipedia.org/wiki/Golden_Rule). If you'd
52+
like more specific guidelines, see the [Contributor Covenant Code of Conduct][COC].
53+
54+
[OCA]: https://oca.opensource.oracle.com
55+
[COC]: https://www.contributor-covenant.org/version/1/4/code-of-conduct/
3756

38-
Follow the [Golden Rule](https://en.wikipedia.org/wiki/Golden_Rule). If
39-
you'd like more specific guidelines see the
40-
[Contributor Covenant Code of Conduct](https://www.contributor-covenant.org/version/1/4/code-of-conduct.html)

LICENSE.txt

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
BSD 2-Clause License
22

3-
Copyright (c) 2020, Oracle and/or its affiliates.
3+
Copyright (c) 2017, 2023 Oracle Inc (Previously Sun Microsystems Inc)
44
All rights reserved.
55

66
Redistribution and use in source and binary forms, with or without
77
modification, are permitted provided that the following conditions are met:
88

9-
1. Redistributions of source code must retain the above copyright notice, this
10-
list of conditions and the following disclaimer.
9+
* Redistributions of source code must retain the above copyright notice, this
10+
list of conditions and the following disclaimer.
1111

12-
2. Redistributions in binary form must reproduce the above copyright notice,
13-
this list of conditions and the following disclaimer in the documentation
14-
and/or other materials provided with the distribution.
12+
* Redistributions in binary form must reproduce the above copyright notice,
13+
this list of conditions and the following disclaimer in the documentation
14+
and/or other materials provided with the distribution.
1515

1616
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
1717
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -22,4 +22,4 @@ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
2222
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
2323
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
2424
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
25-
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25+
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

README.md

+12-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ be used in concert or independently:
1313
This toolkit has been used for many projects over the years and has grown to suit
1414
the needs of a varied user-base.
1515

16-
# Quick Start
16+
## Getting Started
1717

1818
## Maven Coordinates
1919
OLCUT's main components (i.e. `olcut-core`, `olcut-config-json`, `olcut-config-protobuf` and `olcut-config-edn`) are available on Maven Central.
@@ -232,4 +232,14 @@ SubprocessConnection | Provides a simple mechanism for communicating over stdio
232232

233233
## Contributing
234234

235-
We welcome your contributions! Have an idea? Read more about [Contributing to OLCUT](CONTRIBUTING.md).
235+
This project welcomes contributions from the community. Before submitting a pull request, please [review our contribution guide](./CONTRIBUTING.md)
236+
237+
## Security
238+
239+
Please consult the [security guide](./SECURITY.md) for our responsible security vulnerability disclosure process
240+
241+
## License
242+
243+
Copyright (c) 2017, 2023 Oracle and/or its affiliates.
244+
245+
Released under the BSD 2-Clause License

SECURITY.md

+30-9
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,38 @@
1-
# Reporting Security Vulnerabilities
1+
# Reporting security vulnerabilities
22

3-
Oracle values the independent security research community and believes that responsible disclosure of security vulnerabilities helps us ensure the security and privacy of all our users.
3+
Oracle values the independent security research community and believes that
4+
responsible disclosure of security vulnerabilities helps us ensure the security
5+
and privacy of all our users.
46

5-
Please do NOT raise a GitHub Issue to report a security vulnerability. If you believe you have found a security vulnerability, please submit a report to [secalert\_[email protected]](mailto:[email protected]) preferably with a proof of concept. We provide additional information on [how to report security vulnerabilities to Oracle](https://www.oracle.com/corporate/security-practices/assurance/vulnerability/reporting.html) which includes public encryption keys for secure email.
7+
Please do NOT raise a GitHub Issue to report a security vulnerability. If you
8+
believe you have found a security vulnerability, please submit a report to
9+
[[email protected]][1] preferably with a proof of concept. Please review
10+
some additional information on [how to report security vulnerabilities to Oracle][2].
11+
We encourage people who contact Oracle Security to use email encryption using
12+
[our encryption key][3].
613

7-
We ask that you do not use other channels or contact project contributors directly.
14+
We ask that you do not use other channels or contact the project maintainers
15+
directly.
816

9-
Non-vulnerability related security issues such as new great new ideas for security features are welcome on GitHub Issues.
17+
Non-vulnerability related security issues including ideas for new or improved
18+
security features are welcome on GitHub Issues.
1019

11-
### Security Updates, Alerts and Bulletins
20+
## Security updates, alerts and bulletins
1221

13-
Security updates will be released on a regular cadence. Many of our projects will typically release security fixes in conjunction with the [Oracle Critical Patch Update](https://www.oracle.com/security-alerts/) program. Security updates are released on the Tuesday closest to the 17th day of January, April, July and October. A pre-release announcement will be published on the Thursday preceding each release. Additional information, including past advisories, is available on our [Security Alerts](https://www.oracle.com/security-alerts/) page.
22+
Security updates will be released on a regular cadence. Many of our projects
23+
will typically release security fixes in conjunction with the
24+
Oracle Critical Patch Update program. Additional
25+
information, including past advisories, is available on our [security alerts][4]
26+
page.
1427

15-
### Security-Related Information
28+
## Security-related information
1629

17-
We will provide security related information such as a threat model, considerations for secure use, or any known security issues in our documentation. Please note that labs and sample code are intended to demonstrate a concept and may not be sufficiently hardened for production use.
30+
We will provide security related information such as a threat model, considerations
31+
for secure use, or any known security issues in our documentation. Please note
32+
that labs and sample code are intended to demonstrate a concept and may not be
33+
sufficiently hardened for production use.
34+
35+
[1]: mailto:[email protected]
36+
[2]: https://www.oracle.com/corporate/security-practices/assurance/vulnerability/reporting.html
37+
[3]: https://www.oracle.com/security-alerts/encryptionkey.html
38+
[4]: https://www.oracle.com/security-alerts/

0 commit comments

Comments
 (0)