Merge branch 'maint' into master

* maint:
  Updated OTP version
  Prepare release
  Update copyright year

19 files changed, 175 insertions, 14 deletions

diff --git a/lib/compiler/doc/src/notes.xml b/lib/compiler/doc/src/notes.xml
index 9e5b8d4a4f..418ad38d98 100644
--- a/lib/compiler/doc/src/notes.xml
+++ b/lib/compiler/doc/src/notes.xml
@@ -32,6 +32,28 @@
   <p>This document describes the changes made to the Compiler
     application.</p>
 
+<section><title>Compiler 8.1.1</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>Fixed a performance bug in the validator that made
+	    certain files take a very long time to compile.</p>
+          <p>
+	    Own Id: OTP-18066 Aux Id: GH-5915 </p>
+        </item>
+        <item>
+	    <p>In rare circumstances, the compiler would mistakenly
+	    assume that a call to <c>setelement/3</c> would always
+	    fail and remove all code following the call.</p>
+          <p>
+	    Own Id: OTP-18082</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Compiler 8.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/compiler/vsn.mk b/lib/compiler/vsn.mk
index cb8a98d39a..18c452259a 100644
--- a/lib/compiler/vsn.mk
+++ b/lib/compiler/vsn.mk
@@ -1 +1 @@
-COMPILER_VSN = 8.1
+COMPILER_VSN = 8.1.1
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 90f6d1b374..40d1457e1c 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -33,7 +33,23 @@
     <file>notes.xml</file>
   </header>
   
-  <section><title>Inets 7.5.2</title>
+  <section><title>Inets 7.5.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix handling of erl_script_script option in httpd when
+	    atom 'all' is used as AllowedModule.</p>
+          <p>
+	    Own Id: OTP-18069 Aux Id: ERIERL-805 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Inets 7.5.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
diff --git a/lib/inets/src/http_server/mod_esi.erl b/lib/inets/src/http_server/mod_esi.erl
index f53826c4e5..64af60e508 100644
--- a/lib/inets/src/http_server/mod_esi.erl
+++ b/lib/inets/src/http_server/mod_esi.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/inets/vsn.mk b/lib/inets/vsn.mk
index 65e6b8dc49..c2ae51ae51 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -19,6 +19,6 @@
 # %CopyrightEnd%
 
 APPLICATION = inets
-INETS_VSN   = 7.5.2
+INETS_VSN   = 7.5.3
 PRE_VSN     =
 APP_VSN     = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"
diff --git a/lib/kernel/doc/src/notes.xml b/lib/kernel/doc/src/notes.xml
index 23b040570b..3b7c91efa7 100644
--- a/lib/kernel/doc/src/notes.xml
+++ b/lib/kernel/doc/src/notes.xml
@@ -31,6 +31,30 @@
   </header>
   <p>This document describes the changes made to the Kernel application.</p>
 
+<section><title>Kernel 8.3.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    inet:getopts/2 for the 'raw' option for a socket created
+	    with inet-backend 'socket' failed.</p>
+          <p>
+	    Own Id: OTP-18078 Aux Id: GH-5930 </p>
+        </item>
+        <item>
+          <p>
+	    Corrected the behaviour of the shutdown function when
+	    using with the inet_backend = socket. It was not
+	    sufficiently compatible with the "old" gen_tcp.</p>
+          <p>
+	    Own Id: OTP-18080 Aux Id: GH-5930 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Kernel 8.3.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src
index 4f041cda4a..da8221196a 100644
--- a/lib/kernel/src/kernel.appup.src
+++ b/lib/kernel/src/kernel.appup.src
@@ -57,7 +57,8 @@
   {<<"^8\\.2$">>,[restart_new_emulator]},
   {<<"^8\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^8\\.3$">>,[restart_new_emulator]},
-  {<<"^8\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}],
+  {<<"^8\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^8\\.3\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}],
  [{<<"^6\\.4$">>,[restart_new_emulator]},
   {<<"^6\\.4\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^6\\.4\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
@@ -87,4 +88,5 @@
   {<<"^8\\.2$">>,[restart_new_emulator]},
   {<<"^8\\.2\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^8\\.3$">>,[restart_new_emulator]},
-  {<<"^8\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]}]}.
+  {<<"^8\\.3\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^8\\.3\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]}]}.
diff --git a/lib/kernel/vsn.mk b/lib/kernel/vsn.mk
index 817f66720e..5528c87124 100644
--- a/lib/kernel/vsn.mk
+++ b/lib/kernel/vsn.mk
@@ -1 +1 @@
-KERNEL_VSN = 8.3.1
+KERNEL_VSN = 8.3.2
diff --git a/lib/mnesia/doc/src/notes.xml b/lib/mnesia/doc/src/notes.xml
index 8559884a5d..0ce4a959ed 100644
--- a/lib/mnesia/doc/src/notes.xml
+++ b/lib/mnesia/doc/src/notes.xml
@@ -39,7 +39,24 @@
     thus constitutes one section in this document. The title of each
     section is the version number of Mnesia.</p>
 
-  <section><title>Mnesia 4.20.3</title>
+  <section><title>Mnesia 4.20.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fixed <c>mnesia:add_table_copy/3</c> so that calling it
+	    when mnesia started on another node does not fail or
+	    cause hanging nodes.</p>
+          <p>
+	    Own Id: OTP-18056</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Mnesia 4.20.3</title>
 
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/mnesia/vsn.mk b/lib/mnesia/vsn.mk
index 182e3ff20c..8f04eb60fe 100644
--- a/lib/mnesia/vsn.mk
+++ b/lib/mnesia/vsn.mk
@@ -1 +1 @@
-MNESIA_VSN = 4.20.3
+MNESIA_VSN = 4.20.4
diff --git a/lib/ssl/doc/src/notes.xml b/lib/ssl/doc/src/notes.xml
index 7163b077ee..564eb9ec9c 100644
--- a/lib/ssl/doc/src/notes.xml
+++ b/lib/ssl/doc/src/notes.xml
@@ -27,6 +27,38 @@
   </header>
   <p>This document describes the changes made to the SSL application.</p>
 
+<section><title>SSL 10.7.3</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Client certification could fail if TLS-1.3 enabled client
+	    negotiated TLS-1.2 connection with the server, this is
+	    due to the wrong version being used when decoding the
+	    certificate request message from the server.</p>
+          <p>
+	    Own Id: OTP-18028 Aux Id: GH-5835 </p>
+        </item>
+        <item>
+          <p>
+	    socket option packet_size was not handled in ssl:setops/2
+	    and ssl:getotps/2</p>
+          <p>
+	    Own Id: OTP-18062 Aux Id: GH-5898 </p>
+        </item>
+        <item>
+          <p>
+	    Remove legacy code to fix interoperability with new
+	    socket inet_backend.</p>
+          <p>
+	    Own Id: OTP-18071 Aux Id: GH-5930 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>SSL 10.7.2</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index 672ae7a2df..bdc7ce4739 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 10.7.2
+SSL_VSN = 10.7.3
diff --git a/lib/stdlib/doc/src/notes.xml b/lib/stdlib/doc/src/notes.xml
index 0eece83846..aaf1887dc8 100644
--- a/lib/stdlib/doc/src/notes.xml
+++ b/lib/stdlib/doc/src/notes.xml
@@ -31,6 +31,24 @@
   </header>
   <p>This document describes the changes made to the STDLIB application.</p>
 
+<section><title>STDLIB 3.17.2</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+	    <p>The type specifications for
+	    <c>shell_docs:get_doc/3</c>,
+	    <c>shell_docs:get_callback_doc/3</c>, and
+	    <c>shell_docs:get_type_doc/3</c> incorrectly stated that
+	    the returned <c>Metadata</c> was an empty map.</p>
+          <p>
+	    Own Id: OTP-18081</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>STDLIB 3.17.1</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/stdlib/src/shell_docs.erl b/lib/stdlib/src/shell_docs.erl
index a808c42199..e42b5bb5b8 100644
--- a/lib/stdlib/src/shell_docs.erl
+++ b/lib/stdlib/src/shell_docs.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/stdlib.appup.src b/lib/stdlib/src/stdlib.appup.src
index a01e8c0e10..393e4efaa9 100644
--- a/lib/stdlib/src/stdlib.appup.src
+++ b/lib/stdlib/src/stdlib.appup.src
@@ -54,6 +54,7 @@
   {<<"^3\\.16\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^3\\.17$">>,[restart_new_emulator]},
   {<<"^3\\.17\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^3\\.17\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^3\\.9$">>,[restart_new_emulator]},
   {<<"^3\\.9\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^3\\.9\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
@@ -84,6 +85,7 @@
   {<<"^3\\.16\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^3\\.17$">>,[restart_new_emulator]},
   {<<"^3\\.17\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
+  {<<"^3\\.17\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
   {<<"^3\\.9$">>,[restart_new_emulator]},
   {<<"^3\\.9\\.0(?:\\.[0-9]+)+$">>,[restart_new_emulator]},
   {<<"^3\\.9\\.1(?:\\.[0-9]+)*$">>,[restart_new_emulator]},
diff --git a/lib/stdlib/vsn.mk b/lib/stdlib/vsn.mk
index a38292f165..c68e00fd12 100644
--- a/lib/stdlib/vsn.mk
+++ b/lib/stdlib/vsn.mk
@@ -1 +1 @@
-STDLIB_VSN = 3.17.1
+STDLIB_VSN = 3.17.2
diff --git a/lib/wx/c_src/wxe_gl.cpp b/lib/wx/c_src/wxe_gl.cpp
index e819e4302a..46c4cc7679 100644
--- a/lib/wx/c_src/wxe_gl.cpp
+++ b/lib/wx/c_src/wxe_gl.cpp
@@ -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/wx/doc/src/notes.xml b/lib/wx/doc/src/notes.xml
index 5a9632cd01..4261afa703 100644
--- a/lib/wx/doc/src/notes.xml
+++ b/lib/wx/doc/src/notes.xml
@@ -32,6 +32,34 @@
   <p>This document describes the changes made to the wxErlang
     application.</p>
 
+<section><title>Wx 2.1.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Fix build failure with wxWidgets-3.1.6.</p>
+          <p>
+	    Own Id: OTP-18064 Aux Id: GH-5893 </p>
+        </item>
+      </list>
+    </section>
+
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>
+	    Enable the possibility to build wx on windows with
+	    wxWidgets-3.1.6.</p>
+          <p>
+	    Own Id: OTP-18061 Aux Id: GH-5883 </p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
 <section><title>Wx 2.1.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/wx/vsn.mk b/lib/wx/vsn.mk
index b3c8589b83..51279f250b 100644
--- a/lib/wx/vsn.mk
+++ b/lib/wx/vsn.mk
@@ -1 +1 @@
-WX_VSN = 2.1.3
+WX_VSN = 2.1.4