Skip to content

Commit

Permalink
Update documentation according to internal requirements (#66)
Browse files Browse the repository at this point in the history
* Update CONTRIBUTING.md

* Update SECURITY.md

* Update README.md

* Update README.md

* Update LICENSE.txt

* Update README.md
  • Loading branch information
spavlusieva authored Aug 25, 2023
1 parent 9b6a5d2 commit 1ecbcd0
Show file tree
Hide file tree
Showing 4 changed files with 95 additions and 48 deletions.
76 changes: 46 additions & 30 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,40 +1,56 @@
# Contributing to OLCUT
# Contributing to this repository

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

## Questions, Bugs, and Features
## Opening issues

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

1. Version of OLCUT
1. OS
1. Java version
1. As much code as you can provide to reproduce the bug
1. Any relevant configuration file snippets
1. Steps to reproduce
## Contributing code

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

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

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

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

## Code of Conduct
Only pull requests from committers that can be verified as having signed the OCA
can be accepted.

## Pull request process

1. Ensure there is an issue created to track and discuss the fix or enhancement
you intend to submit.
1. Fork this repository.
1. Create a branch in your fork to implement the changes. We recommend using
the issue number as part of your branch name, e.g. `1234-fixes`.
1. Ensure that any documentation is updated with the changes that are required
by your change.
1. Ensure that any samples are updated if the base image has been changed.
1. Submit the pull request. *Do not leave the pull request blank*. Explain exactly
what your changes are meant to do and provide simple steps on how to validate.
your changes. Ensure that you reference the issue you created as well.
1. We will assign the pull request to 2-3 people for review before it is merged.

## Code of conduct

Follow the [Golden Rule](https://en.wikipedia.org/wiki/Golden_Rule). If you'd
like more specific guidelines, see the [Contributor Covenant Code of Conduct][COC].

[OCA]: https://oca.opensource.oracle.com
[COC]: https://www.contributor-covenant.org/version/1/4/code-of-conduct/

Follow the [Golden Rule](https://en.wikipedia.org/wiki/Golden_Rule). If
you'd like more specific guidelines see the
[Contributor Covenant Code of Conduct](https://www.contributor-covenant.org/version/1/4/code-of-conduct.html)
14 changes: 7 additions & 7 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
BSD 2-Clause License

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

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

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

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

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
Expand All @@ -22,4 +22,4 @@ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
14 changes: 12 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ be used in concert or independently:
This toolkit has been used for many projects over the years and has grown to suit
the needs of a varied user-base.

# Quick Start
## Getting Started

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

## Contributing

We welcome your contributions! Have an idea? Read more about [Contributing to OLCUT](CONTRIBUTING.md).
This project welcomes contributions from the community. Before submitting a pull request, please [review our contribution guide](./CONTRIBUTING.md)

## Security

Please consult the [security guide](./SECURITY.md) for our responsible security vulnerability disclosure process

## License

Copyright (c) 2017, 2023 Oracle and/or its affiliates.

Released under the BSD 2-Clause License
39 changes: 30 additions & 9 deletions SECURITY.md
Original file line number Diff line number Diff line change
@@ -1,17 +1,38 @@
# Reporting Security Vulnerabilities
# Reporting security vulnerabilities

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.
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.

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.
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
[[email protected]][1] preferably with a proof of concept. Please review
some additional information on [how to report security vulnerabilities to Oracle][2].
We encourage people who contact Oracle Security to use email encryption using
[our encryption key][3].

We ask that you do not use other channels or contact project contributors directly.
We ask that you do not use other channels or contact the project maintainers
directly.

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

### Security Updates, Alerts and Bulletins
## Security updates, alerts and bulletins

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.
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 program. Additional
information, including past advisories, is available on our [security alerts][4]
page.

### Security-Related Information
## Security-related information

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.
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.

[1]: mailto:[email protected]
[2]: https://www.oracle.com/corporate/security-practices/assurance/vulnerability/reporting.html
[3]: https://www.oracle.com/security-alerts/encryptionkey.html
[4]: https://www.oracle.com/security-alerts/

0 comments on commit 1ecbcd0

Please sign in to comment.