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

8298873: Update IllegalRecordVersion.java for changes to TLS implementation #1814

Closed
wants to merge 2 commits into from

Conversation

GoeLin
Copy link
Member

@GoeLin GoeLin commented Sep 28, 2023

I backport this for parity with 17.0.10-oracle.

Includes JDK-8301189. Both clean, will mark as such.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • JDK-8298873 needs maintainer approval
  • JDK-8301189 needs maintainer approval

Issues

  • JDK-8298873: Update IllegalRecordVersion.java for changes to TLS implementation (Bug - P4 - Approved)
  • JDK-8301189: validate-source fails after JDK-8298873 (Bug - P1 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1814

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 28, 2023

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

@GoeLin GoeLin changed the title Goetz backport 8298873 Backport fc26d3e5770ca3440105d3904a6e4af9af4860fa Sep 28, 2023
@openjdk openjdk bot changed the title Backport fc26d3e5770ca3440105d3904a6e4af9af4860fa 8298873: Update IllegalRecordVersion.java for changes to TLS implementation Sep 28, 2023
@openjdk
Copy link

openjdk bot commented Sep 28, 2023

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

@openjdk openjdk bot added the backport label Sep 28, 2023
@GoeLin
Copy link
Member Author

GoeLin commented Sep 28, 2023

/issue JDK-8301189

@GoeLin
Copy link
Member Author

GoeLin commented Sep 28, 2023

/clean

@openjdk openjdk bot added the rfr Pull request is ready for review label Sep 28, 2023
@openjdk
Copy link

openjdk bot commented Sep 28, 2023

@GoeLin
Adding additional issue to issue list: 8301189: validate-source fails after JDK-8298873.

@GoeLin
Copy link
Member Author

GoeLin commented Sep 28, 2023

/issue JDK-8301189

@GoeLin
Copy link
Member Author

GoeLin commented Sep 28, 2023

/clean

@openjdk openjdk bot added the clean label Sep 28, 2023
@openjdk
Copy link

openjdk bot commented Sep 28, 2023

@GoeLin This backport pull request is now marked as clean

@openjdk
Copy link

openjdk bot commented Sep 28, 2023

⚠️ @GoeLin 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
Copy link

openjdk bot commented Sep 28, 2023

@GoeLin
Updating description of additional solved issue: 8301189: validate-source fails after JDK-8298873.

@openjdk
Copy link

openjdk bot commented Sep 28, 2023

@GoeLin This backport pull request is already marked as clean

@mlbridge
Copy link

mlbridge bot commented Sep 28, 2023

Webrevs

@GoeLin
Copy link
Member Author

GoeLin commented Sep 29, 2023

Pre-submit failure: tools/javac/modules/AnnotationsOnModules.java failed. I have not seen this failure before, but it is unrelated.

@openjdk openjdk bot added the approval label Sep 29, 2023
@openjdk
Copy link

openjdk bot commented Oct 3, 2023

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

8298873: Update IllegalRecordVersion.java for changes to TLS implementation
8301189: validate-source fails after JDK-8298873

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:

  • 174c329: 8296437: NMT incurs costs if disabled
  • cb535e2: 8308592: Framework for CA interoperability testing
  • 9fce30a: 8298867: Basics.java fails with SSL handshake exception
  • 1ce8f3e: 8293156: Dcmd VM.classloaders fails to print the full hierarchy
  • 7e58a42: 8283670: gtest os.release_multi_mappings_vm is still racy

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 ready Pull request is ready to be integrated and removed approval labels Oct 3, 2023
@GoeLin
Copy link
Member Author

GoeLin commented Oct 3, 2023

/integrate

@openjdk
Copy link

openjdk bot commented Oct 3, 2023

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

  • fca2792: 8198668: MemoryPoolMBean/isUsageThresholdExceeded/isexceeded001/TestDescription.java still failing
  • 54533e5: 8271887: mark hotspot runtime/CDSCompressedKPtrs tests which ignore external VM flags
  • 644e410: 8271828: mark hotspot runtime/classFileParserBug tests which ignore external VM flags
  • 003f4f4: 8271829: mark hotspot runtime/Throwable tests which ignore external VM flags
  • 174c329: 8296437: NMT incurs costs if disabled
  • cb535e2: 8308592: Framework for CA interoperability testing
  • 9fce30a: 8298867: Basics.java fails with SSL handshake exception
  • 1ce8f3e: 8293156: Dcmd VM.classloaders fails to print the full hierarchy
  • 7e58a42: 8283670: gtest os.release_multi_mappings_vm is still racy

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Oct 3, 2023

@GoeLin Pushed as commit 28adafc.

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

@GoeLin GoeLin deleted the goetz_backport_8298873 branch October 3, 2023 20:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

1 participant