From cfa3de4b2b1a07e9f4ef90d0aa6b22252238bc47 Mon Sep 17 00:00:00 2001 From: Michal Kuratczyk Date: Wed, 22 May 2024 23:42:29 +0200 Subject: [PATCH 1/2] Remove unused imports (thanks elp!) --- deps/amqp10_client/test/msg_SUITE.erl | 1 - .../test/binary_parser_SUITE.erl | 1 - deps/amqp_client/src/amqp_channel_sup_sup.erl | 2 -- deps/amqp_client/src/amqp_direct_consumer.erl | 2 -- deps/oauth2_client/src/oauth2_client.erl | 2 -- deps/oauth2_client/test/oauth_http_mock.erl | 1 - deps/rabbit/app.bzl | 20 ++++++++----------- deps/rabbit/src/internal_user.erl | 2 -- deps/rabbit/src/rabbit.erl | 1 - deps/rabbit/src/rabbit_amqqueue_process.erl | 1 - .../src/rabbit_auth_mechanism_amqplain.erl | 2 -- .../src/rabbit_auth_mechanism_cr_demo.erl | 2 -- .../src/rabbit_auth_mechanism_plain.erl | 2 -- .../rabbit/src/rabbit_channel_interceptor.erl | 1 - .../src/rabbit_classic_queue_index_v2.erl | 2 -- .../src/rabbit_credential_validation.erl | 2 -- .../src/rabbit_credential_validator.erl | 2 -- ...credential_validator_accept_everything.erl | 2 -- ...edential_validator_min_password_length.erl | 2 -- ...t_credential_validator_password_regexp.erl | 2 -- deps/rabbit/src/rabbit_db.erl | 2 -- .../src/rabbit_db_binding_m2k_converter.erl | 1 - deps/rabbit/src/rabbit_db_m2k_converter.erl | 1 - .../rabbit_db_maintenance_m2k_converter.erl | 1 - .../src/rabbit_db_msup_m2k_converter.erl | 1 - deps/rabbit/src/rabbit_db_queue.erl | 1 - .../src/rabbit_db_queue_m2k_converter.erl | 1 - .../src/rabbit_db_rtparams_m2k_converter.erl | 1 - deps/rabbit/src/rabbit_db_vhost.erl | 1 - .../src/rabbit_db_vhost_m2k_converter.erl | 1 - .../src/rabbit_definitions_import_https.erl | 2 -- ...it_definitions_import_local_filesystem.erl | 2 -- deps/rabbit/src/rabbit_logger_exchange_h.erl | 2 -- .../src/rabbit_mirror_queue_mode_all.erl | 2 -- .../src/rabbit_mirror_queue_mode_exactly.erl | 2 -- .../src/rabbit_mirror_queue_mode_nodes.erl | 2 -- deps/rabbit/src/rabbit_mnesia.erl | 2 -- deps/rabbit/src/rabbit_nodes.erl | 1 - .../rabbit_peer_discovery_classic_config.erl | 2 -- deps/rabbit/src/rabbit_peer_discovery_dns.erl | 2 -- deps/rabbit/src/rabbit_plugins.erl | 2 -- deps/rabbit/src/rabbit_prequeue.erl | 1 - deps/rabbit/src/rabbit_queue_decorator.erl | 1 - .../rabbit_queue_location_client_local.erl | 1 - .../src/rabbit_queue_location_random.erl | 1 - .../src/rabbit_queue_location_validator.erl | 1 - .../src/rabbit_queue_master_location_misc.erl | 1 - .../src/rabbit_quorum_memory_manager.erl | 2 -- deps/rabbit/src/rabbit_router.erl | 2 -- .../rabbit/src/rabbit_upgrade_preparation.erl | 1 - deps/rabbit/src/rabbit_variable_queue.erl | 1 - deps/rabbit/src/rabbit_vhost.erl | 1 - deps/rabbit/src/rabbit_vhost_limit.erl | 2 -- deps/rabbit/src/rabbit_vhost_process.erl | 2 -- deps/rabbit/src/rabbit_vhost_sup.erl | 2 -- deps/rabbit/src/term_to_binary_compat.erl | 2 -- deps/rabbit/src/vhost.erl | 1 - .../amqqueue_backward_compatibility_SUITE.erl | 1 - .../rabbit/test/channel_interceptor_SUITE.erl | 1 - .../test/channel_operation_timeout_SUITE.erl | 1 - .../channel_operation_timeout_test_queue.erl | 2 -- deps/rabbit/test/cluster_limit_SUITE.erl | 2 -- deps/rabbit/test/cluster_minority_SUITE.erl | 1 - .../test/clustering_management_SUITE.erl | 2 -- deps/rabbit/test/consumer_timeout_SUITE.erl | 1 - deps/rabbit/test/definition_import_SUITE.erl | 1 - ...disconnect_detected_during_alarm_SUITE.erl | 1 - deps/rabbit/test/disk_monitor_SUITE.erl | 1 - deps/rabbit/test/eager_sync_SUITE.erl | 1 - deps/rabbit/test/feature_flags_v2_SUITE.erl | 2 -- ...ure_flags_with_unpriveleged_user_SUITE.erl | 1 - .../list_consumers_sanity_check_SUITE.erl | 1 - .../list_queues_online_and_offline_SUITE.erl | 1 - .../test/metadata_store_clustering_SUITE.erl | 2 -- .../test/metadata_store_migration_SUITE.erl | 1 - deps/rabbit/test/msg_store_SUITE.erl | 1 - .../peer_discovery_classic_config_SUITE.erl | 1 - deps/rabbit/test/peer_discovery_dns_SUITE.erl | 1 - .../peer_discovery_tmp_hidden_node_SUITE.erl | 1 - ...nection_channel_limit_partitions_SUITE.erl | 1 - ...host_connection_limit_partitions_SUITE.erl | 1 - .../test/priority_queue_recovery_SUITE.erl | 1 - .../publisher_confirms_parallel_SUITE.erl | 1 - .../rabbit/test/queue_length_limits_SUITE.erl | 1 - ...orum_queue_member_reconciliation_SUITE.erl | 2 -- deps/rabbit/test/rabbit_db_binding_SUITE.erl | 2 -- deps/rabbit/test/rabbit_db_exchange_SUITE.erl | 2 -- .../test/rabbit_db_maintenance_SUITE.erl | 2 -- deps/rabbit/test/rabbit_db_msup_SUITE.erl | 1 - deps/rabbit/test/rabbit_db_policy_SUITE.erl | 2 -- deps/rabbit/test/rabbit_db_queue_SUITE.erl | 1 - .../rabbit_direct_reply_to_prop_SUITE.erl | 1 - deps/rabbit/test/rabbit_fifo_dlx_SUITE.erl | 1 - deps/rabbit/test/rabbit_fifo_v0_SUITE.erl | 1 - .../test/rabbitmqctl_shutdown_SUITE.erl | 2 -- deps/rabbit/test/routing_SUITE.erl | 2 -- .../test/term_to_binary_compat_prop_SUITE.erl | 1 - deps/rabbit/test/topic_permission_SUITE.erl | 1 - ..._authn_authz_context_propagation_SUITE.erl | 1 - ...ss_control_credential_validation_SUITE.erl | 1 - .../unit_amqp091_content_framing_SUITE.erl | 1 - .../unit_amqp091_server_properties_SUITE.erl | 1 - .../rabbit/test/unit_app_management_SUITE.erl | 1 - ...c_mirrored_queue_sync_throttling_SUITE.erl | 1 - ...lassic_mirrored_queue_throughput_SUITE.erl | 1 - ..._cluster_formation_locking_mocks_SUITE.erl | 1 - ...nit_cluster_formation_sort_nodes_SUITE.erl | 1 - deps/rabbit/test/unit_collections_SUITE.erl | 1 - .../test/unit_connection_tracking_SUITE.erl | 1 - deps/rabbit/test/unit_credit_flow_SUITE.erl | 1 - deps/rabbit/test/unit_disk_monitor_SUITE.erl | 1 - .../test/unit_file_handle_cache_SUITE.erl | 1 - deps/rabbit/test/unit_gen_server2_SUITE.erl | 1 - deps/rabbit/test/unit_gm_SUITE.erl | 2 -- .../rabbit/test/unit_log_management_SUITE.erl | 1 - .../test/unit_operator_policy_SUITE.erl | 1 - deps/rabbit/test/unit_pg_local_SUITE.erl | 1 - .../test/unit_plugin_versioning_SUITE.erl | 1 - .../test/unit_policy_validators_SUITE.erl | 1 - .../test/unit_queue_consumers_SUITE.erl | 1 - .../test/unit_stats_and_metrics_SUITE.erl | 1 - deps/rabbit/test/unit_supervisor2_SUITE.erl | 1 - .../test/unit_vm_memory_monitor_SUITE.erl | 1 - .../rabbit/test/upgrade_preparation_SUITE.erl | 1 - .../src/rabbit_authn_backend.erl | 2 -- .../src/rabbit_authz_backend.erl | 2 -- .../src/rabbit_password_hashing.erl | 2 -- .../src/rabbit_peer_discovery_backend.erl | 2 -- deps/rabbit_common/src/rabbit_writer.erl | 2 -- deps/rabbit_common/test/supervisor2_SUITE.erl | 1 - .../test/unit_priority_queue_SUITE.erl | 1 - .../test/auth_http_mock.erl | 1 - .../test/rabbit_ldap_seed.erl | 1 - deps/rabbitmq_auth_backend_oauth2/app.bzl | 2 -- .../test/add_signing_key_command_SUITE.erl | 1 - .../test/add_uaa_key_command_SUITE.erl | 1 - .../test/scope_SUITE.erl | 1 - .../src/rabbit_auth_mechanism_ssl.erl | 1 - deps/rabbitmq_aws/app.bzl | 2 -- .../test/rabbitmq_aws_json_tests.erl | 2 -- .../test/rabbitmq_aws_xml_tests.erl | 2 -- .../rabbit_db_ch_exchange_m2k_converter.erl | 1 - .../src/rabbit_federation_app.erl | 2 -- .../src/rabbit_federation_db.erl | 2 -- .../src/rabbit_federation_parameters.erl | 2 -- .../src/rabbit_federation_queue.erl | 1 - .../test/exchange_SUITE.erl | 1 - .../test/federation_status_command_SUITE.erl | 1 - .../test/rabbit_federation_status_SUITE.erl | 1 - .../restart_federation_link_command_SUITE.erl | 1 - .../test/unit_inbroker_SUITE.erl | 1 - .../test/federation_mgmt_SUITE.erl | 1 - .../rabbit_db_jms_exchange_m2k_converter.erl | 1 - .../test/rjms_topic_selector_SUITE.erl | 1 - .../test/rjms_topic_selector_unit_SUITE.erl | 1 - .../test/sjx_evaluation_SUITE.erl | 1 - deps/rabbitmq_management/app.bzl | 4 ++-- .../src/rabbit_mgmt_app.erl | 1 - .../src/rabbit_mgmt_db.erl | 1 - .../src/rabbit_mgmt_load_definitions.erl | 2 -- .../src/rabbit_mgmt_login.erl | 2 -- .../src/rabbit_mgmt_oauth_bootstrap.erl | 1 - .../src/rabbit_mgmt_stats.erl | 2 -- .../src/rabbit_mgmt_sup.erl | 1 - .../src/rabbit_mgmt_wm_auth.erl | 1 - .../src/rabbit_mgmt_wm_auth_attempts.erl | 2 -- .../src/rabbit_mgmt_wm_channel.erl | 2 -- .../src/rabbit_mgmt_wm_channels.erl | 2 -- .../src/rabbit_mgmt_wm_channels_vhost.erl | 2 -- .../rabbit_mgmt_wm_connection_channels.erl | 2 -- .../src/rabbit_mgmt_wm_connections_vhost.erl | 2 -- .../rabbit_mgmt_wm_deprecated_features.erl | 2 -- .../src/rabbit_mgmt_wm_environment.erl | 2 -- .../src/rabbit_mgmt_wm_exchange.erl | 2 -- .../src/rabbit_mgmt_wm_exchanges.erl | 2 -- .../src/rabbit_mgmt_wm_extensions.erl | 2 -- .../rabbit_mgmt_wm_feature_flag_enable.erl | 2 -- .../src/rabbit_mgmt_wm_feature_flags.erl | 2 -- .../src/rabbit_mgmt_wm_hash_password.erl | 2 -- .../src/rabbit_mgmt_wm_limits.erl | 2 -- .../src/rabbit_mgmt_wm_login.erl | 2 -- .../src/rabbit_mgmt_wm_node.erl | 2 -- .../src/rabbit_mgmt_wm_node_memory.erl | 2 -- .../src/rabbit_mgmt_wm_node_memory_ets.erl | 2 -- .../src/rabbit_mgmt_wm_operator_policies.erl | 2 -- .../src/rabbit_mgmt_wm_parameters.erl | 2 -- .../src/rabbit_mgmt_wm_permissions.erl | 2 -- .../src/rabbit_mgmt_wm_permissions_user.erl | 2 -- .../src/rabbit_mgmt_wm_permissions_vhost.erl | 2 -- .../src/rabbit_mgmt_wm_policies.erl | 2 -- .../src/rabbit_mgmt_wm_queue.erl | 2 -- .../src/rabbit_mgmt_wm_queue_actions.erl | 1 - .../src/rabbit_mgmt_wm_queue_purge.erl | 2 -- ...mt_wm_quorum_queue_replicas_add_member.erl | 2 -- ...wm_quorum_queue_replicas_delete_member.erl | 2 -- ...bit_mgmt_wm_quorum_queue_replicas_grow.erl | 2 -- ...t_mgmt_wm_quorum_queue_replicas_shrink.erl | 2 -- .../src/rabbit_mgmt_wm_topic_permissions.erl | 2 -- .../rabbit_mgmt_wm_topic_permissions_user.erl | 2 -- ...rabbit_mgmt_wm_topic_permissions_vhost.erl | 2 -- .../src/rabbit_mgmt_wm_user_limits.erl | 2 -- .../src/rabbit_mgmt_wm_users.erl | 2 -- .../src/rabbit_mgmt_wm_vhost_restart.erl | 2 -- .../src/rabbit_mgmt_wm_vhosts.erl | 2 -- .../src/rabbit_mgmt_wm_whoami.erl | 2 -- .../test/clustering_SUITE.erl | 1 - .../test/clustering_prop_SUITE.erl | 1 - .../test/listener_config_SUITE.erl | 1 - .../rabbit_mgmt_http_health_checks_SUITE.erl | 1 - .../test/rabbit_mgmt_only_http_SUITE.erl | 1 - .../test/rabbit_mgmt_test_db_SUITE.erl | 1 - .../test/rabbit_mgmt_test_unit_SUITE.erl | 1 - .../src/rabbit_mgmt_data.erl | 2 -- .../src/rabbit_mgmt_external_stats.erl | 2 -- .../src/rabbit_mgmt_gc.erl | 2 -- .../test/metrics_SUITE.erl | 1 - .../test/rabbit_mgmt_gc_SUITE.erl | 1 - deps/rabbitmq_mqtt/test/cluster_SUITE.erl | 1 - deps/rabbitmq_mqtt/test/ff_SUITE.erl | 1 - .../rabbitmq_mqtt/test/mqtt_machine_SUITE.erl | 1 - deps/rabbitmq_mqtt/test/processor_SUITE.erl | 1 - .../src/rabbit_peer_discovery_consul.erl | 1 - .../rabbitmq_peer_discovery_consul_SUITE.erl | 1 - .../src/rabbit_peer_discovery_etcd.erl | 1 - .../src/rabbit_peer_discovery_k8s.erl | 1 - .../rabbitmq_peer_discovery_k8s_SUITE.erl | 1 - .../src/rabbit_boot_state_xterm_titlebar.erl | 2 -- .../src/rabbit_prelaunch_conf.erl | 1 - .../test/rabbit_logger_std_h_SUITE.erl | 1 - deps/rabbitmq_prometheus/app.bzl | 2 -- ...etheus_rabbitmq_core_metrics_collector.erl | 1 - .../src/rabbit_prometheus_handler.erl | 1 - ...us_rabbitmq_federation_collector_SUITE.erl | 1 - .../rabbit_db_rh_exchange_m2k_converter.erl | 1 - .../rabbit_sharding_exchange_decorator.erl | 2 -- .../src/rabbit_sharding_policy_validator.erl | 2 -- .../test/rabbit_hash_exchange_SUITE.erl | 1 - .../test/rabbit_sharding_SUITE.erl | 1 - deps/rabbitmq_shovel/app.bzl | 1 - .../src/rabbit_amqp10_shovel.erl | 1 - .../src/rabbit_shovel_config.erl | 1 - .../src/rabbit_shovel_dyn_worker_sup_sup.erl | 1 - .../rabbitmq_shovel/src/rabbit_shovel_sup.erl | 2 -- .../src/rabbit_shovel_worker_sup.erl | 1 - .../test/amqp10_dynamic_SUITE.erl | 2 -- .../test/amqp10_shovel_SUITE.erl | 1 - .../test/delete_shovel_command_SUITE.erl | 1 - deps/rabbitmq_shovel/test/dynamic_SUITE.erl | 1 - .../test/shovel_status_command_SUITE.erl | 1 - .../test/rabbit_shovel_mgmt_SUITE.erl | 1 - deps/rabbitmq_stomp/app.bzl | 2 +- .../src/rabbit_stomp_processor.erl | 1 - .../rabbitmq_stomp/test/connections_SUITE.erl | 1 - deps/rabbitmq_stomp/test/frame_SUITE.erl | 1 - deps/rabbitmq_stomp/test/topic_SUITE.erl | 2 -- deps/rabbitmq_stomp/test/util_SUITE.erl | 1 - .../test/rabbit_stream_manager_SUITE.erl | 1 - deps/rabbitmq_stream_management/app.bzl | 2 -- ...abbit_stream_connection_consumers_mgmt.erl | 2 -- ...bbit_stream_connection_publishers_mgmt.erl | 2 -- .../rabbit_stream_connections_vhost_mgmt.erl | 2 -- .../src/rabbit_stream_tracking_mgmt.erl | 2 -- .../test/http_SUITE.erl | 1 - deps/rabbitmq_top/BUILD.bazel | 1 - deps/rabbitmq_top/app.bzl | 3 +-- .../src/rabbit_top_wm_ets_tables.erl | 2 -- .../src/rabbit_top_wm_process.erl | 2 -- .../src/rabbit_top_wm_processes.erl | 2 -- .../test/rabbit_tracing_SUITE.erl | 1 - deps/rabbitmq_trust_store/app.bzl | 2 -- .../src/rabbit_trust_store.erl | 1 - ...abbit_trust_store_certificate_provider.erl | 2 -- .../src/rabbit_trust_store_http_provider.erl | 2 -- .../src/rabbit_trust_store_sup.erl | 3 --- .../src/webmachine_log_handler.erl | 2 -- .../test/rabbit_web_dispatch_SUITE.erl | 1 - .../test/rabbit_web_dispatch_unit_SUITE.erl | 1 - .../src/rabbit_web_stomp_handler.erl | 1 - .../src/rabbit_web_stomp_listener.erl | 2 -- deps/rabbitmq_web_stomp/test/unit_SUITE.erl | 2 -- moduleindex.yaml | 13 ++++++++++++ 281 files changed, 25 insertions(+), 416 deletions(-) diff --git a/deps/amqp10_client/test/msg_SUITE.erl b/deps/amqp10_client/test/msg_SUITE.erl index 3a0ac89d1b36..02d851180a4a 100644 --- a/deps/amqp10_client/test/msg_SUITE.erl +++ b/deps/amqp10_client/test/msg_SUITE.erl @@ -7,7 +7,6 @@ -module(msg_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("amqp10_common/include/amqp10_framing.hrl"). diff --git a/deps/amqp10_common/test/binary_parser_SUITE.erl b/deps/amqp10_common/test/binary_parser_SUITE.erl index 1c42641e2eb9..a217509c5325 100644 --- a/deps/amqp10_common/test/binary_parser_SUITE.erl +++ b/deps/amqp10_common/test/binary_parser_SUITE.erl @@ -5,7 +5,6 @@ -export([ ]). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). %%%=================================================================== diff --git a/deps/amqp_client/src/amqp_channel_sup_sup.erl b/deps/amqp_client/src/amqp_channel_sup_sup.erl index 632d0e963798..4b7b5f5169dd 100644 --- a/deps/amqp_client/src/amqp_channel_sup_sup.erl +++ b/deps/amqp_client/src/amqp_channel_sup_sup.erl @@ -8,8 +8,6 @@ %% @private -module(amqp_channel_sup_sup). --include("amqp_client.hrl"). - -behaviour(supervisor). -export([start_link/3, start_channel_sup/4]). diff --git a/deps/amqp_client/src/amqp_direct_consumer.erl b/deps/amqp_client/src/amqp_direct_consumer.erl index 5071ce48dcbf..0e5268886b5a 100644 --- a/deps/amqp_client/src/amqp_direct_consumer.erl +++ b/deps/amqp_client/src/amqp_direct_consumer.erl @@ -31,8 +31,6 @@ %% This module has no public functions. -module(amqp_direct_consumer). --include("amqp_gen_consumer_spec.hrl"). - -behaviour(amqp_gen_consumer). -export([init/1, handle_consume_ok/3, handle_consume/3, handle_cancel_ok/3, diff --git a/deps/oauth2_client/src/oauth2_client.erl b/deps/oauth2_client/src/oauth2_client.erl index c7cee120e8a1..97683f87e9a9 100644 --- a/deps/oauth2_client/src/oauth2_client.erl +++ b/deps/oauth2_client/src/oauth2_client.erl @@ -12,8 +12,6 @@ ]). -include("oauth2_client.hrl"). --include_lib("public_key/include/public_key.hrl"). - -spec get_access_token(oauth_provider_id() | oauth_provider(), access_token_request()) -> {ok, successful_access_token_response()} | {error, unsuccessful_access_token_response() | any()}. get_access_token(OAuth2ProviderId, Request) when is_binary(OAuth2ProviderId) -> diff --git a/deps/oauth2_client/test/oauth_http_mock.erl b/deps/oauth2_client/test/oauth_http_mock.erl index 4381b8a604b4..f299b9704aca 100644 --- a/deps/oauth2_client/test/oauth_http_mock.erl +++ b/deps/oauth2_client/test/oauth_http_mock.erl @@ -6,7 +6,6 @@ %% -module(oauth_http_mock). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -export([init/2]). diff --git a/deps/rabbit/app.bzl b/deps/rabbit/app.bzl index c9adb8e3bbf9..99ff1dc63744 100644 --- a/deps/rabbit/app.bzl +++ b/deps/rabbit/app.bzl @@ -884,7 +884,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"): outs = ["test/clustering_management_SUITE.beam"], app_name = "rabbit", erlc_opts = "//:test_erlc_opts", - deps = ["//deps/amqp_client:erlang_app", "//deps/rabbitmq_ct_helpers:erlang_app"], + deps = ["//deps/amqp_client:erlang_app"], ) erlang_bytecode( name = "test_clustering_utils_beam", @@ -954,7 +954,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"): outs = ["test/definition_import_SUITE.beam"], app_name = "rabbit", erlc_opts = "//:test_erlc_opts", - deps = ["//deps/rabbit_common:erlang_app", "//deps/rabbitmq_ct_helpers:erlang_app"], + deps = ["//deps/rabbitmq_ct_helpers:erlang_app"], ) erlang_bytecode( name = "deprecated_features_SUITE_beam_files", @@ -1033,7 +1033,6 @@ def test_suite_beam_files(name = "test_suite_beam_files"): outs = ["test/feature_flags_v2_SUITE.beam"], app_name = "rabbit", erlc_opts = "//:test_erlc_opts", - deps = ["//deps/rabbit_common:erlang_app"], ) erlang_bytecode( name = "feature_flags_with_unpriveleged_user_SUITE_beam_files", @@ -1140,7 +1139,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"): outs = ["test/peer_discovery_classic_config_SUITE.beam"], app_name = "rabbit", erlc_opts = "//:test_erlc_opts", - deps = ["//deps/amqp_client:erlang_app", "//deps/rabbitmq_ct_helpers:erlang_app"], + deps = ["//deps/rabbitmq_ct_helpers:erlang_app"], ) erlang_bytecode( name = "peer_discovery_dns_SUITE_beam_files", @@ -1371,7 +1370,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"): testonly = True, srcs = ["test/rabbit_fifo_dlx_SUITE.erl"], outs = ["test/rabbit_fifo_dlx_SUITE.beam"], - hdrs = ["src/rabbit_fifo.hrl", "src/rabbit_fifo_dlx.hrl"], + hdrs = ["src/rabbit_fifo.hrl"], app_name = "rabbit", erlc_opts = "//:test_erlc_opts", deps = ["//deps/rabbit_common:erlang_app"], @@ -1477,7 +1476,6 @@ def test_suite_beam_files(name = "test_suite_beam_files"): outs = ["test/rabbitmqctl_shutdown_SUITE.beam"], app_name = "rabbit", erlc_opts = "//:test_erlc_opts", - deps = ["//deps/amqp_client:erlang_app"], ) erlang_bytecode( name = "signal_handling_SUITE_beam_files", @@ -1521,7 +1519,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"): outs = ["test/term_to_binary_compat_prop_SUITE.beam"], app_name = "rabbit", erlc_opts = "//:test_erlc_opts", - deps = ["//deps/rabbit_common:erlang_app", "@proper//:erlang_app"], + deps = ["@proper//:erlang_app"], ) erlang_bytecode( name = "test_channel_operation_timeout_test_queue_beam", @@ -1823,7 +1821,6 @@ def test_suite_beam_files(name = "test_suite_beam_files"): testonly = True, srcs = ["test/unit_gm_SUITE.erl"], outs = ["test/unit_gm_SUITE.beam"], - hdrs = ["include/gm_specs.hrl"], app_name = "rabbit", beam = ["ebin/gm.beam"], erlc_opts = "//:test_erlc_opts", @@ -2007,7 +2004,6 @@ def test_suite_beam_files(name = "test_suite_beam_files"): outs = ["test/rabbit_db_msup_SUITE.beam"], app_name = "rabbit", erlc_opts = "//:test_erlc_opts", - deps = ["//deps/rabbit_common:erlang_app"], ) erlang_bytecode( name = "rabbit_db_policy_SUITE_beam_files", @@ -2088,7 +2084,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"): outs = ["test/quorum_queue_member_reconciliation_SUITE.beam"], app_name = "rabbit", erlc_opts = "//:test_erlc_opts", - deps = ["//deps/amqp_client:erlang_app", "//deps/rabbitmq_ct_helpers:erlang_app"], + deps = ["//deps/amqp_client:erlang_app"], ) erlang_bytecode( @@ -2098,7 +2094,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"): outs = ["test/cluster_limit_SUITE.beam"], app_name = "rabbit", erlc_opts = "//:test_erlc_opts", - deps = ["//deps/amqp_client:erlang_app", "//deps/rabbitmq_ct_helpers:erlang_app"], + deps = ["//deps/amqp_client:erlang_app"], ) erlang_bytecode( name = "metadata_store_clustering_SUITE_beam_files", @@ -2107,7 +2103,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"): outs = ["test/metadata_store_clustering_SUITE.beam"], app_name = "rabbit", erlc_opts = "//:test_erlc_opts", - deps = ["//deps/amqp_client:erlang_app", "//deps/rabbitmq_ct_helpers:erlang_app"], + deps = ["//deps/amqp_client:erlang_app"], ) erlang_bytecode( name = "metadata_store_migration_SUITE_beam_files", diff --git a/deps/rabbit/src/internal_user.erl b/deps/rabbit/src/internal_user.erl index f17876375461..9678cef2ed15 100644 --- a/deps/rabbit/src/internal_user.erl +++ b/deps/rabbit/src/internal_user.erl @@ -7,8 +7,6 @@ -module(internal_user). --include_lib("rabbit_common/include/rabbit.hrl"). - -export([ new/0, new/1, diff --git a/deps/rabbit/src/rabbit.erl b/deps/rabbit/src/rabbit.erl index aab5c9dc75bc..ebdef913e05f 100644 --- a/deps/rabbit/src/rabbit.erl +++ b/deps/rabbit/src/rabbit.erl @@ -275,7 +275,6 @@ %%--------------------------------------------------------------------------- --include_lib("rabbit_common/include/rabbit_framing.hrl"). -include_lib("rabbit_common/include/rabbit.hrl"). -define(APPS, [os_mon, mnesia, rabbit_common, rabbitmq_prelaunch, ra, sysmon_handler, rabbit, osiris]). diff --git a/deps/rabbit/src/rabbit_amqqueue_process.erl b/deps/rabbit/src/rabbit_amqqueue_process.erl index cd74ccc393b3..a26d71ca70b9 100644 --- a/deps/rabbit/src/rabbit_amqqueue_process.erl +++ b/deps/rabbit/src/rabbit_amqqueue_process.erl @@ -7,7 +7,6 @@ -module(rabbit_amqqueue_process). -include_lib("rabbit_common/include/rabbit.hrl"). --include_lib("rabbit_common/include/rabbit_framing.hrl"). -include("amqqueue.hrl"). -behaviour(gen_server2). diff --git a/deps/rabbit/src/rabbit_auth_mechanism_amqplain.erl b/deps/rabbit/src/rabbit_auth_mechanism_amqplain.erl index f583e7f7bb69..a801d16e8dbc 100644 --- a/deps/rabbit/src/rabbit_auth_mechanism_amqplain.erl +++ b/deps/rabbit/src/rabbit_auth_mechanism_amqplain.erl @@ -6,8 +6,6 @@ %% -module(rabbit_auth_mechanism_amqplain). --include_lib("rabbit_common/include/rabbit.hrl"). - -behaviour(rabbit_auth_mechanism). -export([description/0, should_offer/1, init/1, handle_response/2]). diff --git a/deps/rabbit/src/rabbit_auth_mechanism_cr_demo.erl b/deps/rabbit/src/rabbit_auth_mechanism_cr_demo.erl index 9a5e96414b43..9f877414f2a1 100644 --- a/deps/rabbit/src/rabbit_auth_mechanism_cr_demo.erl +++ b/deps/rabbit/src/rabbit_auth_mechanism_cr_demo.erl @@ -6,8 +6,6 @@ %% -module(rabbit_auth_mechanism_cr_demo). --include_lib("rabbit_common/include/rabbit.hrl"). - -behaviour(rabbit_auth_mechanism). -export([description/0, should_offer/1, init/1, handle_response/2]). diff --git a/deps/rabbit/src/rabbit_auth_mechanism_plain.erl b/deps/rabbit/src/rabbit_auth_mechanism_plain.erl index f7987ac0331b..31e235227500 100644 --- a/deps/rabbit/src/rabbit_auth_mechanism_plain.erl +++ b/deps/rabbit/src/rabbit_auth_mechanism_plain.erl @@ -6,8 +6,6 @@ %% -module(rabbit_auth_mechanism_plain). --include_lib("rabbit_common/include/rabbit.hrl"). - -behaviour(rabbit_auth_mechanism). -export([description/0, should_offer/1, init/1, handle_response/2]). diff --git a/deps/rabbit/src/rabbit_channel_interceptor.erl b/deps/rabbit/src/rabbit_channel_interceptor.erl index 0d4c9d1a426b..4aafd46ee0af 100644 --- a/deps/rabbit/src/rabbit_channel_interceptor.erl +++ b/deps/rabbit/src/rabbit_channel_interceptor.erl @@ -7,7 +7,6 @@ -module(rabbit_channel_interceptor). --include_lib("rabbit_common/include/rabbit_framing.hrl"). -include_lib("rabbit_common/include/rabbit.hrl"). -export([init/1, intercept_in/3]). diff --git a/deps/rabbit/src/rabbit_classic_queue_index_v2.erl b/deps/rabbit/src/rabbit_classic_queue_index_v2.erl index ef0f042c6214..b205cb450d8b 100644 --- a/deps/rabbit/src/rabbit_classic_queue_index_v2.erl +++ b/deps/rabbit/src/rabbit_classic_queue_index_v2.erl @@ -51,8 +51,6 @@ -define(STORE_FD_RESERVATIONS, 2). -include_lib("rabbit_common/include/rabbit.hrl"). --include_lib("kernel/include/file.hrl"). - %% Set to true to get an awful lot of debug logs. -if(false). -define(DEBUG(X,Y), logger:debug("~0p: " ++ X, [?FUNCTION_NAME|Y])). diff --git a/deps/rabbit/src/rabbit_credential_validation.erl b/deps/rabbit/src/rabbit_credential_validation.erl index 7fa25cd909bb..e8869d0f316a 100644 --- a/deps/rabbit/src/rabbit_credential_validation.erl +++ b/deps/rabbit/src/rabbit_credential_validation.erl @@ -7,8 +7,6 @@ -module(rabbit_credential_validation). --include_lib("rabbit_common/include/rabbit.hrl"). - %% used for backwards compatibility -define(DEFAULT_BACKEND, rabbit_credential_validator_accept_everything). diff --git a/deps/rabbit/src/rabbit_credential_validator.erl b/deps/rabbit/src/rabbit_credential_validator.erl index 5c184da4bb5e..00c4913f31c4 100644 --- a/deps/rabbit/src/rabbit_credential_validator.erl +++ b/deps/rabbit/src/rabbit_credential_validator.erl @@ -7,8 +7,6 @@ -module(rabbit_credential_validator). --include_lib("rabbit_common/include/rabbit.hrl"). - %% Validates a password. Used by `rabbit_auth_backend_internal`. %% %% Possible return values: diff --git a/deps/rabbit/src/rabbit_credential_validator_accept_everything.erl b/deps/rabbit/src/rabbit_credential_validator_accept_everything.erl index 6ff4d7c32831..c7c693dcfa5f 100644 --- a/deps/rabbit/src/rabbit_credential_validator_accept_everything.erl +++ b/deps/rabbit/src/rabbit_credential_validator_accept_everything.erl @@ -7,8 +7,6 @@ -module(rabbit_credential_validator_accept_everything). --include_lib("rabbit_common/include/rabbit.hrl"). - -behaviour(rabbit_credential_validator). %% diff --git a/deps/rabbit/src/rabbit_credential_validator_min_password_length.erl b/deps/rabbit/src/rabbit_credential_validator_min_password_length.erl index 25641fe195ff..8cf752d8f671 100644 --- a/deps/rabbit/src/rabbit_credential_validator_min_password_length.erl +++ b/deps/rabbit/src/rabbit_credential_validator_min_password_length.erl @@ -7,8 +7,6 @@ -module(rabbit_credential_validator_min_password_length). --include_lib("rabbit_common/include/rabbit.hrl"). - -behaviour(rabbit_credential_validator). %% accommodates default (localhost-only) user credentials, diff --git a/deps/rabbit/src/rabbit_credential_validator_password_regexp.erl b/deps/rabbit/src/rabbit_credential_validator_password_regexp.erl index 5d9dddfe9145..1cc3f952cf75 100644 --- a/deps/rabbit/src/rabbit_credential_validator_password_regexp.erl +++ b/deps/rabbit/src/rabbit_credential_validator_password_regexp.erl @@ -10,8 +10,6 @@ %% password against a pre-configured regular expression. -module(rabbit_credential_validator_password_regexp). --include_lib("rabbit_common/include/rabbit.hrl"). - -behaviour(rabbit_credential_validator). %% diff --git a/deps/rabbit/src/rabbit_db.erl b/deps/rabbit/src/rabbit_db.erl index 0a552adeb1d8..7dcae084876b 100644 --- a/deps/rabbit/src/rabbit_db.erl +++ b/deps/rabbit/src/rabbit_db.erl @@ -7,8 +7,6 @@ -module(rabbit_db). --include_lib("khepri/include/khepri.hrl"). - -include_lib("kernel/include/logger.hrl"). -include_lib("stdlib/include/assert.hrl"). diff --git a/deps/rabbit/src/rabbit_db_binding_m2k_converter.erl b/deps/rabbit/src/rabbit_db_binding_m2k_converter.erl index af450e943736..0bef352db141 100644 --- a/deps/rabbit/src/rabbit_db_binding_m2k_converter.erl +++ b/deps/rabbit/src/rabbit_db_binding_m2k_converter.erl @@ -10,7 +10,6 @@ -behaviour(mnesia_to_khepri_converter). -include_lib("kernel/include/logger.hrl"). --include_lib("khepri/include/khepri.hrl"). -include_lib("khepri_mnesia_migration/src/kmm_logging.hrl"). -include_lib("rabbit_common/include/rabbit.hrl"). diff --git a/deps/rabbit/src/rabbit_db_m2k_converter.erl b/deps/rabbit/src/rabbit_db_m2k_converter.erl index 570a41d4d5b9..6bec45ea7b12 100644 --- a/deps/rabbit/src/rabbit_db_m2k_converter.erl +++ b/deps/rabbit/src/rabbit_db_m2k_converter.erl @@ -9,7 +9,6 @@ -behaviour(mnesia_to_khepri_converter). --include_lib("kernel/include/logger.hrl"). -include_lib("khepri/include/khepri.hrl"). -include_lib("khepri_mnesia_migration/src/kmm_logging.hrl"). -include_lib("rabbit_common/include/rabbit.hrl"). diff --git a/deps/rabbit/src/rabbit_db_maintenance_m2k_converter.erl b/deps/rabbit/src/rabbit_db_maintenance_m2k_converter.erl index 28b569c9c794..815b8a41e543 100644 --- a/deps/rabbit/src/rabbit_db_maintenance_m2k_converter.erl +++ b/deps/rabbit/src/rabbit_db_maintenance_m2k_converter.erl @@ -10,7 +10,6 @@ -behaviour(mnesia_to_khepri_converter). -include_lib("kernel/include/logger.hrl"). --include_lib("khepri/include/khepri.hrl"). -include_lib("khepri_mnesia_migration/src/kmm_logging.hrl"). -include_lib("rabbit_common/include/rabbit.hrl"). diff --git a/deps/rabbit/src/rabbit_db_msup_m2k_converter.erl b/deps/rabbit/src/rabbit_db_msup_m2k_converter.erl index e57b030d7768..a1610716835c 100644 --- a/deps/rabbit/src/rabbit_db_msup_m2k_converter.erl +++ b/deps/rabbit/src/rabbit_db_msup_m2k_converter.erl @@ -10,7 +10,6 @@ -behaviour(mnesia_to_khepri_converter). -include_lib("kernel/include/logger.hrl"). --include_lib("khepri/include/khepri.hrl"). -include_lib("khepri_mnesia_migration/src/kmm_logging.hrl"). -include_lib("rabbit_common/include/rabbit.hrl"). -include("mirrored_supervisor.hrl"). diff --git a/deps/rabbit/src/rabbit_db_queue.erl b/deps/rabbit/src/rabbit_db_queue.erl index ba63cd94eed2..c130bcee5bce 100644 --- a/deps/rabbit/src/rabbit_db_queue.erl +++ b/deps/rabbit/src/rabbit_db_queue.erl @@ -7,7 +7,6 @@ -module(rabbit_db_queue). --include_lib("kernel/include/logger.hrl"). -include_lib("stdlib/include/qlc.hrl"). -include_lib("khepri/include/khepri.hrl"). diff --git a/deps/rabbit/src/rabbit_db_queue_m2k_converter.erl b/deps/rabbit/src/rabbit_db_queue_m2k_converter.erl index 1da5701d7861..fd9f88b0ee8f 100644 --- a/deps/rabbit/src/rabbit_db_queue_m2k_converter.erl +++ b/deps/rabbit/src/rabbit_db_queue_m2k_converter.erl @@ -10,7 +10,6 @@ -behaviour(mnesia_to_khepri_converter). -include_lib("kernel/include/logger.hrl"). --include_lib("khepri/include/khepri.hrl"). -include_lib("khepri_mnesia_migration/src/kmm_logging.hrl"). -include_lib("rabbit_common/include/rabbit.hrl"). -include("amqqueue.hrl"). diff --git a/deps/rabbit/src/rabbit_db_rtparams_m2k_converter.erl b/deps/rabbit/src/rabbit_db_rtparams_m2k_converter.erl index 87e611663587..fdc8fd9a20b9 100644 --- a/deps/rabbit/src/rabbit_db_rtparams_m2k_converter.erl +++ b/deps/rabbit/src/rabbit_db_rtparams_m2k_converter.erl @@ -10,7 +10,6 @@ -behaviour(mnesia_to_khepri_converter). -include_lib("kernel/include/logger.hrl"). --include_lib("khepri/include/khepri.hrl"). -include_lib("khepri_mnesia_migration/src/kmm_logging.hrl"). -include_lib("rabbit_common/include/rabbit.hrl"). diff --git a/deps/rabbit/src/rabbit_db_vhost.erl b/deps/rabbit/src/rabbit_db_vhost.erl index 7c846dbe62ef..05cc0b8fa524 100644 --- a/deps/rabbit/src/rabbit_db_vhost.erl +++ b/deps/rabbit/src/rabbit_db_vhost.erl @@ -7,7 +7,6 @@ -module(rabbit_db_vhost). --include_lib("kernel/include/logger.hrl"). -include_lib("stdlib/include/assert.hrl"). -include_lib("rabbit_common/include/logging.hrl"). -include_lib("khepri/include/khepri.hrl"). diff --git a/deps/rabbit/src/rabbit_db_vhost_m2k_converter.erl b/deps/rabbit/src/rabbit_db_vhost_m2k_converter.erl index 2bef5059b3d3..4e4e14cf5457 100644 --- a/deps/rabbit/src/rabbit_db_vhost_m2k_converter.erl +++ b/deps/rabbit/src/rabbit_db_vhost_m2k_converter.erl @@ -10,7 +10,6 @@ -behaviour(mnesia_to_khepri_converter). -include_lib("kernel/include/logger.hrl"). --include_lib("khepri/include/khepri.hrl"). -include_lib("khepri_mnesia_migration/src/kmm_logging.hrl"). -include_lib("rabbit_common/include/rabbit.hrl"). -include("vhost.hrl"). diff --git a/deps/rabbit/src/rabbit_definitions_import_https.erl b/deps/rabbit/src/rabbit_definitions_import_https.erl index 1a40860302a1..de6a020ff061 100644 --- a/deps/rabbit/src/rabbit_definitions_import_https.erl +++ b/deps/rabbit/src/rabbit_definitions_import_https.erl @@ -14,8 +14,6 @@ %% * rabbit_definitions_import_local_filesystem %% * rabbit_definitions_hashing -module(rabbit_definitions_import_https). --include_lib("rabbit_common/include/rabbit.hrl"). - -export([ is_enabled/0, load/1, diff --git a/deps/rabbit/src/rabbit_definitions_import_local_filesystem.erl b/deps/rabbit/src/rabbit_definitions_import_local_filesystem.erl index 9292f4f17d95..19a70ac9c272 100644 --- a/deps/rabbit/src/rabbit_definitions_import_local_filesystem.erl +++ b/deps/rabbit/src/rabbit_definitions_import_local_filesystem.erl @@ -15,8 +15,6 @@ %% * rabbit_definitions_import_http %% * rabbit_definitions_hashing -module(rabbit_definitions_import_local_filesystem). --include_lib("rabbit_common/include/rabbit.hrl"). - -export([ is_enabled/0, %% definition source options diff --git a/deps/rabbit/src/rabbit_logger_exchange_h.erl b/deps/rabbit/src/rabbit_logger_exchange_h.erl index 7a05c2dcd8af..9cdde43b5967 100644 --- a/deps/rabbit/src/rabbit_logger_exchange_h.erl +++ b/deps/rabbit/src/rabbit_logger_exchange_h.erl @@ -12,8 +12,6 @@ -include_lib("rabbit_common/include/rabbit.hrl"). -include_lib("rabbit_common/include/rabbit_framing.hrl"). -include_lib("rabbit_common/include/logging.hrl"). --include_lib("rabbit/include/mc.hrl"). - %% logger callbacks -export([log/2, adding_handler/1, removing_handler/1, changing_config/3, filter_config/1]). diff --git a/deps/rabbit/src/rabbit_mirror_queue_mode_all.erl b/deps/rabbit/src/rabbit_mirror_queue_mode_all.erl index 7678180b7d72..e341194a57a6 100644 --- a/deps/rabbit/src/rabbit_mirror_queue_mode_all.erl +++ b/deps/rabbit/src/rabbit_mirror_queue_mode_all.erl @@ -7,8 +7,6 @@ -module(rabbit_mirror_queue_mode_all). --include_lib("rabbit_common/include/rabbit.hrl"). - -behaviour(rabbit_mirror_queue_mode). -export([description/0, suggested_queue_nodes/5, validate_policy/1]). diff --git a/deps/rabbit/src/rabbit_mirror_queue_mode_exactly.erl b/deps/rabbit/src/rabbit_mirror_queue_mode_exactly.erl index 4bce12674b2f..c4aa7d5bf399 100644 --- a/deps/rabbit/src/rabbit_mirror_queue_mode_exactly.erl +++ b/deps/rabbit/src/rabbit_mirror_queue_mode_exactly.erl @@ -7,8 +7,6 @@ -module(rabbit_mirror_queue_mode_exactly). --include_lib("rabbit_common/include/rabbit.hrl"). - -behaviour(rabbit_mirror_queue_mode). -export([description/0, suggested_queue_nodes/5, validate_policy/1]). diff --git a/deps/rabbit/src/rabbit_mirror_queue_mode_nodes.erl b/deps/rabbit/src/rabbit_mirror_queue_mode_nodes.erl index 8990b139f343..894d64955ccc 100644 --- a/deps/rabbit/src/rabbit_mirror_queue_mode_nodes.erl +++ b/deps/rabbit/src/rabbit_mirror_queue_mode_nodes.erl @@ -7,8 +7,6 @@ -module(rabbit_mirror_queue_mode_nodes). --include_lib("rabbit_common/include/rabbit.hrl"). - -behaviour(rabbit_mirror_queue_mode). -export([description/0, suggested_queue_nodes/5, validate_policy/1]). diff --git a/deps/rabbit/src/rabbit_mnesia.erl b/deps/rabbit/src/rabbit_mnesia.erl index 8efe2b9dedd0..cd251c35e299 100644 --- a/deps/rabbit/src/rabbit_mnesia.erl +++ b/deps/rabbit/src/rabbit_mnesia.erl @@ -7,8 +7,6 @@ -module(rabbit_mnesia). --include_lib("kernel/include/logger.hrl"). - -include_lib("rabbit_common/include/logging.hrl"). -export([%% Main interface diff --git a/deps/rabbit/src/rabbit_nodes.erl b/deps/rabbit/src/rabbit_nodes.erl index 4bc9d8887f49..879d36cf9d16 100644 --- a/deps/rabbit/src/rabbit_nodes.erl +++ b/deps/rabbit/src/rabbit_nodes.erl @@ -35,7 +35,6 @@ -deprecated({all, 0, "Use rabbit_nodes:list_members/0 instead"}). -deprecated({all_running, 0, "Use rabbit_nodes:list_running/0 instead"}). --include_lib("kernel/include/inet.hrl"). -include_lib("rabbit_common/include/rabbit.hrl"). -define(SAMPLING_INTERVAL, 1000). diff --git a/deps/rabbit/src/rabbit_peer_discovery_classic_config.erl b/deps/rabbit/src/rabbit_peer_discovery_classic_config.erl index 8b9861bc35ad..3c46f36e2384 100644 --- a/deps/rabbit/src/rabbit_peer_discovery_classic_config.erl +++ b/deps/rabbit/src/rabbit_peer_discovery_classic_config.erl @@ -8,8 +8,6 @@ -module(rabbit_peer_discovery_classic_config). -behaviour(rabbit_peer_discovery_backend). --include_lib("rabbit_common/include/rabbit.hrl"). - -export([list_nodes/0, supports_registration/0, register/0, unregister/0, post_registration/0, lock/1, unlock/1]). diff --git a/deps/rabbit/src/rabbit_peer_discovery_dns.erl b/deps/rabbit/src/rabbit_peer_discovery_dns.erl index 729239748ac5..a550ae91f3f8 100644 --- a/deps/rabbit/src/rabbit_peer_discovery_dns.erl +++ b/deps/rabbit/src/rabbit_peer_discovery_dns.erl @@ -8,8 +8,6 @@ -module(rabbit_peer_discovery_dns). -behaviour(rabbit_peer_discovery_backend). --include_lib("rabbit_common/include/rabbit.hrl"). - -export([list_nodes/0, supports_registration/0, register/0, unregister/0, post_registration/0, lock/1, unlock/1]). %% for tests diff --git a/deps/rabbit/src/rabbit_plugins.erl b/deps/rabbit/src/rabbit_plugins.erl index 464e1ff4a017..959a1a6de7cf 100644 --- a/deps/rabbit/src/rabbit_plugins.erl +++ b/deps/rabbit/src/rabbit_plugins.erl @@ -7,8 +7,6 @@ -module(rabbit_plugins). -include_lib("rabbit_common/include/rabbit.hrl"). --include_lib("stdlib/include/zip.hrl"). - -export([setup/0, active/0, read_enabled/1, list/1, list/2, dependencies/3, running_plugins/0]). -export([ensure/1]). -export([validate_plugins/1, format_invalid_plugins/1]). diff --git a/deps/rabbit/src/rabbit_prequeue.erl b/deps/rabbit/src/rabbit_prequeue.erl index 5df0cfe3ee3a..dde7c1c93796 100644 --- a/deps/rabbit/src/rabbit_prequeue.erl +++ b/deps/rabbit/src/rabbit_prequeue.erl @@ -20,7 +20,6 @@ -behaviour(gen_server2). --include_lib("rabbit_common/include/rabbit.hrl"). -include("amqqueue.hrl"). %%---------------------------------------------------------------------------- diff --git a/deps/rabbit/src/rabbit_queue_decorator.erl b/deps/rabbit/src/rabbit_queue_decorator.erl index c9f7cdb02bdf..7e672c0dd901 100644 --- a/deps/rabbit/src/rabbit_queue_decorator.erl +++ b/deps/rabbit/src/rabbit_queue_decorator.erl @@ -7,7 +7,6 @@ -module(rabbit_queue_decorator). --include_lib("rabbit_common/include/rabbit.hrl"). -include("amqqueue.hrl"). -export([select/1, set/1, register/2, unregister/1]). diff --git a/deps/rabbit/src/rabbit_queue_location_client_local.erl b/deps/rabbit/src/rabbit_queue_location_client_local.erl index 0be9e3d4a5ee..8476a16620bd 100644 --- a/deps/rabbit/src/rabbit_queue_location_client_local.erl +++ b/deps/rabbit/src/rabbit_queue_location_client_local.erl @@ -8,7 +8,6 @@ -module(rabbit_queue_location_client_local). -behaviour(rabbit_queue_master_locator). --include_lib("rabbit_common/include/rabbit.hrl"). -include("amqqueue.hrl"). -export([description/0, queue_master_location/1]). diff --git a/deps/rabbit/src/rabbit_queue_location_random.erl b/deps/rabbit/src/rabbit_queue_location_random.erl index ad58d8650880..439682e6b067 100644 --- a/deps/rabbit/src/rabbit_queue_location_random.erl +++ b/deps/rabbit/src/rabbit_queue_location_random.erl @@ -8,7 +8,6 @@ -module(rabbit_queue_location_random). -behaviour(rabbit_queue_master_locator). --include_lib("rabbit_common/include/rabbit.hrl"). -include("amqqueue.hrl"). -export([description/0, queue_master_location/1]). diff --git a/deps/rabbit/src/rabbit_queue_location_validator.erl b/deps/rabbit/src/rabbit_queue_location_validator.erl index 159f8de12044..60d885c1a531 100644 --- a/deps/rabbit/src/rabbit_queue_location_validator.erl +++ b/deps/rabbit/src/rabbit_queue_location_validator.erl @@ -8,7 +8,6 @@ -module(rabbit_queue_location_validator). -behaviour(rabbit_policy_validator). --include_lib("rabbit_common/include/rabbit.hrl"). -include("amqqueue.hrl"). -export([validate_policy/1, validate_strategy/1]). diff --git a/deps/rabbit/src/rabbit_queue_master_location_misc.erl b/deps/rabbit/src/rabbit_queue_master_location_misc.erl index 69e0268fa2da..9fc1b191d8e8 100644 --- a/deps/rabbit/src/rabbit_queue_master_location_misc.erl +++ b/deps/rabbit/src/rabbit_queue_master_location_misc.erl @@ -7,7 +7,6 @@ -module(rabbit_queue_master_location_misc). --include_lib("rabbit_common/include/rabbit.hrl"). -include("amqqueue.hrl"). -export([lookup_master/2, diff --git a/deps/rabbit/src/rabbit_quorum_memory_manager.erl b/deps/rabbit/src/rabbit_quorum_memory_manager.erl index 6324e10e1f7a..93851d09c789 100644 --- a/deps/rabbit/src/rabbit_quorum_memory_manager.erl +++ b/deps/rabbit/src/rabbit_quorum_memory_manager.erl @@ -8,8 +8,6 @@ -behaviour(gen_event). --include_lib("rabbit_common/include/rabbit.hrl"). - -export([init/1, handle_call/2, handle_event/2, handle_info/2, terminate/2, code_change/3]). -export([register/0, unregister/0]). diff --git a/deps/rabbit/src/rabbit_router.erl b/deps/rabbit/src/rabbit_router.erl index b61cfdca4b72..b26c5e004b7f 100644 --- a/deps/rabbit/src/rabbit_router.erl +++ b/deps/rabbit/src/rabbit_router.erl @@ -7,8 +7,6 @@ -module(rabbit_router). -include_lib("stdlib/include/qlc.hrl"). --include_lib("rabbit_common/include/rabbit.hrl"). - -export([match_bindings/2, match_routing_key/2]). %%---------------------------------------------------------------------------- diff --git a/deps/rabbit/src/rabbit_upgrade_preparation.erl b/deps/rabbit/src/rabbit_upgrade_preparation.erl index adc4b82fb348..8e73465d45dd 100644 --- a/deps/rabbit/src/rabbit_upgrade_preparation.erl +++ b/deps/rabbit/src/rabbit_upgrade_preparation.erl @@ -11,7 +11,6 @@ await_online_synchronised_mirrors/1, list_with_minimum_quorum_for_cli/0]). --include_lib("rabbit_common/include/rabbit.hrl"). %% %% API %% diff --git a/deps/rabbit/src/rabbit_variable_queue.erl b/deps/rabbit/src/rabbit_variable_queue.erl index 0c5e59b73c91..f4effb4a60f9 100644 --- a/deps/rabbit/src/rabbit_variable_queue.erl +++ b/deps/rabbit/src/rabbit_variable_queue.erl @@ -268,7 +268,6 @@ -define(IN_MEMORY, memory). -include_lib("rabbit_common/include/rabbit.hrl"). --include_lib("rabbit_common/include/rabbit_framing.hrl"). -include("amqqueue.hrl"). %%---------------------------------------------------------------------------- diff --git a/deps/rabbit/src/rabbit_vhost.erl b/deps/rabbit/src/rabbit_vhost.erl index bb2dd3620861..49450b05d42a 100644 --- a/deps/rabbit/src/rabbit_vhost.erl +++ b/deps/rabbit/src/rabbit_vhost.erl @@ -7,7 +7,6 @@ -module(rabbit_vhost). --include_lib("kernel/include/logger.hrl"). -include_lib("rabbit_common/include/rabbit.hrl"). -include("vhost.hrl"). diff --git a/deps/rabbit/src/rabbit_vhost_limit.erl b/deps/rabbit/src/rabbit_vhost_limit.erl index 765a92917827..9429de2f9018 100644 --- a/deps/rabbit/src/rabbit_vhost_limit.erl +++ b/deps/rabbit/src/rabbit_vhost_limit.erl @@ -9,8 +9,6 @@ -behaviour(rabbit_runtime_parameter). --include_lib("rabbit_common/include/rabbit.hrl"). - -export([register/0]). -export([parse_set/3, set/3, clear/2]). -export([list/0, list/1]). diff --git a/deps/rabbit/src/rabbit_vhost_process.erl b/deps/rabbit/src/rabbit_vhost_process.erl index 36293b45a94d..730425259b88 100644 --- a/deps/rabbit/src/rabbit_vhost_process.erl +++ b/deps/rabbit/src/rabbit_vhost_process.erl @@ -21,8 +21,6 @@ -module(rabbit_vhost_process). --include_lib("rabbit_common/include/rabbit.hrl"). - -define(VHOST_CHECK_INTERVAL, 5000). -behaviour(gen_server2). diff --git a/deps/rabbit/src/rabbit_vhost_sup.erl b/deps/rabbit/src/rabbit_vhost_sup.erl index 9cd16d329cce..9fcf79bffae3 100644 --- a/deps/rabbit/src/rabbit_vhost_sup.erl +++ b/deps/rabbit/src/rabbit_vhost_sup.erl @@ -7,8 +7,6 @@ -module(rabbit_vhost_sup). --include_lib("rabbit_common/include/rabbit.hrl"). - %% Each vhost gets an instance of this supervisor that supervises %% message stores and queues (via rabbit_amqqueue_sup_sup). -behaviour(supervisor). diff --git a/deps/rabbit/src/term_to_binary_compat.erl b/deps/rabbit/src/term_to_binary_compat.erl index f9b9e16440c0..6b844e74f19a 100644 --- a/deps/rabbit/src/term_to_binary_compat.erl +++ b/deps/rabbit/src/term_to_binary_compat.erl @@ -7,8 +7,6 @@ -module(term_to_binary_compat). --include_lib("rabbit_common/include/rabbit.hrl"). - -export([term_to_binary_1/1]). term_to_binary_1(Term) -> diff --git a/deps/rabbit/src/vhost.erl b/deps/rabbit/src/vhost.erl index b43e312234be..9091441dd273 100644 --- a/deps/rabbit/src/vhost.erl +++ b/deps/rabbit/src/vhost.erl @@ -7,7 +7,6 @@ -module(vhost). --include_lib("rabbit_common/include/rabbit.hrl"). -include("vhost.hrl"). -export([ diff --git a/deps/rabbit/test/amqqueue_backward_compatibility_SUITE.erl b/deps/rabbit/test/amqqueue_backward_compatibility_SUITE.erl index db2a4c8e4855..ddf3cc93e321 100644 --- a/deps/rabbit/test/amqqueue_backward_compatibility_SUITE.erl +++ b/deps/rabbit/test/amqqueue_backward_compatibility_SUITE.erl @@ -1,6 +1,5 @@ -module(amqqueue_backward_compatibility_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -include("amqqueue.hrl"). diff --git a/deps/rabbit/test/channel_interceptor_SUITE.erl b/deps/rabbit/test/channel_interceptor_SUITE.erl index 5d1492037a66..2a62a388cbf3 100644 --- a/deps/rabbit/test/channel_interceptor_SUITE.erl +++ b/deps/rabbit/test/channel_interceptor_SUITE.erl @@ -7,7 +7,6 @@ -module(channel_interceptor_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). -include_lib("eunit/include/eunit.hrl"). diff --git a/deps/rabbit/test/channel_operation_timeout_SUITE.erl b/deps/rabbit/test/channel_operation_timeout_SUITE.erl index 4a9f91c176dd..7772ea1df830 100644 --- a/deps/rabbit/test/channel_operation_timeout_SUITE.erl +++ b/deps/rabbit/test/channel_operation_timeout_SUITE.erl @@ -7,7 +7,6 @@ -module(channel_operation_timeout_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). -include("amqqueue.hrl"). diff --git a/deps/rabbit/test/channel_operation_timeout_test_queue.erl b/deps/rabbit/test/channel_operation_timeout_test_queue.erl index 4d9752ef595f..8b1846d2c9b8 100644 --- a/deps/rabbit/test/channel_operation_timeout_test_queue.erl +++ b/deps/rabbit/test/channel_operation_timeout_test_queue.erl @@ -119,8 +119,6 @@ -include_lib("rabbit_common/include/rabbit.hrl"). --include_lib("rabbit_common/include/rabbit_framing.hrl"). - -define(QUEUE, lqueue). -define(TIMEOUT_TEST_MSG, <<"timeout_test_msg!">>). diff --git a/deps/rabbit/test/cluster_limit_SUITE.erl b/deps/rabbit/test/cluster_limit_SUITE.erl index 0073281b502a..c8aa31614587 100644 --- a/deps/rabbit/test/cluster_limit_SUITE.erl +++ b/deps/rabbit/test/cluster_limit_SUITE.erl @@ -10,8 +10,6 @@ -include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). --include_lib("rabbitmq_ct_helpers/include/rabbit_assert.hrl"). - -compile([nowarn_export_all, export_all]). diff --git a/deps/rabbit/test/cluster_minority_SUITE.erl b/deps/rabbit/test/cluster_minority_SUITE.erl index 352199f0afa3..cbab25d6a142 100644 --- a/deps/rabbit/test/cluster_minority_SUITE.erl +++ b/deps/rabbit/test/cluster_minority_SUITE.erl @@ -7,7 +7,6 @@ -module(cluster_minority_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). -include_lib("eunit/include/eunit.hrl"). diff --git a/deps/rabbit/test/clustering_management_SUITE.erl b/deps/rabbit/test/clustering_management_SUITE.erl index b3c69151f79e..0cc5e3578612 100644 --- a/deps/rabbit/test/clustering_management_SUITE.erl +++ b/deps/rabbit/test/clustering_management_SUITE.erl @@ -10,8 +10,6 @@ -include_lib("common_test/include/ct.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). -include_lib("eunit/include/eunit.hrl"). --include_lib("rabbitmq_ct_helpers/include/rabbit_assert.hrl"). - -compile(export_all). -import(clustering_utils, [ diff --git a/deps/rabbit/test/consumer_timeout_SUITE.erl b/deps/rabbit/test/consumer_timeout_SUITE.erl index ed04ce04bf9d..8a3dca60272e 100644 --- a/deps/rabbit/test/consumer_timeout_SUITE.erl +++ b/deps/rabbit/test/consumer_timeout_SUITE.erl @@ -7,7 +7,6 @@ -module(consumer_timeout_SUITE). -include_lib("common_test/include/ct.hrl"). --include_lib("kernel/include/file.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). -include_lib("eunit/include/eunit.hrl"). diff --git a/deps/rabbit/test/definition_import_SUITE.erl b/deps/rabbit/test/definition_import_SUITE.erl index 347e0e829e5d..5cb90d992c21 100644 --- a/deps/rabbit/test/definition_import_SUITE.erl +++ b/deps/rabbit/test/definition_import_SUITE.erl @@ -9,7 +9,6 @@ -include_lib("rabbitmq_ct_helpers/include/rabbit_assert.hrl"). -include_lib("common_test/include/ct.hrl"). --include_lib("rabbit_common/include/rabbit.hrl"). -include_lib("eunit/include/eunit.hrl"). -compile(export_all). diff --git a/deps/rabbit/test/disconnect_detected_during_alarm_SUITE.erl b/deps/rabbit/test/disconnect_detected_during_alarm_SUITE.erl index 3d86446bcb4c..b44c6de1440f 100644 --- a/deps/rabbit/test/disconnect_detected_during_alarm_SUITE.erl +++ b/deps/rabbit/test/disconnect_detected_during_alarm_SUITE.erl @@ -7,7 +7,6 @@ -module(disconnect_detected_during_alarm_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). -compile(export_all). diff --git a/deps/rabbit/test/disk_monitor_SUITE.erl b/deps/rabbit/test/disk_monitor_SUITE.erl index 6f2b5e6f37d6..609ea283441e 100644 --- a/deps/rabbit/test/disk_monitor_SUITE.erl +++ b/deps/rabbit/test/disk_monitor_SUITE.erl @@ -7,7 +7,6 @@ -module(disk_monitor_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -compile(export_all). diff --git a/deps/rabbit/test/eager_sync_SUITE.erl b/deps/rabbit/test/eager_sync_SUITE.erl index ac25c593aa5f..ffc3650e6b0f 100644 --- a/deps/rabbit/test/eager_sync_SUITE.erl +++ b/deps/rabbit/test/eager_sync_SUITE.erl @@ -7,7 +7,6 @@ -module(eager_sync_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). -compile(export_all). diff --git a/deps/rabbit/test/feature_flags_v2_SUITE.erl b/deps/rabbit/test/feature_flags_v2_SUITE.erl index 8f60d1165c6c..8678d7a2d877 100644 --- a/deps/rabbit/test/feature_flags_v2_SUITE.erl +++ b/deps/rabbit/test/feature_flags_v2_SUITE.erl @@ -11,8 +11,6 @@ -include_lib("eunit/include/eunit.hrl"). -include_lib("common_test/include/ct.hrl"). --include_lib("rabbit_common/include/logging.hrl"). - -export([suite/0, all/0, groups/0, diff --git a/deps/rabbit/test/feature_flags_with_unpriveleged_user_SUITE.erl b/deps/rabbit/test/feature_flags_with_unpriveleged_user_SUITE.erl index 878b06dd4b76..d8b627da39d4 100644 --- a/deps/rabbit/test/feature_flags_with_unpriveleged_user_SUITE.erl +++ b/deps/rabbit/test/feature_flags_with_unpriveleged_user_SUITE.erl @@ -7,7 +7,6 @@ -module(feature_flags_with_unpriveleged_user_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -export([suite/0, diff --git a/deps/rabbit/test/list_consumers_sanity_check_SUITE.erl b/deps/rabbit/test/list_consumers_sanity_check_SUITE.erl index 0204efce00af..bf6eff781584 100644 --- a/deps/rabbit/test/list_consumers_sanity_check_SUITE.erl +++ b/deps/rabbit/test/list_consumers_sanity_check_SUITE.erl @@ -7,7 +7,6 @@ -module(list_consumers_sanity_check_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). -compile(export_all). diff --git a/deps/rabbit/test/list_queues_online_and_offline_SUITE.erl b/deps/rabbit/test/list_queues_online_and_offline_SUITE.erl index 251f9545ab5e..343f149a54f1 100644 --- a/deps/rabbit/test/list_queues_online_and_offline_SUITE.erl +++ b/deps/rabbit/test/list_queues_online_and_offline_SUITE.erl @@ -7,7 +7,6 @@ -module(list_queues_online_and_offline_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). -compile(export_all). diff --git a/deps/rabbit/test/metadata_store_clustering_SUITE.erl b/deps/rabbit/test/metadata_store_clustering_SUITE.erl index 928ec909088f..3cb502beb209 100644 --- a/deps/rabbit/test/metadata_store_clustering_SUITE.erl +++ b/deps/rabbit/test/metadata_store_clustering_SUITE.erl @@ -10,8 +10,6 @@ -include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). --include_lib("rabbitmq_ct_helpers/include/rabbit_assert.hrl"). - -compile([nowarn_export_all, export_all]). suite() -> diff --git a/deps/rabbit/test/metadata_store_migration_SUITE.erl b/deps/rabbit/test/metadata_store_migration_SUITE.erl index d207ed0fa123..d2ddcf84a718 100644 --- a/deps/rabbit/test/metadata_store_migration_SUITE.erl +++ b/deps/rabbit/test/metadata_store_migration_SUITE.erl @@ -7,7 +7,6 @@ -module(metadata_store_migration_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). diff --git a/deps/rabbit/test/msg_store_SUITE.erl b/deps/rabbit/test/msg_store_SUITE.erl index 86c9570d093f..117c9896f8ff 100644 --- a/deps/rabbit/test/msg_store_SUITE.erl +++ b/deps/rabbit/test/msg_store_SUITE.erl @@ -7,7 +7,6 @@ -module(msg_store_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("rabbit_common/include/rabbit.hrl"). -compile(export_all). diff --git a/deps/rabbit/test/peer_discovery_classic_config_SUITE.erl b/deps/rabbit/test/peer_discovery_classic_config_SUITE.erl index 301994459b50..f621a689f1c7 100644 --- a/deps/rabbit/test/peer_discovery_classic_config_SUITE.erl +++ b/deps/rabbit/test/peer_discovery_classic_config_SUITE.erl @@ -8,7 +8,6 @@ -module(peer_discovery_classic_config_SUITE). -include_lib("common_test/include/ct.hrl"). --include_lib("amqp_client/include/amqp_client.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("rabbitmq_ct_helpers/include/rabbit_assert.hrl"). diff --git a/deps/rabbit/test/peer_discovery_dns_SUITE.erl b/deps/rabbit/test/peer_discovery_dns_SUITE.erl index 7536faeb3f25..27279c4bcb61 100644 --- a/deps/rabbit/test/peer_discovery_dns_SUITE.erl +++ b/deps/rabbit/test/peer_discovery_dns_SUITE.erl @@ -7,7 +7,6 @@ -module(peer_discovery_dns_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). -include_lib("eunit/include/eunit.hrl"). diff --git a/deps/rabbit/test/peer_discovery_tmp_hidden_node_SUITE.erl b/deps/rabbit/test/peer_discovery_tmp_hidden_node_SUITE.erl index 77338e10198d..a4dde9ab8e66 100644 --- a/deps/rabbit/test/peer_discovery_tmp_hidden_node_SUITE.erl +++ b/deps/rabbit/test/peer_discovery_tmp_hidden_node_SUITE.erl @@ -8,7 +8,6 @@ -module(peer_discovery_tmp_hidden_node_SUITE). --include_lib("kernel/include/logger.hrl"). -include_lib("kernel/include/inet.hrl"). -include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). diff --git a/deps/rabbit/test/per_user_connection_channel_limit_partitions_SUITE.erl b/deps/rabbit/test/per_user_connection_channel_limit_partitions_SUITE.erl index 5b4de6e4c3cc..8c9ec8f4baed 100644 --- a/deps/rabbit/test/per_user_connection_channel_limit_partitions_SUITE.erl +++ b/deps/rabbit/test/per_user_connection_channel_limit_partitions_SUITE.erl @@ -7,7 +7,6 @@ -module(per_user_connection_channel_limit_partitions_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("rabbitmq_ct_helpers/include/rabbit_assert.hrl"). diff --git a/deps/rabbit/test/per_vhost_connection_limit_partitions_SUITE.erl b/deps/rabbit/test/per_vhost_connection_limit_partitions_SUITE.erl index 01b010f91435..a7db71a8452b 100644 --- a/deps/rabbit/test/per_vhost_connection_limit_partitions_SUITE.erl +++ b/deps/rabbit/test/per_vhost_connection_limit_partitions_SUITE.erl @@ -7,7 +7,6 @@ -module(per_vhost_connection_limit_partitions_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("rabbitmq_ct_helpers/include/rabbit_assert.hrl"). diff --git a/deps/rabbit/test/priority_queue_recovery_SUITE.erl b/deps/rabbit/test/priority_queue_recovery_SUITE.erl index f78f4ba72078..5099cda128dd 100644 --- a/deps/rabbit/test/priority_queue_recovery_SUITE.erl +++ b/deps/rabbit/test/priority_queue_recovery_SUITE.erl @@ -7,7 +7,6 @@ -module(priority_queue_recovery_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). -compile(export_all). diff --git a/deps/rabbit/test/publisher_confirms_parallel_SUITE.erl b/deps/rabbit/test/publisher_confirms_parallel_SUITE.erl index 910d252bcb6c..625ca8e590ef 100644 --- a/deps/rabbit/test/publisher_confirms_parallel_SUITE.erl +++ b/deps/rabbit/test/publisher_confirms_parallel_SUITE.erl @@ -7,7 +7,6 @@ -module(publisher_confirms_parallel_SUITE). -include_lib("common_test/include/ct.hrl"). --include_lib("kernel/include/file.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). -include_lib("eunit/include/eunit.hrl"). diff --git a/deps/rabbit/test/queue_length_limits_SUITE.erl b/deps/rabbit/test/queue_length_limits_SUITE.erl index a551fc6e8064..a952fed10c7e 100644 --- a/deps/rabbit/test/queue_length_limits_SUITE.erl +++ b/deps/rabbit/test/queue_length_limits_SUITE.erl @@ -8,7 +8,6 @@ -module(queue_length_limits_SUITE). -include_lib("common_test/include/ct.hrl"). --include_lib("kernel/include/file.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). -include_lib("eunit/include/eunit.hrl"). diff --git a/deps/rabbit/test/quorum_queue_member_reconciliation_SUITE.erl b/deps/rabbit/test/quorum_queue_member_reconciliation_SUITE.erl index fdbb5d06ec6e..00ccb34402fe 100644 --- a/deps/rabbit/test/quorum_queue_member_reconciliation_SUITE.erl +++ b/deps/rabbit/test/quorum_queue_member_reconciliation_SUITE.erl @@ -10,8 +10,6 @@ -include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). --include_lib("rabbitmq_ct_helpers/include/rabbit_assert.hrl"). - -compile([nowarn_export_all, export_all]). diff --git a/deps/rabbit/test/rabbit_db_binding_SUITE.erl b/deps/rabbit/test/rabbit_db_binding_SUITE.erl index 3560b5c2a897..9055e4ff1ddb 100644 --- a/deps/rabbit/test/rabbit_db_binding_SUITE.erl +++ b/deps/rabbit/test/rabbit_db_binding_SUITE.erl @@ -9,8 +9,6 @@ -include_lib("rabbit_common/include/rabbit.hrl"). -include_lib("eunit/include/eunit.hrl"). --include_lib("common_test/include/ct.hrl"). - -compile(export_all). -define(VHOST, <<"/">>). diff --git a/deps/rabbit/test/rabbit_db_exchange_SUITE.erl b/deps/rabbit/test/rabbit_db_exchange_SUITE.erl index 8cf0cd6617b6..4bfb504eddef 100644 --- a/deps/rabbit/test/rabbit_db_exchange_SUITE.erl +++ b/deps/rabbit/test/rabbit_db_exchange_SUITE.erl @@ -9,8 +9,6 @@ -include_lib("rabbit_common/include/rabbit.hrl"). -include_lib("eunit/include/eunit.hrl"). --include_lib("common_test/include/ct.hrl"). - -compile(export_all). -define(VHOST, <<"/">>). diff --git a/deps/rabbit/test/rabbit_db_maintenance_SUITE.erl b/deps/rabbit/test/rabbit_db_maintenance_SUITE.erl index a7c92e4e005b..336ca681bf99 100644 --- a/deps/rabbit/test/rabbit_db_maintenance_SUITE.erl +++ b/deps/rabbit/test/rabbit_db_maintenance_SUITE.erl @@ -8,8 +8,6 @@ -module(rabbit_db_maintenance_SUITE). -include_lib("eunit/include/eunit.hrl"). --include_lib("common_test/include/ct.hrl"). - -compile(export_all). all() -> diff --git a/deps/rabbit/test/rabbit_db_msup_SUITE.erl b/deps/rabbit/test/rabbit_db_msup_SUITE.erl index f4a3f9a7fe00..5fb9994d95e5 100644 --- a/deps/rabbit/test/rabbit_db_msup_SUITE.erl +++ b/deps/rabbit/test/rabbit_db_msup_SUITE.erl @@ -7,7 +7,6 @@ -module(rabbit_db_msup_SUITE). --include_lib("rabbit_common/include/rabbit.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("common_test/include/ct.hrl"). diff --git a/deps/rabbit/test/rabbit_db_policy_SUITE.erl b/deps/rabbit/test/rabbit_db_policy_SUITE.erl index 1a20189bee8d..38068c7bdde4 100644 --- a/deps/rabbit/test/rabbit_db_policy_SUITE.erl +++ b/deps/rabbit/test/rabbit_db_policy_SUITE.erl @@ -9,8 +9,6 @@ -include_lib("rabbit_common/include/rabbit.hrl"). -include_lib("eunit/include/eunit.hrl"). --include_lib("common_test/include/ct.hrl"). - -compile(export_all). -define(VHOST, <<"/">>). diff --git a/deps/rabbit/test/rabbit_db_queue_SUITE.erl b/deps/rabbit/test/rabbit_db_queue_SUITE.erl index 9117f31982eb..525e6b6dc5ae 100644 --- a/deps/rabbit/test/rabbit_db_queue_SUITE.erl +++ b/deps/rabbit/test/rabbit_db_queue_SUITE.erl @@ -9,7 +9,6 @@ -include_lib("rabbit_common/include/rabbit.hrl"). -include_lib("eunit/include/eunit.hrl"). --include_lib("common_test/include/ct.hrl"). -include("amqqueue.hrl"). -compile(export_all). diff --git a/deps/rabbit/test/rabbit_direct_reply_to_prop_SUITE.erl b/deps/rabbit/test/rabbit_direct_reply_to_prop_SUITE.erl index 177847583a5e..59451186ce94 100644 --- a/deps/rabbit/test/rabbit_direct_reply_to_prop_SUITE.erl +++ b/deps/rabbit/test/rabbit_direct_reply_to_prop_SUITE.erl @@ -2,7 +2,6 @@ -compile(export_all). --include_lib("common_test/include/ct.hrl"). -include_lib("proper/include/proper.hrl"). -define(ITERATIONS_TO_RUN_UNTIL_CONFIDENT, 10000). diff --git a/deps/rabbit/test/rabbit_fifo_dlx_SUITE.erl b/deps/rabbit/test/rabbit_fifo_dlx_SUITE.erl index e2c759621214..6800451dcc04 100644 --- a/deps/rabbit/test/rabbit_fifo_dlx_SUITE.erl +++ b/deps/rabbit/test/rabbit_fifo_dlx_SUITE.erl @@ -11,7 +11,6 @@ -include_lib("eunit/include/eunit.hrl"). -include_lib("rabbit/src/rabbit_fifo.hrl"). --include_lib("rabbit/src/rabbit_fifo_dlx.hrl"). -include_lib("rabbit_common/include/rabbit.hrl"). %%%=================================================================== diff --git a/deps/rabbit/test/rabbit_fifo_v0_SUITE.erl b/deps/rabbit/test/rabbit_fifo_v0_SUITE.erl index 291971ba1ab4..ff0778235c12 100644 --- a/deps/rabbit/test/rabbit_fifo_v0_SUITE.erl +++ b/deps/rabbit/test/rabbit_fifo_v0_SUITE.erl @@ -8,7 +8,6 @@ -export([ ]). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("rabbit_common/include/rabbit.hrl"). -include("src/rabbit_fifo_v0.hrl"). diff --git a/deps/rabbit/test/rabbitmqctl_shutdown_SUITE.erl b/deps/rabbit/test/rabbitmqctl_shutdown_SUITE.erl index 797f1f007e6a..dc54354a7ccf 100644 --- a/deps/rabbit/test/rabbitmqctl_shutdown_SUITE.erl +++ b/deps/rabbit/test/rabbitmqctl_shutdown_SUITE.erl @@ -8,8 +8,6 @@ -module(rabbitmqctl_shutdown_SUITE). -include_lib("common_test/include/ct.hrl"). --include_lib("amqp_client/include/amqp_client.hrl"). - -compile(export_all). all() -> diff --git a/deps/rabbit/test/routing_SUITE.erl b/deps/rabbit/test/routing_SUITE.erl index e89ac4d9881f..49cef1aa61f8 100644 --- a/deps/rabbit/test/routing_SUITE.erl +++ b/deps/rabbit/test/routing_SUITE.erl @@ -9,8 +9,6 @@ -include_lib("eunit/include/eunit.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). --include_lib("common_test/include/ct.hrl"). - -compile([nowarn_export_all, export_all]). -compile(export_all). diff --git a/deps/rabbit/test/term_to_binary_compat_prop_SUITE.erl b/deps/rabbit/test/term_to_binary_compat_prop_SUITE.erl index bd549c76e3a4..f53000a8cd78 100644 --- a/deps/rabbit/test/term_to_binary_compat_prop_SUITE.erl +++ b/deps/rabbit/test/term_to_binary_compat_prop_SUITE.erl @@ -10,7 +10,6 @@ -compile(export_all). --include_lib("rabbit_common/include/rabbit.hrl"). -include_lib("common_test/include/ct.hrl"). -include_lib("proper/include/proper.hrl"). diff --git a/deps/rabbit/test/topic_permission_SUITE.erl b/deps/rabbit/test/topic_permission_SUITE.erl index 78881e1e1ae7..0a30f7f30255 100644 --- a/deps/rabbit/test/topic_permission_SUITE.erl +++ b/deps/rabbit/test/topic_permission_SUITE.erl @@ -7,7 +7,6 @@ -module(topic_permission_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("rabbit_common/include/rabbit.hrl"). -compile(export_all). diff --git a/deps/rabbit/test/unit_access_control_authn_authz_context_propagation_SUITE.erl b/deps/rabbit/test/unit_access_control_authn_authz_context_propagation_SUITE.erl index 0d65540ddc77..21dd13f1be99 100644 --- a/deps/rabbit/test/unit_access_control_authn_authz_context_propagation_SUITE.erl +++ b/deps/rabbit/test/unit_access_control_authn_authz_context_propagation_SUITE.erl @@ -7,7 +7,6 @@ -module(unit_access_control_authn_authz_context_propagation_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). diff --git a/deps/rabbit/test/unit_access_control_credential_validation_SUITE.erl b/deps/rabbit/test/unit_access_control_credential_validation_SUITE.erl index c93f3d607fdd..099c9c35bc6c 100644 --- a/deps/rabbit/test/unit_access_control_credential_validation_SUITE.erl +++ b/deps/rabbit/test/unit_access_control_credential_validation_SUITE.erl @@ -9,7 +9,6 @@ -compile(export_all). -include_lib("proper/include/proper.hrl"). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). all() -> diff --git a/deps/rabbit/test/unit_amqp091_content_framing_SUITE.erl b/deps/rabbit/test/unit_amqp091_content_framing_SUITE.erl index 0fe10b244854..13092e3e28f3 100644 --- a/deps/rabbit/test/unit_amqp091_content_framing_SUITE.erl +++ b/deps/rabbit/test/unit_amqp091_content_framing_SUITE.erl @@ -7,7 +7,6 @@ -module(unit_amqp091_content_framing_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("rabbit_common/include/rabbit.hrl"). -include_lib("rabbit_common/include/rabbit_framing.hrl"). diff --git a/deps/rabbit/test/unit_amqp091_server_properties_SUITE.erl b/deps/rabbit/test/unit_amqp091_server_properties_SUITE.erl index 3a9a68f719f3..6b7b70352faa 100644 --- a/deps/rabbit/test/unit_amqp091_server_properties_SUITE.erl +++ b/deps/rabbit/test/unit_amqp091_server_properties_SUITE.erl @@ -8,7 +8,6 @@ -module(unit_amqp091_server_properties_SUITE). -include_lib("common_test/include/ct.hrl"). --include_lib("kernel/include/file.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). -include_lib("eunit/include/eunit.hrl"). diff --git a/deps/rabbit/test/unit_app_management_SUITE.erl b/deps/rabbit/test/unit_app_management_SUITE.erl index 48d7307d5eab..f7491252d6b9 100644 --- a/deps/rabbit/test/unit_app_management_SUITE.erl +++ b/deps/rabbit/test/unit_app_management_SUITE.erl @@ -8,7 +8,6 @@ -module(unit_app_management_SUITE). -include_lib("eunit/include/eunit.hrl"). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("kernel/include/file.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). diff --git a/deps/rabbit/test/unit_classic_mirrored_queue_sync_throttling_SUITE.erl b/deps/rabbit/test/unit_classic_mirrored_queue_sync_throttling_SUITE.erl index ad5138e52861..03610ca12873 100644 --- a/deps/rabbit/test/unit_classic_mirrored_queue_sync_throttling_SUITE.erl +++ b/deps/rabbit/test/unit_classic_mirrored_queue_sync_throttling_SUITE.erl @@ -3,7 +3,6 @@ -include_lib("rabbit_common/include/rabbit.hrl"). -include_lib("rabbit_common/include/rabbit_framing.hrl"). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -compile(export_all). diff --git a/deps/rabbit/test/unit_classic_mirrored_queue_throughput_SUITE.erl b/deps/rabbit/test/unit_classic_mirrored_queue_throughput_SUITE.erl index 7e10b5f5d9bc..8dbc13b8af6d 100644 --- a/deps/rabbit/test/unit_classic_mirrored_queue_throughput_SUITE.erl +++ b/deps/rabbit/test/unit_classic_mirrored_queue_throughput_SUITE.erl @@ -1,6 +1,5 @@ -module(unit_classic_mirrored_queue_throughput_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -compile(export_all). diff --git a/deps/rabbit/test/unit_cluster_formation_locking_mocks_SUITE.erl b/deps/rabbit/test/unit_cluster_formation_locking_mocks_SUITE.erl index 1461b0c5f8ad..9537c1fd1852 100644 --- a/deps/rabbit/test/unit_cluster_formation_locking_mocks_SUITE.erl +++ b/deps/rabbit/test/unit_cluster_formation_locking_mocks_SUITE.erl @@ -6,7 +6,6 @@ %% -module(unit_cluster_formation_locking_mocks_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -compile(export_all). diff --git a/deps/rabbit/test/unit_cluster_formation_sort_nodes_SUITE.erl b/deps/rabbit/test/unit_cluster_formation_sort_nodes_SUITE.erl index e8537a66496d..b882e4558ab0 100644 --- a/deps/rabbit/test/unit_cluster_formation_sort_nodes_SUITE.erl +++ b/deps/rabbit/test/unit_cluster_formation_sort_nodes_SUITE.erl @@ -7,7 +7,6 @@ -module(unit_cluster_formation_sort_nodes_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -export([all/0, diff --git a/deps/rabbit/test/unit_collections_SUITE.erl b/deps/rabbit/test/unit_collections_SUITE.erl index d9e39aa8917b..f91cb4c6aede 100644 --- a/deps/rabbit/test/unit_collections_SUITE.erl +++ b/deps/rabbit/test/unit_collections_SUITE.erl @@ -7,7 +7,6 @@ -module(unit_collections_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -compile(export_all). diff --git a/deps/rabbit/test/unit_connection_tracking_SUITE.erl b/deps/rabbit/test/unit_connection_tracking_SUITE.erl index 016f6b24fb4e..23925155bd63 100644 --- a/deps/rabbit/test/unit_connection_tracking_SUITE.erl +++ b/deps/rabbit/test/unit_connection_tracking_SUITE.erl @@ -8,7 +8,6 @@ -module(unit_connection_tracking_SUITE). -include_lib("eunit/include/eunit.hrl"). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("kernel/include/file.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). diff --git a/deps/rabbit/test/unit_credit_flow_SUITE.erl b/deps/rabbit/test/unit_credit_flow_SUITE.erl index fc5885643611..4b50e6f19a0c 100644 --- a/deps/rabbit/test/unit_credit_flow_SUITE.erl +++ b/deps/rabbit/test/unit_credit_flow_SUITE.erl @@ -7,7 +7,6 @@ -module(unit_credit_flow_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -compile(export_all). diff --git a/deps/rabbit/test/unit_disk_monitor_SUITE.erl b/deps/rabbit/test/unit_disk_monitor_SUITE.erl index 998cd78a4c30..559e9d0f0ee9 100644 --- a/deps/rabbit/test/unit_disk_monitor_SUITE.erl +++ b/deps/rabbit/test/unit_disk_monitor_SUITE.erl @@ -7,7 +7,6 @@ -module(unit_disk_monitor_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -compile(export_all). diff --git a/deps/rabbit/test/unit_file_handle_cache_SUITE.erl b/deps/rabbit/test/unit_file_handle_cache_SUITE.erl index ac8a887ccdb9..7e8406e27fef 100644 --- a/deps/rabbit/test/unit_file_handle_cache_SUITE.erl +++ b/deps/rabbit/test/unit_file_handle_cache_SUITE.erl @@ -8,7 +8,6 @@ -module(unit_file_handle_cache_SUITE). -include_lib("eunit/include/eunit.hrl"). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("kernel/include/file.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). diff --git a/deps/rabbit/test/unit_gen_server2_SUITE.erl b/deps/rabbit/test/unit_gen_server2_SUITE.erl index 3ad1f2769636..efb6f3b65e36 100644 --- a/deps/rabbit/test/unit_gen_server2_SUITE.erl +++ b/deps/rabbit/test/unit_gen_server2_SUITE.erl @@ -7,7 +7,6 @@ -module(unit_gen_server2_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -compile(export_all). diff --git a/deps/rabbit/test/unit_gm_SUITE.erl b/deps/rabbit/test/unit_gm_SUITE.erl index 8b96428bf106..5c8024ec55b2 100644 --- a/deps/rabbit/test/unit_gm_SUITE.erl +++ b/deps/rabbit/test/unit_gm_SUITE.erl @@ -11,8 +11,6 @@ -include_lib("common_test/include/ct.hrl"). --include("gm_specs.hrl"). - -compile(export_all). -define(RECEIVE_OR_THROW(Body, Bool, Error), diff --git a/deps/rabbit/test/unit_log_management_SUITE.erl b/deps/rabbit/test/unit_log_management_SUITE.erl index 0c7909d44630..1addb954706e 100644 --- a/deps/rabbit/test/unit_log_management_SUITE.erl +++ b/deps/rabbit/test/unit_log_management_SUITE.erl @@ -8,7 +8,6 @@ -module(unit_log_management_SUITE). -include_lib("eunit/include/eunit.hrl"). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("kernel/include/file.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). diff --git a/deps/rabbit/test/unit_operator_policy_SUITE.erl b/deps/rabbit/test/unit_operator_policy_SUITE.erl index 01060619fa90..ea2b83984d69 100644 --- a/deps/rabbit/test/unit_operator_policy_SUITE.erl +++ b/deps/rabbit/test/unit_operator_policy_SUITE.erl @@ -7,7 +7,6 @@ -module(unit_operator_policy_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("rabbit_common/include/rabbit.hrl"). diff --git a/deps/rabbit/test/unit_pg_local_SUITE.erl b/deps/rabbit/test/unit_pg_local_SUITE.erl index 1fa6c2534684..cba1bd4a6212 100644 --- a/deps/rabbit/test/unit_pg_local_SUITE.erl +++ b/deps/rabbit/test/unit_pg_local_SUITE.erl @@ -7,7 +7,6 @@ -module(unit_pg_local_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -compile(export_all). diff --git a/deps/rabbit/test/unit_plugin_versioning_SUITE.erl b/deps/rabbit/test/unit_plugin_versioning_SUITE.erl index 52a78f0a3c52..9fd1b3624c9c 100644 --- a/deps/rabbit/test/unit_plugin_versioning_SUITE.erl +++ b/deps/rabbit/test/unit_plugin_versioning_SUITE.erl @@ -7,7 +7,6 @@ -module(unit_plugin_versioning_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). -compile(export_all). diff --git a/deps/rabbit/test/unit_policy_validators_SUITE.erl b/deps/rabbit/test/unit_policy_validators_SUITE.erl index c334113273ff..d4f159706ab7 100644 --- a/deps/rabbit/test/unit_policy_validators_SUITE.erl +++ b/deps/rabbit/test/unit_policy_validators_SUITE.erl @@ -7,7 +7,6 @@ -module(unit_policy_validators_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -compile(export_all). diff --git a/deps/rabbit/test/unit_queue_consumers_SUITE.erl b/deps/rabbit/test/unit_queue_consumers_SUITE.erl index 84a8dd18ef1b..0f0690b2b8c2 100644 --- a/deps/rabbit/test/unit_queue_consumers_SUITE.erl +++ b/deps/rabbit/test/unit_queue_consumers_SUITE.erl @@ -7,7 +7,6 @@ -module(unit_queue_consumers_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -compile(export_all). diff --git a/deps/rabbit/test/unit_stats_and_metrics_SUITE.erl b/deps/rabbit/test/unit_stats_and_metrics_SUITE.erl index 92818a6e5b14..f75e5a1fb2cc 100644 --- a/deps/rabbit/test/unit_stats_and_metrics_SUITE.erl +++ b/deps/rabbit/test/unit_stats_and_metrics_SUITE.erl @@ -8,7 +8,6 @@ -module(unit_stats_and_metrics_SUITE). -include_lib("eunit/include/eunit.hrl"). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("kernel/include/file.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). diff --git a/deps/rabbit/test/unit_supervisor2_SUITE.erl b/deps/rabbit/test/unit_supervisor2_SUITE.erl index a8b355d4f9d9..95f46d7a5dad 100644 --- a/deps/rabbit/test/unit_supervisor2_SUITE.erl +++ b/deps/rabbit/test/unit_supervisor2_SUITE.erl @@ -7,7 +7,6 @@ -module(unit_supervisor2_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -compile(export_all). diff --git a/deps/rabbit/test/unit_vm_memory_monitor_SUITE.erl b/deps/rabbit/test/unit_vm_memory_monitor_SUITE.erl index 247999da1f4a..09e782018f53 100644 --- a/deps/rabbit/test/unit_vm_memory_monitor_SUITE.erl +++ b/deps/rabbit/test/unit_vm_memory_monitor_SUITE.erl @@ -7,7 +7,6 @@ -module(unit_vm_memory_monitor_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -compile(export_all). diff --git a/deps/rabbit/test/upgrade_preparation_SUITE.erl b/deps/rabbit/test/upgrade_preparation_SUITE.erl index bdbedbeb71d4..29787ae8d524 100644 --- a/deps/rabbit/test/upgrade_preparation_SUITE.erl +++ b/deps/rabbit/test/upgrade_preparation_SUITE.erl @@ -7,7 +7,6 @@ -module(upgrade_preparation_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). diff --git a/deps/rabbit_common/src/rabbit_authn_backend.erl b/deps/rabbit_common/src/rabbit_authn_backend.erl index 6efedde94a6b..c657bc82f0b6 100644 --- a/deps/rabbit_common/src/rabbit_authn_backend.erl +++ b/deps/rabbit_common/src/rabbit_authn_backend.erl @@ -7,8 +7,6 @@ -module(rabbit_authn_backend). --include("rabbit.hrl"). - %% Check a user can log in, given a username and a proplist of %% authentication information (e.g. [{password, Password}]). If your %% backend is not to be used for authentication, this should always diff --git a/deps/rabbit_common/src/rabbit_authz_backend.erl b/deps/rabbit_common/src/rabbit_authz_backend.erl index 5270c3178867..eda44d117604 100644 --- a/deps/rabbit_common/src/rabbit_authz_backend.erl +++ b/deps/rabbit_common/src/rabbit_authz_backend.erl @@ -7,8 +7,6 @@ -module(rabbit_authz_backend). --include("rabbit.hrl"). - %% Check that a user can log in, when this backend is being used for %% authorisation only. Authentication has already taken place %% successfully, but we need to check that the user exists in this diff --git a/deps/rabbit_common/src/rabbit_password_hashing.erl b/deps/rabbit_common/src/rabbit_password_hashing.erl index bd9aca7330af..898094c663ab 100644 --- a/deps/rabbit_common/src/rabbit_password_hashing.erl +++ b/deps/rabbit_common/src/rabbit_password_hashing.erl @@ -6,6 +6,4 @@ %% -module(rabbit_password_hashing). --include("rabbit.hrl"). - -callback hash(rabbit_types:password()) -> rabbit_types:password_hash(). diff --git a/deps/rabbit_common/src/rabbit_peer_discovery_backend.erl b/deps/rabbit_common/src/rabbit_peer_discovery_backend.erl index 6f6b2d30b115..4ed3882620ff 100644 --- a/deps/rabbit_common/src/rabbit_peer_discovery_backend.erl +++ b/deps/rabbit_common/src/rabbit_peer_discovery_backend.erl @@ -37,8 +37,6 @@ -module(rabbit_peer_discovery_backend). --include("rabbit.hrl"). - -callback init() -> ok | {error, Reason :: string()}. -callback list_nodes() -> {ok, {Nodes :: [node()] | node(), NodeType :: rabbit_types:node_type()}} | diff --git a/deps/rabbit_common/src/rabbit_writer.erl b/deps/rabbit_common/src/rabbit_writer.erl index d24ae7e38361..e73cc1bb86e2 100644 --- a/deps/rabbit_common/src/rabbit_writer.erl +++ b/deps/rabbit_common/src/rabbit_writer.erl @@ -25,8 +25,6 @@ %% When a socket write fails, writer will exit. -include("rabbit.hrl"). --include("rabbit_framing.hrl"). - -export([start/6, start_link/6, start/7, start_link/7, start/8, start_link/8]). -export([system_continue/3, system_terminate/4, system_code_change/4]). diff --git a/deps/rabbit_common/test/supervisor2_SUITE.erl b/deps/rabbit_common/test/supervisor2_SUITE.erl index 6eedd95b632c..24a1f256302d 100644 --- a/deps/rabbit_common/test/supervisor2_SUITE.erl +++ b/deps/rabbit_common/test/supervisor2_SUITE.erl @@ -9,7 +9,6 @@ -behaviour(supervisor2). --include_lib("common_test/include/ct.hrl"). -include("rabbit.hrl"). -compile(export_all). diff --git a/deps/rabbit_common/test/unit_priority_queue_SUITE.erl b/deps/rabbit_common/test/unit_priority_queue_SUITE.erl index edf983f0b71d..24f98e21a0eb 100644 --- a/deps/rabbit_common/test/unit_priority_queue_SUITE.erl +++ b/deps/rabbit_common/test/unit_priority_queue_SUITE.erl @@ -7,7 +7,6 @@ -module(unit_priority_queue_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -compile(export_all). diff --git a/deps/rabbitmq_auth_backend_http/test/auth_http_mock.erl b/deps/rabbitmq_auth_backend_http/test/auth_http_mock.erl index 76d2f08f71ef..b0112896e384 100644 --- a/deps/rabbitmq_auth_backend_http/test/auth_http_mock.erl +++ b/deps/rabbitmq_auth_backend_http/test/auth_http_mock.erl @@ -1,7 +1,6 @@ -module(auth_http_mock). -export([init/2]). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). %%% CALLBACKS diff --git a/deps/rabbitmq_auth_backend_ldap/test/rabbit_ldap_seed.erl b/deps/rabbitmq_auth_backend_ldap/test/rabbit_ldap_seed.erl index d2b3d0364bc3..7a63cb78b45d 100644 --- a/deps/rabbitmq_auth_backend_ldap/test/rabbit_ldap_seed.erl +++ b/deps/rabbitmq_auth_backend_ldap/test/rabbit_ldap_seed.erl @@ -7,7 +7,6 @@ -module(rabbit_ldap_seed). --include_lib("eldap/include/eldap.hrl"). -include_lib("stdlib/include/assert.hrl"). -export([seed/1,delete/1]). diff --git a/deps/rabbitmq_auth_backend_oauth2/app.bzl b/deps/rabbitmq_auth_backend_oauth2/app.bzl index 7f15bf721026..ccf72932cfaa 100644 --- a/deps/rabbitmq_auth_backend_oauth2/app.bzl +++ b/deps/rabbitmq_auth_backend_oauth2/app.bzl @@ -128,7 +128,6 @@ def test_suite_beam_files(name = "test_suite_beam_files"): outs = ["test/add_uaa_key_command_SUITE.beam"], app_name = "rabbitmq_auth_backend_oauth2", erlc_opts = "//:test_erlc_opts", - deps = ["//deps/rabbit_common:erlang_app"], ) erlang_bytecode( name = "config_schema_SUITE_beam_files", @@ -240,5 +239,4 @@ def test_suite_beam_files(name = "test_suite_beam_files"): outs = ["test/add_signing_key_command_SUITE.beam"], app_name = "rabbitmq_auth_backend_oauth2", erlc_opts = "//:test_erlc_opts", - deps = ["//deps/rabbit_common:erlang_app"], ) diff --git a/deps/rabbitmq_auth_backend_oauth2/test/add_signing_key_command_SUITE.erl b/deps/rabbitmq_auth_backend_oauth2/test/add_signing_key_command_SUITE.erl index 958c48f9912b..d400f3fad8aa 100644 --- a/deps/rabbitmq_auth_backend_oauth2/test/add_signing_key_command_SUITE.erl +++ b/deps/rabbitmq_auth_backend_oauth2/test/add_signing_key_command_SUITE.erl @@ -8,7 +8,6 @@ -compile(export_all). --include_lib("rabbit_common/include/rabbit.hrl"). -include_lib("common_test/include/ct.hrl"). -define(COMMAND, 'Elixir.RabbitMQ.CLI.Ctl.Commands.AddSigningKeyCommand'). diff --git a/deps/rabbitmq_auth_backend_oauth2/test/add_uaa_key_command_SUITE.erl b/deps/rabbitmq_auth_backend_oauth2/test/add_uaa_key_command_SUITE.erl index 7bf228ea2d30..24bfb2e42d1a 100644 --- a/deps/rabbitmq_auth_backend_oauth2/test/add_uaa_key_command_SUITE.erl +++ b/deps/rabbitmq_auth_backend_oauth2/test/add_uaa_key_command_SUITE.erl @@ -8,7 +8,6 @@ -compile(export_all). --include_lib("rabbit_common/include/rabbit.hrl"). -include_lib("common_test/include/ct.hrl"). -define(COMMAND, 'Elixir.RabbitMQ.CLI.Ctl.Commands.AddUaaKeyCommand'). diff --git a/deps/rabbitmq_auth_backend_oauth2/test/scope_SUITE.erl b/deps/rabbitmq_auth_backend_oauth2/test/scope_SUITE.erl index c5dc4d41928c..7a7d2888ed17 100644 --- a/deps/rabbitmq_auth_backend_oauth2/test/scope_SUITE.erl +++ b/deps/rabbitmq_auth_backend_oauth2/test/scope_SUITE.erl @@ -9,7 +9,6 @@ -compile(export_all). -include_lib("rabbit_common/include/rabbit.hrl"). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). all() -> diff --git a/deps/rabbitmq_auth_mechanism_ssl/src/rabbit_auth_mechanism_ssl.erl b/deps/rabbitmq_auth_mechanism_ssl/src/rabbit_auth_mechanism_ssl.erl index 179e4330d9f4..6fc78d9bdeb3 100644 --- a/deps/rabbitmq_auth_mechanism_ssl/src/rabbit_auth_mechanism_ssl.erl +++ b/deps/rabbitmq_auth_mechanism_ssl/src/rabbit_auth_mechanism_ssl.erl @@ -12,7 +12,6 @@ -export([description/0, should_offer/1, init/1, handle_response/2]). --include_lib("rabbit_common/include/rabbit.hrl"). -include_lib("public_key/include/public_key.hrl"). -rabbit_boot_step({?MODULE, diff --git a/deps/rabbitmq_aws/app.bzl b/deps/rabbitmq_aws/app.bzl index c1da7e3fa851..07ea8396bad2 100644 --- a/deps/rabbitmq_aws/app.bzl +++ b/deps/rabbitmq_aws/app.bzl @@ -124,7 +124,6 @@ def test_suite_beam_files(name = "test_suite_beam_files"): testonly = True, srcs = ["test/rabbitmq_aws_json_tests.erl"], outs = ["test/rabbitmq_aws_json_tests.beam"], - hdrs = ["include/rabbitmq_aws.hrl"], app_name = "rabbitmq_aws", erlc_opts = "//:test_erlc_opts", ) @@ -168,7 +167,6 @@ def test_suite_beam_files(name = "test_suite_beam_files"): testonly = True, srcs = ["test/rabbitmq_aws_xml_tests.erl"], outs = ["test/rabbitmq_aws_xml_tests.beam"], - hdrs = ["include/rabbitmq_aws.hrl"], app_name = "rabbitmq_aws", erlc_opts = "//:test_erlc_opts", ) diff --git a/deps/rabbitmq_aws/test/rabbitmq_aws_json_tests.erl b/deps/rabbitmq_aws/test/rabbitmq_aws_json_tests.erl index 98910cf25771..c69049e81efd 100644 --- a/deps/rabbitmq_aws/test/rabbitmq_aws_json_tests.erl +++ b/deps/rabbitmq_aws/test/rabbitmq_aws_json_tests.erl @@ -2,8 +2,6 @@ -include_lib("eunit/include/eunit.hrl"). --include("rabbitmq_aws.hrl"). - parse_test_() -> [ {"string decoding", fun() -> diff --git a/deps/rabbitmq_aws/test/rabbitmq_aws_xml_tests.erl b/deps/rabbitmq_aws/test/rabbitmq_aws_xml_tests.erl index 41b9d4ceb052..02c044be900d 100644 --- a/deps/rabbitmq_aws/test/rabbitmq_aws_xml_tests.erl +++ b/deps/rabbitmq_aws/test/rabbitmq_aws_xml_tests.erl @@ -2,8 +2,6 @@ -include_lib("eunit/include/eunit.hrl"). --include("rabbitmq_aws.hrl"). - parse_test_() -> [ {"s3 error response", fun() -> diff --git a/deps/rabbitmq_consistent_hash_exchange/src/rabbit_db_ch_exchange_m2k_converter.erl b/deps/rabbitmq_consistent_hash_exchange/src/rabbit_db_ch_exchange_m2k_converter.erl index 5f8e9d69fbf1..39cc14fc929f 100644 --- a/deps/rabbitmq_consistent_hash_exchange/src/rabbit_db_ch_exchange_m2k_converter.erl +++ b/deps/rabbitmq_consistent_hash_exchange/src/rabbit_db_ch_exchange_m2k_converter.erl @@ -10,7 +10,6 @@ -behaviour(mnesia_to_khepri_converter). -include_lib("kernel/include/logger.hrl"). --include_lib("khepri/include/khepri.hrl"). -include_lib("khepri_mnesia_migration/src/kmm_logging.hrl"). -include_lib("rabbit_common/include/rabbit.hrl"). diff --git a/deps/rabbitmq_federation/src/rabbit_federation_app.erl b/deps/rabbitmq_federation/src/rabbit_federation_app.erl index bc452e601ddc..b09eb88bfdec 100644 --- a/deps/rabbitmq_federation/src/rabbit_federation_app.erl +++ b/deps/rabbitmq_federation/src/rabbit_federation_app.erl @@ -7,8 +7,6 @@ -module(rabbit_federation_app). --include("rabbit_federation.hrl"). - -behaviour(application). -export([start/2, stop/1]). diff --git a/deps/rabbitmq_federation/src/rabbit_federation_db.erl b/deps/rabbitmq_federation/src/rabbit_federation_db.erl index 28661b5866b1..3e4192f8f0d6 100644 --- a/deps/rabbitmq_federation/src/rabbit_federation_db.erl +++ b/deps/rabbitmq_federation/src/rabbit_federation_db.erl @@ -8,8 +8,6 @@ -module(rabbit_federation_db). -include("rabbit_federation.hrl"). --include_lib("amqp_client/include/amqp_client.hrl"). - -define(DICT, orddict). -export([get_active_suffix/3, set_active_suffix/3, prune_scratch/2]). diff --git a/deps/rabbitmq_federation/src/rabbit_federation_parameters.erl b/deps/rabbitmq_federation/src/rabbit_federation_parameters.erl index ff803ec162c5..f2841dee4091 100644 --- a/deps/rabbitmq_federation/src/rabbit_federation_parameters.erl +++ b/deps/rabbitmq_federation/src/rabbit_federation_parameters.erl @@ -9,8 +9,6 @@ -behaviour(rabbit_runtime_parameter). -behaviour(rabbit_policy_validator). --include_lib("rabbit_common/include/rabbit.hrl"). - -export([validate/5, notify/5, notify_clear/4]). -export([register/0, unregister/0, validate_policy/1, adjust/1]). diff --git a/deps/rabbitmq_federation/src/rabbit_federation_queue.erl b/deps/rabbitmq_federation/src/rabbit_federation_queue.erl index 93da90f72b65..e77f5dc81b60 100644 --- a/deps/rabbitmq_federation/src/rabbit_federation_queue.erl +++ b/deps/rabbitmq_federation/src/rabbit_federation_queue.erl @@ -17,7 +17,6 @@ {enables, recovery}]}). -include_lib("rabbit/include/amqqueue.hrl"). --include_lib("amqp_client/include/amqp_client.hrl"). -include("rabbit_federation.hrl"). -behaviour(rabbit_queue_decorator). diff --git a/deps/rabbitmq_federation/test/exchange_SUITE.erl b/deps/rabbitmq_federation/test/exchange_SUITE.erl index ffa61520123a..bd66a2ad71cf 100644 --- a/deps/rabbitmq_federation/test/exchange_SUITE.erl +++ b/deps/rabbitmq_federation/test/exchange_SUITE.erl @@ -7,7 +7,6 @@ -module(exchange_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("rabbitmq_ct_helpers/include/rabbit_assert.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). diff --git a/deps/rabbitmq_federation/test/federation_status_command_SUITE.erl b/deps/rabbitmq_federation/test/federation_status_command_SUITE.erl index 5d89f457f9ab..229afd494d4d 100644 --- a/deps/rabbitmq_federation/test/federation_status_command_SUITE.erl +++ b/deps/rabbitmq_federation/test/federation_status_command_SUITE.erl @@ -7,7 +7,6 @@ -module(federation_status_command_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). -compile(export_all). diff --git a/deps/rabbitmq_federation/test/rabbit_federation_status_SUITE.erl b/deps/rabbitmq_federation/test/rabbit_federation_status_SUITE.erl index e34b8596aa66..645ebd0fb423 100644 --- a/deps/rabbitmq_federation/test/rabbit_federation_status_SUITE.erl +++ b/deps/rabbitmq_federation/test/rabbit_federation_status_SUITE.erl @@ -7,7 +7,6 @@ -module(rabbit_federation_status_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). -include("rabbit_federation.hrl"). diff --git a/deps/rabbitmq_federation/test/restart_federation_link_command_SUITE.erl b/deps/rabbitmq_federation/test/restart_federation_link_command_SUITE.erl index 906fbb513295..f7c1d14a8def 100644 --- a/deps/rabbitmq_federation/test/restart_federation_link_command_SUITE.erl +++ b/deps/rabbitmq_federation/test/restart_federation_link_command_SUITE.erl @@ -7,7 +7,6 @@ -module(restart_federation_link_command_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). -compile(export_all). diff --git a/deps/rabbitmq_federation/test/unit_inbroker_SUITE.erl b/deps/rabbitmq_federation/test/unit_inbroker_SUITE.erl index 2a53b93b028a..4cb0096fbc67 100644 --- a/deps/rabbitmq_federation/test/unit_inbroker_SUITE.erl +++ b/deps/rabbitmq_federation/test/unit_inbroker_SUITE.erl @@ -7,7 +7,6 @@ -module(unit_inbroker_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("rabbit_common/include/rabbit.hrl"). -include_lib("eunit/include/eunit.hrl"). diff --git a/deps/rabbitmq_federation_management/test/federation_mgmt_SUITE.erl b/deps/rabbitmq_federation_management/test/federation_mgmt_SUITE.erl index 20b1514f8b20..3462b647e55c 100644 --- a/deps/rabbitmq_federation_management/test/federation_mgmt_SUITE.erl +++ b/deps/rabbitmq_federation_management/test/federation_mgmt_SUITE.erl @@ -7,7 +7,6 @@ -module(federation_mgmt_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). -include_lib("rabbitmq_ct_helpers/include/rabbit_mgmt_test.hrl"). diff --git a/deps/rabbitmq_jms_topic_exchange/src/rabbit_db_jms_exchange_m2k_converter.erl b/deps/rabbitmq_jms_topic_exchange/src/rabbit_db_jms_exchange_m2k_converter.erl index 8199df58ab31..13b28f791951 100644 --- a/deps/rabbitmq_jms_topic_exchange/src/rabbit_db_jms_exchange_m2k_converter.erl +++ b/deps/rabbitmq_jms_topic_exchange/src/rabbit_db_jms_exchange_m2k_converter.erl @@ -10,7 +10,6 @@ -behaviour(mnesia_to_khepri_converter). -include_lib("kernel/include/logger.hrl"). --include_lib("khepri/include/khepri.hrl"). -include_lib("khepri_mnesia_migration/src/kmm_logging.hrl"). -include_lib("rabbit_common/include/rabbit.hrl"). diff --git a/deps/rabbitmq_jms_topic_exchange/test/rjms_topic_selector_SUITE.erl b/deps/rabbitmq_jms_topic_exchange/test/rjms_topic_selector_SUITE.erl index 78b71cf77be5..6b61491046a9 100644 --- a/deps/rabbitmq_jms_topic_exchange/test/rjms_topic_selector_SUITE.erl +++ b/deps/rabbitmq_jms_topic_exchange/test/rjms_topic_selector_SUITE.erl @@ -9,7 +9,6 @@ -compile(export_all). --include_lib("common_test/include/ct.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). -include("rabbit_jms_topic_exchange.hrl"). diff --git a/deps/rabbitmq_jms_topic_exchange/test/rjms_topic_selector_unit_SUITE.erl b/deps/rabbitmq_jms_topic_exchange/test/rjms_topic_selector_unit_SUITE.erl index 8f2167840dc3..f0df24020973 100644 --- a/deps/rabbitmq_jms_topic_exchange/test/rjms_topic_selector_unit_SUITE.erl +++ b/deps/rabbitmq_jms_topic_exchange/test/rjms_topic_selector_unit_SUITE.erl @@ -13,7 +13,6 @@ -compile(export_all). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -include("rabbit_jms_topic_exchange.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). diff --git a/deps/rabbitmq_jms_topic_exchange/test/sjx_evaluation_SUITE.erl b/deps/rabbitmq_jms_topic_exchange/test/sjx_evaluation_SUITE.erl index 99e15a0f3d10..0c6ea7616c4e 100644 --- a/deps/rabbitmq_jms_topic_exchange/test/sjx_evaluation_SUITE.erl +++ b/deps/rabbitmq_jms_topic_exchange/test/sjx_evaluation_SUITE.erl @@ -12,7 +12,6 @@ -compile(export_all). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -import(sjx_evaluator, [evaluate/2]). diff --git a/deps/rabbitmq_management/app.bzl b/deps/rabbitmq_management/app.bzl index a1f125fd9c76..0b9bc72cf3c8 100644 --- a/deps/rabbitmq_management/app.bzl +++ b/deps/rabbitmq_management/app.bzl @@ -510,7 +510,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"): outs = ["test/clustering_SUITE.beam"], app_name = "rabbitmq_management", erlc_opts = "//:test_erlc_opts", - deps = ["//deps/amqp_client:erlang_app", "//deps/rabbit_common:erlang_app", "//deps/rabbitmq_ct_helpers:erlang_app", "//deps/rabbitmq_management_agent:erlang_app"], + deps = ["//deps/amqp_client:erlang_app", "//deps/rabbit_common:erlang_app", "//deps/rabbitmq_ct_helpers:erlang_app"], ) erlang_bytecode( name = "clustering_prop_SUITE_beam_files", @@ -519,7 +519,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"): outs = ["test/clustering_prop_SUITE.beam"], app_name = "rabbitmq_management", erlc_opts = "//:test_erlc_opts", - deps = ["//deps/amqp_client:erlang_app", "//deps/rabbit_common:erlang_app", "//deps/rabbitmq_ct_helpers:erlang_app", "//deps/rabbitmq_management_agent:erlang_app", "@proper//:erlang_app"], + deps = ["//deps/amqp_client:erlang_app", "//deps/rabbit_common:erlang_app", "//deps/rabbitmq_ct_helpers:erlang_app", "@proper//:erlang_app"], ) erlang_bytecode( name = "config_schema_SUITE_beam_files", diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_app.erl b/deps/rabbitmq_management/src/rabbit_mgmt_app.erl index 6bf82c19e60a..c34bff1ceda9 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_app.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_app.erl @@ -14,7 +14,6 @@ -export([get_listeners_config/0]). -endif. --include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). -define(TCP_CONTEXT, rabbitmq_management_tcp). diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_db.erl b/deps/rabbitmq_management/src/rabbit_mgmt_db.erl index 83c1b1f3e5e6..0814ede743e9 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_db.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_db.erl @@ -7,7 +7,6 @@ -module(rabbit_mgmt_db). --include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_metrics.hrl"). -include_lib("rabbit_common/include/rabbit.hrl"). -include_lib("rabbit_common/include/rabbit_core_metrics.hrl"). diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_load_definitions.erl b/deps/rabbitmq_management/src/rabbit_mgmt_load_definitions.erl index 51c72fd17f51..f765df4ed123 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_load_definitions.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_load_definitions.erl @@ -7,8 +7,6 @@ -module(rabbit_mgmt_load_definitions). --include_lib("rabbit_common/include/rabbit.hrl"). - -export([boot/0, maybe_load_definitions/0, maybe_load_definitions_from/2]). %% This module exists for backwards compatibility only. diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_login.erl b/deps/rabbitmq_management/src/rabbit_mgmt_login.erl index 32f4652adb72..a78d79c4666f 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_login.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_login.erl @@ -10,8 +10,6 @@ -export([init/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("amqp_client/include/amqp_client.hrl"). - %%-------------------------------------------------------------------- init(Req0, State) -> diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_oauth_bootstrap.erl b/deps/rabbitmq_management/src/rabbit_mgmt_oauth_bootstrap.erl index a2cf75ba96cd..7a6cd4cea3eb 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_oauth_bootstrap.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_oauth_bootstrap.erl @@ -9,7 +9,6 @@ -export([init/2]). --include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). %%-------------------------------------------------------------------- diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_stats.erl b/deps/rabbitmq_management/src/rabbit_mgmt_stats.erl index da5361710709..2990c7238de0 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_stats.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_stats.erl @@ -8,8 +8,6 @@ -module(rabbit_mgmt_stats). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("rabbitmq_management_agent/include/rabbit_mgmt_metrics.hrl"). - -export([format_range/6]). -define(MICRO_TO_MILLI, 1000). diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_sup.erl b/deps/rabbitmq_management/src/rabbit_mgmt_sup.erl index 2f27a597412d..dbed1b18c434 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_sup.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_sup.erl @@ -13,7 +13,6 @@ -export([start_link/0]). -export([setup_wm_logging/0]). --include_lib("rabbitmq_management_agent/include/rabbit_mgmt_metrics.hrl"). -include_lib("rabbit_common/include/rabbit.hrl"). -include_lib("rabbit_common/include/rabbit_core_metrics.hrl"). diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_auth.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_auth.erl index 44ae7b0189b6..ea5402ccd164 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_auth.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_auth.erl @@ -12,7 +12,6 @@ -export([authSettings/0,resolve_oauth_provider_url/1,resolve_oauth_provider_url/3]). %% for testing only -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("rabbit_common/include/rabbit.hrl"). -include_lib("oauth2_client/include/oauth2_client.hrl"). %%-------------------------------------------------------------------- diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_auth_attempts.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_auth_attempts.erl index d202234a31db..3f062954ac33 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_auth_attempts.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_auth_attempts.erl @@ -14,8 +14,6 @@ -import(rabbit_misc, [pget/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("rabbit_common/include/rabbit.hrl"). - %%-------------------------------------------------------------------- init(Req, [Mode]) -> {cowboy_rest, rabbit_mgmt_headers:set_common_permission_headers(Req, ?MODULE), diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_channel.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_channel.erl index 3da0e93ed1d2..18cda923484e 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_channel.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_channel.erl @@ -12,8 +12,6 @@ -export([variances/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("rabbit_common/include/rabbit.hrl"). - %%-------------------------------------------------------------------- init(Req, _State) -> diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_channels.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_channels.erl index d5a2d46ed310..3ca0c7acad2b 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_channels.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_channels.erl @@ -14,8 +14,6 @@ -import(rabbit_misc, [pget/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("rabbit_common/include/rabbit.hrl"). - %%-------------------------------------------------------------------- init(Req, _State) -> diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_channels_vhost.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_channels_vhost.erl index ab0776099539..11941095d387 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_channels_vhost.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_channels_vhost.erl @@ -16,8 +16,6 @@ -import(rabbit_misc, [pget/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("rabbit_common/include/rabbit.hrl"). - %%-------------------------------------------------------------------- init(Req, _State) -> diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_connection_channels.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_connection_channels.erl index 9e23ae6df0b6..d655d6d2964a 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_connection_channels.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_connection_channels.erl @@ -12,8 +12,6 @@ -export([variances/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("rabbit_common/include/rabbit.hrl"). - %%-------------------------------------------------------------------- init(Req, _State) -> diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_connections_vhost.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_connections_vhost.erl index 3c71f61648b8..b847bc520587 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_connections_vhost.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_connections_vhost.erl @@ -16,8 +16,6 @@ -import(rabbit_misc, [pget/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("rabbit_common/include/rabbit.hrl"). - %%-------------------------------------------------------------------- init(Req, _State) -> diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_deprecated_features.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_deprecated_features.erl index 02553cd00729..23bde21c6b2d 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_deprecated_features.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_deprecated_features.erl @@ -14,8 +14,6 @@ -export([deprecated_features/1]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("rabbit_common/include/rabbit.hrl"). - -ifdef(TEST). -export([feature_is_used/1, feature_is_unused/1]). diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_environment.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_environment.erl index f4983eef337d..0cc931e971b2 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_environment.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_environment.erl @@ -11,8 +11,6 @@ -export([variances/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("rabbit_common/include/rabbit.hrl"). - %%-------------------------------------------------------------------- init(Req, _State) -> diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_exchange.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_exchange.erl index aa605e4e997b..d6e4f9bf93d0 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_exchange.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_exchange.erl @@ -14,8 +14,6 @@ -export([variances/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("amqp_client/include/amqp_client.hrl"). - %%-------------------------------------------------------------------- init(Req, _State) -> diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_exchanges.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_exchanges.erl index cb19c5c25f3e..57816670e12b 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_exchanges.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_exchanges.erl @@ -12,8 +12,6 @@ -export([variances/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("rabbit_common/include/rabbit.hrl"). - -define(DEFAULT_SORT, ["vhost", "name"]). -define(BASIC_COLUMNS, ["vhost", "name", "type", "durable", "auto_delete", diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_extensions.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_extensions.erl index 99b78a34f916..15d5b86e2a27 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_extensions.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_extensions.erl @@ -11,8 +11,6 @@ -export([variances/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("rabbit_common/include/rabbit.hrl"). - %%-------------------------------------------------------------------- init(Req, _State) -> diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_feature_flag_enable.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_feature_flag_enable.erl index 9922dbcb2104..b0c0af0e514b 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_feature_flag_enable.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_feature_flag_enable.erl @@ -13,8 +13,6 @@ -export([variances/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("rabbit_common/include/rabbit.hrl"). - %%-------------------------------------------------------------------- init(Req, _Args) -> diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_feature_flags.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_feature_flags.erl index f6045068a879..4fc295da4241 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_feature_flags.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_feature_flags.erl @@ -14,8 +14,6 @@ -export([feature_flags/0]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("rabbit_common/include/rabbit.hrl"). - %%-------------------------------------------------------------------- init(Req, _Args) -> diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_hash_password.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_hash_password.erl index 544d2570e58f..404d7635891a 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_hash_password.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_hash_password.erl @@ -11,8 +11,6 @@ -export([variances/2, allowed_methods/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("rabbit_common/include/rabbit.hrl"). - %%-------------------------------------------------------------------- init(Req, _State) -> diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_limits.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_limits.erl index 231819dc6d95..8f6230fc55e7 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_limits.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_limits.erl @@ -12,8 +12,6 @@ -export([variances/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("rabbit_common/include/rabbit.hrl"). - %%-------------------------------------------------------------------- init(Req, _State) -> diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_login.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_login.erl index c25d4c4ba87d..be8fb9f2fd94 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_login.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_login.erl @@ -13,8 +13,6 @@ -export([variances/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("amqp_client/include/amqp_client.hrl"). - %%-------------------------------------------------------------------- init(Req, _State) -> diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_node.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_node.erl index 5164ad26f594..3a3c6e5b8bc6 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_node.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_node.erl @@ -12,8 +12,6 @@ -export([variances/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("rabbit_common/include/rabbit.hrl"). - %%-------------------------------------------------------------------- init(Req, _State) -> diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_node_memory.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_node_memory.erl index 952e289a5339..0609dba2dbb0 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_node_memory.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_node_memory.erl @@ -12,8 +12,6 @@ -export([variances/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("rabbit_common/include/rabbit.hrl"). - %%-------------------------------------------------------------------- init(Req, [Mode]) -> diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_node_memory_ets.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_node_memory_ets.erl index 7cf063ec2a7b..92efb193a3bb 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_node_memory_ets.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_node_memory_ets.erl @@ -12,8 +12,6 @@ -export([variances/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("rabbit_common/include/rabbit.hrl"). - %%-------------------------------------------------------------------- init(Req, [Mode]) -> diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_operator_policies.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_operator_policies.erl index 5b8f5972cd7c..777389faac2a 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_operator_policies.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_operator_policies.erl @@ -12,8 +12,6 @@ -export([variances/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("rabbit_common/include/rabbit.hrl"). - %%-------------------------------------------------------------------- init(Req, _State) -> diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_parameters.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_parameters.erl index fc3ab32b24b3..d6eac0ff6553 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_parameters.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_parameters.erl @@ -13,8 +13,6 @@ -export([variances/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("rabbit_common/include/rabbit.hrl"). - %%-------------------------------------------------------------------- init(Req, _State) -> diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_permissions.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_permissions.erl index f3771026837f..192add97ece6 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_permissions.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_permissions.erl @@ -12,8 +12,6 @@ -export([variances/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("rabbit_common/include/rabbit.hrl"). - %%-------------------------------------------------------------------- init(Req, _State) -> diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_permissions_user.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_permissions_user.erl index 15a20700c9ef..cbfdc887af9e 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_permissions_user.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_permissions_user.erl @@ -12,8 +12,6 @@ -export([variances/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("rabbit_common/include/rabbit.hrl"). - %%-------------------------------------------------------------------- init(Req, _State) -> diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_permissions_vhost.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_permissions_vhost.erl index 5b5b4c3186f6..5915ab121cff 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_permissions_vhost.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_permissions_vhost.erl @@ -12,8 +12,6 @@ -export([variances/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("rabbit_common/include/rabbit.hrl"). - %%-------------------------------------------------------------------- init(Req, _State) -> diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_policies.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_policies.erl index ac95de5ec6cf..352c2da6b7fd 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_policies.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_policies.erl @@ -12,8 +12,6 @@ -export([variances/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("rabbit_common/include/rabbit.hrl"). - %%-------------------------------------------------------------------- init(Req, _State) -> diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_queue.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_queue.erl index b40df0de4abf..5e17ca81ed30 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_queue.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_queue.erl @@ -14,8 +14,6 @@ -export([variances/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("amqp_client/include/amqp_client.hrl"). - %%-------------------------------------------------------------------- init(Req, _State) -> diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_queue_actions.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_queue_actions.erl index f11d2fd010fb..bd856fecf7cc 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_queue_actions.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_queue_actions.erl @@ -12,7 +12,6 @@ -export([variances/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("amqp_client/include/amqp_client.hrl"). -include_lib("rabbit/include/amqqueue.hrl"). %%-------------------------------------------------------------------- diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_queue_purge.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_queue_purge.erl index 79dd5ef60490..9c82f4614b37 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_queue_purge.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_queue_purge.erl @@ -12,8 +12,6 @@ -export([variances/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("amqp_client/include/amqp_client.hrl"). - %%-------------------------------------------------------------------- init(Req, _State) -> diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_quorum_queue_replicas_add_member.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_quorum_queue_replicas_add_member.erl index ae1f38613d11..15a7d3ff621c 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_quorum_queue_replicas_add_member.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_quorum_queue_replicas_add_member.erl @@ -11,8 +11,6 @@ -export([variances/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("rabbit_common/include/rabbit.hrl"). - -define(TIMEOUT, 30_000). init(Req, _State) -> diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_quorum_queue_replicas_delete_member.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_quorum_queue_replicas_delete_member.erl index f218553506e4..6d5630342ee6 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_quorum_queue_replicas_delete_member.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_quorum_queue_replicas_delete_member.erl @@ -11,8 +11,6 @@ -export([variances/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("rabbit_common/include/rabbit.hrl"). - init(Req, _State) -> {cowboy_rest, rabbit_mgmt_headers:set_common_permission_headers(Req, ?MODULE), #context{}}. diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_quorum_queue_replicas_grow.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_quorum_queue_replicas_grow.erl index b72d097c3df5..226709d745e3 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_quorum_queue_replicas_grow.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_quorum_queue_replicas_grow.erl @@ -11,8 +11,6 @@ -export([variances/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("rabbit_common/include/rabbit.hrl"). - -define(TIMEOUT, 30_000). init(Req, _State) -> diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_quorum_queue_replicas_shrink.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_quorum_queue_replicas_shrink.erl index bbc4e8bd87bb..68647ba82cfa 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_quorum_queue_replicas_shrink.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_quorum_queue_replicas_shrink.erl @@ -11,8 +11,6 @@ -export([variances/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("rabbit_common/include/rabbit.hrl"). - init(Req, _State) -> {cowboy_rest, rabbit_mgmt_headers:set_common_permission_headers(Req, ?MODULE), #context{}}. diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_topic_permissions.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_topic_permissions.erl index 54c0b6f732de..6128e8778424 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_topic_permissions.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_topic_permissions.erl @@ -12,8 +12,6 @@ -export([variances/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("rabbit_common/include/rabbit.hrl"). - %%-------------------------------------------------------------------- init(Req, _State) -> diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_topic_permissions_user.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_topic_permissions_user.erl index 77e3d4eb3cc7..0b30d9d9dc99 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_topic_permissions_user.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_topic_permissions_user.erl @@ -12,8 +12,6 @@ -export([variances/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("rabbit_common/include/rabbit.hrl"). - %%-------------------------------------------------------------------- init(Req, _State) -> diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_topic_permissions_vhost.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_topic_permissions_vhost.erl index 1f46f3253f22..e3185cb6097c 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_topic_permissions_vhost.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_topic_permissions_vhost.erl @@ -12,8 +12,6 @@ -export([variances/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("rabbit_common/include/rabbit.hrl"). - %%-------------------------------------------------------------------- init(Req, _State) -> diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_user_limits.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_user_limits.erl index 825b0a6fedcc..2feb8d2a0384 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_user_limits.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_user_limits.erl @@ -12,8 +12,6 @@ -export([variances/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("rabbit_common/include/rabbit.hrl"). - %%-------------------------------------------------------------------- init(Req, _State) -> diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_users.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_users.erl index bb40e759297c..4ec8988991ae 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_users.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_users.erl @@ -16,8 +16,6 @@ -import(rabbit_misc, [pget/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("rabbit_common/include/rabbit.hrl"). - -define(BASIC_COLUMNS, ["hashing_algorithm", "rabbit_password_hashing_sha256", "limits", diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_vhost_restart.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_vhost_restart.erl index e611574d1014..7533dfde1a61 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_vhost_restart.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_vhost_restart.erl @@ -12,8 +12,6 @@ -export([variances/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("amqp_client/include/amqp_client.hrl"). - %%-------------------------------------------------------------------- init(Req, _State) -> diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_vhosts.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_vhosts.erl index 4c8b395f0185..2decdfc9ede9 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_vhosts.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_vhosts.erl @@ -12,8 +12,6 @@ -export([basic/0, augmented/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("rabbit_common/include/rabbit.hrl"). - -define(BASIC_COLUMNS, ["name", "tracing", "pid"]). -define(DEFAULT_SORT, ["name"]). diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_whoami.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_whoami.erl index 1646175a8976..40dce655f51f 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_whoami.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_whoami.erl @@ -11,8 +11,6 @@ -export([variances/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("rabbit_common/include/rabbit.hrl"). - %%-------------------------------------------------------------------- init(Req, _State) -> diff --git a/deps/rabbitmq_management/test/clustering_SUITE.erl b/deps/rabbitmq_management/test/clustering_SUITE.erl index 63c12b9307fa..2b3e3f5eb682 100644 --- a/deps/rabbitmq_management/test/clustering_SUITE.erl +++ b/deps/rabbitmq_management/test/clustering_SUITE.erl @@ -11,7 +11,6 @@ -include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("rabbit_common/include/rabbit_core_metrics.hrl"). --include_lib("rabbitmq_management_agent/include/rabbit_mgmt_metrics.hrl"). -include_lib("rabbitmq_ct_helpers/include/rabbit_mgmt_test.hrl"). -import(rabbit_ct_broker_helpers, [get_node_config/3, restart_node/2]). diff --git a/deps/rabbitmq_management/test/clustering_prop_SUITE.erl b/deps/rabbitmq_management/test/clustering_prop_SUITE.erl index ded01d85a831..8d81d65eb55c 100644 --- a/deps/rabbitmq_management/test/clustering_prop_SUITE.erl +++ b/deps/rabbitmq_management/test/clustering_prop_SUITE.erl @@ -11,7 +11,6 @@ -include_lib("common_test/include/ct.hrl"). -include_lib("proper/include/proper.hrl"). -include_lib("rabbit_common/include/rabbit_core_metrics.hrl"). --include_lib("rabbitmq_management_agent/include/rabbit_mgmt_metrics.hrl"). -include_lib("rabbitmq_ct_helpers/include/rabbit_mgmt_test.hrl"). diff --git a/deps/rabbitmq_management/test/listener_config_SUITE.erl b/deps/rabbitmq_management/test/listener_config_SUITE.erl index 3611193e35e8..ab0920536380 100644 --- a/deps/rabbitmq_management/test/listener_config_SUITE.erl +++ b/deps/rabbitmq_management/test/listener_config_SUITE.erl @@ -7,7 +7,6 @@ -module(listener_config_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -compile(export_all). diff --git a/deps/rabbitmq_management/test/rabbit_mgmt_http_health_checks_SUITE.erl b/deps/rabbitmq_management/test/rabbit_mgmt_http_health_checks_SUITE.erl index d5cc4ae72865..5fac84918b04 100644 --- a/deps/rabbitmq_management/test/rabbit_mgmt_http_health_checks_SUITE.erl +++ b/deps/rabbitmq_management/test/rabbit_mgmt_http_health_checks_SUITE.erl @@ -9,7 +9,6 @@ -include("rabbit_mgmt.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("rabbitmq_ct_helpers/include/rabbit_mgmt_test.hrl"). diff --git a/deps/rabbitmq_management/test/rabbit_mgmt_only_http_SUITE.erl b/deps/rabbitmq_management/test/rabbit_mgmt_only_http_SUITE.erl index 8d4477a00256..60b214cde8e2 100644 --- a/deps/rabbitmq_management/test/rabbit_mgmt_only_http_SUITE.erl +++ b/deps/rabbitmq_management/test/rabbit_mgmt_only_http_SUITE.erl @@ -8,7 +8,6 @@ -module(rabbit_mgmt_only_http_SUITE). -include_lib("amqp_client/include/amqp_client.hrl"). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("rabbitmq_ct_helpers/include/rabbit_mgmt_test.hrl"). diff --git a/deps/rabbitmq_management/test/rabbit_mgmt_test_db_SUITE.erl b/deps/rabbitmq_management/test/rabbit_mgmt_test_db_SUITE.erl index e83ceb149b5b..976a39d763af 100644 --- a/deps/rabbitmq_management/test/rabbit_mgmt_test_db_SUITE.erl +++ b/deps/rabbitmq_management/test/rabbit_mgmt_test_db_SUITE.erl @@ -10,7 +10,6 @@ -include_lib("common_test/include/ct.hrl"). -include_lib("rabbit_common/include/rabbit_core_metrics.hrl"). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("rabbitmq_management_agent/include/rabbit_mgmt_metrics.hrl"). -include("rabbit_mgmt.hrl"). -include_lib("rabbitmq_ct_helpers/include/rabbit_mgmt_test.hrl"). -import(rabbit_mgmt_test_util, [assert_list/2, diff --git a/deps/rabbitmq_management/test/rabbit_mgmt_test_unit_SUITE.erl b/deps/rabbitmq_management/test/rabbit_mgmt_test_unit_SUITE.erl index 5465940ae454..7813662e0bb8 100644 --- a/deps/rabbitmq_management/test/rabbit_mgmt_test_unit_SUITE.erl +++ b/deps/rabbitmq_management/test/rabbit_mgmt_test_unit_SUITE.erl @@ -7,7 +7,6 @@ -module(rabbit_mgmt_test_unit_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -compile(export_all). diff --git a/deps/rabbitmq_management_agent/src/rabbit_mgmt_data.erl b/deps/rabbitmq_management_agent/src/rabbit_mgmt_data.erl index 337d6ebb42aa..53b56104a0f8 100644 --- a/deps/rabbitmq_management_agent/src/rabbit_mgmt_data.erl +++ b/deps/rabbitmq_management_agent/src/rabbit_mgmt_data.erl @@ -10,8 +10,6 @@ -include("rabbit_mgmt_records.hrl"). -include("rabbit_mgmt_metrics.hrl"). -include_lib("rabbit_common/include/rabbit.hrl"). --include_lib("rabbit_common/include/rabbit_core_metrics.hrl"). - -export([empty/2, pick_range/2]). % delegate api diff --git a/deps/rabbitmq_management_agent/src/rabbit_mgmt_external_stats.erl b/deps/rabbitmq_management_agent/src/rabbit_mgmt_external_stats.erl index 6d998a1c944a..5d3249a8ed04 100644 --- a/deps/rabbitmq_management_agent/src/rabbit_mgmt_external_stats.erl +++ b/deps/rabbitmq_management_agent/src/rabbit_mgmt_external_stats.erl @@ -15,8 +15,6 @@ -export([list_registry_plugins/1]). --include_lib("rabbit_common/include/rabbit.hrl"). - -define(METRICS_KEYS, [fd_used, sockets_used, mem_used, disk_free, proc_used, gc_num, gc_bytes_reclaimed, context_switches]). diff --git a/deps/rabbitmq_management_agent/src/rabbit_mgmt_gc.erl b/deps/rabbitmq_management_agent/src/rabbit_mgmt_gc.erl index b4110736f7c9..55ebf40b099a 100644 --- a/deps/rabbitmq_management_agent/src/rabbit_mgmt_gc.erl +++ b/deps/rabbitmq_management_agent/src/rabbit_mgmt_gc.erl @@ -6,8 +6,6 @@ %% -module(rabbit_mgmt_gc). --include_lib("rabbit_common/include/rabbit.hrl"). - -record(state, {timer, interval }). diff --git a/deps/rabbitmq_management_agent/test/metrics_SUITE.erl b/deps/rabbitmq_management_agent/test/metrics_SUITE.erl index b23c664179fe..c5165efff670 100644 --- a/deps/rabbitmq_management_agent/test/metrics_SUITE.erl +++ b/deps/rabbitmq_management_agent/test/metrics_SUITE.erl @@ -7,7 +7,6 @@ -module(metrics_SUITE). -compile(export_all). --include_lib("common_test/include/ct.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). all() -> diff --git a/deps/rabbitmq_management_agent/test/rabbit_mgmt_gc_SUITE.erl b/deps/rabbitmq_management_agent/test/rabbit_mgmt_gc_SUITE.erl index 2d82c4a72577..06ad8d8c954b 100644 --- a/deps/rabbitmq_management_agent/test/rabbit_mgmt_gc_SUITE.erl +++ b/deps/rabbitmq_management_agent/test/rabbit_mgmt_gc_SUITE.erl @@ -7,7 +7,6 @@ -module(rabbit_mgmt_gc_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). -include("rabbit_mgmt_metrics.hrl"). diff --git a/deps/rabbitmq_mqtt/test/cluster_SUITE.erl b/deps/rabbitmq_mqtt/test/cluster_SUITE.erl index 618de760c924..36333799ef32 100644 --- a/deps/rabbitmq_mqtt/test/cluster_SUITE.erl +++ b/deps/rabbitmq_mqtt/test/cluster_SUITE.erl @@ -7,7 +7,6 @@ -module(cluster_SUITE). -compile([export_all, nowarn_export_all]). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -import(util, [expect_publishes/3, connect/3, diff --git a/deps/rabbitmq_mqtt/test/ff_SUITE.erl b/deps/rabbitmq_mqtt/test/ff_SUITE.erl index a968b3071aea..ce36864dda1e 100644 --- a/deps/rabbitmq_mqtt/test/ff_SUITE.erl +++ b/deps/rabbitmq_mqtt/test/ff_SUITE.erl @@ -8,7 +8,6 @@ -compile([export_all, nowarn_export_all]). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -import(rabbit_ct_broker_helpers, [rpc/5]). diff --git a/deps/rabbitmq_mqtt/test/mqtt_machine_SUITE.erl b/deps/rabbitmq_mqtt/test/mqtt_machine_SUITE.erl index f73149a0036e..6568681d07b1 100644 --- a/deps/rabbitmq_mqtt/test/mqtt_machine_SUITE.erl +++ b/deps/rabbitmq_mqtt/test/mqtt_machine_SUITE.erl @@ -2,7 +2,6 @@ -compile([export_all, nowarn_export_all]). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -include("mqtt_machine.hrl"). diff --git a/deps/rabbitmq_mqtt/test/processor_SUITE.erl b/deps/rabbitmq_mqtt/test/processor_SUITE.erl index 4ed63014643d..647d4fca55b4 100644 --- a/deps/rabbitmq_mqtt/test/processor_SUITE.erl +++ b/deps/rabbitmq_mqtt/test/processor_SUITE.erl @@ -8,7 +8,6 @@ -module(processor_SUITE). -compile([export_all, nowarn_export_all]). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). diff --git a/deps/rabbitmq_peer_discovery_consul/src/rabbit_peer_discovery_consul.erl b/deps/rabbitmq_peer_discovery_consul/src/rabbit_peer_discovery_consul.erl index d18176ef4f59..d64af2fc935e 100644 --- a/deps/rabbitmq_peer_discovery_consul/src/rabbit_peer_discovery_consul.erl +++ b/deps/rabbitmq_peer_discovery_consul/src/rabbit_peer_discovery_consul.erl @@ -11,7 +11,6 @@ -behaviour(rabbit_peer_discovery_backend). -include_lib("kernel/include/logger.hrl"). --include_lib("rabbit_common/include/rabbit.hrl"). -include_lib("rabbitmq_peer_discovery_common/include/rabbit_peer_discovery.hrl"). -include("rabbit_peer_discovery_consul.hrl"). diff --git a/deps/rabbitmq_peer_discovery_consul/test/rabbitmq_peer_discovery_consul_SUITE.erl b/deps/rabbitmq_peer_discovery_consul/test/rabbitmq_peer_discovery_consul_SUITE.erl index 23a069dae9dc..a0734b265875 100644 --- a/deps/rabbitmq_peer_discovery_consul/test/rabbitmq_peer_discovery_consul_SUITE.erl +++ b/deps/rabbitmq_peer_discovery_consul/test/rabbitmq_peer_discovery_consul_SUITE.erl @@ -10,7 +10,6 @@ -module(rabbitmq_peer_discovery_consul_SUITE). -compile(export_all). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). diff --git a/deps/rabbitmq_peer_discovery_etcd/src/rabbit_peer_discovery_etcd.erl b/deps/rabbitmq_peer_discovery_etcd/src/rabbit_peer_discovery_etcd.erl index 3fcd921d9c95..7c4c35345faf 100644 --- a/deps/rabbitmq_peer_discovery_etcd/src/rabbit_peer_discovery_etcd.erl +++ b/deps/rabbitmq_peer_discovery_etcd/src/rabbit_peer_discovery_etcd.erl @@ -10,7 +10,6 @@ -module(rabbit_peer_discovery_etcd). -behaviour(rabbit_peer_discovery_backend). --include_lib("rabbit_common/include/rabbit.hrl"). -include_lib("rabbitmq_peer_discovery_common/include/rabbit_peer_discovery.hrl"). -include("rabbit_peer_discovery_etcd.hrl"). diff --git a/deps/rabbitmq_peer_discovery_k8s/src/rabbit_peer_discovery_k8s.erl b/deps/rabbitmq_peer_discovery_k8s/src/rabbit_peer_discovery_k8s.erl index 665906c40848..c05962edbeba 100644 --- a/deps/rabbitmq_peer_discovery_k8s/src/rabbit_peer_discovery_k8s.erl +++ b/deps/rabbitmq_peer_discovery_k8s/src/rabbit_peer_discovery_k8s.erl @@ -10,7 +10,6 @@ -module(rabbit_peer_discovery_k8s). -behaviour(rabbit_peer_discovery_backend). --include_lib("rabbit_common/include/rabbit.hrl"). -include_lib("rabbitmq_peer_discovery_common/include/rabbit_peer_discovery.hrl"). -include("rabbit_peer_discovery_k8s.hrl"). diff --git a/deps/rabbitmq_peer_discovery_k8s/test/rabbitmq_peer_discovery_k8s_SUITE.erl b/deps/rabbitmq_peer_discovery_k8s/test/rabbitmq_peer_discovery_k8s_SUITE.erl index ba5082ac04d5..376f3f4e8b9f 100644 --- a/deps/rabbitmq_peer_discovery_k8s/test/rabbitmq_peer_discovery_k8s_SUITE.erl +++ b/deps/rabbitmq_peer_discovery_k8s/test/rabbitmq_peer_discovery_k8s_SUITE.erl @@ -10,7 +10,6 @@ -module(rabbitmq_peer_discovery_k8s_SUITE). -compile(export_all). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). diff --git a/deps/rabbitmq_prelaunch/src/rabbit_boot_state_xterm_titlebar.erl b/deps/rabbitmq_prelaunch/src/rabbit_boot_state_xterm_titlebar.erl index e3349682caf3..5c542294e7d6 100644 --- a/deps/rabbitmq_prelaunch/src/rabbit_boot_state_xterm_titlebar.erl +++ b/deps/rabbitmq_prelaunch/src/rabbit_boot_state_xterm_titlebar.erl @@ -14,8 +14,6 @@ -behaviour(gen_server). --include_lib("kernel/include/logger.hrl"). - -include_lib("rabbit_common/include/logging.hrl"). -export([start_link/0]). diff --git a/deps/rabbitmq_prelaunch/src/rabbit_prelaunch_conf.erl b/deps/rabbitmq_prelaunch/src/rabbit_prelaunch_conf.erl index 6265665eea86..c2f27226a1c5 100644 --- a/deps/rabbitmq_prelaunch/src/rabbit_prelaunch_conf.erl +++ b/deps/rabbitmq_prelaunch/src/rabbit_prelaunch_conf.erl @@ -1,6 +1,5 @@ -module(rabbit_prelaunch_conf). --include_lib("kernel/include/file.hrl"). -include_lib("kernel/include/logger.hrl"). -include_lib("stdlib/include/zip.hrl"). diff --git a/deps/rabbitmq_prelaunch/test/rabbit_logger_std_h_SUITE.erl b/deps/rabbitmq_prelaunch/test/rabbit_logger_std_h_SUITE.erl index 13d60f259435..98e40cb893a3 100644 --- a/deps/rabbitmq_prelaunch/test/rabbit_logger_std_h_SUITE.erl +++ b/deps/rabbitmq_prelaunch/test/rabbit_logger_std_h_SUITE.erl @@ -1,6 +1,5 @@ -module(rabbit_logger_std_h_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -compile(export_all). diff --git a/deps/rabbitmq_prometheus/app.bzl b/deps/rabbitmq_prometheus/app.bzl index 8bf9a036be25..d3078b96bf8f 100644 --- a/deps/rabbitmq_prometheus/app.bzl +++ b/deps/rabbitmq_prometheus/app.bzl @@ -24,7 +24,6 @@ def all_beam_files(name = "all_beam_files"): dest = "ebin", erlc_opts = "//:erlc_opts", deps = [ - "//deps/amqp_client:erlang_app", "//deps/rabbit_common:erlang_app", "//deps/rabbitmq_web_dispatch:erlang_app", "@prometheus//:erlang_app", @@ -56,7 +55,6 @@ def all_test_beam_files(name = "all_test_beam_files"): dest = "test", erlc_opts = "//:test_erlc_opts", deps = [ - "//deps/amqp_client:erlang_app", "//deps/rabbit_common:erlang_app", "//deps/rabbitmq_web_dispatch:erlang_app", "@prometheus//:erlang_app", diff --git a/deps/rabbitmq_prometheus/src/collectors/prometheus_rabbitmq_core_metrics_collector.erl b/deps/rabbitmq_prometheus/src/collectors/prometheus_rabbitmq_core_metrics_collector.erl index 5d1c172d6129..fc744e564730 100644 --- a/deps/rabbitmq_prometheus/src/collectors/prometheus_rabbitmq_core_metrics_collector.erl +++ b/deps/rabbitmq_prometheus/src/collectors/prometheus_rabbitmq_core_metrics_collector.erl @@ -18,7 +18,6 @@ -import(prometheus_text_format, [escape_label_value/1]). --include_lib("prometheus/include/prometheus.hrl"). -include_lib("rabbit_common/include/rabbit.hrl"). -behaviour(prometheus_collector). diff --git a/deps/rabbitmq_prometheus/src/rabbit_prometheus_handler.erl b/deps/rabbitmq_prometheus/src/rabbit_prometheus_handler.erl index a6bd020bbb1f..480e80f8ec97 100644 --- a/deps/rabbitmq_prometheus/src/rabbit_prometheus_handler.erl +++ b/deps/rabbitmq_prometheus/src/rabbit_prometheus_handler.erl @@ -10,7 +10,6 @@ -export([generate_response/2, content_types_provided/2, is_authorized/2]). -export([setup/0]). --include_lib("amqp_client/include/amqp_client.hrl"). -include_lib("rabbitmq_web_dispatch/include/rabbitmq_web_dispatch_records.hrl"). -define(SCRAPE_DURATION, telemetry_scrape_duration_seconds). diff --git a/deps/rabbitmq_prometheus/test/prometheus_rabbitmq_federation_collector_SUITE.erl b/deps/rabbitmq_prometheus/test/prometheus_rabbitmq_federation_collector_SUITE.erl index 0e83efc8cbce..e379d1a47b87 100644 --- a/deps/rabbitmq_prometheus/test/prometheus_rabbitmq_federation_collector_SUITE.erl +++ b/deps/rabbitmq_prometheus/test/prometheus_rabbitmq_federation_collector_SUITE.erl @@ -7,7 +7,6 @@ -module(prometheus_rabbitmq_federation_collector_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). -include_lib("prometheus/include/prometheus_model.hrl"). diff --git a/deps/rabbitmq_recent_history_exchange/src/rabbit_db_rh_exchange_m2k_converter.erl b/deps/rabbitmq_recent_history_exchange/src/rabbit_db_rh_exchange_m2k_converter.erl index f46a9bc3a9e4..c3e17dd525d8 100644 --- a/deps/rabbitmq_recent_history_exchange/src/rabbit_db_rh_exchange_m2k_converter.erl +++ b/deps/rabbitmq_recent_history_exchange/src/rabbit_db_rh_exchange_m2k_converter.erl @@ -10,7 +10,6 @@ -behaviour(mnesia_to_khepri_converter). -include_lib("kernel/include/logger.hrl"). --include_lib("khepri/include/khepri.hrl"). -include_lib("khepri_mnesia_migration/src/kmm_logging.hrl"). -include_lib("rabbit_common/include/rabbit.hrl"). diff --git a/deps/rabbitmq_sharding/src/rabbit_sharding_exchange_decorator.erl b/deps/rabbitmq_sharding/src/rabbit_sharding_exchange_decorator.erl index bf130e13addf..d6a7c71e9752 100644 --- a/deps/rabbitmq_sharding/src/rabbit_sharding_exchange_decorator.erl +++ b/deps/rabbitmq_sharding/src/rabbit_sharding_exchange_decorator.erl @@ -7,8 +7,6 @@ -module(rabbit_sharding_exchange_decorator). --include_lib("rabbit_common/include/rabbit.hrl"). - -rabbit_boot_step({?MODULE, [{description, "sharding exchange decorator"}, {mfa, {rabbit_registry, register, diff --git a/deps/rabbitmq_sharding/src/rabbit_sharding_policy_validator.erl b/deps/rabbitmq_sharding/src/rabbit_sharding_policy_validator.erl index 1b0694e49abc..152538455b84 100644 --- a/deps/rabbitmq_sharding/src/rabbit_sharding_policy_validator.erl +++ b/deps/rabbitmq_sharding/src/rabbit_sharding_policy_validator.erl @@ -9,8 +9,6 @@ -behaviour(rabbit_policy_validator). --include_lib("rabbit_common/include/rabbit.hrl"). - -export([register/0, validate_policy/1]). -rabbit_boot_step({?MODULE, diff --git a/deps/rabbitmq_sharding/test/rabbit_hash_exchange_SUITE.erl b/deps/rabbitmq_sharding/test/rabbit_hash_exchange_SUITE.erl index 297b3e7ed932..84461bf54ef9 100644 --- a/deps/rabbitmq_sharding/test/rabbit_hash_exchange_SUITE.erl +++ b/deps/rabbitmq_sharding/test/rabbit_hash_exchange_SUITE.erl @@ -8,7 +8,6 @@ -compile(export_all). --include_lib("common_test/include/ct.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). -include_lib("eunit/include/eunit.hrl"). diff --git a/deps/rabbitmq_sharding/test/rabbit_sharding_SUITE.erl b/deps/rabbitmq_sharding/test/rabbit_sharding_SUITE.erl index e4319a020937..a4196e79d5ef 100644 --- a/deps/rabbitmq_sharding/test/rabbit_sharding_SUITE.erl +++ b/deps/rabbitmq_sharding/test/rabbit_sharding_SUITE.erl @@ -9,7 +9,6 @@ -compile(export_all). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("rabbit/include/amqqueue.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). diff --git a/deps/rabbitmq_shovel/app.bzl b/deps/rabbitmq_shovel/app.bzl index 00b16a791c2e..d0e7ea3dc7ab 100644 --- a/deps/rabbitmq_shovel/app.bzl +++ b/deps/rabbitmq_shovel/app.bzl @@ -170,7 +170,6 @@ def test_suite_beam_files(name = "test_suite_beam_files"): outs = ["test/amqp10_dynamic_SUITE.beam"], app_name = "rabbitmq_shovel", erlc_opts = "//:test_erlc_opts", - deps = ["//deps/amqp_client:erlang_app"], ) erlang_bytecode( name = "amqp10_shovel_SUITE_beam_files", diff --git a/deps/rabbitmq_shovel/src/rabbit_amqp10_shovel.erl b/deps/rabbitmq_shovel/src/rabbit_amqp10_shovel.erl index 492fd535d959..eafe5e15a1ff 100644 --- a/deps/rabbitmq_shovel/src/rabbit_amqp10_shovel.erl +++ b/deps/rabbitmq_shovel/src/rabbit_amqp10_shovel.erl @@ -9,7 +9,6 @@ -behaviour(rabbit_shovel_behaviour). --include_lib("amqp_client/include/amqp_client.hrl"). -include("rabbit_shovel.hrl"). -export([ diff --git a/deps/rabbitmq_shovel/src/rabbit_shovel_config.erl b/deps/rabbitmq_shovel/src/rabbit_shovel_config.erl index ee13ddd1a2fd..16b61071108f 100644 --- a/deps/rabbitmq_shovel/src/rabbit_shovel_config.erl +++ b/deps/rabbitmq_shovel/src/rabbit_shovel_config.erl @@ -10,7 +10,6 @@ -export([parse/2, ensure_defaults/2]). --include_lib("amqp_client/include/amqp_client.hrl"). -include("rabbit_shovel.hrl"). resolve_module(amqp091) -> rabbit_amqp091_shovel; diff --git a/deps/rabbitmq_shovel/src/rabbit_shovel_dyn_worker_sup_sup.erl b/deps/rabbitmq_shovel/src/rabbit_shovel_dyn_worker_sup_sup.erl index 2be78f2c85f7..55bf3e8c0cce 100644 --- a/deps/rabbitmq_shovel/src/rabbit_shovel_dyn_worker_sup_sup.erl +++ b/deps/rabbitmq_shovel/src/rabbit_shovel_dyn_worker_sup_sup.erl @@ -14,7 +14,6 @@ -import(rabbit_misc, [pget/2]). -import(rabbit_data_coercion, [to_map/1, to_list/1]). --include("rabbit_shovel.hrl"). -include_lib("rabbit_common/include/rabbit.hrl"). -define(SUPERVISOR, ?MODULE). diff --git a/deps/rabbitmq_shovel/src/rabbit_shovel_sup.erl b/deps/rabbitmq_shovel/src/rabbit_shovel_sup.erl index f7e65ec2a169..71b004a806f2 100644 --- a/deps/rabbitmq_shovel/src/rabbit_shovel_sup.erl +++ b/deps/rabbitmq_shovel/src/rabbit_shovel_sup.erl @@ -12,8 +12,6 @@ -import(rabbit_shovel_config, []). --include("rabbit_shovel.hrl"). - start_link() -> case parse_configuration(application:get_env(shovels)) of {ok, Configurations} -> diff --git a/deps/rabbitmq_shovel/src/rabbit_shovel_worker_sup.erl b/deps/rabbitmq_shovel/src/rabbit_shovel_worker_sup.erl index 50056d023042..7e2eba66f118 100644 --- a/deps/rabbitmq_shovel/src/rabbit_shovel_worker_sup.erl +++ b/deps/rabbitmq_shovel/src/rabbit_shovel_worker_sup.erl @@ -11,7 +11,6 @@ -export([start_link/2, init/1]). -export([id_to_khepri_path/1]). --include("rabbit_shovel.hrl"). -include_lib("rabbit_common/include/rabbit.hrl"). start_link(ShovelName, ShovelConfig) -> diff --git a/deps/rabbitmq_shovel/test/amqp10_dynamic_SUITE.erl b/deps/rabbitmq_shovel/test/amqp10_dynamic_SUITE.erl index d442c75e228b..18b5ef3595e6 100644 --- a/deps/rabbitmq_shovel/test/amqp10_dynamic_SUITE.erl +++ b/deps/rabbitmq_shovel/test/amqp10_dynamic_SUITE.erl @@ -9,8 +9,6 @@ -include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). --include_lib("amqp_client/include/amqp_client.hrl"). - -compile(export_all). all() -> diff --git a/deps/rabbitmq_shovel/test/amqp10_shovel_SUITE.erl b/deps/rabbitmq_shovel/test/amqp10_shovel_SUITE.erl index 14dfb86ed16e..60cd0d89c785 100644 --- a/deps/rabbitmq_shovel/test/amqp10_shovel_SUITE.erl +++ b/deps/rabbitmq_shovel/test/amqp10_shovel_SUITE.erl @@ -12,7 +12,6 @@ -export([ ]). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("amqp10_common/include/amqp10_framing.hrl"). diff --git a/deps/rabbitmq_shovel/test/delete_shovel_command_SUITE.erl b/deps/rabbitmq_shovel/test/delete_shovel_command_SUITE.erl index 1f51a5215b98..1ec09df3bc57 100644 --- a/deps/rabbitmq_shovel/test/delete_shovel_command_SUITE.erl +++ b/deps/rabbitmq_shovel/test/delete_shovel_command_SUITE.erl @@ -7,7 +7,6 @@ -module(delete_shovel_command_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). -include_lib("stdlib/include/assert.hrl"). diff --git a/deps/rabbitmq_shovel/test/dynamic_SUITE.erl b/deps/rabbitmq_shovel/test/dynamic_SUITE.erl index 6f455f495892..485488a3c98b 100644 --- a/deps/rabbitmq_shovel/test/dynamic_SUITE.erl +++ b/deps/rabbitmq_shovel/test/dynamic_SUITE.erl @@ -7,7 +7,6 @@ -module(dynamic_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). diff --git a/deps/rabbitmq_shovel/test/shovel_status_command_SUITE.erl b/deps/rabbitmq_shovel/test/shovel_status_command_SUITE.erl index c61e7ca487ab..8c8d015c3d3b 100644 --- a/deps/rabbitmq_shovel/test/shovel_status_command_SUITE.erl +++ b/deps/rabbitmq_shovel/test/shovel_status_command_SUITE.erl @@ -7,7 +7,6 @@ -module(shovel_status_command_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). -compile(export_all). diff --git a/deps/rabbitmq_shovel_management/test/rabbit_shovel_mgmt_SUITE.erl b/deps/rabbitmq_shovel_management/test/rabbit_shovel_mgmt_SUITE.erl index 1953aa35851c..ec213bee010f 100644 --- a/deps/rabbitmq_shovel_management/test/rabbit_shovel_mgmt_SUITE.erl +++ b/deps/rabbitmq_shovel_management/test/rabbit_shovel_mgmt_SUITE.erl @@ -1,6 +1,5 @@ -module(rabbit_shovel_mgmt_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("rabbit_common/include/rabbit.hrl"). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). diff --git a/deps/rabbitmq_stomp/app.bzl b/deps/rabbitmq_stomp/app.bzl index 03e7b28eb2d5..90c3f0da04a1 100644 --- a/deps/rabbitmq_stomp/app.bzl +++ b/deps/rabbitmq_stomp/app.bzl @@ -201,7 +201,7 @@ def test_suite_beam_files(name = "test_suite_beam_files"): testonly = True, srcs = ["test/topic_SUITE.erl"], outs = ["test/topic_SUITE.beam"], - hdrs = ["include/rabbit_stomp.hrl", "include/rabbit_stomp_frame.hrl", "include/rabbit_stomp_headers.hrl"], + hdrs = ["include/rabbit_stomp.hrl", "include/rabbit_stomp_frame.hrl"], app_name = "rabbitmq_stomp", erlc_opts = "//:test_erlc_opts", deps = ["//deps/amqp_client:erlang_app"], diff --git a/deps/rabbitmq_stomp/src/rabbit_stomp_processor.erl b/deps/rabbitmq_stomp/src/rabbit_stomp_processor.erl index 9e4129ee8d2d..7eab1bdcc6f8 100644 --- a/deps/rabbitmq_stomp/src/rabbit_stomp_processor.erl +++ b/deps/rabbitmq_stomp/src/rabbit_stomp_processor.erl @@ -19,7 +19,6 @@ -export([info/2]). -include_lib("amqp_client/include/amqp_client.hrl"). --include_lib("amqp_client/include/rabbit_routing_prefixes.hrl"). -include("rabbit_stomp_frame.hrl"). -include("rabbit_stomp.hrl"). -include("rabbit_stomp_headers.hrl"). diff --git a/deps/rabbitmq_stomp/test/connections_SUITE.erl b/deps/rabbitmq_stomp/test/connections_SUITE.erl index 2f079725d63b..3bcac3e5a7a7 100644 --- a/deps/rabbitmq_stomp/test/connections_SUITE.erl +++ b/deps/rabbitmq_stomp/test/connections_SUITE.erl @@ -10,7 +10,6 @@ -import(rabbit_misc, [pget/2]). --include_lib("common_test/include/ct.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). -include("rabbit_stomp_frame.hrl"). -define(DESTINATION, "/queue/bulk-test"). diff --git a/deps/rabbitmq_stomp/test/frame_SUITE.erl b/deps/rabbitmq_stomp/test/frame_SUITE.erl index ebdd7ac7fea2..2688fec246ee 100644 --- a/deps/rabbitmq_stomp/test/frame_SUITE.erl +++ b/deps/rabbitmq_stomp/test/frame_SUITE.erl @@ -7,7 +7,6 @@ -module(frame_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). -include("rabbit_stomp_frame.hrl"). diff --git a/deps/rabbitmq_stomp/test/topic_SUITE.erl b/deps/rabbitmq_stomp/test/topic_SUITE.erl index f38b8726146f..ed7c5790d95b 100644 --- a/deps/rabbitmq_stomp/test/topic_SUITE.erl +++ b/deps/rabbitmq_stomp/test/topic_SUITE.erl @@ -14,8 +14,6 @@ -include_lib("amqp_client/include/amqp_client.hrl"). -include("rabbit_stomp.hrl"). -include("rabbit_stomp_frame.hrl"). --include("rabbit_stomp_headers.hrl"). - all() -> [{group, list_to_atom("version_" ++ V)} || V <- ?SUPPORTED_VERSIONS]. diff --git a/deps/rabbitmq_stomp/test/util_SUITE.erl b/deps/rabbitmq_stomp/test/util_SUITE.erl index cad2fc541301..9e9cbe28514e 100644 --- a/deps/rabbitmq_stomp/test/util_SUITE.erl +++ b/deps/rabbitmq_stomp/test/util_SUITE.erl @@ -7,7 +7,6 @@ -module(util_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). -include_lib("amqp_client/include/rabbit_routing_prefixes.hrl"). diff --git a/deps/rabbitmq_stream/test/rabbit_stream_manager_SUITE.erl b/deps/rabbitmq_stream/test/rabbit_stream_manager_SUITE.erl index dd4196914682..4f0e95d7d7d0 100644 --- a/deps/rabbitmq_stream/test/rabbit_stream_manager_SUITE.erl +++ b/deps/rabbitmq_stream/test/rabbit_stream_manager_SUITE.erl @@ -8,7 +8,6 @@ -module(rabbit_stream_manager_SUITE). -include_lib("eunit/include/eunit.hrl"). --include_lib("common_test/include/ct.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). -compile(export_all). diff --git a/deps/rabbitmq_stream_management/app.bzl b/deps/rabbitmq_stream_management/app.bzl index 98e1ad718e1d..561ce83df507 100644 --- a/deps/rabbitmq_stream_management/app.bzl +++ b/deps/rabbitmq_stream_management/app.bzl @@ -25,7 +25,6 @@ def all_beam_files(name = "all_beam_files"): dest = "ebin", erlc_opts = "//:erlc_opts", deps = [ - "//deps/amqp_client:erlang_app", "//deps/rabbit_common:erlang_app", "//deps/rabbitmq_management:erlang_app", "//deps/rabbitmq_management_agent:erlang_app", @@ -59,7 +58,6 @@ def all_test_beam_files(name = "all_test_beam_files"): dest = "test", erlc_opts = "//:test_erlc_opts", deps = [ - "//deps/amqp_client:erlang_app", "//deps/rabbit_common:erlang_app", "//deps/rabbitmq_management:erlang_app", "//deps/rabbitmq_management_agent:erlang_app", diff --git a/deps/rabbitmq_stream_management/src/rabbit_stream_connection_consumers_mgmt.erl b/deps/rabbitmq_stream_management/src/rabbit_stream_connection_consumers_mgmt.erl index f0ab0ba7a961..352a45598134 100644 --- a/deps/rabbitmq_stream_management/src/rabbit_stream_connection_consumers_mgmt.erl +++ b/deps/rabbitmq_stream_management/src/rabbit_stream_connection_consumers_mgmt.erl @@ -19,8 +19,6 @@ -export([variances/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("rabbit_common/include/rabbit.hrl"). - dispatcher() -> [{"/stream/connections/:vhost/:connection/consumers", ?MODULE, []}]. diff --git a/deps/rabbitmq_stream_management/src/rabbit_stream_connection_publishers_mgmt.erl b/deps/rabbitmq_stream_management/src/rabbit_stream_connection_publishers_mgmt.erl index 2df9fe37e295..7c223d82cf85 100644 --- a/deps/rabbitmq_stream_management/src/rabbit_stream_connection_publishers_mgmt.erl +++ b/deps/rabbitmq_stream_management/src/rabbit_stream_connection_publishers_mgmt.erl @@ -19,8 +19,6 @@ -export([variances/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("rabbit_common/include/rabbit.hrl"). - dispatcher() -> [{"/stream/connections/:vhost/:connection/publishers", ?MODULE, []}]. diff --git a/deps/rabbitmq_stream_management/src/rabbit_stream_connections_vhost_mgmt.erl b/deps/rabbitmq_stream_management/src/rabbit_stream_connections_vhost_mgmt.erl index d1a67f3fe857..7097c66e347c 100644 --- a/deps/rabbitmq_stream_management/src/rabbit_stream_connections_vhost_mgmt.erl +++ b/deps/rabbitmq_stream_management/src/rabbit_stream_connections_vhost_mgmt.erl @@ -18,8 +18,6 @@ is_authorized/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("amqp_client/include/amqp_client.hrl"). - dispatcher() -> [{"/stream/connections/:vhost", ?MODULE, []}]. diff --git a/deps/rabbitmq_stream_management/src/rabbit_stream_tracking_mgmt.erl b/deps/rabbitmq_stream_management/src/rabbit_stream_tracking_mgmt.erl index 9466123b1fcc..b72fab4bb173 100644 --- a/deps/rabbitmq_stream_management/src/rabbit_stream_tracking_mgmt.erl +++ b/deps/rabbitmq_stream_management/src/rabbit_stream_tracking_mgmt.erl @@ -18,8 +18,6 @@ is_authorized/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("rabbit_common/include/rabbit.hrl"). - dispatcher() -> [{"/stream/:vhost/:queue/tracking", ?MODULE, []}]. diff --git a/deps/rabbitmq_stream_management/test/http_SUITE.erl b/deps/rabbitmq_stream_management/test/http_SUITE.erl index 80737ec57025..0cac87e16c0c 100644 --- a/deps/rabbitmq_stream_management/test/http_SUITE.erl +++ b/deps/rabbitmq_stream_management/test/http_SUITE.erl @@ -7,7 +7,6 @@ -module(http_SUITE). --include_lib("common_test/include/ct.hrl"). -include_lib("rabbit_common/include/rabbit_framing.hrl"). -include_lib("rabbitmq_ct_helpers/include/rabbit_mgmt_test.hrl"). diff --git a/deps/rabbitmq_top/BUILD.bazel b/deps/rabbitmq_top/BUILD.bazel index 27af026d8da4..f9608d79377a 100644 --- a/deps/rabbitmq_top/BUILD.bazel +++ b/deps/rabbitmq_top/BUILD.bazel @@ -46,7 +46,6 @@ rabbitmq_app( license_files = [":license_files"], priv = [":priv"], deps = [ - "//deps/amqp_client:erlang_app", "//deps/rabbit:erlang_app", # keep "//deps/rabbit_common:erlang_app", "//deps/rabbitmq_management:erlang_app", diff --git a/deps/rabbitmq_top/app.bzl b/deps/rabbitmq_top/app.bzl index 31559679ffeb..75f5a2b91fad 100644 --- a/deps/rabbitmq_top/app.bzl +++ b/deps/rabbitmq_top/app.bzl @@ -23,7 +23,6 @@ def all_beam_files(name = "all_beam_files"): dest = "ebin", erlc_opts = "//:erlc_opts", deps = [ - "//deps/amqp_client:erlang_app", "//deps/rabbit_common:erlang_app", "//deps/rabbitmq_management:erlang_app", "//deps/rabbitmq_management_agent:erlang_app", @@ -100,7 +99,7 @@ def all_test_beam_files(name = "all_test_beam_files"): app_name = "rabbitmq_top", dest = "test", erlc_opts = "//:test_erlc_opts", - deps = ["//deps/amqp_client:erlang_app", "//deps/rabbit_common:erlang_app", "//deps/rabbitmq_management:erlang_app", "//deps/rabbitmq_management_agent:erlang_app"], + deps = ["//deps/rabbit_common:erlang_app", "//deps/rabbitmq_management:erlang_app", "//deps/rabbitmq_management_agent:erlang_app"], ) def test_suite_beam_files(name = "test_suite_beam_files"): diff --git a/deps/rabbitmq_top/src/rabbit_top_wm_ets_tables.erl b/deps/rabbitmq_top/src/rabbit_top_wm_ets_tables.erl index ecb3baa73fb2..f3d4601e9e77 100644 --- a/deps/rabbitmq_top/src/rabbit_top_wm_ets_tables.erl +++ b/deps/rabbitmq_top/src/rabbit_top_wm_ets_tables.erl @@ -10,8 +10,6 @@ -export([init/2, to_json/2, content_types_provided/2, is_authorized/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("amqp_client/include/amqp_client.hrl"). - %%-------------------------------------------------------------------- init(Req, _State) -> diff --git a/deps/rabbitmq_top/src/rabbit_top_wm_process.erl b/deps/rabbitmq_top/src/rabbit_top_wm_process.erl index 3284979b01af..507ca3f5ff8b 100644 --- a/deps/rabbitmq_top/src/rabbit_top_wm_process.erl +++ b/deps/rabbitmq_top/src/rabbit_top_wm_process.erl @@ -14,8 +14,6 @@ [current_stacktrace, trap_exit, links, monitors, monitored_by]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("amqp_client/include/amqp_client.hrl"). - %%-------------------------------------------------------------------- init(Req, _State) -> diff --git a/deps/rabbitmq_top/src/rabbit_top_wm_processes.erl b/deps/rabbitmq_top/src/rabbit_top_wm_processes.erl index 70fa4e6e2dba..7dcf75fe55e3 100644 --- a/deps/rabbitmq_top/src/rabbit_top_wm_processes.erl +++ b/deps/rabbitmq_top/src/rabbit_top_wm_processes.erl @@ -10,8 +10,6 @@ -export([init/2, to_json/2, content_types_provided/2, is_authorized/2]). -include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl"). --include_lib("amqp_client/include/amqp_client.hrl"). - %%-------------------------------------------------------------------- init(Req, _State) -> diff --git a/deps/rabbitmq_tracing/test/rabbit_tracing_SUITE.erl b/deps/rabbitmq_tracing/test/rabbit_tracing_SUITE.erl index 3b3ef6783c66..089cdc132a74 100644 --- a/deps/rabbitmq_tracing/test/rabbit_tracing_SUITE.erl +++ b/deps/rabbitmq_tracing/test/rabbit_tracing_SUITE.erl @@ -11,7 +11,6 @@ -define(LOG_DIR, "/var/tmp/rabbitmq-tracing/"). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). -include_lib("rabbitmq_ct_helpers/include/rabbit_mgmt_test.hrl"). diff --git a/deps/rabbitmq_trust_store/app.bzl b/deps/rabbitmq_trust_store/app.bzl index 4c3569a309f0..9f9c6bb21488 100644 --- a/deps/rabbitmq_trust_store/app.bzl +++ b/deps/rabbitmq_trust_store/app.bzl @@ -28,7 +28,6 @@ def all_beam_files(name = "all_beam_files"): beam = [":behaviours"], dest = "ebin", erlc_opts = "//:erlc_opts", - deps = ["//deps/rabbit_common:erlang_app"], ) def all_test_beam_files(name = "all_test_beam_files"): @@ -61,7 +60,6 @@ def all_test_beam_files(name = "all_test_beam_files"): beam = [":test_behaviours"], dest = "test", erlc_opts = "//:test_erlc_opts", - deps = ["//deps/rabbit_common:erlang_app"], ) def all_srcs(name = "all_srcs"): diff --git a/deps/rabbitmq_trust_store/src/rabbit_trust_store.erl b/deps/rabbitmq_trust_store/src/rabbit_trust_store.erl index 48c2afcdbe6e..123d652bce6e 100644 --- a/deps/rabbitmq_trust_store/src/rabbit_trust_store.erl +++ b/deps/rabbitmq_trust_store/src/rabbit_trust_store.erl @@ -18,7 +18,6 @@ code_change/3]). -include_lib("stdlib/include/ms_transform.hrl"). --include_lib("kernel/include/file.hrl"). -include_lib("public_key/include/public_key.hrl"). -type certificate() :: #'OTPCertificate'{}. diff --git a/deps/rabbitmq_trust_store/src/rabbit_trust_store_certificate_provider.erl b/deps/rabbitmq_trust_store/src/rabbit_trust_store_certificate_provider.erl index 32539be9c9b1..5d79a6aac2ad 100644 --- a/deps/rabbitmq_trust_store/src/rabbit_trust_store_certificate_provider.erl +++ b/deps/rabbitmq_trust_store/src/rabbit_trust_store_certificate_provider.erl @@ -7,8 +7,6 @@ -module(rabbit_trust_store_certificate_provider). --include_lib("public_key/include/public_key.hrl"). - -callback list_certs(Config) -> no_change | {ok, [{CertId, Attributes}], ProviderState} when Config :: list(), diff --git a/deps/rabbitmq_trust_store/src/rabbit_trust_store_http_provider.erl b/deps/rabbitmq_trust_store/src/rabbit_trust_store_http_provider.erl index 28faca73f43a..5e0aee535451 100644 --- a/deps/rabbitmq_trust_store/src/rabbit_trust_store_http_provider.erl +++ b/deps/rabbitmq_trust_store/src/rabbit_trust_store_http_provider.erl @@ -7,8 +7,6 @@ -module(rabbit_trust_store_http_provider). --include_lib("public_key/include/public_key.hrl"). - -behaviour(rabbit_trust_store_certificate_provider). -define(PROFILE, ?MODULE). diff --git a/deps/rabbitmq_trust_store/src/rabbit_trust_store_sup.erl b/deps/rabbitmq_trust_store/src/rabbit_trust_store_sup.erl index 942499b9152b..eb52427cf3e4 100644 --- a/deps/rabbitmq_trust_store/src/rabbit_trust_store_sup.erl +++ b/deps/rabbitmq_trust_store/src/rabbit_trust_store_sup.erl @@ -10,9 +10,6 @@ -export([start_link/0]). -export([init/1]). --include_lib("rabbit_common/include/rabbit.hrl"). - - %% ... start_link() -> diff --git a/deps/rabbitmq_web_dispatch/src/webmachine_log_handler.erl b/deps/rabbitmq_web_dispatch/src/webmachine_log_handler.erl index 4d539c7f0ed0..0f4ca6d5c9ab 100644 --- a/deps/rabbitmq_web_dispatch/src/webmachine_log_handler.erl +++ b/deps/rabbitmq_web_dispatch/src/webmachine_log_handler.erl @@ -28,8 +28,6 @@ terminate/2, code_change/3]). --include("webmachine_logger.hrl"). - -ifdef(TEST). -include_lib("eunit/include/eunit.hrl"). -endif. diff --git a/deps/rabbitmq_web_dispatch/test/rabbit_web_dispatch_SUITE.erl b/deps/rabbitmq_web_dispatch/test/rabbit_web_dispatch_SUITE.erl index 16d3dbfdbbf7..50a2b171a405 100644 --- a/deps/rabbitmq_web_dispatch/test/rabbit_web_dispatch_SUITE.erl +++ b/deps/rabbitmq_web_dispatch/test/rabbit_web_dispatch_SUITE.erl @@ -10,7 +10,6 @@ -compile(export_all). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). all() -> diff --git a/deps/rabbitmq_web_dispatch/test/rabbit_web_dispatch_unit_SUITE.erl b/deps/rabbitmq_web_dispatch/test/rabbit_web_dispatch_unit_SUITE.erl index aaf1aeddbe80..7c2fb9c69e01 100644 --- a/deps/rabbitmq_web_dispatch/test/rabbit_web_dispatch_unit_SUITE.erl +++ b/deps/rabbitmq_web_dispatch/test/rabbit_web_dispatch_unit_SUITE.erl @@ -9,7 +9,6 @@ -compile(export_all). --include_lib("common_test/include/ct.hrl"). -include_lib("eunit/include/eunit.hrl"). all() -> diff --git a/deps/rabbitmq_web_stomp/src/rabbit_web_stomp_handler.erl b/deps/rabbitmq_web_stomp/src/rabbit_web_stomp_handler.erl index 19193961da4e..07dd03737b2f 100644 --- a/deps/rabbitmq_web_stomp/src/rabbit_web_stomp_handler.erl +++ b/deps/rabbitmq_web_stomp/src/rabbit_web_stomp_handler.erl @@ -10,7 +10,6 @@ -behaviour(cowboy_sub_protocol). -include_lib("kernel/include/logger.hrl"). --include_lib("rabbit_common/include/logging.hrl"). -include_lib("rabbitmq_stomp/include/rabbit_stomp.hrl"). -include_lib("rabbitmq_stomp/include/rabbit_stomp_frame.hrl"). -include_lib("amqp_client/include/amqp_client.hrl"). diff --git a/deps/rabbitmq_web_stomp/src/rabbit_web_stomp_listener.erl b/deps/rabbitmq_web_stomp/src/rabbit_web_stomp_listener.erl index 1547014b8a5a..31293278ff99 100644 --- a/deps/rabbitmq_web_stomp/src/rabbit_web_stomp_listener.erl +++ b/deps/rabbitmq_web_stomp/src/rabbit_web_stomp_listener.erl @@ -17,8 +17,6 @@ %% for testing purposes -export([get_binding_address/1, get_tcp_port/1, get_tcp_conf/2]). --include_lib("rabbitmq_stomp/include/rabbit_stomp.hrl"). - -import(rabbit_misc, [pget/2]). -define(TCP_PROTOCOL, 'http/web-stomp'). diff --git a/deps/rabbitmq_web_stomp/test/unit_SUITE.erl b/deps/rabbitmq_web_stomp/test/unit_SUITE.erl index b728f3e86bbb..c59efad31a70 100644 --- a/deps/rabbitmq_web_stomp/test/unit_SUITE.erl +++ b/deps/rabbitmq_web_stomp/test/unit_SUITE.erl @@ -7,8 +7,6 @@ -module(unit_SUITE). --include_lib("common_test/include/ct.hrl"). - -compile(export_all). all() -> diff --git a/moduleindex.yaml b/moduleindex.yaml index 28ee2970f1fb..4fae6a2e6c3d 100755 --- a/moduleindex.yaml +++ b/moduleindex.yaml @@ -322,6 +322,10 @@ jose: - jose_xchacha20_poly1305 - jose_xchacha20_poly1305_crypto - jose_xchacha20_poly1305_unsupported +katana_code: +- ktn_code +- ktn_dodger +- ktn_io_string khepri: - khepri - khepri_adv @@ -1275,6 +1279,15 @@ ranch: - ranch_sup - ranch_tcp - ranch_transport +rebar3_format: +- default_formatter +- erlfmt_formatter +- otp_formatter +- rebar3_ast_formatter +- rebar3_format +- rebar3_format_prv +- rebar3_formatter +- sr_formatter recon: - recon - recon_alloc From ca53195b1c389c89bcc1c42a27afe770aec3c803 Mon Sep 17 00:00:00 2001 From: Michal Kuratczyk Date: Thu, 23 May 2024 16:37:16 +0200 Subject: [PATCH 2/2] Ignore in git blame --- .git-blame-ignore-revs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index fb86a8deb832..c2f0a39259c1 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -2,3 +2,5 @@ 209f23fa2f58e0240116b3e8e5be9cd54d34b569 # Format MQTT code with erlfmt 1de9fcf582def91d1cee6bea457dd24e8a53a431 +# Remove unsed imports +cfa3de4b2b1a07e9f4ef90d0aa6b22252238bc47