-
Notifications
You must be signed in to change notification settings - Fork 29
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
4de3a6b
commit cd77d79
Showing
43 changed files
with
2,990 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
--- | ||
name: Bug report | ||
about: Create a report to help us improve | ||
title: '' | ||
labels: '' | ||
assignees: '' | ||
|
||
--- | ||
|
||
Thank you for taking the time to help improve OpenJDK and Corretto. | ||
|
||
If your request concerns a security vulnerability then please report it by email to [email protected] instead of here. (You can find more information regarding security issues at https://aws.amazon.com/security/vulnerability-reporting/.) | ||
|
||
Otherwise, if your issue concerns OpenJDK and is not specific to Corretto we ask that you raise it to the OpenJDK community. Depending on your contributor status for OpenJDK, please use the [JDK bug system](https://bugs.openjdk.java.net/) or the appropriate [mailing list](http://mail.openjdk.java.net/mailman/listinfo) for the given problem area or [update project](http://mail.openjdk.java.net/mailman/listinfo/jdk-updates-dev). | ||
|
||
If your issue is specific to Corretto, then you are in the right place. Please proceed with the following. | ||
|
||
### Describe the bug | ||
A clear and concise description of what the bug is. | ||
|
||
### To Reproduce | ||
Steps and (source) code to reproduce the behavior. | ||
|
||
### Expected behavior | ||
A clear and concise description of what you expected to happen. | ||
|
||
### Screenshots | ||
If applicable, add screenshots to help explain your problem. | ||
|
||
### Platform information | ||
OS: [e.g. Amazon Linux 2] | ||
Version [e.g. "Corretto-15.0.1.9.1" (output from "java -version")] | ||
|
||
### Additional context | ||
Add any other context about the problem here. | ||
|
||
For VM crashes, please attach the error report file. By default the file name is `hs_err_pidpid.log`, where pid is the process ID of the process. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
--- | ||
name: Feature request | ||
about: Suggest an idea for this project | ||
title: '' | ||
labels: '' | ||
assignees: '' | ||
|
||
--- | ||
|
||
Thank you for taking the time to help improve OpenJDK and Corretto. | ||
|
||
If your request concerns a security vulnerability then please report it by email to [email protected] instead of here. | ||
(You can find more information regarding security issues at https://aws.amazon.com/security/vulnerability-reporting/.) | ||
|
||
Otherwise, if your idea concerns OpenJDK | ||
and is not specific to Corretto | ||
we ask that you propose it to the OpenJDK community. | ||
Depending on your contributor status for OpenJDK, | ||
please use the [JDK bug system](https://bugs.openjdk.java.net/) or | ||
the appropriate [mailing list](http://mail.openjdk.java.net/mailman/listinfo) | ||
for the given problem area or [update project](http://mail.openjdk.java.net/mailman/listinfo/jdk-updates-dev)). | ||
|
||
If your proposal is specific to Corretto, | ||
then you are in the right place. | ||
Please proceed with the following. | ||
|
||
### Is your feature request related to a problem? | ||
Please provide a clear and concise description of what the problem is. | ||
|
||
### Describe a solution you would like | ||
Please provide a clear and concise description of what you want to happen. | ||
|
||
### Describe alternatives you have considered | ||
Please provide a clear and concise description | ||
of any alternative solutions or features you have considered. | ||
|
||
### Additional context | ||
Add any other context or screenshots about the feature request here. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
name: 'Fetch upstream repository' | ||
description: 'Fetch the upstream openjdk repository and update the corresponding branches' | ||
|
||
inputs: | ||
upstream: | ||
description: 'Upstream repository https git url' | ||
required: true | ||
local-branch: | ||
description: 'Local branch tracking the remote upstream' | ||
required: true | ||
outputs: | ||
status: | ||
description: 'Status of the upstream fetch and merge' | ||
runs: | ||
using: "composite" | ||
steps: | ||
- run: $GITHUB_ACTION_PATH/refresh.sh ${{ inputs.upstream }} ${{ inputs.local-branch }} | ||
shell: bash | ||
id: fetch-and-update-repo | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
#!/bin/bash | ||
set -x | ||
|
||
UPSTREAM=$1 | ||
LOCAL_BRANCH=$2 | ||
|
||
REMOTE_NAME=upstream-${LOCAL_BRANCH} | ||
git remote add ${REMOTE_NAME} ${UPSTREAM} | ||
git fetch origin ${LOCAL_BRANCH}:${LOCAL_BRANCH} || exit 1 | ||
git fetch ${REMOTE_NAME} master:${LOCAL_BRANCH} || exit 1 | ||
git push origin ${LOCAL_BRANCH} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
name: 'Merge Upstream branch' | ||
description: 'Merge Upstream branch to Develop branch.' | ||
|
||
inputs: | ||
upstream: | ||
description: 'Upstream branch in repository' | ||
required: true | ||
merge-branch: | ||
description: 'Merge branch in local repository' | ||
required: true | ||
outputs: | ||
status: | ||
description: 'Status of the upstream fetch and merge' | ||
runs: | ||
using: "composite" | ||
steps: | ||
- run: $GITHUB_ACTION_PATH/merge.sh ${{ inputs.upstream }} ${{ inputs.merge-branch }} | ||
shell: bash | ||
id: merge-upstream-to-develop |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
#!/bin/bash | ||
set -x | ||
|
||
UPSTREAM_BRANCH=$1 | ||
MERGE_BRANCH=$2 | ||
|
||
git config user.email "[email protected]" | ||
git config user.name "corretto-github-robot" | ||
|
||
git checkout ${MERGE_BRANCH} | ||
git merge -m "Merge ${UPSTREAM_BRANCH}" ${UPSTREAM_BRANCH} || exit 1 | ||
|
||
git push origin ${MERGE_BRANCH} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
Thank you for taking the time to help improve OpenJDK and Corretto 11. | ||
|
||
If your pull request concerns a security vulnerability then please do not file it here. | ||
Instead, report the problem by email to [email protected]. | ||
(You can find more information regarding security issues at https://aws.amazon.com/security/vulnerability-reporting/.) | ||
|
||
Otherwise, if your pull request concerns OpenJDK 11 | ||
and is not specific to Corretto 11, | ||
then we ask you to redirect your contribution to the OpenJDK project. | ||
See http://openjdk.java.net/contribute/ for details on how to do that. | ||
|
||
If your issue is specific to Corretto 11, | ||
then you are in the right place. | ||
Please fill in the following information about your pull request. | ||
|
||
### Description | ||
|
||
|
||
### Related issues | ||
|
||
|
||
### Motivation and context | ||
|
||
|
||
### How has this been tested? | ||
|
||
|
||
### Platform information | ||
Works on OS: [e.g. Amazon Linux 2 only] | ||
Applies to version [e.g. "11.0.1+13-1" (see output from "java -version")] | ||
|
||
|
||
### Additional context |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
name: "Refresh jdk16 from Upstream" | ||
on: | ||
schedule: | ||
- cron: '0 8 * * *' | ||
workflow_dispatch: | ||
|
||
jobs: | ||
refresh-jdk16: | ||
runs-on: ubuntu-latest | ||
name: "Update Corretto-16" | ||
if: github.repository_owner == 'corretto' | ||
steps: | ||
- name: "Checkout code" | ||
uses: actions/checkout@v2 | ||
with: | ||
fetch-depth: 0 | ||
- name: "Fetch Corretto-16" | ||
uses: ./.github/actions/fetch-repo | ||
with: | ||
upstream: 'https://github.com/openjdk/jdk16u.git' | ||
local-branch: 'upstream-jdk16' | ||
- name: "Merge Corretto-16" | ||
uses: ./.github/actions/merge-repo | ||
with: | ||
upstream: 'upstream-jdk16' | ||
merge-branch: 'develop-jdk16' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
# Change Log for Amazon Corretto 16 | ||
|
||
The following sections describe the changes for each release of Amazon Corretto 16. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,42 @@ | ||
# Welcome to the JDK! | ||
## Corretto JDK | ||
|
||
For build instructions please see the | ||
[online documentation](https://openjdk.java.net/groups/build/doc/building.html), | ||
or either of these files: | ||
Amazon Corretto is a no-cost, multiplatform, | ||
production-ready distribution of the Open Java Development Kit (OpenJDK). | ||
Corretto is used internally at Amazon for production services. | ||
With Corretto, you can develop and run Java applications | ||
on operating systems such as Linux, Windows, and macOS. | ||
|
||
- [doc/building.html](doc/building.html) (html version) | ||
- [doc/building.md](doc/building.md) (markdown version) | ||
This repository is used to track [OpenJDK upstream tip](https://github.com/openjdk/jdk). | ||
Please look at the branches section for more information on Feature Releases. | ||
|
||
See <https://openjdk.java.net/> for more information about | ||
Documentation is available at [https://docs.aws.amazon.com/corretto](https://docs.aws.amazon.com/corretto). | ||
|
||
### Licenses and Trademarks | ||
|
||
Please read these files: "LICENSE", "ADDITIONAL_LICENSE_INFO", "ASSEMBLY_EXCEPTION", "TRADEMARKS.md". | ||
|
||
### Branches | ||
|
||
_develop-jdk16_ | ||
: The default branch. The branch that consumes development and patches to upstream jdk16u. Corretto 16 builds are generated from this branch. | ||
|
||
_upstream-jdk16_ | ||
: The branch is similar to master at [openjdk/jdk16u](https://github.com/openjdk/jdk16u). This branch merges into develop-jdk16. | ||
|
||
_upstream_ | ||
: The branch is similar to master at [openjdk/jdk](https://github.com/openjdk/jdk). This branch merges into develop. | ||
|
||
### OpenJDK Readme | ||
``` | ||
Welcome to the JDK! | ||
=================== | ||
For build instructions, please see either of these files: | ||
* doc/building.html (html version) | ||
* doc/building.md (markdown version) | ||
See https://openjdk.java.net/ for more information about | ||
the OpenJDK Community and the JDK. | ||
``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
# TRADEMARK POLICY | ||
|
||
This policy of Amazon.com, Inc. or its affiliates ("Amazon") provides guidelines for use of the "Corretto" and “Amazon Corretto” trademarks (“Corretto Trademarks") to identify Amazon's Corretto software. Use of the Corretto Trademarks must be in accordance with this policy. Our goal is to ensure that Amazon’s trademarks remain reliable indicators of quality and security while also permitting community members, software distributors and others we work with to discuss Amazon's products and to accurately describe such products’ affiliation with Amazon. Note that this policy only applies to use of the Corretto Trademarks. Use of any other Amazon trademarks is not included or covered by this policy. | ||
|
||
## OVERALL GUIDELINES | ||
|
||
You may use the Corretto and Amazon Corretto word marks in plain text to refer to Amazon’s Corretto software in compliance with this policy. Any other use of our trademarks, including any logos, requires prior written permission. | ||
|
||
Overall, your use of the Corretto Trademarks must not be confusing or damaging to Amazon or to the Corretto Trademarks themselves. | ||
|
||
People should always know who they are dealing with, and where the software they are downloading came from. You may not use the Corretto Trademarks in any manner that implies approval or endorsement by or association with Amazon. You may not use the Corretto Trademarks to refer to a product other than Amazon’s Corretto software. Following the guidelines below for modifications will help avoid confusion. | ||
|
||
You may not use the Corretto Trademarks as a vehicle to damage the reputation of Amazon or our Corretto software or to make any false or misleading statements. You may not use the Corretto Trademarks in a manner that may diminish or otherwise damage Amazon's goodwill in the trademarks. The Corretto Trademarks should be used in their exact form and not abbreviated or combined with any other word or words (e.g., "Corretto" software rather than "CRTO" or "Correttofied"). | ||
|
||
Amazon owns all rights in the Corretto Trademarks, and your use of them does not transfer rights to you. Any goodwill generated by your use of our Corretto Trademarks will belong to Amazon. | ||
|
||
## MODIFICATIONS | ||
|
||
Those taking full advantage of the open source nature of the Amazon Corretto code and making modifications may not redistribute the modified software under the Corretto Trademarks. Additionally, to avoid misleading a user into believing the modified software is a native Amazon product, if you modify any file where the file name contains a Corretto Trademark or the Amazon name, you must rename that file (except files that contain only an Amazon copyright that is part of an open source license header). | ||
|
||
## RELATED SOFTWARE | ||
|
||
Amazon recognizes that community members writing related software need some way to identify the Amazon product to which that software pertains. Users should not be confused as to whether the related software is an official Amazon product or otherwise approved by Amazon. The name of such software may not include, in whole or in part, the Corretto Trademarks in a way that suggests a connection between Amazon and the extension. | ||
|
||
## QUESTIONS | ||
|
||
If you are unsure whether your use of the Corretto Trademarks would run afoul of this policy, feel free to contact us and ask. If you have questions about these guidelines or use of any other Amazon trademark, please contact [email protected] for assistance, or write to us at: | ||
|
||
**Amazon.com, Inc., Attention: Trademarks, | ||
PO Box 81226 Seattle, WA 98108-1226** | ||
|
||
This policy is based in part on the open source trademark policy defined by the Mozilla organization, available [here](https://www.mozilla.org/en-US/foundation/trademarks/policy/), as adapted to Amazon’s Carbonado policy, available [here](http://carbonado.sourceforge.net/trademark.html). Thus, the text of this policy (and not the Corretto Trademarks themselves) is licensed under the Creative Commons "Attribution-ShareAlike 2.0" license. | ||
|
||
### FAQ: | ||
|
||
**1. Can I create and redistribute my own builds of Amazon Corretto?** | ||
: If you build Amazon Corretto from source and redistribute the results, you may use the Corretto Trademarks only if it is clear in both the name of your distribution and the content associated with it that your distribution is your build of Amazon Corretto and not the official build, and you must identify the commit from which it is built, including the commit date. |
Binary file not shown.
Oops, something went wrong.