8285497: Add system property for Java SE specification maintenance version #5

justin-curtis-lu · 2023-02-23T00:18:48Z

This PR adds the system property: java.specification.maintenance.version with a value of 2. This change is done towards the Reference Implementation of the proposed Java SE 11 Maintenance Release 2 (https://mail.openjdk.org/pipermail/jdk8u-dev/2023-February/016710.html).

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

Issue

JDK-8285497: Add system property for Java SE specification maintenance version

Reviewers

Lance Andersen (@LanceAndersen - Reviewer) ⚠️ Review applies to b238cbb7
Joe Darcy (@jddarcy - Reviewer) ⚠️ Review applies to b238cbb7
Naoto Sato (@naotoj - Reviewer) ⚠️ Review applies to b238cbb7
Iris Clark (@irisclark - Reviewer)
Christoph Langer (@RealCLanger - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk11u-ri pull/5/head:pull/5
$ git checkout pull/5

Update a local copy of the PR:
$ git checkout pull/5
$ git pull https://git.openjdk.org/jdk11u-ri pull/5/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk11u-ri/pull/5.diff

… of 2

bridgekeeper · 2023-02-23T00:19:06Z

👋 Welcome back jlu! 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.

mlbridge · 2023-02-23T00:24:37Z

Webrevs

openjdk · 2023-02-23T08:33:53Z

This backport pull request has now been updated with issue from the original commit.

LanceAndersen

Looks good and in line with the previous PR in this area

openjdk · 2023-02-23T15:05:08Z

@justin-curtis-lu This change now passes all automated pre-integration checks.

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

8285497: Add system property for Java SE specification maintenance version

Reviewed-by: lancea, darcy, naoto, iris, clanger

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 6 new commits pushed to the master branch:

0a700c6: 8301401: Allow additional characters for GB18030-2022 support
9cedc07: 8223627: jdk-13+20 bundle name contains null instead of ea
4cb8f62: 8223464: Improve version string for Oracle CI builds
da9ac64: 8210283: Support git as an SCM alternative in the build
ce73117: 8210008: custom extension for make/SourceRevision.gmk
8692799: 8303036: Update .jcheck/conf for 11.0.0.1

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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@LanceAndersen, @jddarcy, @naotoj, @irisclark, @RealCLanger) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

jddarcy

If backported change is the same from a previous year and is made unchanged, the copyright year should match the year the original change was authored. Otherwise, looks fine.

RealCLanger · 2023-02-24T21:46:08Z

src/java.base/share/classes/sun/security/provider/PolicyFile.java

@@ -608,6 +608,9 @@ public Void run() {
                pe.add(new PropertyPermission
                                ("java.specification.version",
                                    SecurityConstants.PROPERTY_READ_ACTION));
+                pe.add(new PropertyPermission
+                        ("java.specification.maintenance.version",


the indentation is not in sync with the lines above and below, maybe you could fix this.

RealCLanger · 2023-02-24T21:46:46Z

src/java.base/share/conf/security/java.policy

@@ -30,6 +30,8 @@ grant {
    permission java.util.PropertyPermission "line.separator", "read";
    permission java.util.PropertyPermission
                   "java.specification.version", "read";
+    permission java.util.PropertyPermission
+                       "java.specification.maintenance.version", "read";


Same here, indentation could be fixed so as to be in sync with line 32.

RealCLanger · 2023-02-24T21:47:12Z

src/java.base/share/native/libjava/System.c

@@ -206,6 +206,8 @@ Java_java_lang_System_initProperties(JNIEnv *env, jclass cla, jobject props)

    PUTPROP(props, "java.specification.version",
            VERSION_SPECIFICATION);
+    PUTPROP(props, "java.specification.maintenance.version",
+                    "2");


Same here, please check rows above and below.

Thank you for catching that, fixed the indentation for this and your previous comments.

Great, thanks for updating. Looks nice now. 😄

justin-curtis-lu · 2023-03-13T19:56:05Z

/integrate

openjdk · 2023-03-13T19:58:07Z

@justin-curtis-lu
Your change (at version a3fe59d) is now ready to be sponsored by a Committer.

naotoj · 2023-03-13T19:59:13Z

/sponsor

openjdk · 2023-03-13T19:59:56Z

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

0a700c6: 8301401: Allow additional characters for GB18030-2022 support
9cedc07: 8223627: jdk-13+20 bundle name contains null instead of ea
4cb8f62: 8223464: Improve version string for Oracle CI builds
da9ac64: 8210283: Support git as an SCM alternative in the build
ce73117: 8210008: custom extension for make/SourceRevision.gmk
8692799: 8303036: Update .jcheck/conf for 11.0.0.1

Your commit was automatically rebased without conflicts.

openjdk · 2023-03-13T20:00:14Z

@naotoj @justin-curtis-lu Pushed as commit e5ac7a1.

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

Add java.specification.maintenance.version system property with value…

b238cbb

… of 2

openjdk bot added the rfr Pull request is ready for review label Feb 23, 2023

justin-curtis-lu changed the title ~~8302365: Add system property for Java SE specification maintenance version~~ Backport 59ef76a365eafe40d8d68b4d5e028f0e731abd01 Feb 23, 2023

openjdk bot changed the title ~~Backport 59ef76a365eafe40d8d68b4d5e028f0e731abd01~~ 8285497: Add system property for Java SE specification maintenance version Feb 23, 2023

openjdk bot added the backport label Feb 23, 2023

LanceAndersen approved these changes Feb 23, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Feb 23, 2023

jddarcy approved these changes Feb 23, 2023

View reviewed changes

naotoj approved these changes Feb 23, 2023

View reviewed changes

irisclark approved these changes Feb 23, 2023

View reviewed changes

Backported change should reflect original commit's copyright year

c6aa4d2

RealCLanger approved these changes Feb 24, 2023

View reviewed changes

Adjust indentation to be in sync with other lines

a3fe59d

RealCLanger approved these changes Feb 24, 2023

View reviewed changes

irisclark approved these changes Feb 28, 2023

View reviewed changes

openjdk bot added the sponsor Pull request is ready to be sponsored label Mar 13, 2023

openjdk bot added the integrated Pull request has been integrated label Mar 13, 2023

openjdk bot closed this Mar 13, 2023

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Mar 13, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8285497: Add system property for Java SE specification maintenance version #5

8285497: Add system property for Java SE specification maintenance version #5

justin-curtis-lu commented Feb 23, 2023 •

edited by openjdk bot

Loading

bridgekeeper bot commented Feb 23, 2023

mlbridge bot commented Feb 23, 2023 •

edited

Loading

openjdk bot commented Feb 23, 2023

LanceAndersen left a comment

openjdk bot commented Feb 23, 2023 •

edited

Loading

jddarcy left a comment

RealCLanger Feb 24, 2023

RealCLanger Feb 24, 2023

RealCLanger Feb 24, 2023

justin-curtis-lu Feb 24, 2023

RealCLanger Feb 24, 2023

justin-curtis-lu commented Mar 13, 2023

openjdk bot commented Mar 13, 2023

naotoj commented Mar 13, 2023

openjdk bot commented Mar 13, 2023

openjdk bot commented Mar 13, 2023

8285497: Add system property for Java SE specification maintenance version #5

8285497: Add system property for Java SE specification maintenance version #5

Conversation

justin-curtis-lu commented Feb 23, 2023 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Feb 23, 2023

mlbridge bot commented Feb 23, 2023 • edited Loading

Webrevs

openjdk bot commented Feb 23, 2023

LanceAndersen left a comment

Choose a reason for hiding this comment

openjdk bot commented Feb 23, 2023 • edited Loading

jddarcy left a comment

Choose a reason for hiding this comment

RealCLanger Feb 24, 2023

Choose a reason for hiding this comment

RealCLanger Feb 24, 2023

Choose a reason for hiding this comment

RealCLanger Feb 24, 2023

Choose a reason for hiding this comment

justin-curtis-lu Feb 24, 2023

Choose a reason for hiding this comment

RealCLanger Feb 24, 2023

Choose a reason for hiding this comment

justin-curtis-lu commented Mar 13, 2023

openjdk bot commented Mar 13, 2023

naotoj commented Mar 13, 2023

openjdk bot commented Mar 13, 2023

openjdk bot commented Mar 13, 2023

justin-curtis-lu commented Feb 23, 2023 •

edited by openjdk bot

Loading

mlbridge bot commented Feb 23, 2023 •

edited

Loading

openjdk bot commented Feb 23, 2023 •

edited

Loading