There's no date yet, but when it's available we should remove --add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED from test tasks' JVM args in 2.4 and 2.5 when we forward-merge the upgrade.