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-8294837: unify Windows 2019 version check in os_windows and java_props_md #10570

Closed
wants to merge 1 commit into from

Conversation

MBaesken
Copy link
Member

@MBaesken MBaesken commented Oct 5, 2022

Currently the buildNumber check for Windows 2019 server differs in os_windows.cpp and java_props_md.c ( java_props_md.c still checks pre GA versions , this is probably not necessary any more ).
The check should be unified.


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-8294837: unify Windows 2019 version check in os_windows and java_props_md

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 10570

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 5, 2022

👋 Welcome back mbaesken! 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 openjdk bot added the rfr Pull request is ready for review label Oct 5, 2022
@openjdk
Copy link

openjdk bot commented Oct 5, 2022

@MBaesken The following label will be automatically applied to this pull request:

  • core-libs

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

@openjdk openjdk bot added the core-libs core-libs-dev@openjdk.org label Oct 5, 2022
@mlbridge
Copy link

mlbridge bot commented Oct 5, 2022

Webrevs

@openjdk
Copy link

openjdk bot commented Oct 5, 2022

@MBaesken 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:

8294837: unify Windows 2019 version check in os_windows and java_props_md

Reviewed-by: alanb, rriggs

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

  • ee6c391: 8289925: Shared code shouldn't reference the platform specific method frame::interpreter_frame_last_sp()
  • bd90c4c: 8282900: runtime/stringtable/StringTableCleaningTest.java verify unavailable at this moment
  • 979efd4: 8289004: investigate if SharedRuntime::get_java_tid parameter should be a JavaThread*
  • b9eeec2: 8294310: compare.sh fails on macos after JDK-8293550
  • 13a5000: 8294151: JFR: Unclear exception message when dumping stopped in memory recording
  • 8ebebbc: 8294368: Java incremental builds broken on Windows after JDK-8293116
  • 4bdd1c9: 8290964: C2 compilation fails with assert "non-reduction loop contains reduction nodes"
  • b4e74ae: 8294514: Wrong initialization of nmethod::_consts_offset for native nmethods

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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Oct 5, 2022
Copy link
Contributor

@RogerRiggs RogerRiggs left a comment

Choose a reason for hiding this comment

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

LGTM

@MBaesken
Copy link
Member Author

MBaesken commented Oct 6, 2022

Hi Roger and Alan, thanks for the reviews.

@MBaesken
Copy link
Member Author

MBaesken commented Oct 6, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Oct 6, 2022

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

  • 8c15f77: 8270915: GIFImageReader disregards ignoreMetadata flag which causes memory exhaustion
  • 6029120: 8278086: [REDO] ImageIO.write() method will throw IndexOutOfBoundsException
  • 8f56115: 8294679: RISC-V: Misc crash dump improvements
  • e986a97: 8292330: Update JCov version to 3.0.13
  • d4142d8: 8290036: Define and specify Runtime shutdown sequence
  • 0ec1838: 8294869: Correct failure of RemovedJDKInternals.java after JDK-8294618
  • 87acfee: 8294397: Replace StringBuffer with StringBuilder within java.text
  • f2c5718: 8294734: Redundant override in AES implementation
  • 536c9a5: 8294618: Update openjdk.java.net => openjdk.org
  • f531dae: 8294840: langtools OptionalDependencyTest.java use File.pathSeparator
  • ... and 8 more: https://git.openjdk.org/jdk/compare/953ce8da2c7ddd60b09a18c7875616a2477e5ba5...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Oct 6, 2022
@openjdk openjdk bot closed this Oct 6, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Oct 6, 2022
@openjdk
Copy link

openjdk bot commented Oct 6, 2022

@MBaesken Pushed as commit 7012d4b.

💡 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
Labels
core-libs core-libs-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants