From 65f4a6feabb92e2559eaf03006ff11e52fb03e8d Mon Sep 17 00:00:00 2001
From: Kjell Winblad <kjellwinblad@gmail.com>
Date: Thu, 2 Mar 2023 13:02:11 +0100
Subject: [PATCH] build: fix diverged dependencies

---
 mix.exs      | 3 ++-
 rebar.config | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/mix.exs b/mix.exs
index d72f64039..33828d11f 100644
--- a/mix.exs
+++ b/mix.exs
@@ -89,7 +89,8 @@ defmodule EMQXUmbrella.MixProject do
       {:ranch,
        github: "ninenines/ranch", ref: "a692f44567034dacf5efcaa24a24183788594eb7", override: true},
       # in conflict by grpc and eetcd
-      {:gpb, "4.19.5", override: true, runtime: false}
+      {:gpb, "4.19.5", override: true, runtime: false},
+      {:hackney, github: "benoitc/hackney", tag: "1.18.1", override: true}
     ] ++
       umbrella_apps() ++
       enterprise_apps(profile_info) ++
diff --git a/rebar.config b/rebar.config
index 108a64ecf..c774a4f95 100644
--- a/rebar.config
+++ b/rebar.config
@@ -74,6 +74,7 @@
     , {esasl, {git, "https://github.com/emqx/esasl", {tag, "0.2.0"}}}
     , {jose, {git, "https://github.com/potatosalad/erlang-jose", {tag, "1.11.2"}}}
     , {telemetry, "1.1.0"}
+    , {hackney, {git, "https://github.com/benoitc/hackney", {tag, "1.18.1"}}}
     ]}.
 
 {xref_ignores,