Skip to content

Commit c07a068

Browse files
authored
Merge pull request #45 from oracle-quickstart/LesiaChaban-patch-1
Docs updates according to OGHO requirements
2 parents d9bdf1b + 1277b88 commit c07a068

File tree

3 files changed

+67
-17
lines changed

3 files changed

+67
-17
lines changed

LICENSE

Lines changed: 25 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,34 @@ Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
22

33
The Universal Permissive License (UPL), Version 1.0
44

5-
Subject to the condition set forth below, permission is hereby granted to any person obtaining a copy of this
6-
software, associated documentation and/or data (collectively the "Software"), free of charge and under any and
7-
all copyright rights in the Software, and any and all patent rights owned or freely licensable by each licensor
8-
hereunder covering either (i) the unmodified Software as contributed to or provided by such licensor, or
9-
(ii) the Larger Works (as defined below), to deal in both
5+
Subject to the condition set forth below, permission is hereby granted to any
6+
person obtaining a copy of this software, associated documentation and/or data
7+
(collectively the "Software"), free of charge and under any and all copyright
8+
rights in the Software, and any and all patent rights owned or freely
9+
licensable by each licensor hereunder covering either (i) the unmodified
10+
Software as contributed to or provided by such licensor, or (ii) the Larger
11+
Works (as defined below), to deal in both
1012

1113
(a) the Software, and
12-
(b) any piece of software and/or hardware listed in the lrgrwrks.txt file if one is included with the Software
13-
(each a “Larger Work” to which the Software is contributed by such licensors),
14+
(b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
15+
one is included with the Software (each a "Larger Work" to which the Software
16+
is contributed by such licensors),
1417

15-
without restriction, including without limitation the rights to copy, create derivative works of, display,
16-
perform, and distribute the Software and make, use, sell, offer for sale, import, export, have made, and have
17-
sold the Software and the Larger Work(s), and to sublicense the foregoing rights on either these or other terms.
18+
without restriction, including without limitation the rights to copy, create
19+
derivative works of, display, perform, and distribute the Software and make,
20+
use, sell, offer for sale, import, export, have made, and have sold the
21+
Software and the Larger Work(s), and to sublicense the foregoing rights on
22+
either these or other terms.
1823

1924
This license is subject to the following condition:
20-
The above copyright notice and either this complete permission notice or at a minimum a reference to the UPL must
21-
be included in all copies or substantial portions of the Software.
25+
The above copyright notice and either this complete permission notice or at
26+
a minimum a reference to the UPL must be included in all copies or
27+
substantial portions of the Software.
2228

23-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO
24-
THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
25-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
26-
CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
27-
IN THE SOFTWARE.
29+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
30+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
31+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
32+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
33+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
34+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
35+
SOFTWARE.

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,10 @@ If you have an issue or a question, please take a look at our [FAQs](./FAQs.md)
181181
This project welcomes contributions from the community. Before submitting a pull
182182
request, see [CONTRIBUTING](./CONTRIBUTING.md) for details.
183183

184+
## Security
185+
186+
Please consult the [security guide](./SECURITY.md) for our responsible security vulnerability disclosure process
187+
184188
## License
185189

186190
Copyright (c) 2021, 2022 Oracle and/or its affiliates.

SECURITY.md

Lines changed: 38 additions & 0 deletions
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)