فهرست منبع

Merge pull request #14054 from keynslug/chore/bump/ra-2.15

chore: switch back to upstream ra 2.15.0
Andrew Mayorov 1 سال پیش
والد
کامیت
fd071aa54a
3فایلهای تغییر یافته به همراه3 افزوده شده و 3 حذف شده
  1. 1 1
      apps/emqx_ds_builtin_raft/rebar.config
  2. 1 1
      mix.exs
  3. 1 1
      rebar.config

+ 1 - 1
apps/emqx_ds_builtin_raft/rebar.config

@@ -2,5 +2,5 @@
 
 
 {deps, [
 {deps, [
     {emqx_durable_storage, {path, "../emqx_durable_storage"}},
     {emqx_durable_storage, {path, "../emqx_durable_storage"}},
-    {ra, {git, "https://github.com/emqx/ra.git", {tag, "v2.14.0-emqx-1"}}}
+    {ra, "2.15.0"}
 ]}.
 ]}.

+ 1 - 1
mix.exs

@@ -212,7 +212,7 @@ defmodule EMQXUmbrella.MixProject do
   def common_dep(:telemetry), do: {:telemetry, "1.1.0", override: true}
   def common_dep(:telemetry), do: {:telemetry, "1.1.0", override: true}
   # in conflict by grpc and eetcd
   # in conflict by grpc and eetcd
   def common_dep(:gpb), do: {:gpb, "4.19.9", override: true, runtime: false}
   def common_dep(:gpb), do: {:gpb, "4.19.9", override: true, runtime: false}
-  def common_dep(:ra), do: {:ra, github: "emqx/ra", tag: "v2.14.0-emqx-1", override: true}
+  def common_dep(:ra), do: {:ra, "2.15.0", override: true}
 
 
   # in conflict by emqx_connector and system_monitor
   # in conflict by emqx_connector and system_monitor
   def common_dep(:epgsql), do: {:epgsql, github: "emqx/epgsql", tag: "4.7.1.3", override: true}
   def common_dep(:epgsql), do: {:epgsql, github: "emqx/epgsql", tag: "4.7.1.3", override: true}

+ 1 - 1
rebar.config

@@ -110,7 +110,7 @@
     {uuid, {git, "https://github.com/okeuday/uuid.git", {tag, "v2.0.6"}}},
     {uuid, {git, "https://github.com/okeuday/uuid.git", {tag, "v2.0.6"}}},
     {ssl_verify_fun, "1.1.7"},
     {ssl_verify_fun, "1.1.7"},
     {bcrypt, {git, "https://github.com/emqx/erlang-bcrypt.git", {tag, "0.6.2"}}},
     {bcrypt, {git, "https://github.com/emqx/erlang-bcrypt.git", {tag, "0.6.2"}}},
-    {ra, {git, "https://github.com/emqx/ra.git", {tag, "v2.14.0-emqx-1"}}}
+    {ra, "2.15.0"}
 ]}.
 ]}.
 
 
 {xref_ignores,
 {xref_ignores,