[jdk11u-dev] Integrated: Merge jdk11u:master

Wed Oct 18 11:45:18 UTC 2023

On Wed, 18 Oct 2023 08:29:05 GMT, Goetz Lindenmaier <goetz at openjdk.org> wrote:

> Merge build tag 11.0.21-ga from jdk11u to jdk11u-dev
> 
> I had to resolve these two files.
> src/java.base/share/classes/javax/security/auth/callback/ChoiceCallback.java
> src/java.base/share/classes/javax/security/auth/callback/ConfirmationCallback.java
> I chose the version coming from jdk11u, because 11u contains one additional change to 11u-dev.

This pull request has now been integrated.

Changeset: 281a51fe
Author:    Goetz Lindenmaier <goetz at openjdk.org>
URL:       https://git.openjdk.org/jdk11u-dev/commit/281a51feefe8a2550a7f5f468e7a8dfebef724ad
Stats:     1309 lines in 48 files changed: 967 ins; 212 del; 130 mod

Merge

-------------

PR: https://git.openjdk.org/jdk11u-dev/pull/2195