Просмотр исходного кода

Merge pull request #9776 from keynslug/chore/bump-epgsql-otp-25

chore: update epgsql to 4.7.0.1 with full OTP-25 compat
Andrew Mayorov 3 лет назад
Родитель
Сommit
5fd157fb1d
2 измененных файлов с 3 добавлено и 3 удалено
  1. 1 1
      apps/emqx_connector/rebar.config
  2. 2 2
      mix.exs

+ 1 - 1
apps/emqx_connector/rebar.config

@@ -10,7 +10,7 @@
     {emqx_resource, {path, "../emqx_resource"}},
     {eldap2, {git, "https://github.com/emqx/eldap2", {tag, "v0.2.2"}}},
     {mysql, {git, "https://github.com/emqx/mysql-otp", {tag, "1.7.1"}}},
-    {epgsql, {git, "https://github.com/emqx/epgsql", {tag, "4.7-emqx.2"}}},
+    {epgsql, {git, "https://github.com/emqx/epgsql", {tag, "4.7.0.1"}}},
     %% NOTE: mind poolboy version when updating mongodb-erlang version
     {mongodb, {git, "https://github.com/emqx/mongodb-erlang", {tag, "v3.0.19"}}},
     %% NOTE: mind poolboy version when updating eredis_cluster version

+ 2 - 2
mix.exs

@@ -74,8 +74,8 @@ defmodule EMQXUmbrella.MixProject do
       {:jose, github: "potatosalad/erlang-jose", tag: "1.11.2"},
       # in conflict by ehttpc and emqtt
       {:gun, github: "emqx/gun", tag: "1.3.9", override: true},
-      # in conflict by emqx_connectior and system_monitor
-      {:epgsql, github: "emqx/epgsql", tag: "4.7-emqx.2", override: true},
+      # in conflict by emqx_connector and system_monitor
+      {:epgsql, github: "emqx/epgsql", tag: "4.7.0.1", override: true},
       # in conflict by mongodb and eredis_cluster
       {:poolboy, github: "emqx/poolboy", tag: "1.5.2", override: true},
       # in conflict by emqx and observer_cli