[jdk11u-dev] RFR: Merge jdk11u:master [v2]

Goetz Lindenmaier goetz at openjdk.org
Wed Oct 16 11:39:01 UTC 2024


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

Goetz Lindenmaier has updated the pull request with a new target base due to a merge or a rebase. The pull request now contains 16 commits:

 - Merge
 - 8251188: Update LDAP tests not to use wildcard addresses
   
   Reviewed-by: mbalao, andrew
   Backport-of: a75edc29c6ce41116cc99530aa1710efb62c6d5a
 - 8339644: Improve parsing of Day/Month in tzdata rules
   
   Backport-of: 5faa0df6fb1b4c5dc7f642d7e062c44a1764029c
 - Merge
 - 8338402: GHA: some of bundles may not get removed
   
   Backport-of: d8e4d3f2d6c187f2487acd390a4e5fa2a99010ea
 - 8299254: Support dealing with standard assert macro
   
   Reviewed-by: sgehwolf
   Backport-of: 89dd23f2fab0d98879e68f817923656e113087e3
 - 8316193: jdk/jfr/event/oldobject/TestListenerLeak.java java.lang.Exception: Could not find leak
   
   Backport-of: f6be922952642f40dcf0d27b7896c9a6acdd6378
 - 8211920: Close server socket and cleanups in test/jdk/javax/naming/module/RunBasic.java
   
   Reviewed-by: yan, andrew
   Backport-of: e61252dc278fd44345c5377811552ed6760ffcf0
 - 8340815: Add SECURITY.md file
   
   Backport-of: 0474f020bf276c761f46bc8ba0873ed90a8fd19b
 - 8340671: GHA: Bump macOS and Xcode versions to macos-12 and XCode 13.4.1
   
   Reviewed-by: sgehwolf
 - ... and 6 more: https://git.openjdk.org/jdk11u-dev/compare/cee8535a...2188c9d7

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

Changes: https://git.openjdk.org/jdk11u-dev/pull/2952/files
  Webrev: https://webrevs.openjdk.org/?repo=jdk11u-dev&pr=2952&range=01
  Stats: 679 lines in 22 files changed: 271 ins; 306 del; 102 mod
  Patch: https://git.openjdk.org/jdk11u-dev/pull/2952.diff
  Fetch: git fetch https://git.openjdk.org/jdk11u-dev.git pull/2952/head:pull/2952

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


More information about the jdk-updates-dev mailing list