Skip to content

Conversation

@GoeLin
Copy link
Member

@GoeLin GoeLin commented Dec 18, 2024

I backport this for parity with 21.0.7-oracle


Progress

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

Issue

  • JDK-8342811: java/net/httpclient/PlainProxyConnectionTest.java failed: Unexpected connection count: 5 (Bug - P4 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 1265

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Dec 18, 2024

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

@openjdk
Copy link

openjdk bot commented Dec 18, 2024

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

8342811: java/net/httpclient/PlainProxyConnectionTest.java failed: Unexpected connection count: 5

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

  • eaa475f: 8294316: SA core file support is broken on macosx-x64 starting with macOS 12.x
  • 227c430: 8344275: tools/jpackage/windows/Win8301247Test.java fails on localized Windows platform

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 changed the title Backport 59ffac84d39250623b0e6bcb871b5b3fe9c9cfe6 8342811: java/net/httpclient/PlainProxyConnectionTest.java failed: Unexpected connection count: 5 Dec 18, 2024
@openjdk
Copy link

openjdk bot commented Dec 18, 2024

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

@openjdk openjdk bot added backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required labels Dec 18, 2024
@openjdk
Copy link

openjdk bot commented Dec 18, 2024

⚠️ @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 openjdk bot added the rfr Pull request is ready for review label Dec 18, 2024
@mlbridge
Copy link

mlbridge bot commented Dec 18, 2024

Webrevs

@openjdk openjdk bot added approval Requires approval; will be removed when approval is received ready Pull request is ready to be integrated and removed approval Requires approval; will be removed when approval is received labels Dec 19, 2024
@GoeLin
Copy link
Member Author

GoeLin commented Dec 19, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Dec 19, 2024

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

  • 9a61698: 8277240: java/awt/Graphics2D/ScaledTransform/ScaledTransform.java dialog does not get disposed
  • 2924515: 8342270: Test sun/security/pkcs11/Provider/RequiredMechCheck.java needs write access to src tree
  • 1cfc1e7: 8343128: PassFailJFrame.java test result: Error. Bad action for script: build}
  • 9f06e33: 8340116: test/jdk/sun/security/tools/jarsigner/PreserveRawManifestEntryAndDigest.java can fail due to regex
  • 42d3509: 8338426: Test java/nio/channels/Selector/WakeupNow.java failed
  • e543315: 8325937: runtime/handshake/HandshakeDirectTest.java causes "monitor end should be strictly below the frame pointer" assertion failure on AArch64
  • 0929526: 8339943: Frame not disposed in java/awt/dnd/DropActionChangeTest.java
  • f70b4f3: 8328005: Convert java/awt/im/JTextFieldTest.java applet test to main
  • 4ab8e84: 8328130: Remove applet usage from JColorChooser tests Test4759934
  • c89fc27: 8316149: Open source several Swing JTree JViewport KeyboardManager tests
  • ... and 3 more: https://git.openjdk.org/jdk21u-dev/compare/1c53e8cadf30d0de6bcdb7c043bd338f100e0fb7...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Dec 19, 2024

@GoeLin Pushed as commit e83e6be.

💡 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

backport Port of a pull request already in a different code base clean Identical backport; no merge resolution required integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

1 participant