Merge branch 'raimo/gen_statem-callback_mode/OTP-13752' into maint

* raimo/gen_statem-callback_mode/OTP-13752:
  ssl: Upgrade suite testing skipped if stdlib upgrade is required
  Fix version numbers and dependencies

Conflicts:
	lib/ssl/src/ssl.appup.src
	lib/ssl/vsn.mk

9 files changed, 26 insertions, 29 deletions

diff --git a/lib/ssh/src/ssh.app.src b/lib/ssh/src/ssh.app.src
index 3245ba5197..76b7d8cd55 100644
--- a/lib/ssh/src/ssh.app.src
+++ b/lib/ssh/src/ssh.app.src
@@ -45,7 +45,7 @@
 			  "erts-6.0",
 			  "kernel-3.0",
 			  "public_key-1.1",
-			  "stdlib-3.0"
+			  "stdlib-3.1"
 			 ]}]}.
 
 
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 575c1af3a9..212b99c695 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,5 +1,5 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SSH_VSN = 4.3.1
+SSH_VSN = 4.3.2
 
 APP_VSN    = "ssh-$(SSH_VSN)"
diff --git a/lib/ssl/src/ssl.app.src b/lib/ssl/src/ssl.app.src
index b26efbd88f..00b0513891 100644
--- a/lib/ssl/src/ssl.app.src
+++ b/lib/ssl/src/ssl.app.src
@@ -55,7 +55,7 @@
     {applications, [crypto, public_key, kernel, stdlib]},
     {env, []},
     {mod, {ssl_app, []}},
-    {runtime_dependencies, ["stdlib-3.0","public_key-1.2","kernel-3.0",
+    {runtime_dependencies, ["stdlib-3.1","public_key-1.2","kernel-3.0",
 			    "erts-7.0","crypto-3.3", "inets-5.10.7"]}]}.
 
 
diff --git a/lib/ssl/src/ssl.appup.src b/lib/ssl/src/ssl.appup.src
index fadc67ef80..22e24af0a8 100644
--- a/lib/ssl/src/ssl.appup.src
+++ b/lib/ssl/src/ssl.appup.src
@@ -1,24 +1,11 @@
 %% -*- erlang -*-
 {"%VSN%",
  [
-  {<<"^8[.]0$">>,
-   [{load_module, ssl_handshake, soft_purge, soft_purge, []}
-   ]},
-  {<<"^7[.][^.].*">>, [{restart_application, ssl}]},
-  {<<"6\\..*">>, [{restart_application, ssl}]},
-  {<<"5\\..*">>, [{restart_application, ssl}]},
-  {<<"4\\..*">>, [{restart_application, ssl}]},
-  {<<"3\\..*">>, [{restart_application, ssl}]}
+  {<<"^8[.]0([.][0-9]+)?$">>, [{restart_application, ssl}]},
+  {<<"^[3-7][.][^.].*">>, [{restart_application, ssl}]}
  ], 
  [
-  {<<"^8[.]0$">>,
-   [{load_module, ssl_handshake, soft_purge, soft_purge, []}
-   ]},
-  {<<"^7[.][^.].*">>, [{restart_application, ssl}]},
-  {<<"6\\..*">>, [{restart_application, ssl}]},
-  {<<"5\\..*">>, [{restart_application, ssl}]},
-  {<<"4\\..*">>, [{restart_application, ssl}]},
-  {<<"3\\..*">>, [{restart_application, ssl}]}
+  {<<"^8[.]0([.][0-9]+)?$">>, [{restart_application, ssl}]},
+  {<<"^[3-7][.][^.].*">>, [{restart_application, ssl}]}
  ]
 }.
-
diff --git a/lib/ssl/test/ssl_upgrade_SUITE.erl b/lib/ssl/test/ssl_upgrade_SUITE.erl
index 113b3b4158..f6af1e6182 100644
--- a/lib/ssl/test/ssl_upgrade_SUITE.erl
+++ b/lib/ssl/test/ssl_upgrade_SUITE.erl
@@ -29,7 +29,8 @@
 	  server,
 	  client,
 	  soft,
-	  result_proxy
+	  result_proxy,
+	  skip
 	 }).
 
 all() -> 
@@ -73,8 +74,15 @@ major_upgrade(Config) when is_list(Config) ->
 minor_upgrade(Config) when is_list(Config) ->
     ct_release_test:upgrade(ssl, minor,{?MODULE, #state{config = Config}}, Config).
 
-upgrade_init(CTData, #state{config = Config} = State) -> 
-    {ok, {_, _, Up, _Down}} = ct_release_test:get_appup(CTData, ssl),
+upgrade_init(CtData, State) -> 
+    {ok,{FromVsn,ToVsn}} = ct_release_test:get_app_vsns(CtData, ssl),
+    upgrade_init(FromVsn, ToVsn, CtData, State).
+
+upgrade_init(_, "8.0.2", _, State) ->
+    %% Requires stdlib upgrade so it will be a node upgrade!
+    State#state{skip = true};
+upgrade_init(_, _, CtData, #state{config = Config} = State) ->
+    {ok, {_, _, Up, _Down}} = ct_release_test:get_appup(CtData, ssl),
     ct:pal("Up: ~p", [Up]),
     Soft = is_soft(Up), %% It is symmetrical, if upgrade is soft so is downgrade  
     Pid = spawn(?MODULE, result_proxy_init, [[]]),
@@ -88,6 +96,8 @@ upgrade_init(CTData, #state{config = Config} = State) ->
 	    State#state{soft = Soft, result_proxy = Pid}
     end.
 
+upgrade_upgraded(_, #state{skip = true} = State) ->
+    State;
 upgrade_upgraded(_, #state{soft = false, config = Config, result_proxy = Pid} = State) ->
     ct:pal("Restart upgrade ~n", []),
     {Server, Client} = restart_start_connection(Config, Pid),
@@ -96,7 +106,6 @@ upgrade_upgraded(_, #state{soft = false, config = Config, result_proxy = Pid} =
     ssl_test_lib:close(Client),
     ok = Result,
     State;
-
 upgrade_upgraded(_, #state{server = Server0, client = Client0,
 			   config = Config, soft = true,
 			   result_proxy = Pid} = State) ->
@@ -110,6 +119,8 @@ upgrade_upgraded(_, #state{server = Server0, client = Client0,
     {Server, Client} = soft_start_connection(Config, Pid),
     State#state{server = Server, client = Client}.
 
+upgrade_downgraded(_, #state{skip = true} = State) ->
+    State;
 upgrade_downgraded(_, #state{soft = false, config = Config, result_proxy = Pid} = State) ->
     ct:pal("Restart downgrade: ~n", []),
     {Server, Client} = restart_start_connection(Config, Pid),
@@ -119,7 +130,6 @@ upgrade_downgraded(_, #state{soft = false, config = Config, result_proxy = Pid}
     Pid ! stop,
     ok = Result,
     State;
-
 upgrade_downgraded(_, #state{server = Server, client = Client, soft = true, result_proxy = Pid} = State) ->
     ct:pal("Soft downgrade: ~n", []),
     Server ! changed_version,
diff --git a/lib/ssl/vsn.mk b/lib/ssl/vsn.mk
index 6afac59109..914eb43505 100644
--- a/lib/ssl/vsn.mk
+++ b/lib/ssl/vsn.mk
@@ -1 +1 @@
-SSL_VSN = 8.0.1
+SSL_VSN = 8.0.2
diff --git a/lib/stdlib/vsn.mk b/lib/stdlib/vsn.mk
index 41037b8f53..c74343d9ca 100644
--- a/lib/stdlib/vsn.mk
+++ b/lib/stdlib/vsn.mk
@@ -1 +1 @@
-STDLIB_VSN = 3.0.1
+STDLIB_VSN = 3.1
diff --git a/lib/tools/src/tools.app.src b/lib/tools/src/tools.app.src
index a00969eabe..18166cceb0 100644
--- a/lib/tools/src/tools.app.src
+++ b/lib/tools/src/tools.app.src
@@ -40,7 +40,7 @@
   {env, [{file_util_search_methods,[{"", ""}, {"ebin", "esrc"}, {"ebin", "src"}]}
 	]
   },
-  {runtime_dependencies, ["stdlib-2.5","runtime_tools-1.8.14",
+  {runtime_dependencies, ["stdlib-3.1","runtime_tools-1.8.14",
 			  "kernel-3.0","inets-5.10","erts-7.0",
 			  "compiler-5.0"]}
  ]
diff --git a/lib/tools/vsn.mk b/lib/tools/vsn.mk
index e6287b0430..e066dbf5e9 100644
--- a/lib/tools/vsn.mk
+++ b/lib/tools/vsn.mk
@@ -1 +1 @@
-TOOLS_VSN = 2.8.5
+TOOLS_VSN = 2.8.6