Преглед изворни кода

Merge pull request #14181 from zmstone/241107-upgrade-replayq-from-0.3.9-to-0.3.10

chore: upgrade replayq from 0.3.9 to 0.3.10
zmstone пре 1 година
родитељ
комит
de357d216e

+ 2 - 2
apps/emqx_bridge_azure_event_hub/rebar.config

@@ -2,8 +2,8 @@
 
 
 {erl_opts, [debug_info]}.
 {erl_opts, [debug_info]}.
 {deps, [
 {deps, [
-    {wolff, "4.0.3"},
-    {kafka_protocol, "4.1.9"},
+    {wolff, "4.0.4"},
+    {kafka_protocol, "4.1.10"},
     {brod_gssapi, "0.1.3"},
     {brod_gssapi, "0.1.3"},
     {brod, "4.3.1"},
     {brod, "4.3.1"},
     {snappyer, "1.2.10"},
     {snappyer, "1.2.10"},

+ 2 - 2
apps/emqx_bridge_confluent/rebar.config

@@ -2,8 +2,8 @@
 
 
 {erl_opts, [debug_info]}.
 {erl_opts, [debug_info]}.
 {deps, [
 {deps, [
-    {wolff, "4.0.3"},
-    {kafka_protocol, "4.1.9"},
+    {wolff, "4.0.4"},
+    {kafka_protocol, "4.1.10"},
     {brod_gssapi, "0.1.3"},
     {brod_gssapi, "0.1.3"},
     {brod, "4.3.1"},
     {brod, "4.3.1"},
     {snappyer, "1.2.10"},
     {snappyer, "1.2.10"},

+ 2 - 2
apps/emqx_bridge_kafka/rebar.config

@@ -2,8 +2,8 @@
 
 
 {erl_opts, [debug_info]}.
 {erl_opts, [debug_info]}.
 {deps, [
 {deps, [
-    {wolff, "4.0.3"},
-    {kafka_protocol, "4.1.9"},
+    {wolff, "4.0.4"},
+    {kafka_protocol, "4.1.10"},
     {brod_gssapi, "0.1.3"},
     {brod_gssapi, "0.1.3"},
     {brod, "4.3.1"},
     {brod, "4.3.1"},
     {snappyer, "1.2.10"},
     {snappyer, "1.2.10"},

+ 4 - 0
changes/ee/fix-14181.en.md

@@ -0,0 +1,4 @@
+Made Kafka and Pulsar producers tolerate corrupted COMMIT file.
+
+For disk mode buffers, if the COMMIT file is corrupted, it will be ignored.
+This means the producer may replay some already sent messages, but shold not crash.

+ 3 - 3
mix.exs

@@ -207,7 +207,7 @@ defmodule EMQXUmbrella.MixProject do
   def common_dep(:cowboy), do: {:cowboy, github: "emqx/cowboy", tag: "2.9.2", override: true}
   def common_dep(:cowboy), do: {:cowboy, github: "emqx/cowboy", tag: "2.9.2", override: true}
   def common_dep(:jsone), do: {:jsone, github: "emqx/jsone", tag: "1.7.1", override: true}
   def common_dep(:jsone), do: {:jsone, github: "emqx/jsone", tag: "1.7.1", override: true}
   def common_dep(:ecpool), do: {:ecpool, github: "emqx/ecpool", tag: "0.5.10", override: true}
   def common_dep(:ecpool), do: {:ecpool, github: "emqx/ecpool", tag: "0.5.10", override: true}
-  def common_dep(:replayq), do: {:replayq, github: "emqx/replayq", tag: "0.3.9", override: true}
+  def common_dep(:replayq), do: {:replayq, github: "emqx/replayq", tag: "0.3.10", override: true}
   def common_dep(:jsx), do: {:jsx, github: "talentdeficit/jsx", tag: "v3.1.0", override: true}
   def common_dep(:jsx), do: {:jsx, github: "talentdeficit/jsx", tag: "v3.1.0", override: true}
   # in conflict by emqtt and hocon
   # in conflict by emqtt and hocon
   def common_dep(:getopt), do: {:getopt, "1.0.2", override: true}
   def common_dep(:getopt), do: {:getopt, "1.0.2", override: true}
@@ -276,11 +276,11 @@ defmodule EMQXUmbrella.MixProject do
   def common_dep(:influxdb),
   def common_dep(:influxdb),
     do: {:influxdb, github: "emqx/influxdb-client-erl", tag: "1.1.13", override: true}
     do: {:influxdb, github: "emqx/influxdb-client-erl", tag: "1.1.13", override: true}
 
 
-  def common_dep(:wolff), do: {:wolff, "4.0.3"}
+  def common_dep(:wolff), do: {:wolff, "4.0.4"}
   def common_dep(:brod_gssapi), do: {:brod_gssapi, "0.1.3"}
   def common_dep(:brod_gssapi), do: {:brod_gssapi, "0.1.3"}
 
 
   def common_dep(:kafka_protocol),
   def common_dep(:kafka_protocol),
-    do: {:kafka_protocol, "4.1.9", override: true}
+    do: {:kafka_protocol, "4.1.10", override: true}
 
 
   def common_dep(:brod), do: {:brod, "4.3.1"}
   def common_dep(:brod), do: {:brod, "4.3.1"}
   ## TODO: remove `mix.exs` from `wolff` and remove this override
   ## TODO: remove `mix.exs` from `wolff` and remove this override

+ 1 - 1
rebar.config

@@ -88,7 +88,7 @@
     {grpc, {git, "https://github.com/emqx/grpc-erl", {tag, "0.6.12"}}},
     {grpc, {git, "https://github.com/emqx/grpc-erl", {tag, "0.6.12"}}},
     {minirest, {git, "https://github.com/emqx/minirest", {tag, "1.4.4"}}},
     {minirest, {git, "https://github.com/emqx/minirest", {tag, "1.4.4"}}},
     {ecpool, {git, "https://github.com/emqx/ecpool", {tag, "0.5.10"}}},
     {ecpool, {git, "https://github.com/emqx/ecpool", {tag, "0.5.10"}}},
-    {replayq, {git, "https://github.com/emqx/replayq.git", {tag, "0.3.9"}}},
+    {replayq, {git, "https://github.com/emqx/replayq.git", {tag, "0.3.10"}}},
     {pbkdf2, {git, "https://github.com/emqx/erlang-pbkdf2.git", {tag, "2.0.4"}}},
     {pbkdf2, {git, "https://github.com/emqx/erlang-pbkdf2.git", {tag, "2.0.4"}}},
     {emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.13.0"}}},
     {emqtt, {git, "https://github.com/emqx/emqtt", {tag, "1.13.0"}}},
     {rulesql, {git, "https://github.com/emqx/rulesql", {tag, "0.2.1"}}},
     {rulesql, {git, "https://github.com/emqx/rulesql", {tag, "0.2.1"}}},