Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

8267630: Start of release updates for JDK 18 #4175

Closed
wants to merge 25 commits into from

Conversation

jddarcy
Copy link
Member

@jddarcy jddarcy commented May 24, 2021


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issues

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/4175/head:pull/4175
$ git checkout pull/4175

Update a local copy of the PR:
$ git checkout pull/4175
$ git pull https://git.openjdk.java.net/jdk pull/4175/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 4175

View PR using the GUI difftool:
$ git pr show -t 4175

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/4175.diff

@bridgekeeper
Copy link

bridgekeeper bot commented May 24, 2021

👋 Welcome back darcy! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented May 24, 2021

@jddarcy The following labels will be automatically applied to this pull request:

  • build
  • compiler
  • core-libs
  • hotspot-runtime

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing lists. If you would like to change these labels, use the /label pull request command.

@openjdk openjdk bot added hotspot-runtime hotspot-runtime-dev@openjdk.org build build-dev@openjdk.org core-libs core-libs-dev@openjdk.org compiler compiler-dev@openjdk.org labels May 24, 2021
@jddarcy
Copy link
Member Author

jddarcy commented Jun 3, 2021

/issue add JDK-8268156

@openjdk
Copy link

openjdk bot commented Jun 3, 2021

@jddarcy
Adding additional issue to issue list: 8268156: Add SourceVersion.RELEASE_18.

@jddarcy
Copy link
Member Author

jddarcy commented Jun 3, 2021

/issue add JDK-8267632

@openjdk
Copy link

openjdk bot commented Jun 3, 2021

@jddarcy
Adding additional issue to issue list: 8267632: Add source 18 and target 18 to javac.

@jddarcy
Copy link
Member Author

jddarcy commented Jun 3, 2021

JDK 18 is right around the corner, time for the usual start-of-release changeset for review.

Typical structure for these kinds of changes. I'll update the symbol file information of JDK 17 b25 after that build is promoted.

Usual updates to SourceVersion, javac, HotSpot, and version-oriented tests.

Please also review the related CSRs:

JDK-8268156: Add SourceVersion.RELEASE_18
https://bugs.openjdk.java.net/browse/JDK-8268156

JDK-8268157: Add source 18 and target 18 to javac
https://bugs.openjdk.java.net/browse/JDK-8268157

@jddarcy jddarcy marked this pull request as ready for review Jun 3, 2021
@jddarcy
Copy link
Member Author

jddarcy commented Jun 3, 2021

/issue remove JDK-8268156

@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 3, 2021
@jddarcy
Copy link
Member Author

jddarcy commented Jun 3, 2021

/issue add JDK-8267631

@openjdk
Copy link

openjdk bot commented Jun 3, 2021

@jddarcy
Removing additional issue from issue list: 8268156.

@openjdk
Copy link

openjdk bot commented Jun 3, 2021

@jddarcy
Adding additional issue to issue list: 8267631: Add SourceVersion.RELEASE_18.

@mlbridge
Copy link

mlbridge bot commented Jun 3, 2021

Webrevs

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Looks good.

Thanks,
David

@openjdk
Copy link

openjdk bot commented Jun 9, 2021

@jddarcy this pull request can not be integrated into master due to one or more merge conflicts. To resolve these merge conflicts and update this pull request you can run the following commands in the local repository for your personal fork:

git checkout 8267630
git fetch https://git.openjdk.java.net/jdk master
git merge FETCH_HEAD
# resolve conflicts and follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk openjdk bot added merge-conflict Pull request has merge conflict with target branch ready Pull request is ready to be integrated and removed ready Pull request is ready to be integrated merge-conflict Pull request has merge conflict with target branch labels Jun 9, 2021
@jddarcy
Copy link
Member Author

jddarcy commented Jun 10, 2021

/integrate

@openjdk
Copy link

openjdk bot commented Jun 10, 2021

Going to push as commit b018c45.
Since your change was applied there has been 1 commit pushed to the master branch:

  • 7400789: 8268542: serviceability/logging/TestFullNames.java tests only 1st test case

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Jun 10, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jun 10, 2021
@openjdk
Copy link

openjdk bot commented Jun 10, 2021

@jddarcy Pushed as commit b018c45.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@jddarcy jddarcy deleted the 8267630 branch Jun 10, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
build build-dev@openjdk.org compiler compiler-dev@openjdk.org core-libs core-libs-dev@openjdk.org hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated
4 participants