summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorHenrik Nord <henrik@erlang.org>2022-09-21 11:10:58 +0200
committerHenrik Nord <henrik@erlang.org>2022-09-21 11:10:58 +0200
commit8682e4d28cad3dd4f315000d8328f40cc316d48a (patch)
tree97a4006ed4c535e77b96c0824695d9da97b8303a /lib
parent28de4f43cb7f6fceba828d0847d9f34a51b0ca51 (diff)
parent6efb5e31df6bc512ed6c466584ef15b846dcecab (diff)
downloaderlang-8682e4d28cad3dd4f315000d8328f40cc316d48a.tar.gz
Merge branch 'maint' into master
* maint: Updated OTP version Prepare release Update copyright year
Diffstat (limited to 'lib')
-rw-r--r--lib/asn1/doc/src/asn1ct.xml2
-rw-r--r--lib/asn1/doc/src/notes.xml19
-rw-r--r--lib/asn1/src/asn1ct_gen.erl2
-rw-r--r--lib/asn1/test/test_compile_options.erl2
-rw-r--r--lib/asn1/vsn.mk2
-rw-r--r--lib/common_test/doc/src/notes.xml29
-rw-r--r--lib/common_test/test/ct_test_support.erl2
-rw-r--r--lib/common_test/vsn.mk2
-rw-r--r--lib/compiler/doc/src/notes.xml103
-rw-r--r--lib/compiler/src/sys_core_fold_lists.erl2
-rw-r--r--lib/compiler/vsn.mk2
-rw-r--r--lib/crypto/doc/src/crypto.xml4
-rw-r--r--lib/crypto/doc/src/notes.xml99
-rw-r--r--lib/crypto/vsn.mk2
-rw-r--r--lib/dialyzer/doc/src/notes.xml33
-rw-r--r--lib/dialyzer/vsn.mk2
-rw-r--r--lib/diameter/doc/src/notes.xml19
-rw-r--r--lib/diameter/vsn.mk2
-rw-r--r--lib/erl_docgen/doc/src/notes.xml17
-rw-r--r--lib/erl_docgen/vsn.mk2
-rw-r--r--lib/eunit/doc/src/notes.xml18
-rw-r--r--lib/eunit/vsn.mk2
-rw-r--r--lib/inets/doc/src/http_client.xml2
-rw-r--r--lib/inets/doc/src/httpc.xml2
-rw-r--r--lib/inets/doc/src/notes.xml33
-rw-r--r--lib/inets/examples/httpd_load_test/hdlt_ctrl.erl2
-rw-r--r--lib/inets/examples/httpd_load_test/hdlt_slave.erl2
-rw-r--r--lib/inets/src/http_client/httpc.erl2
-rw-r--r--lib/inets/src/inets_app/inets.appup.src2
-rw-r--r--lib/inets/vsn.mk2
-rw-r--r--lib/jinterface/doc/src/Makefile2
-rw-r--r--lib/jinterface/doc/src/notes.xml16
-rw-r--r--lib/jinterface/vsn.mk2
-rw-r--r--lib/kernel/doc/src/gen_udp.xml2
-rw-r--r--lib/kernel/doc/src/global.xml3
-rw-r--r--lib/kernel/doc/src/notes.xml133
-rw-r--r--lib/kernel/src/gen_tcp.erl2
-rw-r--r--lib/kernel/src/gen_udp.erl2
-rw-r--r--lib/kernel/src/kernel.app.src2
-rw-r--r--lib/kernel/src/kernel.appup.src6
-rw-r--r--lib/kernel/src/logger_internal.hrl2
-rw-r--r--lib/kernel/vsn.mk2
-rw-r--r--lib/megaco/Makefile2
-rw-r--r--lib/megaco/doc/src/notes.xml34
-rw-r--r--lib/megaco/src/app/megaco.mk2
-rw-r--r--lib/megaco/src/binary/depend.mk2
-rw-r--r--lib/megaco/test/megaco_mess_SUITE.erl2
-rw-r--r--lib/megaco/test/megaco_trans_SUITE.erl2
-rw-r--r--lib/megaco/vsn.mk2
-rw-r--r--lib/mnesia/doc/src/mnesia.xml2
-rw-r--r--lib/mnesia/doc/src/notes.xml2
-rw-r--r--lib/observer/doc/src/notes.xml15
-rw-r--r--lib/observer/src/observer_lib.erl2
-rw-r--r--lib/observer/src/observer_sys_wx.erl2
-rw-r--r--lib/observer/vsn.mk2
-rw-r--r--lib/parsetools/doc/src/notes.xml19
-rw-r--r--lib/parsetools/src/yecc.erl2
-rw-r--r--lib/parsetools/test/leex_SUITE.erl2
-rw-r--r--lib/parsetools/vsn.mk2
-rw-r--r--lib/public_key/doc/src/notes.xml28
-rw-r--r--lib/public_key/test/pbe_SUITE.erl2
-rw-r--r--lib/public_key/vsn.mk2
-rw-r--r--lib/runtime_tools/Makefile2
-rw-r--r--lib/sasl/test/release_handler_SUITE.erl2
-rw-r--r--lib/snmp/doc/src/notes.xml25
-rw-r--r--lib/snmp/examples/ex2/snmp_ex2_manager.erl2
-rw-r--r--lib/snmp/examples/ex2/snmp_ex2_simple_standard_test.erl2
-rw-r--r--lib/snmp/vsn.mk2
-rw-r--r--lib/ssh/doc/src/Makefile2
-rw-r--r--lib/ssh/doc/src/notes.xml61
-rw-r--r--lib/ssh/src/ssh.erl2
-rw-r--r--lib/ssh/src/ssh_client_channel.erl2
-rw-r--r--lib/ssh/src/ssh_fsm_userauth_server.erl2
-rw-r--r--lib/ssh/src/ssh_sftp.erl2
-rw-r--r--lib/ssh/src/ssh_system_sup.erl2
-rw-r--r--lib/ssh/test/ssh_connection_SUITE.erl2
-rw-r--r--lib/ssh/test/ssh_protocol_SUITE.erl2
-rw-r--r--lib/ssh/vsn.mk2
-rw-r--r--lib/ssl/doc/src/notes.xml100
-rw-r--r--lib/ssl/src/ssl_crl_cache.erl2
-rw-r--r--lib/ssl/test/openssl_alpn_SUITE.erl2
-rw-r--r--lib/ssl/test/openssl_cipher_suite_SUITE.erl2
-rw-r--r--lib/ssl/test/openssl_key_update_SUITE.erl2
-rw-r--r--lib/ssl/test/openssl_mfl_SUITE.erl2
-rw-r--r--lib/ssl/test/openssl_reject_SUITE.erl2
-rw-r--r--lib/ssl/test/openssl_session_ticket_SUITE.erl2
-rw-r--r--lib/ssl/test/ssl_cipher_suite_SUITE.erl2
-rw-r--r--lib/ssl/test/ssl_crl_SUITE.erl2
-rw-r--r--lib/ssl/test/ssl_eqc_SUITE.erl2
-rw-r--r--lib/ssl/test/ssl_key_update_SUITE.erl2
-rw-r--r--lib/ssl/test/ssl_session_cache_api_SUITE.erl2
-rw-r--r--lib/ssl/vsn.mk2
-rw-r--r--lib/stdlib/doc/src/calendar.xml2
-rw-r--r--lib/stdlib/doc/src/epp.xml2
-rw-r--r--lib/stdlib/doc/src/erl_features.xml2
-rw-r--r--lib/stdlib/doc/src/notes.xml121
-rw-r--r--lib/stdlib/src/calendar.erl2
-rw-r--r--lib/stdlib/src/erl_internal.erl2
-rw-r--r--lib/stdlib/src/stdlib.app.src2
-rw-r--r--lib/stdlib/src/stdlib.appup.src6
-rw-r--r--lib/stdlib/src/timer.erl2
-rw-r--r--lib/stdlib/test/base64_property_test_SUITE.erl2
-rw-r--r--lib/stdlib/test/calendar_SUITE.erl2
-rw-r--r--lib/stdlib/test/property_test/base64_prop.erl2
-rw-r--r--lib/stdlib/test/timer_simple_SUITE.erl2
-rw-r--r--lib/stdlib/vsn.mk2
-rw-r--r--lib/tools/doc/src/eprof.xml2
-rw-r--r--lib/xmerl/doc/src/notes.xml19
-rw-r--r--lib/xmerl/vsn.mk2
109 files changed, 1031 insertions, 99 deletions
diff --git a/lib/asn1/doc/src/asn1ct.xml b/lib/asn1/doc/src/asn1ct.xml
index a9a71db629..7b38499d48 100644
--- a/lib/asn1/doc/src/asn1ct.xml
+++ b/lib/asn1/doc/src/asn1ct.xml
@@ -4,7 +4,7 @@
<erlref>
<header>
<copyright>
- <year>1997</year><year>2020</year>
+ <year>1997</year><year>2022</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
diff --git a/lib/asn1/doc/src/notes.xml b/lib/asn1/doc/src/notes.xml
index 5885148b8a..ac7bceb5ca 100644
--- a/lib/asn1/doc/src/notes.xml
+++ b/lib/asn1/doc/src/notes.xml
@@ -32,6 +32,25 @@
<p>This document describes the changes made to the asn1 application.</p>
+<section><title>Asn1 5.0.20</title>
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>There is a new configure option,
+ <c>--enable-deterministic-build</c>, which will apply the
+ <c>deterministic</c> compiler option when building
+ Erlang/OTP. The <c>deterministic</c> option has been
+ improved to eliminate more sources of non-determinism in
+ several applications.</p>
+ <p>
+ Own Id: OTP-18165 Aux Id: PR-5965 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Asn1 5.0.19</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/asn1/src/asn1ct_gen.erl b/lib/asn1/src/asn1ct_gen.erl
index 88dc88487d..cc1a33149c 100644
--- a/lib/asn1/src/asn1ct_gen.erl
+++ b/lib/asn1/src/asn1ct_gen.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1997-2021. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/asn1/test/test_compile_options.erl b/lib/asn1/test/test_compile_options.erl
index 45e8f39d39..9334b8118a 100644
--- a/lib/asn1/test/test_compile_options.erl
+++ b/lib/asn1/test/test_compile_options.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2005-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/asn1/vsn.mk b/lib/asn1/vsn.mk
index 8093d57b72..2fbe40e589 100644
--- a/lib/asn1/vsn.mk
+++ b/lib/asn1/vsn.mk
@@ -1 +1 @@
-ASN1_VSN = 5.0.19
+ASN1_VSN = 5.0.20
diff --git a/lib/common_test/doc/src/notes.xml b/lib/common_test/doc/src/notes.xml
index d5a47e2110..5dca77f4e9 100644
--- a/lib/common_test/doc/src/notes.xml
+++ b/lib/common_test/doc/src/notes.xml
@@ -33,6 +33,35 @@
<file>notes.xml</file>
</header>
+<section><title>Common_Test 1.23.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fix cth_surefire to handle when a suite is not compiled
+ with <c>debug_info</c>. This bug has been present since
+ Erlang/OTP 25.0.</p>
+ <p>
+ Own Id: OTP-18208 Aux Id: ERIERL-852 PR-6229 </p>
+ </item>
+ </list>
+ </section>
+
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Common Test now preserves stack traces for throws.</p>
+ <p>
+ Own Id: OTP-18138 Aux Id: GH-5719, PR-6029 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Common_Test 1.23</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/common_test/test/ct_test_support.erl b/lib/common_test/test/ct_test_support.erl
index d24551eed2..3b7fc70313 100644
--- a/lib/common_test/test/ct_test_support.erl
+++ b/lib/common_test/test/ct_test_support.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2008-2021. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/common_test/vsn.mk b/lib/common_test/vsn.mk
index 4f8c4b55d2..03521d90f6 100644
--- a/lib/common_test/vsn.mk
+++ b/lib/common_test/vsn.mk
@@ -1 +1 @@
-COMMON_TEST_VSN = 1.23
+COMMON_TEST_VSN = 1.23.1
diff --git a/lib/compiler/doc/src/notes.xml b/lib/compiler/doc/src/notes.xml
index 9e38e8ed92..443b8cb5e5 100644
--- a/lib/compiler/doc/src/notes.xml
+++ b/lib/compiler/doc/src/notes.xml
@@ -32,6 +32,109 @@
<p>This document describes the changes made to the Compiler
application.</p>
+<section><title>Compiler 8.2.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>The compiler will now forbid using the empty atom
+ <c>''</c> as module name. Also forbidden are modules
+ names containing control characters, and module names
+ containing only spaces and soft hyphens.</p>
+ <p>
+ Own Id: OTP-18125 Aux Id: GH-6026 </p>
+ </item>
+ <item>
+ <p>The <c>bin_opt_info</c> and <c>recv_opt_info</c>
+ options would cause the compiler to crash when attempting
+ to compile generated code without location
+ information.</p>
+ <p>
+ Own Id: OTP-18162 Aux Id: PR-6102 </p>
+ </item>
+ <item>
+ <p>In rare circumstances involving floating point
+ operations, the compiler could terminate with an internal
+ consistency check failure.</p>
+ <p>
+ Own Id: OTP-18182 Aux Id: GH-6163 </p>
+ </item>
+ <item>
+ <p>In rare circumstances when doing arithmetic
+ instructions on non-numbers, the compiler could
+ crash.</p>
+ <p>
+ Own Id: OTP-18183 Aux Id: GH-6169 </p>
+ </item>
+ <item>
+ <p>In rare circumstances, complex boolean expressions in
+ nested cases could cause the compiler to crash.</p>
+ <p>
+ Own Id: OTP-18184 Aux Id: GH-6164 </p>
+ </item>
+ <item>
+ <p>Expression similar to <c>#{assoc:=V} =
+ #key=&gt;self()}, V</c> would return the empty map
+ instead of raising an exception.</p>
+ <p>
+ Own Id: OTP-18186</p>
+ </item>
+ <item>
+ <p>Eliminated a crash in the <c>beam_ssa_bool</c> pass of
+ the compiler when compiling a complex guard
+ expression.</p>
+ <p>
+ Own Id: OTP-18187 Aux Id: GH-6184 </p>
+ </item>
+ <item>
+ <p>In rare circumstances, the compiler could crash with
+ an internal consistency check failure.</p>
+ <p>
+ Own Id: OTP-18202 Aux Id: GH-6222 </p>
+ </item>
+ <item>
+ <p>When compiling with the option
+ <c>inline_list_funcs</c>, the compiler could produce a
+ nonsensical warning.</p>
+ <p>
+ Own Id: OTP-18214 Aux Id: GH-6158 </p>
+ </item>
+ <item>
+ <p>When given the <c>no_ssa_opt</c> option, the compiler
+ could terminate with an internal consistency failure
+ diagnostic when compiling map matching.</p>
+ <p>
+ Own Id: OTP-18234 Aux Id: GH-6277 </p>
+ </item>
+ </list>
+ </section>
+
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Made warnings for existing atoms being keywords in
+ experimental features more precise, by not warning about
+ quoted atoms.</p>
+ <p>
+ Own Id: OTP-18050</p>
+ </item>
+ <item>
+ <p>There is a new configure option,
+ <c>--enable-deterministic-build</c>, which will apply the
+ <c>deterministic</c> compiler option when building
+ Erlang/OTP. The <c>deterministic</c> option has been
+ improved to eliminate more sources of non-determinism in
+ several applications.</p>
+ <p>
+ Own Id: OTP-18165 Aux Id: PR-5965 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Compiler 8.2</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/compiler/src/sys_core_fold_lists.erl b/lib/compiler/src/sys_core_fold_lists.erl
index 6fc98e3411..21d1a4687e 100644
--- a/lib/compiler/src/sys_core_fold_lists.erl
+++ b/lib/compiler/src/sys_core_fold_lists.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2015-2020. All Rights Reserved.
+%% Copyright Ericsson AB 2015-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/compiler/vsn.mk b/lib/compiler/vsn.mk
index a1ed7bf10a..dee0da88fd 100644
--- a/lib/compiler/vsn.mk
+++ b/lib/compiler/vsn.mk
@@ -1 +1 @@
-COMPILER_VSN = 8.2
+COMPILER_VSN = 8.2.1
diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml
index c8b80a4b9e..3a65824a67 100644
--- a/lib/crypto/doc/src/crypto.xml
+++ b/lib/crypto/doc/src/crypto.xml
@@ -1857,7 +1857,7 @@ FloatValue = rand:uniform(). % again
</func>
<func>
- <name name="engine_register" arity="2" since="OTP @OTP-18172@"/>
+ <name name="engine_register" arity="2" since="OTP 25.1"/>
<fsummary>Register engine for some methods</fsummary>
<desc>
<p>Register engine to handle some type of methods, for example engine_method_digests.</p>
@@ -1870,7 +1870,7 @@ FloatValue = rand:uniform(). % again
</func>
<func>
- <name name="engine_unregister" arity="2" since="OTP @OTP-18172@"/>
+ <name name="engine_unregister" arity="2" since="OTP 25.1"/>
<fsummary>Unregister engine for some methods</fsummary>
<desc>
<p>Unregister engine so it don't handle some type of methods.</p>
diff --git a/lib/crypto/doc/src/notes.xml b/lib/crypto/doc/src/notes.xml
index 369a80059c..cfe135808b 100644
--- a/lib/crypto/doc/src/notes.xml
+++ b/lib/crypto/doc/src/notes.xml
@@ -4,7 +4,7 @@
<chapter>
<header>
<copyright>
- <year>1999</year><year>2021</year>
+ <year>1999</year><year>2022</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
@@ -31,6 +31,103 @@
</header>
<p>This document describes the changes made to the Crypto application.</p>
+<section><title>Crypto 5.1.2</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>Fix configure with <c>--with-ssl</c> and
+ <c>--disable-dynamic-ssl-lib</c> on Windows.</p>
+ <p>
+ Own Id: OTP-18147 Aux Id: GH-6024, PR-6056 </p>
+ </item>
+ <item>
+ <p> Remove all references correctly in the garbage
+ collection if an engine handle was not explicit unloaded.
+ </p>
+ <p>
+ Own Id: OTP-18152</p>
+ </item>
+ <item>
+ <p>Changed the behaviour of the engine load/unload
+ functions</p> <p> The engine load/unload functions have
+ got changed semantics to get a more consistent behaviour
+ and work correct when variables are garbage collected.
+ </p> <p> The load functions now don't register the
+ methods for the engine to replace. That will now be
+ handled with the new functions
+ engine_register/engine_unregister if needed. </p> <p>
+ Some functions are removed from the documentation and
+ therefor the API, but they are left in the code for
+ compatibility. </p> <list> <item>engine_load/4: is now
+ the same as engine_load/3</item> <item>engine_unload/2:
+ is now the same as engine_unload/1</item>
+ <item>ensure_engine_loaded/3: is now the same as
+ ensure_engine_loaded/2</item>
+ <item>ensure_engine_unloaded/1, ensure_engine_unloaded/2:
+ is now the same as engine_unload/1</item> </list>
+ <p>
+ *** POTENTIAL INCOMPATIBILITY ***</p>
+ <p>
+ Own Id: OTP-18172 Aux Id: ERIERL-826 </p>
+ </item>
+ <item>
+ <p>
+ Fixed a naming bug for AES-CFB and Blowfish-CFB/OFB when
+ linked with OpenSSL 3.0 cryptolib.</p>
+ <p>
+ Own Id: OTP-18200</p>
+ </item>
+ <item>
+ <p>
+ Sign/verify does now behave as in OTP-24 and earlier for
+ eddsa.</p>
+ <p>
+ Own Id: OTP-18205 Aux Id: GH-6219 </p>
+ </item>
+ </list>
+ </section>
+
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Pass elliptic curve names from crypto.erl to crypto's
+ nif.</p>
+ <p>
+ Own Id: OTP-18037</p>
+ </item>
+ <item>
+ <p>
+ The configure option <c>--disable-deprecated-warnings</c>
+ is removed. It was used for some releases when the
+ support for OpenSSL 3.0 was not completed. It is not
+ needed in OTP 25.</p>
+ <p>
+ Own Id: OTP-18133</p>
+ </item>
+ <item>
+ <p>
+ Crypto is now considered to be usable with the OpenSSL
+ 3.0 cryptolib for production code.</p>
+ <p>
+ ENGINE and FIPS are not yet fully functional.</p>
+ <p>
+ Own Id: OTP-18153</p>
+ </item>
+ <item>
+ <p>
+ Do not exit if the legacy provider is missing in
+ libcrypto 3.0.</p>
+ <p>
+ Own Id: OTP-18217</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Crypto 5.1.1</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/crypto/vsn.mk b/lib/crypto/vsn.mk
index a555676d49..d9fae2abd7 100644
--- a/lib/crypto/vsn.mk
+++ b/lib/crypto/vsn.mk
@@ -1 +1 @@
-CRYPTO_VSN = 5.1.1
+CRYPTO_VSN = 5.1.2
diff --git a/lib/dialyzer/doc/src/notes.xml b/lib/dialyzer/doc/src/notes.xml
index 9b7c7d91d0..4a9174e685 100644
--- a/lib/dialyzer/doc/src/notes.xml
+++ b/lib/dialyzer/doc/src/notes.xml
@@ -32,6 +32,39 @@
<p>This document describes the changes made to the Dialyzer
application.</p>
+<section><title>Dialyzer 5.0.2</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>Two bugs have been fixed in Dialyzer's checking of
+ behaviors:</p>
+ <p>When a <em>mandatory</em> callback function is present
+ but not exported, Dialyzer would not complain about a
+ missing callback.</p>
+ <p>When an <em>optional</em> callback function was not
+ exported and had incompatible arguments and/or the return
+ values were incompatible, Dialyzer would complain. This
+ has been changed to suppress the warning, because the
+ function might not be intended to be a callback function,
+ for instance if a release added a new optional callback
+ function (such as <c>format_status/1</c> for the
+ gen_server behaviour added in OTP 25).</p>
+ <p>
+ Own Id: OTP-18127 Aux Id: ERIERL-817 </p>
+ </item>
+ <item>
+ <p>The <c>no_extra_return</c> and
+ <c>no_missing_return</c> warnings can now be suppressed
+ through <c>-dialyzer</c> directives in source code.</p>
+ <p>
+ Own Id: OTP-18148 Aux Id: PR-6068 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Dialyzer 5.0.1</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/dialyzer/vsn.mk b/lib/dialyzer/vsn.mk
index 3baabf0915..de813958da 100644
--- a/lib/dialyzer/vsn.mk
+++ b/lib/dialyzer/vsn.mk
@@ -1 +1 @@
-DIALYZER_VSN = 5.0.1
+DIALYZER_VSN = 5.0.2
diff --git a/lib/diameter/doc/src/notes.xml b/lib/diameter/doc/src/notes.xml
index 19a2d278fc..3619a118a1 100644
--- a/lib/diameter/doc/src/notes.xml
+++ b/lib/diameter/doc/src/notes.xml
@@ -43,6 +43,25 @@ first.</p>
<!-- ===================================================================== -->
+<section><title>diameter 2.2.7</title>
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>There is a new configure option,
+ <c>--enable-deterministic-build</c>, which will apply the
+ <c>deterministic</c> compiler option when building
+ Erlang/OTP. The <c>deterministic</c> option has been
+ improved to eliminate more sources of non-determinism in
+ several applications.</p>
+ <p>
+ Own Id: OTP-18165 Aux Id: PR-5965 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>diameter 2.2.6</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/diameter/vsn.mk b/lib/diameter/vsn.mk
index e0dbd4c442..5eda96f384 100644
--- a/lib/diameter/vsn.mk
+++ b/lib/diameter/vsn.mk
@@ -17,5 +17,5 @@
# %CopyrightEnd%
APPLICATION = diameter
-DIAMETER_VSN = 2.2.6
+DIAMETER_VSN = 2.2.7
APP_VSN = $(APPLICATION)-$(DIAMETER_VSN)$(PRE_VSN)
diff --git a/lib/erl_docgen/doc/src/notes.xml b/lib/erl_docgen/doc/src/notes.xml
index 893b60117a..92726daa8a 100644
--- a/lib/erl_docgen/doc/src/notes.xml
+++ b/lib/erl_docgen/doc/src/notes.xml
@@ -31,7 +31,22 @@
</header>
<p>This document describes the changes made to the <em>erl_docgen</em> application.</p>
- <section><title>Erl_Docgen 1.3</title>
+ <section><title>Erl_Docgen 1.4</title>
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Update DTD to allow XML tag <c>em</c> under <c>pre</c>.</p>
+ <p>
+ Own Id: OTP-18244</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
+<section><title>Erl_Docgen 1.3</title>
<section><title>Fixed Bugs and Malfunctions</title>
<list>
diff --git a/lib/erl_docgen/vsn.mk b/lib/erl_docgen/vsn.mk
index 90715c9c82..a887c5c839 100644
--- a/lib/erl_docgen/vsn.mk
+++ b/lib/erl_docgen/vsn.mk
@@ -1 +1 @@
-ERL_DOCGEN_VSN = 1.3
+ERL_DOCGEN_VSN = 1.4
diff --git a/lib/eunit/doc/src/notes.xml b/lib/eunit/doc/src/notes.xml
index c9bd570770..98c2a00c41 100644
--- a/lib/eunit/doc/src/notes.xml
+++ b/lib/eunit/doc/src/notes.xml
@@ -33,6 +33,24 @@
</header>
<p>This document describes the changes made to the EUnit application.</p>
+<section><title>Eunit 2.8</title>
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ With this change, Eunit can optionally not try to execute
+ related module with "_tests" suffix. This might be used
+ for avoiding duplicated executions when source and test
+ modules are located in the same folder.</p>
+ <p>
+ Own Id: OTP-18181 Aux Id: ERL-97, GH-3064, PR-5461 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Eunit 2.7.1</title>
<section><title>Improvements and New Features</title>
diff --git a/lib/eunit/vsn.mk b/lib/eunit/vsn.mk
index 757bc168d7..22c38f4c7a 100644
--- a/lib/eunit/vsn.mk
+++ b/lib/eunit/vsn.mk
@@ -1 +1 @@
-EUNIT_VSN = 2.7.1
+EUNIT_VSN = 2.8
diff --git a/lib/inets/doc/src/http_client.xml b/lib/inets/doc/src/http_client.xml
index 3153482d59..34868408c6 100644
--- a/lib/inets/doc/src/http_client.xml
+++ b/lib/inets/doc/src/http_client.xml
@@ -4,7 +4,7 @@
<chapter>
<header>
<copyright>
- <year>2004</year><year>2021</year>
+ <year>2004</year><year>2022</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
diff --git a/lib/inets/doc/src/httpc.xml b/lib/inets/doc/src/httpc.xml
index ba6a6cc047..2d02ddd2be 100644
--- a/lib/inets/doc/src/httpc.xml
+++ b/lib/inets/doc/src/httpc.xml
@@ -649,7 +649,7 @@
</func>
<func>
- <name since="OTP @OTP-18118@">ssl_verify_host_options(WildcardHostName) -> list() </name>
+ <name since="OTP 25.1">ssl_verify_host_options(WildcardHostName) -> list() </name>
<fsummary>Returns ssl options for host verification.</fsummary>
<type>
<v>WildcardHostName = boolean()</v>
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 67ef801173..0f29c8852f 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -33,7 +33,38 @@
<file>notes.xml</file>
</header>
- <section><title>Inets 8.0</title>
+ <section><title>Inets 8.1</title>
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Add <c>httpc:ssl_verify_host_options/1</c> to help
+ setting default ssl options for the https client.</p>
+ <p>
+ Own Id: OTP-18118</p>
+ </item>
+ <item>
+ <p>
+ This change fixes dialyzer warnings generated for
+ inets/httpd examples (includes needed adjustment of spec
+ for ssh_sftp module).</p>
+ <p>
+ Own Id: OTP-18178 Aux Id: ERIERL-833, ERIERL-834,
+ ERIERL-835 </p>
+ </item>
+ <item>
+ <p>
+ Remove documentation of no longer supported callback.</p>
+ <p>
+ Own Id: OTP-18193 Aux Id: GH-6122 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
+<section><title>Inets 8.0</title>
<section><title>Fixed Bugs and Malfunctions</title>
<list>
diff --git a/lib/inets/examples/httpd_load_test/hdlt_ctrl.erl b/lib/inets/examples/httpd_load_test/hdlt_ctrl.erl
index d2f1bfe068..7ecf6c3876 100644
--- a/lib/inets/examples/httpd_load_test/hdlt_ctrl.erl
+++ b/lib/inets/examples/httpd_load_test/hdlt_ctrl.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2010-2021. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/inets/examples/httpd_load_test/hdlt_slave.erl b/lib/inets/examples/httpd_load_test/hdlt_slave.erl
index 7835dabaf0..2c15db21d5 100644
--- a/lib/inets/examples/httpd_load_test/hdlt_slave.erl
+++ b/lib/inets/examples/httpd_load_test/hdlt_slave.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2010-2021. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/inets/src/http_client/httpc.erl b/lib/inets/src/http_client/httpc.erl
index 3e8fe59ad8..6fb10edfc2 100644
--- a/lib/inets/src/http_client/httpc.erl
+++ b/lib/inets/src/http_client/httpc.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2009-2021. All Rights Reserved.
+%% Copyright Ericsson AB 2009-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src
index 4926f63fae..e9b88dc469 100644
--- a/lib/inets/src/inets_app/inets.appup.src
+++ b/lib/inets/src/inets_app/inets.appup.src
@@ -1,7 +1,7 @@
%% -*- erlang -*-
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1999-2018. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index 8ba56d96a6..27ac6ca6bb 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -19,6 +19,6 @@
# %CopyrightEnd%
APPLICATION = inets
-INETS_VSN = 8.0
+INETS_VSN = 8.1
PRE_VSN =
APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"
diff --git a/lib/jinterface/doc/src/Makefile b/lib/jinterface/doc/src/Makefile
index 3e329a3a3f..304dad5547 100644
--- a/lib/jinterface/doc/src/Makefile
+++ b/lib/jinterface/doc/src/Makefile
@@ -3,7 +3,7 @@
#
# %CopyrightBegin%
#
-# Copyright Ericsson AB 2000-2021. All Rights Reserved.
+# Copyright Ericsson AB 2000-2022. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/lib/jinterface/doc/src/notes.xml b/lib/jinterface/doc/src/notes.xml
index aa50a19343..544bcb0eb2 100644
--- a/lib/jinterface/doc/src/notes.xml
+++ b/lib/jinterface/doc/src/notes.xml
@@ -31,6 +31,22 @@
</header>
<p>This document describes the changes made to the Jinterface application.</p>
+<section><title>Jinterface 1.13.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fix javadoc build error by adding option <c>-encoding
+ UTF-8</c>.</p>
+ <p>
+ Own Id: OTP-18215 Aux Id: PR-6154 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Jinterface 1.13</title>
<section><title>Improvements and New Features</title>
diff --git a/lib/jinterface/vsn.mk b/lib/jinterface/vsn.mk
index 67802bef8c..dc71145e36 100644
--- a/lib/jinterface/vsn.mk
+++ b/lib/jinterface/vsn.mk
@@ -1 +1 @@
-JINTERFACE_VSN = 1.13
+JINTERFACE_VSN = 1.13.1
diff --git a/lib/kernel/doc/src/gen_udp.xml b/lib/kernel/doc/src/gen_udp.xml
index 1d1b5ea1c5..b21cd3e35e 100644
--- a/lib/kernel/doc/src/gen_udp.xml
+++ b/lib/kernel/doc/src/gen_udp.xml
@@ -4,7 +4,7 @@
<erlref>
<header>
<copyright>
- <year>1997</year><year>2021</year>
+ <year>1997</year><year>2022</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
diff --git a/lib/kernel/doc/src/global.xml b/lib/kernel/doc/src/global.xml
index 32dd40c980..9d2442c84a 100644
--- a/lib/kernel/doc/src/global.xml
+++ b/lib/kernel/doc/src/global.xml
@@ -147,7 +147,7 @@
</func>
<func>
- <name name="disconnect" arity="0" since="OTP @OTP-18232@"/>
+ <name name="disconnect" arity="0" since="OTP 25.1"/>
<fsummary>Disconnect from all other nodes known to global</fsummary>
<desc>
<p>
@@ -452,4 +452,3 @@
<seeerl marker="net_kernel"><c>net_kernel(3)</c></seeerl></p>
</section>
</erlref>
-
diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
index dfc028a12f..4e7537dfb0 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -31,6 +31,139 @@
</header>
<p>This document describes the changes made to the Kernel application.</p>
+<section><title>Kernel 8.5</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fixed inconsistency bugs in <seeerl
+ marker="kernel:global"><c>global</c></seeerl> due to
+ <c>nodeup</c>/<c>nodedown</c> messages not being
+ delivered before/after traffic over connections. Also
+ fixed various other inconsistency bugs and deadlocks in
+ both <seeerl
+ marker="kernel:global_group"><c>global_group</c></seeerl>
+ and <c>global</c>.</p>
+ <p>
+ As building blocks for these fixes, a new BIF <seemfa
+ marker="erts:erlang#nodes/2"><c>erlang:nodes/2</c></seemfa>
+ has been introduced and <seemfa
+ marker="kernel:net_kernel#monitor_nodes/2"><c>net_kernel:monitor_nodes/2</c></seemfa>
+ has been extended.</p>
+ <p>
+ The <seecom
+ marker="erts:erl#hidden"><c>-hidden</c></seecom> and
+ <seecom
+ marker="erts:erl#connect_all"><c>-connect_all</c></seecom>
+ command line arguments did not work if multiple instances
+ were present on the command line which has been fixed.
+ The new kernel parameter <seeapp
+ marker="kernel:kernel_app#connect_all"><c>connect_all</c></seeapp>
+ has also been introduced in order to replace the
+ <c>-connect_all</c> command line argument.</p>
+ <p>
+ Own Id: OTP-17934 Aux Id: PR-6007 </p>
+ </item>
+ <item>
+ <p>
+ Fixed IPv6 multicast_if and membership socket options.</p>
+ <p>
+ Own Id: OTP-18091 Aux Id: #5789 </p>
+ </item>
+ <item>
+ <p>
+ Fixed issue with inet:getifaddrs hanging on pure IPv6
+ Windows</p>
+ <p>
+ Own Id: OTP-18102 Aux Id: #5904 </p>
+ </item>
+ <item>
+ <p>
+ The type specifications for <c>inet:getopts/2</c> and
+ <c>inet:setopts/2</c> have been corrected regarding SCTP
+ options.</p>
+ <p>
+ Own Id: OTP-18115 Aux Id: PR-5939 </p>
+ </item>
+ <item>
+ <p>
+ The type specifications for <c>inet:parse_*</c> have been
+ tightened.</p>
+ <p>
+ Own Id: OTP-18121 Aux Id: PR-5972 </p>
+ </item>
+ <item>
+ <p>
+ Fix gen_tcp:connect/3 spec to include the inet_backend
+ option.</p>
+ <p>
+ Own Id: OTP-18171 Aux Id: PR-6131 </p>
+ </item>
+ <item>
+ <p>
+ Fix bug where using a binary as the format when calling
+ <c>logger:log(Level, Format, Args)</c> (or any other
+ logging function) would cause a crash or incorrect
+ logging.</p>
+ <p>
+ Own Id: OTP-18229 Aux Id: PR-6212 </p>
+ </item>
+ </list>
+ </section>
+
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Add rudimentary debug feature (option) for the
+ inet-driver based sockets, such as gen_tcp and gen_udp.</p>
+ <p>
+ Own Id: OTP-18032</p>
+ </item>
+ <item>
+ <p>
+ Introduced the <c>hidden</c> and <c>dist_listen</c>
+ options to <seemfa
+ marker="kernel:net_kernel#start/2"><c>net_kernel:start/2</c></seemfa>.</p>
+ <p>
+ Also documented the <seecom
+ marker="erts:erl#dist_listen"><c>-dist_listen</c></seecom>
+ command line argument which was erroneously documented as
+ a <c>kernel</c> parameter and not as a command line
+ argument.</p>
+ <p>
+ Own Id: OTP-18107 Aux Id: PR-6009 </p>
+ </item>
+ <item>
+ <p>
+ Scope and group monitoring have been introduced in
+ <seeerl marker="kernel:pg"><c>pg</c></seeerl>. For more
+ information see the documentation of <seemfa
+ marker="kernel:pg#monitor_scope/0"><c>pg:monitor_scope()</c></seemfa>,
+ <seemfa
+ marker="kernel:pg#monitor/1"><c>pg:monitor()</c></seemfa>,
+ and <seemfa
+ marker="kernel:pg#demonitor/1"><c>pg:demonitor()</c></seemfa>.</p>
+ <p>
+ Own Id: OTP-18163 Aux Id: PR-6058, PR-6275 </p>
+ </item>
+ <item>
+ <p>
+ A new function <seemfa
+ marker="kernel:global#disconnect/0"><c>global:disconnect/0</c></seemfa>
+ has been introduced with which one can cleanly disconnect
+ a node from all other nodes in a cluster of <c>global</c>
+ nodes.</p>
+ <p>
+ Own Id: OTP-18232 Aux Id: OTP-17843, PR-6264 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Kernel 8.4.2</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/kernel/src/gen_tcp.erl b/lib/kernel/src/gen_tcp.erl
index 7700cc470a..df0e8b1b13 100644
--- a/lib/kernel/src/gen_tcp.erl
+++ b/lib/kernel/src/gen_tcp.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1997-2021. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/kernel/src/gen_udp.erl b/lib/kernel/src/gen_udp.erl
index b30c13d062..c652a7663f 100644
--- a/lib/kernel/src/gen_udp.erl
+++ b/lib/kernel/src/gen_udp.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1997-2021. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/kernel/src/kernel.app.src b/lib/kernel/src/kernel.app.src
index 0cac3d413b..c8786fdfb7 100644
--- a/lib/kernel/src/kernel.app.src
+++ b/lib/kernel/src/kernel.app.src
@@ -159,6 +159,6 @@
{shell_docs_ansi,auto}
]},
{mod, {kernel, []}},
- {runtime_dependencies, ["erts-@OTP-17934@", "stdlib-@OTP-17932@", "sasl-3.0", "crypto-5.0"]}
+ {runtime_dependencies, ["erts-13.1", "stdlib-@OTP-17932@", "sasl-3.0", "crypto-5.0"]}
]
}.
diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src
index 19cb1b8970..7c530c2940 100644
--- a/lib/kernel/src/kernel.appup.src
+++ b/lib/kernel/src/kernel.appup.src
@@ -55,7 +55,8 @@
{<<"^8\\.3\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
{<<"^8\\.4$">>,[restart_new_emulator]},
{<<"^8\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
- {<<"^8\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}],
+ {<<"^8\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+ {<<"^8\\.4\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]}],
[{<<"^7\\.0$">>,[restart_new_emulator]},
{<<"^7\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
{<<"^7\\.1$">>,[restart_new_emulator]},
@@ -83,4 +84,5 @@
{<<"^8\\.3\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
{<<"^8\\.4$">>,[restart_new_emulator]},
{<<"^8\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
- {<<"^8\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}.
+ {<<"^8\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
+ {<<"^8\\.4\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}.
diff --git a/lib/kernel/src/logger_internal.hrl b/lib/kernel/src/logger_internal.hrl
index a4da02ba10..7047ca8ae9 100644
--- a/lib/kernel/src/logger_internal.hrl
+++ b/lib/kernel/src/logger_internal.hrl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2017-2020. All Rights Reserved.
+%% Copyright Ericsson AB 2017-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk
index 8a231615b4..4665a09e55 100644
--- a/lib/kernel/vsn.mk
+++ b/lib/kernel/vsn.mk
@@ -1 +1 @@
-KERNEL_VSN = 8.4.2
+KERNEL_VSN = 8.5
diff --git a/lib/megaco/Makefile b/lib/megaco/Makefile
index a1b7adc924..0250167791 100644
--- a/lib/megaco/Makefile
+++ b/lib/megaco/Makefile
@@ -1,7 +1,7 @@
#
# %CopyrightBegin%
#
-# Copyright Ericsson AB 1999-2021. All Rights Reserved.
+# Copyright Ericsson AB 1999-2022. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/lib/megaco/doc/src/notes.xml b/lib/megaco/doc/src/notes.xml
index e42f484091..1ae6b0c908 100644
--- a/lib/megaco/doc/src/notes.xml
+++ b/lib/megaco/doc/src/notes.xml
@@ -37,7 +37,39 @@
section is the version number of Megaco.</p>
- <section><title>Megaco 4.4</title>
+ <section><title>Megaco 4.4.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fixed various dialyzer related issues in the examples and
+ the application proper.</p>
+ <p>
+ Own Id: OTP-18179 Aux Id: ERIERL-836 </p>
+ </item>
+ </list>
+ </section>
+
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>There is a new configure option,
+ <c>--enable-deterministic-build</c>, which will apply the
+ <c>deterministic</c> compiler option when building
+ Erlang/OTP. The <c>deterministic</c> option has been
+ improved to eliminate more sources of non-determinism in
+ several applications.</p>
+ <p>
+ Own Id: OTP-18165 Aux Id: PR-5965 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
+<section><title>Megaco 4.4</title>
<section><title>Improvements and New Features</title>
<list>
diff --git a/lib/megaco/src/app/megaco.mk b/lib/megaco/src/app/megaco.mk
index d42fd0d7ed..ce2b265ffc 100644
--- a/lib/megaco/src/app/megaco.mk
+++ b/lib/megaco/src/app/megaco.mk
@@ -2,7 +2,7 @@
# %CopyrightBegin%
#
-# Copyright Ericsson AB 2007-2021. All Rights Reserved.
+# Copyright Ericsson AB 2007-2022. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/lib/megaco/src/binary/depend.mk b/lib/megaco/src/binary/depend.mk
index d430d157c0..c03f557e24 100644
--- a/lib/megaco/src/binary/depend.mk
+++ b/lib/megaco/src/binary/depend.mk
@@ -2,7 +2,7 @@
# %CopyrightBegin%
#
-# Copyright Ericsson AB 2001-2020. All Rights Reserved.
+# Copyright Ericsson AB 2001-2022. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/lib/megaco/test/megaco_mess_SUITE.erl b/lib/megaco/test/megaco_mess_SUITE.erl
index 5d040e21c1..10f8561c37 100644
--- a/lib/megaco/test/megaco_mess_SUITE.erl
+++ b/lib/megaco/test/megaco_mess_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1999-2020. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/megaco/test/megaco_trans_SUITE.erl b/lib/megaco/test/megaco_trans_SUITE.erl
index 5950b2a4ee..0d98cb3895 100644
--- a/lib/megaco/test/megaco_trans_SUITE.erl
+++ b/lib/megaco/test/megaco_trans_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2003-2021. All Rights Reserved.
+%% Copyright Ericsson AB 2003-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/megaco/vsn.mk b/lib/megaco/vsn.mk
index a58cf04e2a..deb85264ae 100644
--- a/lib/megaco/vsn.mk
+++ b/lib/megaco/vsn.mk
@@ -19,6 +19,6 @@
# %CopyrightEnd%
APPLICATION = megaco
-MEGACO_VSN = 4.4
+MEGACO_VSN = 4.4.1
PRE_VSN =
APP_VSN = "$(APPLICATION)-$(MEGACO_VSN)$(PRE_VSN)"
diff --git a/lib/mnesia/doc/src/mnesia.xml b/lib/mnesia/doc/src/mnesia.xml
index cf3ef41ab2..13d2688ad1 100644
--- a/lib/mnesia/doc/src/mnesia.xml
+++ b/lib/mnesia/doc/src/mnesia.xml
@@ -4,7 +4,7 @@
<erlref>
<header>
<copyright>
- <year>1996</year><year>2021</year>
+ <year>1996</year><year>2022</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
diff --git a/lib/mnesia/doc/src/notes.xml b/lib/mnesia/doc/src/notes.xml
index 2caabef858..128ff303ee 100644
--- a/lib/mnesia/doc/src/notes.xml
+++ b/lib/mnesia/doc/src/notes.xml
@@ -4,7 +4,7 @@
<chapter>
<header>
<copyright>
- <year>1996</year><year>2021</year>
+ <year>1996</year><year>2022</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
diff --git a/lib/observer/doc/src/notes.xml b/lib/observer/doc/src/notes.xml
index f8ffc76158..c90095718f 100644
--- a/lib/observer/doc/src/notes.xml
+++ b/lib/observer/doc/src/notes.xml
@@ -32,6 +32,21 @@
<p>This document describes the changes made to the Observer
application.</p>
+<section><title>Observer 2.13</title>
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Fixed units in gui.</p>
+ <p>
+ Own Id: OTP-18151 Aux Id: PR-6063 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Observer 2.12</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/observer/src/observer_lib.erl b/lib/observer/src/observer_lib.erl
index b06f645688..438fa80ce2 100644
--- a/lib/observer/src/observer_lib.erl
+++ b/lib/observer/src/observer_lib.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2011-2021. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/observer/src/observer_sys_wx.erl b/lib/observer/src/observer_sys_wx.erl
index dcd93b9ef6..25086b10b7 100644
--- a/lib/observer/src/observer_sys_wx.erl
+++ b/lib/observer/src/observer_sys_wx.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2011-2017. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/observer/vsn.mk b/lib/observer/vsn.mk
index cc6f77a8a2..d0250a76f6 100644
--- a/lib/observer/vsn.mk
+++ b/lib/observer/vsn.mk
@@ -1 +1 @@
-OBSERVER_VSN = 2.12
+OBSERVER_VSN = 2.13
diff --git a/lib/parsetools/doc/src/notes.xml b/lib/parsetools/doc/src/notes.xml
index eeab5d776d..6d79b4ce49 100644
--- a/lib/parsetools/doc/src/notes.xml
+++ b/lib/parsetools/doc/src/notes.xml
@@ -31,6 +31,25 @@
</header>
<p>This document describes the changes made to the Parsetools application.</p>
+<section><title>Parsetools 2.4.1</title>
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>There is a new configure option,
+ <c>--enable-deterministic-build</c>, which will apply the
+ <c>deterministic</c> compiler option when building
+ Erlang/OTP. The <c>deterministic</c> option has been
+ improved to eliminate more sources of non-determinism in
+ several applications.</p>
+ <p>
+ Own Id: OTP-18165 Aux Id: PR-5965 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Parsetools 2.4</title>
<section><title>Improvements and New Features</title>
diff --git a/lib/parsetools/src/yecc.erl b/lib/parsetools/src/yecc.erl
index 7833c6a120..ffd04a1631 100644
--- a/lib/parsetools/src/yecc.erl
+++ b/lib/parsetools/src/yecc.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1996-2021. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/parsetools/test/leex_SUITE.erl b/lib/parsetools/test/leex_SUITE.erl
index 54e15b3b79..8d7e44629c 100644
--- a/lib/parsetools/test/leex_SUITE.erl
+++ b/lib/parsetools/test/leex_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2010-2021. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/parsetools/vsn.mk b/lib/parsetools/vsn.mk
index fa41d05179..f903e0274d 100644
--- a/lib/parsetools/vsn.mk
+++ b/lib/parsetools/vsn.mk
@@ -1 +1 @@
-PARSETOOLS_VSN = 2.4
+PARSETOOLS_VSN = 2.4.1
diff --git a/lib/public_key/doc/src/notes.xml b/lib/public_key/doc/src/notes.xml
index 22ca079487..846a05025e 100644
--- a/lib/public_key/doc/src/notes.xml
+++ b/lib/public_key/doc/src/notes.xml
@@ -35,6 +35,34 @@
<file>notes.xml</file>
</header>
+<section><title>Public_Key 1.13.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Support more Linux distributions in cacerts_load/0.</p>
+ <p>
+ Own Id: OTP-18154 Aux Id: PR-6002 </p>
+ </item>
+ <item>
+ <p>
+ Correct asn1 typenames available in type pki_asn1_type()</p>
+ <p>
+ Own Id: OTP-18189 Aux Id: ERIERL-829 </p>
+ </item>
+ <item>
+ <p>
+ Sign/verify does now behave as in OTP-24 and earlier for
+ eddsa.</p>
+ <p>
+ Own Id: OTP-18205 Aux Id: GH-6219 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Public_Key 1.13</title>
<section><title>Improvements and New Features</title>
diff --git a/lib/public_key/test/pbe_SUITE.erl b/lib/public_key/test/pbe_SUITE.erl
index 3e6e9c9c3f..f3ed9f9b1d 100644
--- a/lib/public_key/test/pbe_SUITE.erl
+++ b/lib/public_key/test/pbe_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2011-2020. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/public_key/vsn.mk b/lib/public_key/vsn.mk
index 6ca08cfddb..fe098dd1a4 100644
--- a/lib/public_key/vsn.mk
+++ b/lib/public_key/vsn.mk
@@ -1 +1 @@
-PUBLIC_KEY_VSN = 1.13
+PUBLIC_KEY_VSN = 1.13.1
diff --git a/lib/runtime_tools/Makefile b/lib/runtime_tools/Makefile
index b0dd18137b..c85d81922b 100644
--- a/lib/runtime_tools/Makefile
+++ b/lib/runtime_tools/Makefile
@@ -1,7 +1,7 @@
#
# %CopyrightBegin%
#
-# Copyright Ericsson AB 1999-2021. All Rights Reserved.
+# Copyright Ericsson AB 1999-2022. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/lib/sasl/test/release_handler_SUITE.erl b/lib/sasl/test/release_handler_SUITE.erl
index 81c7b3fc32..570e1bc1fe 100644
--- a/lib/sasl/test/release_handler_SUITE.erl
+++ b/lib/sasl/test/release_handler_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2011-2021. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/snmp/doc/src/notes.xml b/lib/snmp/doc/src/notes.xml
index 837022cdd9..a57c21ffe4 100644
--- a/lib/snmp/doc/src/notes.xml
+++ b/lib/snmp/doc/src/notes.xml
@@ -34,7 +34,30 @@
</header>
- <section><title>SNMP 5.13</title>
+ <section><title>SNMP 5.13.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Improved the get-bulk response max size calculation. Its
+ now possible to configure 'empty pdu size', see appendix
+ c for more info.</p>
+ <p>
+ Own Id: OTP-17115 Aux Id: ERIERL-456 </p>
+ </item>
+ <item>
+ <p>
+ Fix various example dialyzer issues</p>
+ <p>
+ Own Id: OTP-18180 Aux Id: ERIERL-837 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
+<section><title>SNMP 5.13</title>
<section><title>Improvements and New Features</title>
<list>
diff --git a/lib/snmp/examples/ex2/snmp_ex2_manager.erl b/lib/snmp/examples/ex2/snmp_ex2_manager.erl
index d5e17f8696..43f585f026 100644
--- a/lib/snmp/examples/ex2/snmp_ex2_manager.erl
+++ b/lib/snmp/examples/ex2/snmp_ex2_manager.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2006-2021. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/snmp/examples/ex2/snmp_ex2_simple_standard_test.erl b/lib/snmp/examples/ex2/snmp_ex2_simple_standard_test.erl
index 7439f36416..181a789529 100644
--- a/lib/snmp/examples/ex2/snmp_ex2_simple_standard_test.erl
+++ b/lib/snmp/examples/ex2/snmp_ex2_simple_standard_test.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2006-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2006-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/snmp/vsn.mk b/lib/snmp/vsn.mk
index a607273107..b69b3c40b2 100644
--- a/lib/snmp/vsn.mk
+++ b/lib/snmp/vsn.mk
@@ -19,6 +19,6 @@
# %CopyrightEnd%
APPLICATION = snmp
-SNMP_VSN = 5.13
+SNMP_VSN = 5.13.1
PRE_VSN =
APP_VSN = "$(APPLICATION)-$(SNMP_VSN)$(PRE_VSN)"
diff --git a/lib/ssh/doc/src/Makefile b/lib/ssh/doc/src/Makefile
index 6a7f17a828..3835866fcc 100644
--- a/lib/ssh/doc/src/Makefile
+++ b/lib/ssh/doc/src/Makefile
@@ -1,7 +1,7 @@
#
# %CopyrightBegin%
#
-# Copyright Ericsson AB 2004-2021. All Rights Reserved.
+# Copyright Ericsson AB 2004-2022. All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 13019140eb..465ac854f0 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -30,6 +30,67 @@
<file>notes.xml</file>
</header>
+<section><title>Ssh 4.15</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Handling rare race condition at channel close.</p>
+ <p>
+ Own Id: OTP-18220 Aux Id: ERIERL-666, ERIERL-661 </p>
+ </item>
+ </list>
+ </section>
+
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ New ssh option <c>no_auth_needed</c> to skip the ssh
+ authentication. Use with caution!</p>
+ <p>
+ Own Id: OTP-18134 Aux Id: GH-6021 </p>
+ </item>
+ <item>
+ <p>
+ This change fixes dialyzer warnings generated for
+ inets/httpd examples (includes needed adjustment of spec
+ for ssh_sftp module).</p>
+ <p>
+ Own Id: OTP-18178 Aux Id: ERIERL-833, ERIERL-834,
+ ERIERL-835 </p>
+ </item>
+ <item>
+ <p>
+ The new function <c>ssh:daemon_replace_options/2</c>
+ makes it possible to change the <c>Options</c> in a
+ running SSH server.</p>
+ <p>
+ Established connections are not affected, only those
+ created after the call to this new function.</p>
+ <p>
+ Own Id: OTP-18196</p>
+ </item>
+ <item>
+ <p>
+ Add a timeout as option <c>max_initial_idle_time</c>. It
+ closes a connection that does not allocate a channel
+ within the timeout time.</p>
+ <p>
+ For more information about timeouts, see the <seeguide
+ marker="hardening#timeouts">Timeouts section </seeguide>
+ in the User's Guide <seeguide
+ marker="hardening">Hardening</seeguide> chapter.</p>
+ <p>
+ Own Id: OTP-18207 Aux Id: PR-6231 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Ssh 4.14.1</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index 0a7fce9fce..5fb95fc7d9 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -1,7 +1,7 @@
%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2004-2021. All Rights Reserved.
+%% Copyright Ericsson AB 2004-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/ssh/src/ssh_client_channel.erl b/lib/ssh/src/ssh_client_channel.erl
index 254b8e85ff..e1c7e1a7b5 100644
--- a/lib/ssh/src/ssh_client_channel.erl
+++ b/lib/ssh/src/ssh_client_channel.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2008-2021. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/ssh/src/ssh_fsm_userauth_server.erl b/lib/ssh/src/ssh_fsm_userauth_server.erl
index 9a64df4545..fc1750ce2c 100644
--- a/lib/ssh/src/ssh_fsm_userauth_server.erl
+++ b/lib/ssh/src/ssh_fsm_userauth_server.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2008-2021. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/ssh/src/ssh_sftp.erl b/lib/ssh/src/ssh_sftp.erl
index 8f70765b28..9d912e2a6c 100644
--- a/lib/ssh/src/ssh_sftp.erl
+++ b/lib/ssh/src/ssh_sftp.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2005-2021. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/ssh/src/ssh_system_sup.erl b/lib/ssh/src/ssh_system_sup.erl
index a494c97daa..ed27dc52b2 100644
--- a/lib/ssh/src/ssh_system_sup.erl
+++ b/lib/ssh/src/ssh_system_sup.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2008-2021. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/ssh/test/ssh_connection_SUITE.erl b/lib/ssh/test/ssh_connection_SUITE.erl
index f7f0a118f7..06d90cc036 100644
--- a/lib/ssh/test/ssh_connection_SUITE.erl
+++ b/lib/ssh/test/ssh_connection_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2008-2021. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/ssh/test/ssh_protocol_SUITE.erl b/lib/ssh/test/ssh_protocol_SUITE.erl
index dd7c22dcd5..666ac76f63 100644
--- a/lib/ssh/test/ssh_protocol_SUITE.erl
+++ b/lib/ssh/test/ssh_protocol_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2008-2021. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2022. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 48b03adafa..fc5447302c 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,4 +1,4 @@
#-*-makefile-*- ; force emacs to enter makefile-mode
-SSH_VSN = 4.14.1
+SSH_VSN = 4.15
APP_VSN = "ssh-$(SSH_VSN)"
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index a490b41ac7..78b81b5f9c 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -27,6 +27,106 @@
</header>
<p>This document describes the changes made to the SSL application.</p>
+<section><title>SSL 10.8.4</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Reject unexpected application data in all relevant places
+ for all TLS versions. Also, handle TLS-1.3 middlebox
+ compatibility with more care. This will make malicious
+ connections fail early and further, mitigate possible DoS
+ attacks, that would be caught by the handshake timeout.</p>
+ <p>
+ Thanks to Aina Toky Rasoamanana and Olivier Levillain
+ from Télécom SudParis for alerting us of the issues in
+ our implementation.</p>
+ <p>
+ Own Id: OTP-18044</p>
+ </item>
+ <item>
+ <p>
+ With this change, value of cacertfile option will be
+ adjusted before loading certs from the file. Adjustments
+ include converting relative paths to absolute and
+ converting symlinks to actual file path.</p>
+ <p>
+ Thanks to Marcus Johansson</p>
+ <p>
+ Own Id: OTP-18099 Aux Id: PR-6287 </p>
+ </item>
+ <item>
+ <p>
+ In TLS-1.3, if chain certs are missing (so server auth
+ domain adherence can not be determined) send peer cert
+ and hope the server is able to recreate a chain in its
+ auth domain.</p>
+ <p>
+ Own Id: OTP-18191 Aux Id: GH-6105 </p>
+ </item>
+ <item>
+ <p>
+ Make sure periodical refresh of CA certificate files
+ repopulates cache properly.</p>
+ <p>
+ Own Id: OTP-18195</p>
+ </item>
+ <item>
+ <p>
+ Correct internal CRL cache functions to use internal
+ format consistently.</p>
+ <p>
+ Own Id: OTP-18203 Aux Id: PR-5996 </p>
+ </item>
+ <item>
+ <p>
+ Incorrect handling of client middlebox negotiation for
+ TLS-1.3 could result in that a TLS-1.3 server would not
+ use middlebox mode although the client was expecting it
+ too and failing the negotiation with unexpected message.</p>
+ <p>
+ Own Id: OTP-18219 Aux Id: GH-6241, PR-6249 </p>
+ </item>
+ <item>
+ <p>
+ If the "User" process, the process starting the TLS
+ connection, gets killed in the middle of spawning the
+ dynamic connection tree make sure we do not leave any
+ processes behind.</p>
+ <p>
+ Own Id: OTP-18233 Aux Id: GH-6244, PR-6270 </p>
+ </item>
+ </list>
+ </section>
+
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ A vulnerability has been discovered and corrected. It is
+ registered as CVE-2022-37026 "Client Authentication
+ Bypass". Corrections have been released on the supported
+ tracks with patches 23.3.4.15, 24.3.4.2, and 25.0.2. The
+ vulnerability might also exist in older OTP versions. We
+ recommend that impacted users upgrade to one of these
+ versions or later on the respective tracks. OTP 25.1
+ would be an even better choice. Impacted are those who
+ are running an ssl/tls/dtls server using the ssl
+ application either directly or indirectly via other
+ applications. For example via inets (httpd), cowboy, etc.
+ Note that the vulnerability only affects servers that
+ request client certification, that is sets the option
+ {verify, verify_peer}.</p>
+ <p>
+ Own Id: OTP-18241</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>SSL 10.8.3</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssl/src/ssl_crl_cache.erl b/lib/ssl/src/ssl_crl_cache.erl
index 909b137c08..c12d829470 100644
--- a/lib/ssl/src/ssl_crl_cache.erl
+++ b/lib/ssl/src/ssl_crl_cache.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2015-2020. All Rights Reserved.
+%% Copyright Ericsson AB 2015-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/ssl/test/openssl_alpn_SUITE.erl b/lib/ssl/test/openssl_alpn_SUITE.erl
index ff1afcb05f..d43f198943 100644
--- a/lib/ssl/test/openssl_alpn_SUITE.erl
+++ b/lib/ssl/test/openssl_alpn_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2019-2020. All Rights Reserved.
+%% Copyright Ericsson AB 2019-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/ssl/test/openssl_cipher_suite_SUITE.erl b/lib/ssl/test/openssl_cipher_suite_SUITE.erl
index e9713d8596..14a1ee61b4 100644
--- a/lib/ssl/test/openssl_cipher_suite_SUITE.erl
+++ b/lib/ssl/test/openssl_cipher_suite_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2019-2021. All Rights Reserved.
+%% Copyright Ericsson AB 2019-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/ssl/test/openssl_key_update_SUITE.erl b/lib/ssl/test/openssl_key_update_SUITE.erl
index e4d42d0684..b619084c7a 100644
--- a/lib/ssl/test/openssl_key_update_SUITE.erl
+++ b/lib/ssl/test/openssl_key_update_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2020-2020. All Rights Reserved.
+%% Copyright Ericsson AB 2020-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/ssl/test/openssl_mfl_SUITE.erl b/lib/ssl/test/openssl_mfl_SUITE.erl
index e7e2d73b0b..2fbf580535 100644
--- a/lib/ssl/test/openssl_mfl_SUITE.erl
+++ b/lib/ssl/test/openssl_mfl_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2020-2020. All Rights Reserved.
+%% Copyright Ericsson AB 2020-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/ssl/test/openssl_reject_SUITE.erl b/lib/ssl/test/openssl_reject_SUITE.erl
index e846644c26..ddb350dd46 100644
--- a/lib/ssl/test/openssl_reject_SUITE.erl
+++ b/lib/ssl/test/openssl_reject_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2019-2021. All Rights Reserved.
+%% Copyright Ericsson AB 2019-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/ssl/test/openssl_session_ticket_SUITE.erl b/lib/ssl/test/openssl_session_ticket_SUITE.erl
index 31b2d4a8b2..8529afef77 100644
--- a/lib/ssl/test/openssl_session_ticket_SUITE.erl
+++ b/lib/ssl/test/openssl_session_ticket_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2007-2021. All Rights Reserved.
+%% Copyright Ericsson AB 2007-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/ssl/test/ssl_cipher_suite_SUITE.erl b/lib/ssl/test/ssl_cipher_suite_SUITE.erl
index 1c6c6fa4d4..0ddbf59e56 100644
--- a/lib/ssl/test/ssl_cipher_suite_SUITE.erl
+++ b/lib/ssl/test/ssl_cipher_suite_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2019-2020. All Rights Reserved.
+%% Copyright Ericsson AB 2019-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/ssl/test/ssl_crl_SUITE.erl b/lib/ssl/test/ssl_crl_SUITE.erl
index 997f7f11e9..6f4485d438 100644
--- a/lib/ssl/test/ssl_crl_SUITE.erl
+++ b/lib/ssl/test/ssl_crl_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2008-2021. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/ssl/test/ssl_eqc_SUITE.erl b/lib/ssl/test/ssl_eqc_SUITE.erl
index c8eda84c32..6db3c93482 100644
--- a/lib/ssl/test/ssl_eqc_SUITE.erl
+++ b/lib/ssl/test/ssl_eqc_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2015-2021. All Rights Reserved.
+%% Copyright Ericsson AB 2015-2022. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
diff --git a/lib/ssl/test/ssl_key_update_SUITE.erl b/lib/ssl/test/ssl_key_update_SUITE.erl
index b4979c4ed3..de6c0b3274 100644
--- a/lib/ssl/test/ssl_key_update_SUITE.erl
+++ b/lib/ssl/test/ssl_key_update_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2020-2020. All Rights Reserved.
+%% Copyright Ericsson AB 2020-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/ssl/test/ssl_session_cache_api_SUITE.erl b/lib/ssl/test/ssl_session_cache_api_SUITE.erl
index 12e25bdcc0..0f775ea7ba 100644
--- a/lib/ssl/test/ssl_session_cache_api_SUITE.erl
+++ b/lib/ssl/test/ssl_session_cache_api_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2010-2021. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index d06e4c86a6..dff4b5a4fd 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 10.8.3
+SSL_VSN = 10.8.4
diff --git a/lib/stdlib/doc/src/calendar.xml b/lib/stdlib/doc/src/calendar.xml
index b6fc42de78..228c0808d3 100644
--- a/lib/stdlib/doc/src/calendar.xml
+++ b/lib/stdlib/doc/src/calendar.xml
@@ -4,7 +4,7 @@
<erlref>
<header>
<copyright>
- <year>1996</year><year>2021</year>
+ <year>1996</year><year>2022</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
diff --git a/lib/stdlib/doc/src/epp.xml b/lib/stdlib/doc/src/epp.xml
index c2c24ee34d..11130b0065 100644
--- a/lib/stdlib/doc/src/epp.xml
+++ b/lib/stdlib/doc/src/epp.xml
@@ -4,7 +4,7 @@
<erlref>
<header>
<copyright>
- <year>1996</year><year>2020</year>
+ <year>1996</year><year>2022</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
diff --git a/lib/stdlib/doc/src/erl_features.xml b/lib/stdlib/doc/src/erl_features.xml
index f86f6f1d5b..cf85b4ccd6 100644
--- a/lib/stdlib/doc/src/erl_features.xml
+++ b/lib/stdlib/doc/src/erl_features.xml
@@ -71,7 +71,7 @@
</func>
<func>
- <name name="configurable" arity="0" since="OTP @OTP-18199@"/>
+ <name name="configurable" arity="0" since="OTP 25.1"/>
<fsummary>Return all configurable features.</fsummary>
<desc>
<p>Return a list of all configurable features, that is, features
diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml
index c28a1317a7..af68daad9e 100644
--- a/lib/stdlib/doc/src/notes.xml
+++ b/lib/stdlib/doc/src/notes.xml
@@ -4,7 +4,7 @@
<chapter>
<header>
<copyright>
- <year>2004</year><year>2021</year>
+ <year>2004</year><year>2022</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
@@ -31,6 +31,125 @@
</header>
<p>This document describes the changes made to the STDLIB application.</p>
+<section><title>STDLIB 4.1</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Fixed inconsistency bugs in <seeerl
+ marker="kernel:global"><c>global</c></seeerl> due to
+ <c>nodeup</c>/<c>nodedown</c> messages not being
+ delivered before/after traffic over connections. Also
+ fixed various other inconsistency bugs and deadlocks in
+ both <seeerl
+ marker="kernel:global_group"><c>global_group</c></seeerl>
+ and <c>global</c>.</p>
+ <p>
+ As building blocks for these fixes, a new BIF <seemfa
+ marker="erts:erlang#nodes/2"><c>erlang:nodes/2</c></seemfa>
+ has been introduced and <seemfa
+ marker="kernel:net_kernel#monitor_nodes/2"><c>net_kernel:monitor_nodes/2</c></seemfa>
+ has been extended.</p>
+ <p>
+ The <seecom
+ marker="erts:erl#hidden"><c>-hidden</c></seecom> and
+ <seecom
+ marker="erts:erl#connect_all"><c>-connect_all</c></seecom>
+ command line arguments did not work if multiple instances
+ were present on the command line which has been fixed.
+ The new kernel parameter <seeapp
+ marker="kernel:kernel_app#connect_all"><c>connect_all</c></seeapp>
+ has also been introduced in order to replace the
+ <c>-connect_all</c> command line argument.</p>
+ <p>
+ Own Id: OTP-17934 Aux Id: PR-6007 </p>
+ </item>
+ <item>
+ <p>
+ Fix the <c>public_key:ssh*</c> functions to be listed
+ under the correct release in the Removed Functionality
+ User's Guide.</p>
+ <p>
+ Own Id: OTP-18139 Aux Id: PR-6060 </p>
+ </item>
+ <item>
+ <p>
+ The type spec for <c>format_status/1</c> in
+ <c>gen_statem</c>, <c>gen_server</c> and <c>gen_event</c>
+ has been corrected to state that the return value is of
+ the same type as the argument (instead of the same value
+ as the argument).</p>
+ <p>
+ Own Id: OTP-18142 Aux Id: PR-6078 </p>
+ </item>
+ <item>
+ <p>
+ If the <c>timer</c> server child spec was already present
+ in <c>kernel_sup</c> but it was not started, the
+ <c>timer</c> server would fail to start with an
+ <c>{error, already_present}</c> error instead of
+ restarting the server.</p>
+ <p>
+ Own Id: OTP-18146 Aux Id: PR-5983 </p>
+ </item>
+ <item>
+ <p>When changing callback module in <c>gen_statem</c> the
+ state_enter calls flag from the old module was used in
+ for the first event in the new module, which could
+ confuse the new module and cause malfunction. This bug
+ has been corrected. </p><p> With this change some
+ <c>sys</c> debug message formats have been modified,
+ which can be a problem for debug code relying on the
+ format. </p>
+ <p>
+ *** POTENTIAL INCOMPATIBILITY ***</p>
+ <p>
+ Own Id: OTP-18239</p>
+ </item>
+ </list>
+ </section>
+
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>There is a new configure option,
+ <c>--enable-deterministic-build</c>, which will apply the
+ <c>deterministic</c> compiler option when building
+ Erlang/OTP. The <c>deterministic</c> option has been
+ improved to eliminate more sources of non-determinism in
+ several applications.</p>
+ <p>
+ Own Id: OTP-18165 Aux Id: PR-5965 </p>
+ </item>
+ <item>
+ <p>The <c>rfc339_to_system_time/1,2</c> functions now
+ allows the minutes part to be omitted from the time
+ zone.</p>
+ <p>
+ Own Id: OTP-18166 Aux Id: PR-6108 </p>
+ </item>
+ <item>
+ <p>
+ The <c>receive</c> statement in <c>gen_event</c> has been
+ optimized to not use selective receive (which was never
+ needed, and could cause severe performance degradation
+ under heavy load).</p>
+ <p>
+ Own Id: OTP-18194 Aux Id: PR-6199 </p>
+ </item>
+ <item>
+ <p>
+ Add new API function erl_features:configurable/0</p>
+ <p>
+ Own Id: OTP-18199 Aux Id: PR-5790 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>STDLIB 4.0.1</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/stdlib/src/calendar.erl b/lib/stdlib/src/calendar.erl
index e9d3a16dce..788444a664 100644
--- a/lib/stdlib/src/calendar.erl
+++ b/lib/stdlib/src/calendar.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1996-2021. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/stdlib/src/erl_internal.erl b/lib/stdlib/src/erl_internal.erl
index e6d23f1cf4..92651084c7 100644
--- a/lib/stdlib/src/erl_internal.erl
+++ b/lib/stdlib/src/erl_internal.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1998-2021. All Rights Reserved.
+%% Copyright Ericsson AB 1998-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/stdlib/src/stdlib.app.src b/lib/stdlib/src/stdlib.app.src
index 653e928127..d03f8fbfcd 100644
--- a/lib/stdlib/src/stdlib.app.src
+++ b/lib/stdlib/src/stdlib.app.src
@@ -112,6 +112,6 @@
dets]},
{applications, [kernel]},
{env, []},
- {runtime_dependencies, ["sasl-3.0","kernel-@OTP-17932@","erts-@OTP-17934@","crypto-4.5",
+ {runtime_dependencies, ["sasl-3.0","kernel-@OTP-17932@","erts-13.1","crypto-4.5",
"compiler-5.0"]}
]}.
diff --git a/lib/stdlib/src/stdlib.appup.src b/lib/stdlib/src/stdlib.appup.src
index 0a031e3579..864429adbd 100644
--- a/lib/stdlib/src/stdlib.appup.src
+++ b/lib/stdlib/src/stdlib.appup.src
@@ -48,7 +48,8 @@
{<<"^3\\.17\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
{<<"^3\\.17\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
{<<"^4\\.0$">>,[restart_new_emulator]},
- {<<"^4\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}],
+ {<<"^4\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+ {<<"^4\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}],
[{<<"^3\\.13$">>,[restart_new_emulator]},
{<<"^3\\.13\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
{<<"^3\\.13\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
@@ -69,4 +70,5 @@
{<<"^3\\.17\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
{<<"^3\\.17\\.2(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
{<<"^4\\.0$">>,[restart_new_emulator]},
- {<<"^4\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}]}.
+ {<<"^4\\.0\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+ {<<"^4\\.0\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}.
diff --git a/lib/stdlib/src/timer.erl b/lib/stdlib/src/timer.erl
index 982a4766f9..182f5cb4f2 100644
--- a/lib/stdlib/src/timer.erl
+++ b/lib/stdlib/src/timer.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1996-2021. All Rights Reserved.
+%% Copyright Ericsson AB 1996-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/stdlib/test/base64_property_test_SUITE.erl b/lib/stdlib/test/base64_property_test_SUITE.erl
index 0b8d1f69e3..68ac5e9ee7 100644
--- a/lib/stdlib/test/base64_property_test_SUITE.erl
+++ b/lib/stdlib/test/base64_property_test_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2021. All Rights Reserved.
+%% Copyright Ericsson AB 2021-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/stdlib/test/calendar_SUITE.erl b/lib/stdlib/test/calendar_SUITE.erl
index 138fdfc086..1dbbf678fd 100644
--- a/lib/stdlib/test/calendar_SUITE.erl
+++ b/lib/stdlib/test/calendar_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1997-2021. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/stdlib/test/property_test/base64_prop.erl b/lib/stdlib/test/property_test/base64_prop.erl
index 44b1811936..f77ce9b664 100644
--- a/lib/stdlib/test/property_test/base64_prop.erl
+++ b/lib/stdlib/test/property_test/base64_prop.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2021. All Rights Reserved.
+%% Copyright Ericsson AB 2021-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/stdlib/test/timer_simple_SUITE.erl b/lib/stdlib/test/timer_simple_SUITE.erl
index 1a3ac2716f..98a8dd408d 100644
--- a/lib/stdlib/test/timer_simple_SUITE.erl
+++ b/lib/stdlib/test/timer_simple_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 1997-2021. All Rights Reserved.
+%% Copyright Ericsson AB 1997-2022. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
diff --git a/lib/stdlib/vsn.mk b/lib/stdlib/vsn.mk
index 03051bf49f..7ffabdde04 100644
--- a/lib/stdlib/vsn.mk
+++ b/lib/stdlib/vsn.mk
@@ -1 +1 @@
-STDLIB_VSN = 4.0.1
+STDLIB_VSN = 4.1
diff --git a/lib/tools/doc/src/eprof.xml b/lib/tools/doc/src/eprof.xml
index b9e6be759f..a1e25b5505 100644
--- a/lib/tools/doc/src/eprof.xml
+++ b/lib/tools/doc/src/eprof.xml
@@ -4,7 +4,7 @@
<erlref>
<header>
<copyright>
- <year>1996</year><year>2020</year>
+ <year>1996</year><year>2022</year>
<holder>Ericsson AB. All Rights Reserved.</holder>
</copyright>
<legalnotice>
diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml
index 276d3dab57..701c4d372b 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -32,6 +32,25 @@
<p>This document describes the changes made to the Xmerl application.</p>
+<section><title>Xmerl 1.3.30</title>
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>There is a new configure option,
+ <c>--enable-deterministic-build</c>, which will apply the
+ <c>deterministic</c> compiler option when building
+ Erlang/OTP. The <c>deterministic</c> option has been
+ improved to eliminate more sources of non-determinism in
+ several applications.</p>
+ <p>
+ Own Id: OTP-18165 Aux Id: PR-5965 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Xmerl 1.3.29</title>
<section><title>Improvements and New Features</title>
diff --git a/lib/xmerl/vsn.mk b/lib/xmerl/vsn.mk
index 53f4ffa895..038f7ba263 100644
--- a/lib/xmerl/vsn.mk
+++ b/lib/xmerl/vsn.mk
@@ -1 +1 @@
-XMERL_VSN = 1.3.29
+XMERL_VSN = 1.3.30