JDK-8296149: Start of release updates for JDK 21 #10924

jddarcy · 2022-11-01T05:49:25Z

Usual start-of-release updates. Symbol updates in initial version reflect JDK 20 build 21.

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 a CSR request to be approved

Issues

JDK-8296149: Start of release updates for JDK 21
JDK-8296150: Add SourceVersion.RELEASE_21
JDK-8296151: Add source 21 and target 21 to javac
JDK-8296182: Start of release updates for JDK 21 (CSR)

Reviewers

David Holmes (@dholmes-ora - Reviewer) ⚠️ Review applies to 5810345e
Iris Clark (@irisclark - Reviewer) ⚠️ Review applies to 89731cb2
Erik Joelsson (@erikj79 - Reviewer) ⚠️ Review applies to 5810345e
Vicente Romero (@vicente-romero-oracle - Reviewer) ⚠️ Review applies to 5810345e
Jan Lahoda (@lahodaj - Reviewer) ⚠️ Review applies to 515002c7

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10924

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

Using diff file

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

bridgekeeper · 2022-11-01T05:50:32Z

👋 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 · 2022-11-01T05:53:26Z

@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.

jddarcy · 2022-11-02T02:03:10Z

/issue add JDK-8296150

openjdk · 2022-11-02T02:04:05Z

@jddarcy
Adding additional issue to issue list: 8296150: Add SourceVersion.RELEASE_21.

jddarcy · 2022-11-02T02:04:06Z

/issue add JDK-8296151

openjdk · 2022-11-02T02:05:53Z

@jddarcy
Adding additional issue to issue list: 8296151: Add source 21 and target 21 to javac.

jddarcy · 2022-11-29T04:14:17Z

Flipping the draft-bit off for this PR ahead of the upcoming start of JDK 21.

Symbol information now up-to-date as of JDK 20 b25.

mlbridge · 2022-11-29T04:21:13Z

Webrevs

dholmes-ora

I looked at everything bar the sym files. All seems fine/usual.

One query below (probably one I ask each release).

Thanks.

dholmes-ora · 2022-11-29T04:45:57Z

src/java.compiler/share/classes/javax/lang/model/util/AbstractAnnotationValueVisitor14.java

@@ -44,7 +44,7 @@
 * @see AbstractAnnotationValueVisitor9
 * @since 14
 */
-@SupportedSourceVersion(RELEASE_20)
+@SupportedSourceVersion(RELEASE_21)


It is a pity these have to be updated each release. Is there no way to say latest here?

Not with the current language specification, no.

The only enum value "constant-enough" to use in an annotation is the name of an enum constant, a public static final field assigned an enum value is not enough.

On the flip side, I make the updates to these annotations using a one-line sed script I have saved away in a comment on one of the previous start-of-release-updates-for-JDK-N bugs. Using the annotations in this way is in lieu of adding another type specification for the JDK version. In other words, having AbstractAnnotationValueVisitor14.java with an annotation indicating RELEASE_21 prevents having AbstractAnnotationValueVisitor15, AbstractAnnotationValueVisitor16, ... , AbstractAnnotationValueVisitor21.

New visitors are now only introduced when adding new kinds of structures requires differences in behavior.

Thanks for the review.

vicente-romero-oracle

looks good

turbanoff · 2022-12-05T07:21:55Z

test/langtools/tools/javac/versions/Versions.java

@@ -88,7 +88,8 @@ static enum SourceTarget {
        SEVENTEEN(false, "61.0", "17", Versions::checksrc17),
        EIGHTEEN(false,  "62.0", "18", Versions::checksrc18),
        NINETEEN(false,  "63.0", "19", Versions::checksrc19),
-        TWENTY(false,  "64.0", "20", Versions::checksrc20);
+        TWENTY(false,  "64.0", "20", Versions::checksrc20),


nit:

Suggested change

TWENTY(false, "64.0", "20", Versions::checksrc20),

TWENTY(false, "64.0", "20", Versions::checksrc20),

lahodaj

javac changes look fine to me.

openjdk · 2022-12-05T19:56:32Z

@jddarcy This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8296149: Start of release updates for JDK 21
8296150: Add SourceVersion.RELEASE_21
8296151: Add source 21 and target 21 to javac

Reviewed-by: dholmes, iris, erikj, vromero, jlahoda

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 5 new commits pushed to the master branch:

cd2182a: 8295724: VirtualMachineError: Out of space in CodeCache for method handle intrinsic
2cdc019: 8298178: Update to use jtreg 7.1.1
79d163d: 8293412: Remove unnecessary java.security.egd overrides
ea83cb9: 8297450: ScaledTextFieldBorderTest.java fails when run with -show parameter
336d230: 8297958: NMT: Display peak values

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

irisclark

Still looks good.

jddarcy · 2022-12-06T21:21:32Z

/integrate delegate

openjdk · 2022-12-06T21:24:35Z

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

JesperIRL · 2022-12-08T16:01:24Z

/integrate

openjdk · 2022-12-08T16:04:18Z

Going to push as commit 175e3d3.
Since your change was applied there have been 59 commits pushed to the master branch:

d562d3f: 8297642: PhaseIdealLoop::only_has_infinite_loops must detect all loops that never lead to termination
fc52f21: 8298255: JFR provide information about dynamization of number of compiler threads
e555d54: 8298383: JFR: GenerateJfrFiles.java lacks copyright header
c084431: 8298379: JFR: Some UNTIMED events only sets endTime
ea108f5: 8298129: Let checkpoint event sizes grow beyond u4 limit
165dcdd: 8297718: Make NMT free:ing protocol more granular
fbe7b00: 8298173: GarbageCollectionNotificationContentTest test failed: no decrease in Eden usage
d8ef60b: 8298272: Clean up ProblemList
9353899: 8298175: JFR: Common timestamp for periodic events
94575d1: 8295116: C2: assert(dead->outcnt() == 0 && !dead->is_top()) failed: node must be dead
... and 49 more: https://git.openjdk.org/jdk/compare/0d2a9ee5287779c2e33fc0bfda84aa6128d8f479...master

Your commit was automatically rebased without conflicts.

openjdk · 2022-12-08T16:05:02Z

@JesperIRL Pushed as commit 175e3d3.

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

JDK-8296149: Start of release updates for JDK 21

652fb68

jddarcy marked this pull request as draft November 1, 2022 05:50

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 Nov 1, 2022

openjdk bot added the csr Pull request needs approved CSR before integration label Nov 2, 2022

jddarcy added 10 commits November 3, 2022 09:57

Update expected GA date.

fe1840d

Update symbols for JDK 20 build 22.

9ddca66

Merge branch 'master' into JDK-8296149

19a25e8

Merge branch 'master' into JDK-8296149

c130f88

Update symbols for JDK 20 b23.

c96bc77

Merge branch 'master' into JDK-8296149

16b536f

Merge branch 'master' into JDK-8296149

38474a8

Update symbol information to JDK 20 build 24.

716dd63

Merge branch 'master' into JDK-8296149

e8fc0ae

Fix failed HotSpot regression tests.

5810345

jddarcy marked this pull request as ready for review November 29, 2022 04:13

openjdk bot added the rfr Pull request is ready for review label Nov 29, 2022

dholmes-ora approved these changes Nov 29, 2022

View reviewed changes

irisclark approved these changes Nov 29, 2022

View reviewed changes

erikj79 approved these changes Nov 29, 2022

View reviewed changes

vicente-romero-oracle approved these changes Nov 29, 2022

View reviewed changes

erikj79 mentioned this pull request Nov 29, 2022

1696: CSRBot uses wrong fixVersion when resolving CSR issues for PR openjdk/skara#1429

Closed

2 tasks

jddarcy added 3 commits November 30, 2022 08:54

Merge branch 'master' into JDK-8296149

ac5c6aa

Merge branch 'master' into JDK-8296149

86eb96f

Update symbol information for JDK 20 build 26.

89731cb

irisclark approved these changes Dec 1, 2022

View reviewed changes

jddarcy added 2 commits December 2, 2022 14:27

Merge branch 'master' into JDK-8296149

d1496cc

Merge branch 'master' into JDK-8296149

515002c

turbanoff reviewed Dec 5, 2022

View reviewed changes

lahodaj approved these changes Dec 5, 2022

View reviewed changes

Merge branch 'master' into JDK-8296149

f178334

openjdk bot removed the csr Pull request needs approved CSR before integration label Dec 5, 2022

openjdk bot added the ready Pull request is ready to be integrated label Dec 5, 2022

jddarcy added 2 commits December 5, 2022 12:46

Merge branch 'master' into JDK-8296149

62bd183

Merge branch 'master' into JDK-8296149

e252e83

irisclark reviewed Dec 6, 2022

View reviewed changes

Respond to review feedback; reformat test.

fc28c49

openjdk bot added the delegated label Dec 6, 2022

openjdk bot added the integrated Pull request has been integrated label Dec 8, 2022

openjdk bot closed this Dec 8, 2022

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review delegated labels Dec 8, 2022

jddarcy deleted the JDK-8296149 branch June 10, 2023 20:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

JDK-8296149: Start of release updates for JDK 21 #10924

JDK-8296149: Start of release updates for JDK 21 #10924

jddarcy commented Nov 1, 2022 •

edited by openjdk bot

Loading

bridgekeeper bot commented Nov 1, 2022

openjdk bot commented Nov 1, 2022

jddarcy commented Nov 2, 2022

openjdk bot commented Nov 2, 2022

jddarcy commented Nov 2, 2022

openjdk bot commented Nov 2, 2022

jddarcy commented Nov 29, 2022

mlbridge bot commented Nov 29, 2022 •

edited

Loading

dholmes-ora left a comment

dholmes-ora Nov 29, 2022

jddarcy Nov 29, 2022

vicente-romero-oracle left a comment

turbanoff Dec 5, 2022

lahodaj left a comment

openjdk bot commented Dec 5, 2022 •

edited

Loading

irisclark left a comment

jddarcy commented Dec 6, 2022

openjdk bot commented Dec 6, 2022

JesperIRL commented Dec 8, 2022

openjdk bot commented Dec 8, 2022

openjdk bot commented Dec 8, 2022

	TWENTY(false, "64.0", "20", Versions::checksrc20),
	TWENTY(false, "64.0", "20", Versions::checksrc20),

JDK-8296149: Start of release updates for JDK 21 #10924

JDK-8296149: Start of release updates for JDK 21 #10924

Conversation

jddarcy commented Nov 1, 2022 • edited by openjdk bot Loading

Progress

Issues

Reviewers

Reviewing

bridgekeeper bot commented Nov 1, 2022

openjdk bot commented Nov 1, 2022

jddarcy commented Nov 2, 2022

openjdk bot commented Nov 2, 2022

jddarcy commented Nov 2, 2022

openjdk bot commented Nov 2, 2022

jddarcy commented Nov 29, 2022

mlbridge bot commented Nov 29, 2022 • edited Loading

Webrevs

dholmes-ora left a comment

Choose a reason for hiding this comment

dholmes-ora Nov 29, 2022

Choose a reason for hiding this comment

jddarcy Nov 29, 2022

Choose a reason for hiding this comment

vicente-romero-oracle left a comment

Choose a reason for hiding this comment

turbanoff Dec 5, 2022

Choose a reason for hiding this comment

lahodaj left a comment

Choose a reason for hiding this comment

openjdk bot commented Dec 5, 2022 • edited Loading

irisclark left a comment

Choose a reason for hiding this comment

jddarcy commented Dec 6, 2022

openjdk bot commented Dec 6, 2022

JesperIRL commented Dec 8, 2022

openjdk bot commented Dec 8, 2022

openjdk bot commented Dec 8, 2022

jddarcy commented Nov 1, 2022 •

edited by openjdk bot

Loading

mlbridge bot commented Nov 29, 2022 •

edited

Loading

openjdk bot commented Dec 5, 2022 •

edited

Loading