diff options
author | Anders Svensson <[email protected]> | 2018-06-12 17:20:41 +0200 |
---|---|---|
committer | Anders Svensson <[email protected]> | 2018-06-12 17:20:41 +0200 |
commit | 70f163f1a2b5c92b0935e8de1fb38a7f5c7e6a67 (patch) | |
tree | 1a884e97936ea51d4c7ed8ba974d8884068a8452 /lib/diameter/src/diameter.app.src | |
parent | b9289f8cc3a97b22b7bfdb2acfef1dc5aec6893e (diff) | |
parent | da952eb9c08d208dfeef4c78b087486f8489fbe8 (diff) | |
download | otp-70f163f1a2b5c92b0935e8de1fb38a7f5c7e6a67.tar.gz otp-70f163f1a2b5c92b0935e8de1fb38a7f5c7e6a67.tar.bz2 otp-70f163f1a2b5c92b0935e8de1fb38a7f5c7e6a67.zip |
Merge branch 'anders/diameter/21.0/OTP-15110'
* anders/diameter/21.0/OTP-15110:
Make diameter_app_SUITE fail more usefully
Simplify app-file generation
Match in diameter_app_SUITE to identify an unexpected path
Don't use deprecated ssl:ssl_accept/1-3
Don't use deprecated erlang:get_stacktrace/0
Diffstat (limited to 'lib/diameter/src/diameter.app.src')
-rw-r--r-- | lib/diameter/src/diameter.app.src | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/lib/diameter/src/diameter.app.src b/lib/diameter/src/diameter.app.src index 9a6e47006b..18202f033e 100644 --- a/lib/diameter/src/diameter.app.src +++ b/lib/diameter/src/diameter.app.src @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2010-2017. All Rights Reserved. +%% Copyright Ericsson AB 2010-2018. 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. @@ -28,14 +28,21 @@ ]}, {registered, [%REGISTERED%]}, {applications, [ - {stdlib, "2.4"}, {kernel, "3.2"}%, {erts, "6.4"} - %% {syntax-tools, "1.6,18"} - %% {runtime-tools, "1.8.16"} - %, {ssl, "6.0"} + stdlib, + kernel + %, ssl + %, syntax-tools + %, runtime-tools ]}, {env, []}, {mod, {diameter_app, []}}, {runtime_dependencies, [ + "erts-10.0", + "stdlib-2.4", + "kernel-3.2", + "ssl-9.0" + %, "syntax-tools-1.6.18" + %, "runtime-tools-1.8.16" ]} %% %% Note that ssl is only required if configured on TCP transports, |