Merge branch 'siri/appup-for-r17/OTP-10950'

* siri/appup-for-r17/OTP-10950:
  Update sasl version and sasl.appup.src for R17
  Update stdlib.appup.src for R17
  Update kernel.appup.src for R17

5 files changed, 22 insertions, 58 deletions

diff --git a/lib/kernel/src/kernel.appup.src b/lib/kernel/src/kernel.appup.src
index 54628800a8..ae2666d496 100644
--- a/lib/kernel/src/kernel.appup.src
+++ b/lib/kernel/src/kernel.appup.src
@@ -1,7 +1,7 @@
 %% -*- erlang -*-
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2013. 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
@@ -17,11 +17,11 @@
 %% %CopyrightEnd%
 {"%VSN%",
  %% Up from - max two major revisions back
- [{<<"2\\.16(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16
-  {<<"2\\.15(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R15
-  {<<"2\\.14(\\.[0-9]+)*">>,[restart_new_emulator]}],%% R14
+ [{<<"2\\.17(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17
+  {<<"2\\.16(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16
+  {<<"2\\.15(\\.[0-9]+)*">>,[restart_new_emulator]}],%% R15
  %% Down to - max two major revisions back
- [{<<"2\\.16(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16
-  {<<"2\\.15(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R15
-  {<<"2\\.14(\\.[0-9]+)*">>,[restart_new_emulator]}] %% R14
+ [{<<"2\\.17(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17
+  {<<"2\\.16(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16
+  {<<"2\\.15(\\.[0-9]+)*">>,[restart_new_emulator]}] %% R15
 }.
diff --git a/lib/sasl/src/sasl.appup.src b/lib/sasl/src/sasl.appup.src
index a4a38ee40a..0c4d80a74f 100644
--- a/lib/sasl/src/sasl.appup.src
+++ b/lib/sasl/src/sasl.appup.src
@@ -17,13 +17,11 @@
 %% %CopyrightEnd%
 {"%VSN%",
  %% Up from - max two major revisions back
- [{<<"2\\.3(\\.[0-9]+)*">>,[restart_new_emulator]},         %% R16
-  {<<"2\\.2(\\.[0-9]+)*">>,[restart_new_emulator]},         %% R15
-  {<<"2\\.1\\.10(\\.[0-9]+)*">>,[restart_new_emulator]},    %% R14B04
-  {<<"2\\.1\\.9\\.[24](\\.[0-9]+)*">>,[restart_new_emulator]}],%% R14B-R14B03
+ [{<<"2\\.4(\\.[0-9]+)*">>,[restart_new_emulator]},         %% R17
+  {<<"2\\.3(\\.[0-9]+)*">>,[restart_new_emulator]},         %% R16
+  {<<"2\\.2(\\.[0-9]+)*">>,[restart_new_emulator]}],        %% R15
  %% Down to - max two major revisions back
- [{<<"2\\.3(\\.[0-9]+)*">>,[restart_new_emulator]},         %% R16
-  {<<"2\\.2(\\.[0-9]+)*">>,[restart_new_emulator]},         %% R15
-  {<<"2\\.1\\.10(\\.[0-9]+)*">>,[restart_new_emulator]},    %% R14B04
-  {<<"2\\.1\\.9\\.[24](\\.[0-9]+)*">>,[restart_new_emulator]}] %% R14B-R14B03
+ [{<<"2\\.4(\\.[0-9]+)*">>,[restart_new_emulator]},         %% R17
+  {<<"2\\.3(\\.[0-9]+)*">>,[restart_new_emulator]},         %% R16
+  {<<"2\\.2(\\.[0-9]+)*">>,[restart_new_emulator]}]         %% R15
 }.
diff --git a/lib/sasl/test/sasl_SUITE.erl b/lib/sasl/test/sasl_SUITE.erl
index b6eaf41323..e8f6a4a2eb 100644
--- a/lib/sasl/test/sasl_SUITE.erl
+++ b/lib/sasl/test/sasl_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2011. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2013. 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
@@ -74,40 +74,6 @@ appup_test(_Config) ->
     check_appup(NokVsns,DownTo,error),
     ok.
 
-
-%% For sasl, the versions up to R14B03 were not according to the rule
-%% used for other core applications - i.e. to change the second number
-%% at major releases, the third at maintenance releases and the fourth
-%% for patches - therefore test versions up to and including R16 are
-%% hardcoded.
-%% (All versions below are not necessarily existing.)
--define(r12_vsns,["2.1.5"]).
--define(r13_vsns,["2.1.6","2.1.7.1","2.1.9","2.1.9.1.2"]).
--define(r14_vsns,["2.1.9.2","2.1.9.2.20","2.1.9.4","2.1.10"]).
--define(r15_major,"2.2").
--define(r16_major,"2.3").
--define(r17_major,"2.4").
-create_test_vsns(?r15_major ++ Rest) ->
-    R15Vsns =
-	case string:tokens(Rest,".") of
-	    [] -> [];
-	    ["1"] -> [?r15_major];
-	    _ -> [?r15_major,?r15_major++".1"]
-	end,
-    OkVsns = ?r13_vsns ++ ?r14_vsns ++ R15Vsns,
-    NokVsns = ?r12_vsns ++ [?r15_major++",1", ?r16_major],
-    {OkVsns,NokVsns};
-create_test_vsns(?r16_major ++ Rest) ->
-    R16Vsns =
-	case string:tokens(Rest,".") of
-	    [] -> [];
-	    ["1"] -> [?r16_major];
-	    _ -> [?r16_major,?r16_major++".1"]
-	end,
-    OkVsns = ?r14_vsns ++ [?r15_major, ?r15_major ++ ".1.4"] ++ R16Vsns,
-    NokVsns = ?r13_vsns ++ [?r16_major++",1", ?r17_major],
-    {OkVsns,NokVsns};
-%% Normal erts case - i.e. for versions that comply to the erts standard
 create_test_vsns(Current) ->
     [XStr,YStr|Rest] = string:tokens(Current,"."),
     X = list_to_integer(XStr),
diff --git a/lib/sasl/vsn.mk b/lib/sasl/vsn.mk
index 0e52133166..da8cbc5130 100644
--- a/lib/sasl/vsn.mk
+++ b/lib/sasl/vsn.mk
@@ -1 +1 @@
-SASL_VSN = 2.3.1
+SASL_VSN = 2.4
diff --git a/lib/stdlib/src/stdlib.appup.src b/lib/stdlib/src/stdlib.appup.src
index 55c8087475..4c828e4434 100644
--- a/lib/stdlib/src/stdlib.appup.src
+++ b/lib/stdlib/src/stdlib.appup.src
@@ -1,7 +1,7 @@
 %% -*- erlang -*-
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 1999-2011. All Rights Reserved.
+%% Copyright Ericsson AB 1999-2013. 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
@@ -17,11 +17,11 @@
 %% %CopyrightEnd%
 {"%VSN%",
  %% Up from - max two major revisions back
- [{<<"1\\.19(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16
-  {<<"1\\.18(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R15
-  {<<"1\\.17(\\.[0-9]+)*">>,[restart_new_emulator]}],%% R14
+ [{<<"1\\.20(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17
+  {<<"1\\.19(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16
+  {<<"1\\.18(\\.[0-9]+)*">>,[restart_new_emulator]}],%% R15
  %% Down to - max two major revisions back
- [{<<"1\\.19(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16
-  {<<"1\\.18(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R15
-  {<<"1\\.17(\\.[0-9]+)*">>,[restart_new_emulator]}] %% R14
+ [{<<"1\\.20(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R17
+  {<<"1\\.19(\\.[0-9]+)*">>,[restart_new_emulator]}, %% R16
+  {<<"1\\.18(\\.[0-9]+)*">>,[restart_new_emulator]}] %% R15
 }.