[jdk11u-dev] Integrated: Merge jdk11u:master

[Goetz Lindenmaier]

On Wed, 16 Oct 2024 07:41:16 GMT, Goetz Lindenmaier <goetz at openjdk.org> wrote:

> Merge build tag 11.0.25-ga from jdk11u to jdk11u-dev
> 
> I had to resolve a row of files because 
> "8211920: Close server socket and cleanups in test/jdk/javax/naming/module/RunBasic.java"
> was pushed to both repositories:
> 
> test/jdk/javax/naming/module/RunBasic.java
> test/jdk/javax/naming/module/src/test/test/ConnectWithAuthzId.java
> test/jdk/javax/naming/module/src/test/test/ConnectWithFoo.java
> test/jdk/javax/naming/module/src/test/test/ReadByUrl.java
> test/jdk/javax/naming/module/src/test/test/StoreFruit.java
> test/jdk/javax/naming/module/src/test/test/StoreObject.java
> test/jdk/javax/naming/module/src/test/test/StorePerson.java
> test/jdk/javax/naming/module/src/test/test/StoreRemote.java
> 
> I resolved it to the version of jdk11u. Should be harmless as only test files are touched.

This pull request has now been integrated.

Changeset: 8ba03417
Author:    Goetz Lindenmaier <goetz at openjdk.org>
URL:       https://git.openjdk.org/jdk11u-dev/commit/8ba0341757545856666fbfcd3e7f9d715f5c0f86
Stats:     3274 lines in 63 files changed: 2832 ins; 150 del; 292 mod

Merge

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

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