From 1afb9738fd6b319ede8d466154452d1c55473bf0 Mon Sep 17 00:00:00 2001 From: Michael Klishin Date: Tue, 25 Mar 2025 00:04:25 -0400 Subject: [PATCH 1/2] Bump Cuttlefish to 3.5.0 (cherry picked from commit 265e273eda0b8b2ddd03336895bf98893c77c556) (cherry picked from commit 7ec3aa7459dffde3c09c21ca9f31fa9baf9dfaeb) # Conflicts: # rabbitmq-components.mk --- rabbitmq-components.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rabbitmq-components.mk b/rabbitmq-components.mk index 1d0594de827c..4431b64d3a03 100644 --- a/rabbitmq-components.mk +++ b/rabbitmq-components.mk @@ -40,9 +40,15 @@ endif # all projects use the same versions. It avoids conflicts. dep_accept = hex 0.3.5 +<<<<<<< HEAD dep_cowboy = hex 2.12.0 dep_cowlib = hex 2.13.0 dep_credentials_obfuscation = hex 3.4.0 +======= +dep_cowboy = hex 2.13.0 +dep_cowlib = hex 2.14.0 +dep_credentials_obfuscation = hex 3.5.0 +>>>>>>> 7ec3aa745 (Bump Cuttlefish to 3.5.0) dep_cuttlefish = hex 3.4.0 dep_gen_batch_server = hex 0.8.8 dep_jose = hex 1.11.10 From 8af35babf7da317f9adb24f0dba77c53c08e8566 Mon Sep 17 00:00:00 2001 From: Michael Klishin Date: Tue, 25 Mar 2025 11:24:38 -0400 Subject: [PATCH 2/2] Resolve a conflict #13608 #13607 #13611 --- rabbitmq-components.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/rabbitmq-components.mk b/rabbitmq-components.mk index 4431b64d3a03..0319eabc8477 100644 --- a/rabbitmq-components.mk +++ b/rabbitmq-components.mk @@ -40,15 +40,9 @@ endif # all projects use the same versions. It avoids conflicts. dep_accept = hex 0.3.5 -<<<<<<< HEAD dep_cowboy = hex 2.12.0 dep_cowlib = hex 2.13.0 -dep_credentials_obfuscation = hex 3.4.0 -======= -dep_cowboy = hex 2.13.0 -dep_cowlib = hex 2.14.0 dep_credentials_obfuscation = hex 3.5.0 ->>>>>>> 7ec3aa745 (Bump Cuttlefish to 3.5.0) dep_cuttlefish = hex 3.4.0 dep_gen_batch_server = hex 0.8.8 dep_jose = hex 1.11.10