From 0c259133a88ace02c86d091712cb8a5b56c57bc2 Mon Sep 17 00:00:00 2001 From: Diana Parra Corbacho Date: Thu, 19 Jun 2025 16:28:50 +0200 Subject: [PATCH 1/2] Federation: update makefile to avoid dialyzer compilation errors They just happen with a combination of OTP 27.3 and Elixir 1.17 (cherry picked from commit 0801e68c14276b449ee2cc731c0a855d6b274667) # Conflicts: # deps/rabbitmq_federation/Makefile --- deps/rabbitmq_federation/Makefile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/deps/rabbitmq_federation/Makefile b/deps/rabbitmq_federation/Makefile index 13d055c45d..d007508ba4 100644 --- a/deps/rabbitmq_federation/Makefile +++ b/deps/rabbitmq_federation/Makefile @@ -9,9 +9,14 @@ define PROJECT_ENV ] endef +<<<<<<< HEAD define PROJECT_APP_EXTRA_KEYS {broker_version_requirements, []} endef +======= +DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk +DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk +>>>>>>> 0801e68c1 (Federation: update makefile to avoid dialyzer compilation errors) DEPS = rabbit_common rabbit amqp_client TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers From defcf1897602f3e31721a01faab67aed9b85ab64 Mon Sep 17 00:00:00 2001 From: Michael Klishin Date: Fri, 20 Jun 2025 19:42:35 +0400 Subject: [PATCH 2/2] Resolve a conflict #14097 14099 --- deps/rabbitmq_federation/Makefile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/deps/rabbitmq_federation/Makefile b/deps/rabbitmq_federation/Makefile index d007508ba4..13d055c45d 100644 --- a/deps/rabbitmq_federation/Makefile +++ b/deps/rabbitmq_federation/Makefile @@ -9,14 +9,9 @@ define PROJECT_ENV ] endef -<<<<<<< HEAD define PROJECT_APP_EXTRA_KEYS {broker_version_requirements, []} endef -======= -DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk -DEP_PLUGINS = rabbit_common/mk/rabbitmq-build.mk ->>>>>>> 0801e68c1 (Federation: update makefile to avoid dialyzer compilation errors) DEPS = rabbit_common rabbit amqp_client TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers