Openfire (master)

• 

  daryl herzmann 13 Mar 2026 81d66bdeca1d485d050197ec0604cb67399fa02f

  Merge pull request #3183 from guusdk/OF-3204_DefaultExternalizableUtil-fixes
  OF-3204: Fix readSerializableMap incorrectly narrowing key type to String
• 

  daryl herzmann 13 Mar 2026 5941f71b5913b4be0a7b8ca474c56de5040ed646

  Merge pull request #3182 from guusdk/OF-3203_HappyEyeballs-done
  OF-3203: Rename HappyEyeballsResolver#isDone() to isExhausted() for clarity
• 

  Guus der Kinderen 13 Mar 2026 4eeb8608d28791a45fcad463521188e6a3ae4c35

  Additional bumps of junit to version 6.0.3

  • .github/actions/connectivitytests-action/conntest/pom.xml (version 4eeb8608d28791a45fcad463521188e6a3ae4c35)
  • starter/pom.xml (version 4eeb8608d28791a45fcad463521188e6a3ae4c35)
• 

  dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> 13 Mar 2026 52295a00c6947a5b891b5f0483c363f67b5675d7

  chore(deps): bump org.junit:junit-bom from 5.13.4 to 6.0.3
  Bumps [org.junit:junit-bom](https://github.com/junit-team/junit-framework) from 5.13.4 to 6.0.3.
  - [Release notes](https://github.com/junit-team/junit-framework/releases)
  - [Commits](https://github.com/junit-team/junit-framework/compare/r5.13.4...r6.0.3)
  
  ---
  updated-dependencies:
  - dependency-name: org.junit:junit-bom
    dependency-version: 6.0.3
    dependency-type: direct:production
    update-type: version-update:semver-major
  ...
  
  Signed-off-by: dependabot[bot] <support@github.com>

  • xmppserver/pom.xml (version 52295a00c6947a5b891b5f0483c363f67b5675d7)
• 

  Guus der Kinderen 13 Mar 2026 d4097c73c1335bfed1517218b54a92aa17515ec5 m

  OF-3119: Fix flaky tests on macOS by reducing short-delay solver sleep duration
  On macOS, coarser JVM timer granularity meant Thread.sleep(25) could overshoot the 50ms deadline, causing the resolver to fall through to getAlternativeImmediately() and return the lower-priority host instead of waiting for the preferred one.
  
  Reduce the sleep duration used in short-delay test solvers from RESOLUTION_DELAY/2 (25ms) to RESOLUTION_DELAY/10 (5ms), leaving a 45ms margin within the 50ms resolution delay window.

  • xmppserver/src/test/java/org/jivesoftware/openfire/net/HappyEyeballsResolverTest.java (version d4097c73c1335bfed1517218b54a92aa17515ec5)
• 

  Guus der Kinderen 13 Mar 2026 d5fd709d63c40d6cc9230e0dbee3a4dd35765a28 m

  OF-3204: Fix readSerializableMap incorrectly narrowing key type to String
  The deserialized result was cast to Map<String, Serializable> despite the method signature accepting Map<? extends Serializable, ? extends Serializable>. Due to type erasure this succeeded silently, but would cause failures at the call site for any map with non-String keys. Widened the cast to Map<Serializable, Serializable> to match the declared contract.
  
  Test coverage for readSerializableMap and several other previously disabled or missing cases added in DefaultExternalizableUtilTest.
  
  Replaced an incorrect javadoc statement.

  • xmppserver/src/main/java/org/jivesoftware/util/cache/DefaultExternalizableUtil.java (version d5fd709d63c40d6cc9230e0dbee3a4dd35765a28)
  • xmppserver/src/main/java/org/jivesoftware/util/cache/ExternalizableUtil.java (version d5fd709d63c40d6cc9230e0dbee3a4dd35765a28)
  • xmppserver/src/test/java/org/jivesoftware/util/cache/DefaultExternalizableUtilTest.java (version d5fd709d63c40d6cc9230e0dbee3a4dd35765a28)
• 

  Guus der Kinderen 12 Mar 2026 f42d7bddfd79ff4dc83c6c2b47fd648b0779f36e m

  OF-3203: Rename HappyEyeballsResolver#isDone() to isExhausted() for clarity
  The previous name `isDone()` implied that the method signals completion of DNS resolution, whereas it actually returns `true` only once all resolved addresses have been consumed by the caller. The name `isExhausted()` more accurately reflects this semantics, which aligns with the Happy Eyeballs concept of iterating through candidate addresses until none remain.
  
  Additionally, a NullPointerException in solve() has been fixed. The exceptionally() handler previously returned null, which was passed to addResults() and caused a NullPointerException on the completion thread whenever DNS resolution failed. The handler now returns an empty Set, ensuring the failure is handled cleanly without masking the original exception.
  
  Unit tests have been added to cover `isExhausted()` and mixed resolution failure scenarios.

  • xmppserver/src/main/java/org/jivesoftware/openfire/net/HappyEyeballsResolver.java (version f42d7bddfd79ff4dc83c6c2b47fd648b0779f36e)
  • xmppserver/src/main/java/org/jivesoftware/openfire/net/SocketUtil.java (version f42d7bddfd79ff4dc83c6c2b47fd648b0779f36e)
  • xmppserver/src/test/java/org/jivesoftware/openfire/net/HappyEyeballsResolverTest.java (version f42d7bddfd79ff4dc83c6c2b47fd648b0779f36e)