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

JDK-8306584: Start of release updates for JDK 22 #13567

Closed
wants to merge 39 commits into from

Conversation

jddarcy
Copy link
Member

@jddarcy jddarcy commented Apr 20, 2023

Time to get JDK 22 underway...


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change requires CSR request JDK-8306627 to be approved
  • Change requires CSR request JDK-8306628 to be approved
  • Change requires CSR request JDK-8306626 to be approved

Issues

  • JDK-8306584: Start of release updates for JDK 22 (Bug - P4)
  • JDK-8306585: Add SourceVersion.RELEASE_22 (Sub-task - P4)
  • JDK-8306586: Add source 22 and target 22 to javac (Sub-task - P4)
  • JDK-8306627: Add SourceVersion.RELEASE_22 (CSR)
  • JDK-8306626: Add source 22 and target 22 to javac (CSR)
  • JDK-8306628: Start of release updates for JDK 22 (CSR)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/13567/head:pull/13567
$ git checkout pull/13567

Update a local copy of the PR:
$ git checkout pull/13567
$ git pull https://git.openjdk.org/jdk.git pull/13567/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 13567

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/13567.diff

Webrev

Link to Webrev Comment

@jddarcy jddarcy marked this pull request as draft April 20, 2023 20:28
@bridgekeeper
Copy link

bridgekeeper bot commented Apr 20, 2023

👋 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 Apr 20, 2023

@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 Apr 20, 2023
@jddarcy
Copy link
Member Author

jddarcy commented Apr 20, 2023

/issue add JDK-8306585

@jddarcy
Copy link
Member Author

jddarcy commented Apr 20, 2023

/issue add JDK-8306586

@openjdk
Copy link

openjdk bot commented Apr 20, 2023

@jddarcy
Adding additional issue to issue list: 8306585: Add SourceVersion.RELEASE_22.

@openjdk
Copy link

openjdk bot commented Apr 20, 2023

@jddarcy
Adding additional issue to issue list: 8306586: Add source 22 and target 22 to javac.

@openjdk
Copy link

openjdk bot commented Apr 23, 2023

@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 JDK-8306584
git fetch https://git.openjdk.org/jdk.git 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 csr Pull request needs approved CSR before integration merge-conflict Pull request has merge conflict with target branch labels Apr 23, 2023
@openjdk openjdk bot removed the merge-conflict Pull request has merge conflict with target branch label Apr 24, 2023
@openjdk openjdk bot removed the csr Pull request needs approved CSR before integration label May 11, 2023
Copy link
Contributor

@lahodaj lahodaj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

javac and symbol related changes seem reasonable to me. Two minor comments added for consideration.

@@ -89,7 +89,8 @@ static enum SourceTarget {
EIGHTEEN(false, "62.0", "18", Versions::checksrc18),
NINETEEN(false, "63.0", "19", Versions::checksrc19),
TWENTY(false, "64.0", "20", Versions::checksrc20),
TWENTY_ONE(false,"65.0", "21", Versions::checksrc21);
TWENTY_ONE(false,"65.0", "21", Versions::checksrc21),
TWENTY_TWO(false,"66.0", "22", Versions::checksrc21);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should there be checksrc22 instead of checksrc21? Or is that done later?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch. I have a refactoring of the test planned which will eliminate the explicit "checksrc$N" methods.

@jddarcy
Copy link
Member Author

jddarcy commented Jun 8, 2023

/integrate delegate

@openjdk openjdk bot added the delegated label Jun 8, 2023
@openjdk
Copy link

openjdk bot commented Jun 8, 2023

@jddarcy Integration of this pull request has been delegated and may be completed by any project committer using the /integrate pull request command.

Copy link
Contributor

@AlanBateman AlanBateman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ready to go :-)

@JesperIRL
Copy link
Member

/integrate

@openjdk
Copy link

openjdk bot commented Jun 8, 2023

Going to push as commit 5a706fb.
Since your change was applied there have been 15 commits pushed to the master branch:

  • bb377b2: 8306841: Generational ZGC: NMT reports Java heap size larger than max heap size
  • ac3ce2b: 8304425: ClassHierarchyResolver from Reflection
  • 79a4ac7: 8309235: Unnamed Variables (_) can't be used in JShell
  • 9d64a9d: 8306431: File.listRoots method description should be re-examined
  • 5af9d2a: 8309602: update JVMTI history table for jdk 21
  • 6646272: 8308764: Reporting errors from create_vm may crash
  • 73dd03c: 8308152: PropertyDescriptor should work with overridden generic getter method
  • 760cb04: 8309569: sun/security/pkcs11/Signature/TestRSAKeyLength.java fails after JDK-8301553
  • e8a5984: 8309630: Clean up tests that reference deploy modules
  • 90027ff: 8309515: Stale cached data from Matcher.namedGroups() after Matcher.usePattern()
  • ... and 5 more: https://git.openjdk.org/jdk/compare/4ffc8cc2169c6b34ce5d9cf0ce98125520c4495a...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jun 8, 2023
@openjdk openjdk bot closed this Jun 8, 2023
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review delegated labels Jun 8, 2023
@openjdk
Copy link

openjdk bot commented Jun 8, 2023

@JesperIRL Pushed as commit 5a706fb.

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

@jddarcy jddarcy deleted the JDK-8306584 branch June 10, 2023 20:06
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
Development

Successfully merging this pull request may close these issues.

8 participants