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.

Sign up for GitHub

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

Jump to bottom

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

Closed
wants to merge 1 commit into from
Closed

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

wants to merge 1 commit into from

Conversation

justin-curtis-lu
Copy link
Member

@justin-curtis-lu justin-curtis-lu commented Jun 17, 2024 •
edited by openjdk bot
Loading

Please review this PR which is a backport of openjdk/jdk17u-ri@c2c9e7f
This change adds the "java.specification.maintenance.version" system property with a value of 1.
Associated GHA run: https://github.com/justin-curtis-lu/jdk17u-dev/actions/runs/9553139534

Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change requires CSR request JDK-8330418 to be approved
  • JDK-8285497 needs maintainer approval

Issues

  • JDK-8285497: Add system property for Java SE specification maintenance version (Enhancement - P4 - Approved)
  • JDK-8330418: Add system property for Java SE specification maintenance version (CSR)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev.git pull/2598/head:pull/2598
$ git checkout pull/2598

Update a local copy of the PR:
$ git checkout pull/2598
$ git pull https://git.openjdk.org/jdk17u-dev.git pull/2598/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2598

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/2598.diff

Webrev

Link to Webrev Comment

@justin-curtis-lu
8285497: Add system property for Java SE specification maintenance ve…
efb0354 
…rsion

Reviewed-by: lancea, iris, prr, andrew
Backport-of: 59ef76a365eafe40d8d68b4d5e028f0e731abd01
@bridgekeeper
Copy link

bridgekeeper bot commented Jun 17, 2024

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

@openjdk
Copy link

openjdk bot commented Jun 17, 2024 •
edited
Loading

@justin-curtis-lu 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:

8285497: Add system property for Java SE specification maintenance version

Reviewed-by: lancea, andrew, iris

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 202 new commits pushed to 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, @gnu-andrew, @irisclark) 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).

@openjdk openjdk bot changed the title Backport c2c9e7fb8c857e40bc43b4053c2633825d4fb68e 8285497: Add system property for Java SE specification maintenance version Jun 17, 2024
@openjdk
Copy link

openjdk bot commented Jun 17, 2024

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

@openjdk
Copy link

openjdk bot commented Jun 17, 2024

At least one of the issues associated with this backport has a resolved CSR for a different version. As this means that this backport may also need a CSR, the csr label is being added to this pull request to signal this potential requirement. The command /csr unneeded can be used to remove the label in case a CSR is not needed.

@openjdk openjdk bot added csr Pull request needs approved CSR before integration rfr Pull request is ready for review labels Jun 17, 2024
@mlbridge
Copy link

mlbridge bot commented Jun 17, 2024

Webrevs

@openjdk
Copy link

openjdk bot commented Jun 17, 2024

⚠️ @justin-curtis-lu This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot removed the csr Pull request needs approved CSR before integration label Jun 17, 2024
gnu-andrew
gnu-andrew approved these changes Jun 27, 2024
View reviewed changes
Copy link
Member

@gnu-andrew gnu-andrew left a comment

Choose a reason for hiding this comment

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

The copyright header changes are a bit odd, because java/lang/System.java is bumped to 2022 but java/lang/VersionProps.java.template is bumped to 2024. However, I think this is because the former matches the original 19u patch (as does PolicyFile.java which doesn't need bumping here as it's already 2023), while the VersionProps.java.template is a new change unique to 17 as it sets us to MR1.

So ok with me.

@gnu-andrew
Copy link
Member

/approve yes

@openjdk
Copy link

openjdk bot commented Jun 27, 2024

@gnu-andrew
8285497: There is no maintainer approval request for this issue.

@gnu-andrew
Copy link
Member

@gnu-andrew 8285497: There is no maintainer approval request for this issue.

Ah, right.
@justin-curtis-lu this won't move forward unless you request approval.

@justin-curtis-lu
Copy link
Member Author

@gnu-andrew, thanks for the approval! (I am waiting to request maintainer approval until closer to our target date of integration, which is still some time away. Hope that is OK)

@MBaesken
Copy link
Member

Hi Justin, do you have an estimate when you want to request approval ?
Would next week be fine?

@justin-curtis-lu
Copy link
Member Author

Hi @MBaesken,

I plan on requesting approval sometime later in next week.

@justin-curtis-lu
Copy link
Member Author

/approval request Backporting the addition of the "java.specification.maintenance.version" system property with a value of 1. (This has already been integrated in jdk17u-ri for JSR392).

@openjdk
Copy link

openjdk bot commented Jul 3, 2024

@justin-curtis-lu
8285497: The approval request has been created successfully.

@openjdk openjdk bot added the approval label Jul 3, 2024
@gnu-andrew
Copy link
Member

/approve yes

@openjdk
Copy link

openjdk bot commented Jul 3, 2024

@gnu-andrew
8285497: The approval request has been approved.

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed approval labels Jul 3, 2024
@justin-curtis-lu
Copy link
Member Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Jul 16, 2024
@openjdk
Copy link

openjdk bot commented Jul 16, 2024

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

irisclark
irisclark approved these changes Jul 16, 2024
View reviewed changes
Copy link
Member

@irisclark irisclark left a comment

Choose a reason for hiding this comment

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

Changes as expected for JSR 392 MR 1 support.

@RealCLanger
Copy link
Contributor

/sponsor

@openjdk
Copy link

openjdk bot commented Jul 18, 2024

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

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jul 18, 2024
@openjdk openjdk bot closed this Jul 18, 2024
@openjdk 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 Jul 18, 2024
@openjdk
Copy link

openjdk bot commented Jul 18, 2024

@RealCLanger @justin-curtis-lu Pushed as commit 2464d8c.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@irisclark irisclark irisclark approved these changes

@LanceAndersen LanceAndersen LanceAndersen approved these changes

@gnu-andrew gnu-andrew gnu-andrew approved these changes

Assignees
No one assigned
Labels
backport clean integrated Pull request has been integrated
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@justin-curtis-lu @gnu-andrew @MBaesken @RealCLanger @LanceAndersen @irisclark