Drop dependency on xmerl where it isn't needed

UTF-8 validation that used xmerl_ucs:from_bin/1
now uses unicode:characters_to_binary/3.

Author: lhoguin

deps/amqp_client/Makefile

@@ -39,7 +39,7 @@ endef
 # Release artifacts are put in $(PACKAGES_DIR).
 PACKAGES_DIR ?= $(abspath PACKAGES)
 
-LOCAL_DEPS = xmerl ssl public_key
+LOCAL_DEPS = ssl public_key
 DEPS = rabbit_common credentials_obfuscation
 TEST_DEPS = rabbitmq_ct_helpers rabbit meck
 

deps/amqp_client/src/amqp_connection.erl

@@ -203,7 +203,7 @@ set_connection_name(ConnName,
 %% application controller is in the process of shutting down the very
 %% application which is making this call.
 ensure_started() ->
-    [ensure_started(App) || App <- [syntax_tools, compiler, xmerl,
+    [ensure_started(App) || App <- [syntax_tools, compiler,
                                     rabbit_common, amqp_client, credentials_obfuscation]],
     ok.
 

deps/rabbit/Makefile

@@ -126,7 +126,7 @@ define PROJECT_ENV
 	  ]
 endef
 
-LOCAL_DEPS = sasl os_mon inets compiler public_key crypto ssl syntax_tools xmerl
+LOCAL_DEPS = sasl os_mon inets compiler public_key crypto ssl syntax_tools
 
 BUILD_DEPS = rabbitmq_cli
 DEPS = ranch cowlib rabbit_common amqp10_common rabbitmq_prelaunch ra sysmon_handler stdout_formatter recon redbug observer_cli osiris syslog systemd seshat horus khepri khepri_mnesia_migration cuttlefish gen_batch_server

deps/rabbit_common/Makefile

@@ -25,7 +25,7 @@ define HEX_TARBALL_EXTRA_METADATA
 }
 endef
 
-LOCAL_DEPS = compiler crypto public_key sasl ssl syntax_tools tools xmerl runtime_tools
+LOCAL_DEPS = compiler crypto public_key sasl ssl syntax_tools tools runtime_tools
 DEPS = thoas ranch recon credentials_obfuscation
 
 # Variables and recipes in development.*.mk are meant to be used from
@@ -43,7 +43,7 @@ DEP_EARLY_PLUGINS = $(PROJECT)/mk/rabbitmq-early-plugin.mk
 DEP_PLUGINS = $(PROJECT)/mk/rabbitmq-build.mk \
 	      $(PROJECT)/mk/rabbitmq-hexpm.mk
 
-PLT_APPS += mnesia crypto ssl xmerl
+PLT_APPS += mnesia crypto ssl
 
 include ../../rabbitmq-components.mk
 include ../../erlang.mk

deps/rabbit_common/src/rabbit_binary_parser.erl

@@ -164,9 +164,11 @@ assert_utf8(B) ->
     end.
 
 validate_utf8(Bin) ->
-    try
-        _ = xmerl_ucs:from_utf8(Bin),
-        ok
-    catch exit:{ucs, _} ->
+    case unicode:characters_to_binary(Bin, unicode, unicode) of
+        B when is_binary(B) ->
+            ok;
+        {error, _, _} ->
+            error;
+        {incomplete, _, _} ->
             error
     end.

deps/rabbit_common/src/rabbit_misc.erl

@@ -505,10 +505,13 @@ b64decode_or_throw(B64) ->
     end.
 
 utf8_safe(V) ->
-    try
-        _ = xmerl_ucs:from_utf8(V),
-        V
-    catch exit:{ucs, _} ->
+    case unicode:characters_to_binary(V, unicode, unicode) of
+        B when is_binary(B) ->
+            B;
+        {error, _, _} ->
+            Enc = split_lines(base64:encode(V)),
+            <<"Not UTF-8, base64 is: ", Enc/binary>>;
+        {incomplete, _, _} ->
             Enc = split_lines(base64:encode(V)),
             <<"Not UTF-8, base64 is: ", Enc/binary>>
     end.

deps/rabbitmq_cli/test/test_helper.exs

@@ -35,7 +35,6 @@ if function_exported?(Mix, :ensure_application!, 1) do
   Mix.ensure_application!(:public_key)
   Mix.ensure_application!(:runtime_tools)
   Mix.ensure_application!(:sasl)
-  Mix.ensure_application!(:xmerl)
 end
 
 defmodule TestHelper do

deps/rabbitmq_management_agent/Makefile

@@ -19,7 +19,7 @@ endef
 
 DEPS = rabbit_common rabbit rabbitmq_web_dispatch
 TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers
-LOCAL_DEPS += xmerl ranch ssl crypto public_key
+LOCAL_DEPS += ranch ssl crypto public_key
 
 PLT_APPS += rabbitmq_cli