Merge branch 'maint-25' into maint

* maint-25:
  Updated OTP version
  Prepare release
  Update copyright year

lib/diameter/doc/notes.md

@@ -131,6 +131,14 @@ Releases are listed in reverse chronological order, most recent first.
 
   Own Id: OTP-18490 Aux Id: OTP-18471, GH-6339, PR-6843
 
+## diameter 2.2.7.2
+
+### Fixed Bugs and Malfunctions
+
+* \`diameter:stop_service/1\` has been made more synchronous.
+
+  Own Id: OTP-19206 Aux Id: ERIERL-1102
+
 ## diameter 2.2.7.1
 
 ### Fixed Bugs and Malfunctions

lib/public_key/doc/notes.md

@@ -197,6 +197,14 @@ limitations under the License.
 
   Own Id: OTP-18447
 
+## Public_Key 1.13.3.3
+
+### Fixed Bugs and Malfunctions
+
+* For completeness handle rsa_pss implicit default value, although this will probably not be commonly used as it provides very weak security.
+
+  Own Id: OTP-19179
+
 ## Public_Key 1.13.3.2
 
 ### Fixed Bugs and Malfunctions

lib/ssh/doc/notes.md

@@ -214,6 +214,17 @@ limitations under the License.
 
   Own Id: OTP-18490 Aux Id: OTP-18471, GH-6339, PR-6843
 
+## Ssh 4.15.3.6
+
+### Fixed Bugs and Malfunctions
+
+* The SSh daemon started with a TCP port number argument will now re-try obtaining a listen socket before returning an error to the user.
+
+  Own Id: OTP-19170 Aux Id: GH-7746
+* Robustness has been improved by monitoring the connection handler process before casting the socket control notification.
+
+  Own Id: OTP-19173 Aux Id: PR-8310
+
 ## Ssh 4.15.3.5
 
 ### Fixed Bugs and Malfunctions

lib/xmerl/doc/notes.md

@@ -127,6 +127,14 @@ This document describes the changes made to the Xmerl application.
 
   Own Id: OTP-18595 Aux Id: ERIERL-944
 
+## Xmerl 1.3.31.2
+
+### Fixed Bugs and Malfunctions
+
+* Corrected export functions from internal structure to XML so xmlText items of type cdata are handled correctly. They were just exported as normal text instead of output in a CDATA section.
+
+  Own Id: OTP-19217 Aux Id: ERIERL-1104
+
 ## Xmerl 1.3.31.1
 
 ### Fixed Bugs and Malfunctions

otp_versions.table

@@ -16,6 +16,7 @@ OTP-26.1 : asn1-5.2 common_test-1.25.1 compiler-8.4 crypto-5.3 debugger-5.3.2 di
 OTP-26.0.2 : compiler-8.3.2 erts-14.0.2 kernel-9.0.2 ssh-5.0.1 ssl-11.0.2 stdlib-5.0.2 # asn1-5.1 common_test-1.25 crypto-5.2 debugger-5.3.1 dialyzer-5.1 diameter-2.3 edoc-1.2 eldap-1.2.11 erl_docgen-1.5 erl_interface-5.4 et-1.7 eunit-2.8.2 ftp-1.2 inets-9.0.1 jinterface-1.14 megaco-4.4.4 mnesia-4.22 observer-2.15 odbc-2.14.1 os_mon-2.9 parsetools-2.5 public_key-1.14 reltool-1.0 runtime_tools-2.0 sasl-4.2.1 snmp-5.14 syntax_tools-3.1 tftp-1.1 tools-3.6 wx-2.3 xmerl-1.3.32 :
 OTP-26.0.1 : compiler-8.3.1 erts-14.0.1 inets-9.0.1 kernel-9.0.1 ssl-11.0.1 stdlib-5.0.1 xmerl-1.3.32 # asn1-5.1 common_test-1.25 crypto-5.2 debugger-5.3.1 dialyzer-5.1 diameter-2.3 edoc-1.2 eldap-1.2.11 erl_docgen-1.5 erl_interface-5.4 et-1.7 eunit-2.8.2 ftp-1.2 jinterface-1.14 megaco-4.4.4 mnesia-4.22 observer-2.15 odbc-2.14.1 os_mon-2.9 parsetools-2.5 public_key-1.14 reltool-1.0 runtime_tools-2.0 sasl-4.2.1 snmp-5.14 ssh-5.0 syntax_tools-3.1 tftp-1.1 tools-3.6 wx-2.3 :
 OTP-26.0 : asn1-5.1 common_test-1.25 compiler-8.3 crypto-5.2 dialyzer-5.1 diameter-2.3 erl_docgen-1.5 erl_interface-5.4 erts-14.0 et-1.7 ftp-1.2 inets-9.0 jinterface-1.14 kernel-9.0 megaco-4.4.4 mnesia-4.22 observer-2.15 odbc-2.14.1 os_mon-2.9 parsetools-2.5 public_key-1.14 reltool-1.0 runtime_tools-2.0 sasl-4.2.1 snmp-5.14 ssh-5.0 ssl-11.0 stdlib-5.0 syntax_tools-3.1 tftp-1.1 tools-3.6 wx-2.3 # debugger-5.3.1 edoc-1.2 eldap-1.2.11 eunit-2.8.2 xmerl-1.3.31 :
+OTP-25.3.2.14 : diameter-2.2.7.2 public_key-1.13.3.3 ssh-4.15.3.6 xmerl-1.3.31.2 # asn1-5.0.21.1 common_test-1.24.0.3 compiler-8.2.6.4 crypto-5.1.4.3 debugger-5.3.1.3 dialyzer-5.0.5 edoc-1.2 eldap-1.2.11 erl_docgen-1.4 erl_interface-5.3.2.1 erts-13.2.2.10 et-1.6.5 eunit-2.8.2 ftp-1.1.4 inets-8.3.1.3 jinterface-1.13.2 kernel-8.5.4.3 megaco-4.4.3 mnesia-4.21.4.3 observer-2.14.0.1 odbc-2.14 os_mon-2.8.2.1 parsetools-2.4.1 reltool-0.9.1.1 runtime_tools-1.19 sasl-4.2 snmp-5.13.5 ssl-10.9.1.5 stdlib-4.3.1.4 syntax_tools-3.0.1 tftp-1.0.4 tools-3.5.3 wx-2.2.2.1 :
 OTP-25.3.2.13 : erts-13.2.2.10 ssh-4.15.3.5 ssl-10.9.1.5 # asn1-5.0.21.1 common_test-1.24.0.3 compiler-8.2.6.4 crypto-5.1.4.3 debugger-5.3.1.3 dialyzer-5.0.5 diameter-2.2.7.1 edoc-1.2 eldap-1.2.11 erl_docgen-1.4 erl_interface-5.3.2.1 et-1.6.5 eunit-2.8.2 ftp-1.1.4 inets-8.3.1.3 jinterface-1.13.2 kernel-8.5.4.3 megaco-4.4.3 mnesia-4.21.4.3 observer-2.14.0.1 odbc-2.14 os_mon-2.8.2.1 parsetools-2.4.1 public_key-1.13.3.2 reltool-0.9.1.1 runtime_tools-1.19 sasl-4.2 snmp-5.13.5 stdlib-4.3.1.4 syntax_tools-3.0.1 tftp-1.0.4 tools-3.5.3 wx-2.2.2.1 xmerl-1.3.31.1 :
 OTP-25.3.2.12 : erts-13.2.2.9 mnesia-4.21.4.3 ssl-10.9.1.4 # asn1-5.0.21.1 common_test-1.24.0.3 compiler-8.2.6.4 crypto-5.1.4.3 debugger-5.3.1.3 dialyzer-5.0.5 diameter-2.2.7.1 edoc-1.2 eldap-1.2.11 erl_docgen-1.4 erl_interface-5.3.2.1 et-1.6.5 eunit-2.8.2 ftp-1.1.4 inets-8.3.1.3 jinterface-1.13.2 kernel-8.5.4.3 megaco-4.4.3 observer-2.14.0.1 odbc-2.14 os_mon-2.8.2.1 parsetools-2.4.1 public_key-1.13.3.2 reltool-0.9.1.1 runtime_tools-1.19 sasl-4.2 snmp-5.13.5 ssh-4.15.3.4 stdlib-4.3.1.4 syntax_tools-3.0.1 tftp-1.0.4 tools-3.5.3 wx-2.2.2.1 xmerl-1.3.31.1 :
 OTP-25.3.2.11 : common_test-1.24.0.3 crypto-5.1.4.3 debugger-5.3.1.3 diameter-2.2.7.1 erts-13.2.2.8 inets-8.3.1.3 kernel-8.5.4.3 observer-2.14.0.1 os_mon-2.8.2.1 reltool-0.9.1.1 ssh-4.15.3.4 stdlib-4.3.1.4 # asn1-5.0.21.1 compiler-8.2.6.4 dialyzer-5.0.5 edoc-1.2 eldap-1.2.11 erl_docgen-1.4 erl_interface-5.3.2.1 et-1.6.5 eunit-2.8.2 ftp-1.1.4 jinterface-1.13.2 megaco-4.4.3 mnesia-4.21.4.2 odbc-2.14 parsetools-2.4.1 public_key-1.13.3.2 runtime_tools-1.19 sasl-4.2 snmp-5.13.5 ssl-10.9.1.3 syntax_tools-3.0.1 tftp-1.0.4 tools-3.5.3 wx-2.2.2.1 xmerl-1.3.31.1 :