Don't allow {Mod,Vsn} in modules list in .app file

It was possible to insert {Mod::atom(),Vsn::term()} instead of
Mod::atom() in the modules list in a .app file. This was not visible
in the documentation of .app files, but it was visible in the
documentation of application:load/[1,2] (where the .app file term can
be used directly as first argument).

The Vsn part was never used, so this possibility has now been removed.

35 files changed, 40 insertions, 162 deletions

diff --git a/lib/sasl/test/release_handler_SUITE_data/Makefile.src b/lib/sasl/test/release_handler_SUITE_data/Makefile.src
index 55d20aa8b6..b794aa0e6f 100644
--- a/lib/sasl/test/release_handler_SUITE_data/Makefile.src
+++ b/lib/sasl/test/release_handler_SUITE_data/Makefile.src
@@ -1,9 +1,5 @@
 EFLAGS=+debug_info
 
-P2B= \
-     P2B/a-2.0/ebin/a.@EMULATOR@ \
-     P2B/a-2.0/ebin/a_sup.@EMULATOR@
-
 LIB= \
      lib/a-9.1/ebin/a.@EMULATOR@ \
      lib/a-9.1/ebin/a_sup.@EMULATOR@ \
@@ -80,13 +76,7 @@ SUP= \
 	 release_handler_timeouts/dummy-0.1/ebin/dummy_sup.@EMULATOR@ \
 	 release_handler_timeouts/dummy-0.1/ebin/dummy_sup_2.@EMULATOR@
 
-all: $(P2B) $(LIB) $(APP) $(OTP2740) $(C) $(SUP)
-
-P2B/a-2.0/ebin/a.@EMULATOR@: P2B/a-2.0/src/a.erl
-	erlc $(EFLAGS) -oP2B/a-2.0/ebin P2B/a-2.0/src/a.erl
-P2B/a-2.0/ebin/a_sup.@EMULATOR@: P2B/a-2.0/src/a_sup.erl
-	erlc $(EFLAGS) -oP2B/a-2.0/ebin P2B/a-2.0/src/a_sup.erl
-
+all: $(LIB) $(APP) $(OTP2740) $(C) $(SUP)
 
 lib/a-1.0/ebin/a.@EMULATOR@: lib/a-1.0/src/a.erl
 	erlc $(EFLAGS) -olib/a-1.0/ebin lib/a-1.0/src/a.erl
diff --git a/lib/sasl/test/release_handler_SUITE_data/P2B/a-2.0/ebin/a.app b/lib/sasl/test/release_handler_SUITE_data/P2B/a-2.0/ebin/a.app
deleted file mode 100644
index 200cfcfe47..0000000000
--- a/lib/sasl/test/release_handler_SUITE_data/P2B/a-2.0/ebin/a.app
+++ /dev/null
@@ -1,8 +0,0 @@
-{application, a,
-	     [{description, "A  CXC 138 11"},
-              {vsn, "2.0"},
-	      {modules, [{a, 1}, {a_sup,1}]},
-	      {registered, [a_sup]},
-	      {applications, [kernel, stdlib]},
-	      {env, [{key1, val1}]},
-	      {mod, {a_sup, []}}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/P2B/a-2.0/src/a.erl b/lib/sasl/test/release_handler_SUITE_data/P2B/a-2.0/src/a.erl
deleted file mode 100644
index cfe38b55ce..0000000000
--- a/lib/sasl/test/release_handler_SUITE_data/P2B/a-2.0/src/a.erl
+++ /dev/null
@@ -1,47 +0,0 @@
-%% ``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
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved via the world wide web at http://www.erlang.org/.
-%%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%%
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%%
-%%     $Id$
-%%
--module(a).
-
-
--behaviour(gen_server).
-
-%% External exports
--export([start_link/0, a/0]).
-%% Internal exports
--export([init/1, handle_call/3, handle_info/2, terminate/2]).
-
-start_link() -> gen_server:start_link({local, aa}, a, [], []).
-
-a() -> gen_server:call(aa, a).
-
-%%-----------------------------------------------------------------
-%% Callback functions from gen_server
-%%-----------------------------------------------------------------
-init([]) ->
-    process_flag(trap_exit, true),
-    {ok, state}.
-
-handle_call(a, _From, State) ->
-    X = application:get_all_env(a),
-    {reply, X, State}.
-
-handle_info(_, State) ->
-    {noreply, State}.
-
-terminate(_Reason, _State) ->
-    ok.
diff --git a/lib/sasl/test/release_handler_SUITE_data/P2B/a-2.0/src/a_sup.erl b/lib/sasl/test/release_handler_SUITE_data/P2B/a-2.0/src/a_sup.erl
deleted file mode 100644
index a141c1767b..0000000000
--- a/lib/sasl/test/release_handler_SUITE_data/P2B/a-2.0/src/a_sup.erl
+++ /dev/null
@@ -1,37 +0,0 @@
-%% ``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
-%% compliance with the License. You should have received a copy of the
-%% Erlang Public License along with this software. If not, it can be
-%% retrieved via the world wide web at http://www.erlang.org/.
-%%
-%% Software distributed under the License is distributed on an "AS IS"
-%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
-%% the License for the specific language governing rights and limitations
-%% under the License.
-%%
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
-%%
-%%     $Id$
-%%
--module(a_sup).
-
-
--behaviour(supervisor).
-
-%% External exports
--export([start/2]).
-
-%% Internal exports
--export([init/1]).
-
-start(_, _) ->
-    supervisor:start_link({local, a_sup}, a_sup, []).
-
-init([]) ->
-    SupFlags = {one_for_one, 4, 3600},
-    Config = {a,
-	      {a, start_link, []},
-	      permanent, 2000, worker, [a]},
-    {ok, {SupFlags, [Config]}}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/c/c.app b/lib/sasl/test/release_handler_SUITE_data/c/c.app
index 908a94cf2d..2f56196918 100644
--- a/lib/sasl/test/release_handler_SUITE_data/c/c.app
+++ b/lib/sasl/test/release_handler_SUITE_data/c/c.app
@@ -1,7 +1,7 @@
 {application, c,
 	     [{description, "C  CXC 138 11"},
               {vsn, "1.0"},
-	      {modules, [b, {aa, 1}, {c_sup,1}]},
+	      {modules, [b, aa, c_sup]},
 	      {registered, [cc,bb,c_sup]},
 	      {applications, [kernel, stdlib]},
 	      {env, [{key1, val1}]},
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/a-1.0/ebin/a.app b/lib/sasl/test/release_handler_SUITE_data/lib/a-1.0/ebin/a.app
index e938137f67..7ae189a36a 100644
--- a/lib/sasl/test/release_handler_SUITE_data/lib/a-1.0/ebin/a.app
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/a-1.0/ebin/a.app
@@ -1,7 +1,7 @@
 {application, a,
 	     [{description, "A  CXC 138 11"},
               {vsn, "1.0"},
-	      {modules, [{a, 1}, {a_sup,1}]},
+	      {modules, [a, a_sup]},
 	      {registered, [a_sup]},
 	      {applications, [kernel, stdlib]},
 	      {env, [{key1, val1}]},
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/a-1.1/ebin/a.app b/lib/sasl/test/release_handler_SUITE_data/lib/a-1.1/ebin/a.app
index 1c3053b2fa..f8ab31fab9 100644
--- a/lib/sasl/test/release_handler_SUITE_data/lib/a-1.1/ebin/a.app
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/a-1.1/ebin/a.app
@@ -1,7 +1,7 @@
 {application, a,
 	     [{description, "A  CXC 138 11"},
               {vsn, "1.1"},
-	      {modules, [{a, 2}, {a_sup,1}]},
+	      {modules, [a, a_sup]},
 	      {registered, [a_sup]},
 	      {applications, [kernel, stdlib]},
 	      {env, [{key1, val1}]},
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/a-1.2/ebin/a.app b/lib/sasl/test/release_handler_SUITE_data/lib/a-1.2/ebin/a.app
index b38722f06d..2393af0493 100644
--- a/lib/sasl/test/release_handler_SUITE_data/lib/a-1.2/ebin/a.app
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/a-1.2/ebin/a.app
@@ -1,7 +1,7 @@
 {application, a,
 	     [{description, "A  CXC 138 11"},
               {vsn, "1.2"},
-	      {modules, [{a, 2}, {a_sup,1}]},
+	      {modules, [a, a_sup]},
 	      {registered, [a_sup]},
 	      {applications, [kernel, stdlib]},
 	      {env, [{key1, val1}]},
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/b-1.0/ebin/b.app b/lib/sasl/test/release_handler_SUITE_data/lib/b-1.0/ebin/b.app
index 00347b2754..e2eada00a4 100644
--- a/lib/sasl/test/release_handler_SUITE_data/lib/b-1.0/ebin/b.app
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/b-1.0/ebin/b.app
@@ -2,6 +2,6 @@
 {application, b,
  [{description, "B  CXC 138 12"},
   {vsn, "1.0"},
-  {modules, [{b_server, 1},{b_lib, 1}]},
+  {modules, [b_server,b_lib]},
   {registered, [b_server]},
   {applications, [kernel, stdlib]}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/b-2.0/ebin/b.app b/lib/sasl/test/release_handler_SUITE_data/lib/b-2.0/ebin/b.app
index 73c8e42b32..e4f8369ae5 100644
--- a/lib/sasl/test/release_handler_SUITE_data/lib/b-2.0/ebin/b.app
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/b-2.0/ebin/b.app
@@ -2,6 +2,6 @@
 {application, b,
  [{description, "B  CXC 138 12"},
   {vsn, "2.0"},
-  {modules, [{b_server, 1}]},
+  {modules, [b_server]},
   {registered, [b_server]},
   {applications, [kernel, stdlib]}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/ebin/many_mods.app b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/ebin/many_mods.app
index aa39adfffa..5c56c4cd74 100644
--- a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/ebin/many_mods.app
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.0/ebin/many_mods.app
@@ -2,16 +2,6 @@
 {application, many_mods,
  [{description, "Application with many modules  CXC 138 11"},
   {vsn, "1.0"},
-  {modules, [{m, 1},
-	     {m1,1},
-	     {m2,1},
-	     {m3,1},
-	     {m4,1},
-	     {m5,1},
-	     {m6,1},
-	     {m7,1},
-	     {m8,1},
-	     {m9,1},
-	     {m10,1}]},
+  {modules, [m,m1,m2,m3,m4,m5,m6,m7,m8,m9,m10]},
   {registered, []},
   {applications, [kernel, stdlib]}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/ebin/many_mods.app b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/ebin/many_mods.app
index 36c50caf2f..87fdfe8442 100644
--- a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/ebin/many_mods.app
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-1.1/ebin/many_mods.app
@@ -2,16 +2,6 @@
 {application, many_mods,
  [{description, "Application with many modules  CXC 138 11"},
   {vsn, "1.1"},
-  {modules, [{m, 1},
-	     {m1,1},
-	     {m2,1},
-	     {m3,1},
-	     {m4,1},
-	     {m5,1},
-	     {m6,1},
-	     {m7,1},
-	     {m8,1},
-	     {m9,1},
-	     {m10,1}]},
+  {modules, [m,m1,m2,m3,m4,m5,m6,m7,m8,m9,m10]},
   {registered, []},
   {applications, [kernel, stdlib]}]}.
diff --git a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-2.0/ebin/many_mods.app b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-2.0/ebin/many_mods.app
index 98f6527750..aba906d667 100644
--- a/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-2.0/ebin/many_mods.app
+++ b/lib/sasl/test/release_handler_SUITE_data/lib/many_mods-2.0/ebin/many_mods.app
@@ -2,6 +2,6 @@
 {application, many_mods,
  [{description, "Application with many modules  CXC 138 11"},
   {vsn, "2.0"},
-  {modules, [{m, 1}]},
+  {modules, [m]},
   {registered, []},
   {applications, [kernel, stdlib]}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/db-2.1/ebin/db.app b/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/db-2.1/ebin/db.app
index d375768b99..0878b80cb5 100644
--- a/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/db-2.1/ebin/db.app
+++ b/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/db-2.1/ebin/db.app
@@ -1,7 +1,7 @@
 {application, db,
    [{description, "ERICSSON NR FOR DB"},
     {vsn, "2.0"},
-    {modules, [{db1, "1.0"}, {db2, "1.0"}]},
+    {modules, [db1, db2]},
     {registered, []},
     {applications, []},
     {env, []},
diff --git a/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/fe-3.1/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/fe-3.1/ebin/fe.app
index d3bd85cda6..33d44805bd 100644
--- a/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/fe-3.1/ebin/fe.app
+++ b/lib/sasl/test/systools_SUITE_data/d_bad_app_vsn/lib/fe-3.1/ebin/fe.app
@@ -1,7 +1,7 @@
 {application, fe,
    [{description, "ERICSSON NR FOR FE"},
     {vsn, "3.1"},
-    {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+    {modules, [fe1, fe2, fe3]},
     {registered, []},
     {applications, []},
     {env, []},
diff --git a/lib/sasl/test/systools_SUITE_data/d_bad_appup/lib/fe-2.1/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_bad_appup/lib/fe-2.1/ebin/fe.app
index 3cb0b0c2cf..d7fae9e092 100644
--- a/lib/sasl/test/systools_SUITE_data/d_bad_appup/lib/fe-2.1/ebin/fe.app
+++ b/lib/sasl/test/systools_SUITE_data/d_bad_appup/lib/fe-2.1/ebin/fe.app
@@ -1,7 +1,7 @@
 {application, fe,
  [{description, "ERICSSON NR FOR FE"},
   {vsn, "2.1"},
-  {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+  {modules, [fe1, fe2, fe3]},
   {registered, []},
   {applications, []},
   {mod, {fe1, []}}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_bad_appup/lib/fe-3.1/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_bad_appup/lib/fe-3.1/ebin/fe.app
index 0696e2494c..682d40eb12 100644
--- a/lib/sasl/test/systools_SUITE_data/d_bad_appup/lib/fe-3.1/ebin/fe.app
+++ b/lib/sasl/test/systools_SUITE_data/d_bad_appup/lib/fe-3.1/ebin/fe.app
@@ -1,7 +1,7 @@
 {application, fe,
  [{description, "ERICSSON NR FOR FE"},
   {vsn, "3.1"},
-  {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+  {modules, [fe1, fe2, fe3]},
   {registered, []},
   {applications, []},
   {mod, {fe1, []}}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/db-2.1/ebin/db.app b/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/db-2.1/ebin/db.app
index 191919f8d3..a1025c306a 100644
--- a/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/db-2.1/ebin/db.app
+++ b/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/db-2.1/ebin/db.app
@@ -1,7 +1,7 @@
 {application, db,
    [{description, "ERICSSON NR FOR DB"},
     {vsn, "2.1"},
-    {modules, [{db1, "1.0"}, {db2, "1.0"}]},
+    {modules, [db1, db2]},
     {registered, []},
     {applications, []},
     {env, []},
diff --git a/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/fe-3.1/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/fe-3.1/ebin/fe.app
index d3bd85cda6..33d44805bd 100644
--- a/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/fe-3.1/ebin/fe.app
+++ b/lib/sasl/test/systools_SUITE_data/d_bad_mod+warn/lib/fe-3.1/ebin/fe.app
@@ -1,7 +1,7 @@
 {application, fe,
    [{description, "ERICSSON NR FOR FE"},
     {vsn, "3.1"},
-    {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+    {modules, [fe1, fe2, fe3]},
     {registered, []},
     {applications, []},
     {env, []},
diff --git a/lib/sasl/test/systools_SUITE_data/d_links/lib/db-2.1/ebin/db.app b/lib/sasl/test/systools_SUITE_data/d_links/lib/db-2.1/ebin/db.app
index 3e0ac3c3c9..28d0f80d34 100644
--- a/lib/sasl/test/systools_SUITE_data/d_links/lib/db-2.1/ebin/db.app
+++ b/lib/sasl/test/systools_SUITE_data/d_links/lib/db-2.1/ebin/db.app
@@ -1,7 +1,7 @@
 {application, db,
    [{description, "ERICSSON NR FOR DB"},
     {vsn, "2.1"},
-    {modules, [{db1, "1.0"}, {db2, "1.0"}, {db3, "2.0"}]},
+    {modules, [db1, db2, db3]},
     {registered, []},
     {applications, []},
     {env, []},
diff --git a/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/db-2.1/ebin/db.app b/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/db-2.1/ebin/db.app
index 191919f8d3..a1025c306a 100644
--- a/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/db-2.1/ebin/db.app
+++ b/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/db-2.1/ebin/db.app
@@ -1,7 +1,7 @@
 {application, db,
    [{description, "ERICSSON NR FOR DB"},
     {vsn, "2.1"},
-    {modules, [{db1, "1.0"}, {db2, "1.0"}]},
+    {modules, [db1, db2]},
     {registered, []},
     {applications, []},
     {env, []},
diff --git a/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/fe-3.1/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/fe-3.1/ebin/fe.app
index d3bd85cda6..33d44805bd 100644
--- a/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/fe-3.1/ebin/fe.app
+++ b/lib/sasl/test/systools_SUITE_data/d_missing_src/lib/fe-3.1/ebin/fe.app
@@ -1,7 +1,7 @@
 {application, fe,
    [{description, "ERICSSON NR FOR FE"},
     {vsn, "3.1"},
-    {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+    {modules, [fe1, fe2, fe3]},
     {registered, []},
     {applications, []},
     {env, []},
diff --git a/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-2.1/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-2.1/ebin/fe.app
index 47ea248720..717d30cf45 100644
--- a/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-2.1/ebin/fe.app
+++ b/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-2.1/ebin/fe.app
@@ -1,7 +1,7 @@
 {application, fe,
    [{description, "ERICSSON NR FOR FE"},
     {vsn, "2.1"},
-    {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+    {modules, [fe1, fe2, fe3]},
     {registered, []},
     {applications, []},
     {env, []},
diff --git a/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-3.1/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-3.1/ebin/fe.app
index 0696e2494c..682d40eb12 100644
--- a/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-3.1/ebin/fe.app
+++ b/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-3.1/ebin/fe.app
@@ -1,7 +1,7 @@
 {application, fe,
  [{description, "ERICSSON NR FOR FE"},
   {vsn, "3.1"},
-  {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+  {modules, [fe1, fe2, fe3]},
   {registered, []},
   {applications, []},
   {mod, {fe1, []}}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-500.18.7/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-500.18.7/ebin/fe.app
index 3a5c0ddd9b..77b97979cb 100644
--- a/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-500.18.7/ebin/fe.app
+++ b/lib/sasl/test/systools_SUITE_data/d_no_appup/lib/fe-500.18.7/ebin/fe.app
@@ -1,7 +1,7 @@
 {application, fe,
  [{description, "ERICSSON NR FOR FE"},
   {vsn, "500.18.7"},
-  {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+  {modules, [fe1, fe2, fe3]},
   {registered, []},
   {applications, []},
   {mod, {fe1, []}}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.0/ebin/db.app b/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.0/ebin/db.app
index 22530ee335..3968ce3c32 100644
--- a/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.0/ebin/db.app
+++ b/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.0/ebin/db.app
@@ -1,7 +1,7 @@
 {application, db,
    [{description, "ERICSSON NR FOR DB"},
     {vsn, "1.0"},
-    {modules, [{db1, "1.0"}, {db2, "1.0"}]},
+    {modules, [db1, db2]},
     {registered, []},
     {applications, []},
     {env, []},
diff --git a/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.1/ebin/db.app b/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.1/ebin/db.app
index 7243a0a96a..0f0c926fbd 100644
--- a/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.1/ebin/db.app
+++ b/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-1.1/ebin/db.app
@@ -1,7 +1,7 @@
 {application, db,
    [{description, "ERICSSON NR FOR DB"},
     {vsn, "1.1"},
-    {modules, [{db1, "1.0"}, {db2, "1.0"}]},
+    {modules, [db1, db2]},
     {registered, []},
     {applications, []},
     {env, []},
diff --git a/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-2.1/ebin/db.app b/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-2.1/ebin/db.app
index 202d7f1234..6901d225e2 100644
--- a/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-2.1/ebin/db.app
+++ b/lib/sasl/test/systools_SUITE_data/d_normal/lib/db-2.1/ebin/db.app
@@ -1,7 +1,7 @@
 {application, db,
  [{description, "ERICSSON NR FOR DB"},
   {vsn, "2.1"},
-  {modules, [{db1, "1.0"}, {db2, "1.0"}]},
+  {modules, [db1, db2]},
   {registered, []},
   {applications, []},
   {mod, {db1, []}}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1.1/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1.1/ebin/fe.app
index c7ba1dfe91..d963a7e7fa 100644
--- a/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1.1/ebin/fe.app
+++ b/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1.1/ebin/fe.app
@@ -1,7 +1,7 @@
 {application, fe,
    [{description, "ERICSSON NR FOR FE"},
     {vsn, "2.1.1"},
-    {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+    {modules, [fe1, fe2, fe3]},
     {registered, []},
     {applications, []},
     {env, []},
diff --git a/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1/ebin/fe.app
index 47ea248720..717d30cf45 100644
--- a/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1/ebin/fe.app
+++ b/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-2.1/ebin/fe.app
@@ -1,7 +1,7 @@
 {application, fe,
    [{description, "ERICSSON NR FOR FE"},
     {vsn, "2.1"},
-    {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+    {modules, [fe1, fe2, fe3]},
     {registered, []},
     {applications, []},
     {env, []},
diff --git a/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-3.1/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-3.1/ebin/fe.app
index 0696e2494c..682d40eb12 100644
--- a/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-3.1/ebin/fe.app
+++ b/lib/sasl/test/systools_SUITE_data/d_normal/lib/fe-3.1/ebin/fe.app
@@ -1,7 +1,7 @@
 {application, fe,
  [{description, "ERICSSON NR FOR FE"},
   {vsn, "3.1"},
-  {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+  {modules, [fe1, fe2, fe3]},
   {registered, []},
   {applications, []},
   {mod, {fe1, []}}]}.
diff --git a/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-2.1.1/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-2.1.1/ebin/fe.app
index c7ba1dfe91..d963a7e7fa 100644
--- a/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-2.1.1/ebin/fe.app
+++ b/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-2.1.1/ebin/fe.app
@@ -1,7 +1,7 @@
 {application, fe,
    [{description, "ERICSSON NR FOR FE"},
     {vsn, "2.1.1"},
-    {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+    {modules, [fe1, fe2, fe3]},
     {registered, []},
     {applications, []},
     {env, []},
diff --git a/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-2.1/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-2.1/ebin/fe.app
index 47ea248720..717d30cf45 100644
--- a/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-2.1/ebin/fe.app
+++ b/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-2.1/ebin/fe.app
@@ -1,7 +1,7 @@
 {application, fe,
    [{description, "ERICSSON NR FOR FE"},
     {vsn, "2.1"},
-    {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+    {modules, [fe1, fe2, fe3]},
     {registered, []},
     {applications, []},
     {env, []},
diff --git a/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-3.1/ebin/fe.app b/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-3.1/ebin/fe.app
index 0696e2494c..682d40eb12 100644
--- a/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-3.1/ebin/fe.app
+++ b/lib/sasl/test/systools_SUITE_data/d_regexp_appup/lib/fe-3.1/ebin/fe.app
@@ -1,7 +1,7 @@
 {application, fe,
  [{description, "ERICSSON NR FOR FE"},
   {vsn, "3.1"},
-  {modules, [{fe1, "1.0"}, {fe2, "1.0"}, {fe3, "2.0"}]},
+  {modules, [fe1, fe2, fe3]},
   {registered, []},
   {applications, []},
   {mod, {fe1, []}}]}.
diff --git a/lib/sasl/test/systools_rc_SUITE.erl b/lib/sasl/test/systools_rc_SUITE.erl
index bd4aa9e7a7..0cb6e63cf3 100644
--- a/lib/sasl/test/systools_rc_SUITE.erl
+++ b/lib/sasl/test/systools_rc_SUITE.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2010-2011. All Rights Reserved.
+%% Copyright Ericsson AB 2010-2012. 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
@@ -46,7 +46,7 @@ syntax_check(Config) when is_list(Config) ->
 	[#application{name = test,
 		      description = "TEST",
 		      vsn = "0.1",
-		      modules = [{foo,1},{bar,1},{baz,1},{old_mod,1}],
+		      modules = [foo,bar,baz,old_mod],
 		      regs = [],
 		      mod = {sasl, []}},
 	 #application{name = snmp,
@@ -59,7 +59,7 @@ syntax_check(Config) when is_list(Config) ->
 	[#application{name = test,
 		      description = "TEST",
 		      vsn = "1.0",
-		      modules = [{foo,1},{bar,1},{baz,1},{new_mod,1}],
+		      modules = [foo,bar,baz,new_mod],
 		      regs = [],
 		      mod = {sasl, []}}],
     S1 = [
@@ -128,8 +128,8 @@ translate(Config) when is_list(Config) ->
 	[#application{name = test,
 		      description = "TEST",
 		      vsn = "1.0",
-		      modules = [{foo,1},{bar,1},{baz,1},
-				 {x,1},{y,1},{z,1}],
+		      modules = [foo,bar,baz,
+				 x,y,z],
 		      regs = [],
 		      mod = {sasl, []}}],
     %% Simple translation (1)
@@ -439,7 +439,7 @@ translate_app(Config) when is_list(Config) ->
 	[#application{name = test,
 		      description = "TEST",
 		      vsn = "1.0",
-		      modules = [{foo,1},{bar,1},{baz,1}],
+		      modules = [foo,bar,baz],
 		      regs = [],
 		      mod = {sasl, []}},
 	 #application{name = pelle,
@@ -452,7 +452,7 @@ translate_app(Config) when is_list(Config) ->
 	[#application{name = test,
 		      description = "TEST",
 		      vsn = "1.0",
-		      modules = [{foo,1},{bar,1},{baz,1}],
+		      modules = [foo,bar,baz],
 		      regs = [],
 		      mod = {sasl, []}}],
     %% Simple translation (1)
@@ -492,13 +492,13 @@ translate_emulator_restarts(_Config) ->
 	[#application{name = test,
 		      description = "TEST",
 		      vsn = "1.0",
-		      modules = [{foo,1},{bar,1},{baz,1}],
+		      modules = [foo,bar,baz],
 		      regs = [],
 		      mod = {sasl, []}},
 	 #application{name = test,
 		      description = "TEST2",
 		      vsn = "1.0",
-		      modules = [{x,1},{y,1},{z,1}],
+		      modules = [x,y,z],
 		      regs = [],
 		      mod = {sasl, []}}],
     %% restart_new_emulator