Skip to content

Commit 5bd0389

Browse files
authored
Merge pull request #524 from oracle/docs-updates
Update docs
2 parents fc3f101 + 4cd50e4 commit 5bd0389

File tree

3 files changed

+89
-17
lines changed

3 files changed

+89
-17
lines changed

CONTRIBUTING.md

+46-13
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,59 @@
11
# Contributing to the Oracle Cloud Infrastructure Java SDK
22

3-
*Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
3+
*Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
44
This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl
55
or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.*
66

7-
Pull requests can be made under
8-
[The Oracle Contributor Agreement](https://www.oracle.com/technetwork/community/oca-486395.html)
9-
(OCA).
7+
We welcome your contributions! There are multiple ways to contribute.
108

11-
For pull requests to be accepted, the bottom of
12-
your commit message must have the following line using your name and
13-
e-mail address as it appears in the OCA Signatories list.
9+
## Opening issues
1410

15-
```
11+
For bugs or enhancement requests, please file a GitHub issue unless it's
12+
security related. When filing a bug remember that the better written the bug is,
13+
the more likely it is to be fixed. If you think you've found a security
14+
vulnerability, do not raise a GitHub issue and follow the instructions in our
15+
[security policy](./SECURITY.md).
16+
17+
## Contributing code
18+
19+
We welcome your code contributions. Before submitting code via a pull request,
20+
you will need to have signed the [Oracle Contributor Agreement][OCA] (OCA) and
21+
your commits need to include the following line using the name and e-mail
22+
address you used to sign the OCA:
23+
24+
```text
1625
Signed-off-by: Your Name <[email protected]>
1726
```
1827

19-
This can be automatically added to pull requests by committing with:
28+
This can be automatically added to pull requests by committing with `--sign-off`
29+
or `-s`, e.g.
2030

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

25-
Only pull requests from committers that can be verified as having
26-
signed the OCA can be accepted.
58+
[OCA]: https://oca.opensource.oracle.com
59+
[COC]: https://www.contributor-covenant.org/version/1/4/code-of-conduct/

README.md

+5-4
Original file line numberDiff line numberDiff line change
@@ -214,9 +214,7 @@ See [CHANGELOG](https://github.com/oracle/oci-java-sdk/blob/master/CHANGELOG.md)
214214

215215
## Contributing
216216

217-
oci-java-sdk is an open source project. See [CONTRIBUTING](https://github.com/oracle/oci-java-sdk/blob/master/CONTRIBUTING.md) for details.
218-
219-
Oracle gratefully acknowledges the contributions to oci-java-sdk that have been made by the community.
217+
This project welcomes contributions from the community. Before submitting a pull request, please [review our contribution guide](./CONTRIBUTING.md)
220218

221219
## Known Issues
222220

@@ -262,10 +260,13 @@ To resolve this problem, you can run Maven with the following parameter:
262260
`-Djdk.jar.maxSignatureFileSize=16000000`
263261

264262
The low default value in Java will be addressed and resolved in upcoming minor Java version releases.
263+
## Security
264+
265+
Please consult the [security guide](./SECURITY.md) for our responsible security vulnerability disclosure process
265266

266267
## License
267268

268-
Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
269+
Copyright (c) 2016, 2024, Oracle and/or its affiliates. All rights reserved.
269270
This software is dual-licensed to you under the Universal Permissive License (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl
270271
or Apache License 2.0 as shown at http://www.apache.org/licenses/LICENSE-2.0. You may choose either license.
271272

SECURITY.md

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
# Reporting security vulnerabilities
2+
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.
6+
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].
13+
14+
We ask that you do not use other channels or contact the project maintainers
15+
directly.
16+
17+
Non-vulnerability related security issues including ideas for new or improved
18+
security features are welcome on GitHub Issues.
19+
20+
## Security updates, alerts and bulletins
21+
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.
27+
28+
## Security-related information
29+
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)