Revert "Remove Elixir json dep in a few more places #9926"

This reverts commit 50e1fed.
rabbitmq · Nov 17, 2023 · 9373661 · 9373661
1 parent 7ef4bec
commit 9373661
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/BUILD.bazel b/BUILD.bazel
@@ -53,6 +53,7 @@ exports_files([
 # gazelle:exclude deps/gun
 # gazelle:exclude deps/inet_tcp_proxy
 # gazelle:exclude deps/jose
+# gazelle:exclude deps/json
 # gazelle:exclude deps/meck
 # gazelle:exclude deps/observer_cli
 # gazelle:exclude deps/osiris

diff --git a/Makefile b/Makefile
@@ -41,6 +41,8 @@ XREF_EXTRA_APP_DIRS = $(filter-out deps/rabbitmq_cli/_build/dev/lib/rabbit_commo
 # protocols directly.
 XREF_IGNORE = [ \
     {'Elixir.CSV.Encode',impl_for,1}, \
+    {'Elixir.JSON.Decoder',impl_for,1}, \
+    {'Elixir.JSON.Encoder',impl_for,1}, \
     {'Elixir.RabbitMQ.CLI.Core.DataCoercion',impl_for,1}]
 
 # Include Elixir libraries in the Xref checks.

diff --git a/dist.bzl b/dist.bzl
@@ -335,6 +335,15 @@ def source_archive(
         prefix = "deps",
     )
 
+    pkg_files(
+        name = "json-files",
+        srcs = [
+            "@json//:sources",
+        ],
+        strip_prefix = "",
+        prefix = "deps/json",
+    )
+
     pkg_files(
         name = "csv-files",
         srcs = [
@@ -349,6 +358,7 @@ def source_archive(
         extension = extension,
         srcs = [
             ":deps-files",
+            ":json-files",
             ":csv-files",
             Label("@rabbitmq-server//:root-licenses"),
         ],