aboutsummaryrefslogtreecommitdiffstats
path: root/lib/xmerl
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2014-03-20 17:10:32 +0100
committerRickard Green <[email protected]>2014-03-20 17:10:32 +0100
commit3c06b5b3cdde72453d97910889e38e91c1dd4870 (patch)
tree1e58ec80f38cdea611b1ce297a1826ee869de605 /lib/xmerl
parenta50d7e892e3b2b3c8241eabd6bd0121672a6720f (diff)
parente0052804daa336e0d05b8a451e15b07afd085074 (diff)
downloadotp-3c06b5b3cdde72453d97910889e38e91c1dd4870.tar.gz
otp-3c06b5b3cdde72453d97910889e38e91c1dd4870.tar.bz2
otp-3c06b5b3cdde72453d97910889e38e91c1dd4870.zip
Merge branch 'rickard/runtime-dep/OTP-11773'
* rickard/runtime-dep/OTP-11773: Introduce system_information:sanity_check() Verify runtime_dependencies when running 'otp_build patch_app' Add test-case verifying runtime dependencies found by xref Introduce runtime_dependencies in .app files Bump versions and ensure that all are "normal" versions
Diffstat (limited to 'lib/xmerl')
-rw-r--r--lib/xmerl/src/xmerl.app.src3
-rw-r--r--lib/xmerl/vsn.mk2
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/xmerl/src/xmerl.app.src b/lib/xmerl/src/xmerl.app.src
index b471447bbd..45cfe9d250 100644
--- a/lib/xmerl/src/xmerl.app.src
+++ b/lib/xmerl/src/xmerl.app.src
@@ -39,5 +39,6 @@
{registered, []},
{env, []},
- {applications, [kernel, stdlib]}
+ {applications, [kernel, stdlib]},
+ {runtime_dependencies, ["stdlib-2.0","kernel-3.0","erts-6.0"]}
]}.
diff --git a/lib/xmerl/vsn.mk b/lib/xmerl/vsn.mk
index 333466c11e..aab2a37d6c 100644
--- a/lib/xmerl/vsn.mk
+++ b/lib/xmerl/vsn.mk
@@ -1 +1 @@
-XMERL_VSN = 1.3.6
+XMERL_VSN = 1.3.7