Skip to content

Conversation

@GoeLin
Copy link
Member

@GoeLin GoeLin commented Jan 22, 2024

I backport this for parity with 17.0.11-oracle.


Progress

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

Issue

  • JDK-8306014: Update javax.net.ssl TLS tests to use SSLContextTemplate or SSLEngineTemplate (Sub-task - P4 - Approved)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2156

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 22, 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 openjdk bot changed the title Backport 705ad7d829dcbf8f5e2f098275d0856f6b86db2d 8306014: Update javax.net.ssl TLS tests to use SSLContextTemplate or SSLEngineTemplate Jan 22, 2024
@openjdk
Copy link

openjdk bot commented Jan 22, 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 Jan 22, 2024
@openjdk
Copy link

openjdk bot commented Jan 22, 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 Jan 22, 2024
@mlbridge
Copy link

mlbridge bot commented Jan 22, 2024

Webrevs

@openjdk openjdk bot added the approval Requires approval; will be removed when approval is received label Jan 24, 2024
@openjdk
Copy link

openjdk bot commented Jan 24, 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:

8306014: Update javax.net.ssl TLS tests to use SSLContextTemplate or SSLEngineTemplate

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

  • c774469: 8272811: Document the effects of building with _GNU_SOURCE in os_posix.hpp
  • 5a8af23: 8281543: Remove unused code/headerfile dtraceAttacher.hpp
  • ab3d1d0: 8323243: JNI invocation of an abstract instance method corrupts the stack
  • cac0e96: 8319436: Proxy.newProxyInstance throws NPE if loader is null and interface not visible from class loader
  • 1425971: 8322321: Add man page doc for -XX:+VerifySharedSpaces
  • 5b2aec6: 8318490: Increase timeout for JDK tests that are close to the limit when run with libgraal
  • 67aa1de: 8319213: Compatibility.java reads both stdout and stderr of JdkUtils
  • b4f1deb: 8312428: PKCS11 tests fail with NSS 3.91
  • b186446: 8317039: Enable specifying the JDK used to run jtreg
  • 7c4aaec: 8313206: PKCS11 tests silently skip execution
  • ... and 3 more: https://git.openjdk.org/jdk17u-dev/compare/a6135d783d49dc8047375f62bd969b0874a21891...master

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 Requires approval; will be removed when approval is received labels Jan 24, 2024
@GoeLin
Copy link
Member Author

GoeLin commented Jan 25, 2024

/integrate

@openjdk
Copy link

openjdk bot commented Jan 25, 2024

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

  • 6437792: 8281585: Remove unused imports under test/lib and jtreg/gc
  • 29044ee: 8310238: [test bug] javax/swing/JTableHeader/6889007/bug6889007.java fails
  • 561f956: 8308245: Add -proc:full to describe current default annotation processing policy
  • cb3bd49: 8323086: Shenandoah: Heap could be corrupted by oom during evacuation
  • 4f80edf: 8324184: Windows VS2010 build failed with "error C2275: 'int64_t'"
  • c774469: 8272811: Document the effects of building with _GNU_SOURCE in os_posix.hpp
  • 5a8af23: 8281543: Remove unused code/headerfile dtraceAttacher.hpp
  • ab3d1d0: 8323243: JNI invocation of an abstract instance method corrupts the stack
  • cac0e96: 8319436: Proxy.newProxyInstance throws NPE if loader is null and interface not visible from class loader
  • 1425971: 8322321: Add man page doc for -XX:+VerifySharedSpaces
  • ... and 8 more: https://git.openjdk.org/jdk17u-dev/compare/a6135d783d49dc8047375f62bd969b0874a21891...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 25, 2024

@GoeLin Pushed as commit 0b44cd0.

💡 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