From 876067c1313c47c6b5afd32da307468d222a54a5 Mon Sep 17 00:00:00 2001
From: Michal Kuratczyk <mkuratczyk@vmware.com>
Date: Fri, 17 Nov 2023 13:05:38 +0100
Subject: [PATCH 1/8] Revert "Use rabbit_json in the CLI"

This reverts commit 6c657158759f8e9ad9a175d2ae671d313c3bda6f.

(cherry picked from commit 5459975c5c448401a2993e8e88a55687fdd94236)
(cherry picked from commit 86fb6c9754213038dfb4128fdfd4a55916cf0a27)
---
 deps/rabbitmq_cli/Makefile                                  | 3 ++-
 .../rabbitmq/cli/ctl/commands/export_definitions_command.ex | 2 +-
 .../rabbitmq/cli/ctl/commands/import_definitions_command.ex | 2 +-
 .../rabbitmq/cli/ctl/commands/list_user_limits_command.ex   | 4 ++--
 .../rabbitmq/cli/ctl/commands/list_vhost_limits_command.ex  | 4 ++--
 deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/json.ex       | 2 +-
 .../rabbitmq_cli/lib/rabbitmq/cli/formatters/json_stream.ex | 2 +-
 deps/rabbitmq_cli/lib/rabbitmqctl.ex                        | 6 +++---
 deps/rabbitmq_cli/mix.exs                                   | 5 ++++-
 .../test/ctl/export_definitions_command_test.exs            | 4 ++--
 deps/rabbitmq_cli/test/ctl/set_user_limits_command_test.exs | 2 +-
 .../rabbitmq_cli/test/ctl/set_vhost_limits_command_test.exs | 2 +-
 deps/rabbitmq_cli/test/json_formatting.exs                  | 4 ++--
 deps/rabbitmq_cli/test/test_helper.exs                      | 1 +
 14 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/deps/rabbitmq_cli/Makefile b/deps/rabbitmq_cli/Makefile
index 8352583bb38f..a4c62349f25f 100644
--- a/deps/rabbitmq_cli/Makefile
+++ b/deps/rabbitmq_cli/Makefile
@@ -1,11 +1,12 @@
 PROJECT = rabbitmq_cli
 
 BUILD_DEPS = rabbit_common
-DEPS = csv observer_cli stdout_formatter
+DEPS = csv json observer_cli stdout_formatter
 TEST_DEPS = amqp amqp_client temp x509 rabbit
 
 dep_amqp = hex 3.3.0
 dep_csv = hex 3.2.0
+dep_json = hex 1.4.1
 dep_temp = hex 0.4.7
 dep_x509 = hex 0.8.8
 
diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/export_definitions_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/export_definitions_command.ex
index a16f42fde4d9..c009c79d187e 100644
--- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/export_definitions_command.ex
+++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/export_definitions_command.ex
@@ -159,7 +159,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ExportDefinitionsCommand do
         end)
       end)
 
-    {:ok, json} = :rabbit_json.try_encode(map)
+    {:ok, json} = JSON.encode(map)
     json
   end
 
diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/import_definitions_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/import_definitions_command.ex
index 233c8660be8d..665b821fcc01 100644
--- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/import_definitions_command.ex
+++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/import_definitions_command.ex
@@ -166,7 +166,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ImportDefinitionsCommand do
   #
 
   defp deserialise(bin, "json") do
-    :rabbit_json.try_decode(bin)
+    JSON.decode(bin)
   end
 
   defp deserialise(bin, "erlang") do
diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_user_limits_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_user_limits_command.ex
index 97241303c784..1e01a13f644b 100644
--- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_user_limits_command.ex
+++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_user_limits_command.ex
@@ -36,7 +36,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ListUserLimitsCommand do
 
       val ->
         Enum.map(val, fn {user, val} ->
-          {:ok, val_encoded} = :rabbit_json.try_encode(Map.new(val))
+          {:ok, val_encoded} = JSON.encode(Map.new(val))
           [user: user, limits: val_encoded]
         end)
     end
@@ -56,7 +56,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ListUserLimitsCommand do
         {:badrpc, node}
 
       val when is_list(val) or is_map(val) ->
-        {:ok, val_encoded} = :rabbit_json.try_encode(Map.new(val))
+        {:ok, val_encoded} = JSON.encode(Map.new(val))
         val_encoded
     end
   end
diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_vhost_limits_command.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_vhost_limits_command.ex
index 6f5e4063f3d4..973452816bac 100644
--- a/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_vhost_limits_command.ex
+++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/ctl/commands/list_vhost_limits_command.ex
@@ -36,7 +36,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ListVhostLimitsCommand do
 
       val ->
         Enum.map(val, fn {vhost, val} ->
-          {:ok, val_encoded} = :rabbit_json.try_encode(Map.new(val))
+          {:ok, val_encoded} = JSON.encode(Map.new(val))
           [vhost: vhost, limits: val_encoded]
         end)
     end
@@ -54,7 +54,7 @@ defmodule RabbitMQ.CLI.Ctl.Commands.ListVhostLimitsCommand do
         {:badrpc, node}
 
       val when is_list(val) or is_map(val) ->
-        :rabbit_json.try_encode(Map.new(val))
+        JSON.encode(Map.new(val))
     end
   end
 
diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/json.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/json.ex
index 246140ead00c..ad46b1be9bf3 100644
--- a/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/json.ex
+++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/json.ex
@@ -18,7 +18,7 @@ defmodule RabbitMQ.CLI.Formatters.Json do
   end
 
   def format_output(output, _opts) do
-    {:ok, json} = :rabbit_json.try_encode(keys_to_atoms(output))
+    {:ok, json} = JSON.encode(keys_to_atoms(output))
     json
   end
 
diff --git a/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/json_stream.ex b/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/json_stream.ex
index 23d7be95ecf4..7f29998a8631 100644
--- a/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/json_stream.ex
+++ b/deps/rabbitmq_cli/lib/rabbitmq/cli/formatters/json_stream.ex
@@ -31,7 +31,7 @@ defmodule RabbitMQ.CLI.Formatters.JsonStream do
   end
 
   def format_output(output, _opts) do
-    {:ok, json} = :rabbit_json.try_encode(output)
+    {:ok, json} = JSON.encode(keys_to_atoms(output))
     json
   end
 
diff --git a/deps/rabbitmq_cli/lib/rabbitmqctl.ex b/deps/rabbitmq_cli/lib/rabbitmqctl.ex
index a25a65585ccf..fc9fd2321f39 100644
--- a/deps/rabbitmq_cli/lib/rabbitmqctl.ex
+++ b/deps/rabbitmq_cli/lib/rabbitmqctl.ex
@@ -558,7 +558,7 @@ defmodule RabbitMQCtl do
   end
 
   defp format_error({:error, :check_failed, err}, %{formatter: "json"}, _) when is_map(err) do
-    {:ok, res} = :rabbit_json.try_encode(err)
+    {:ok, res} = JSON.encode(err)
     {:error, ExitCodes.exit_unavailable(), res}
   end
 
@@ -578,12 +578,12 @@ defmodule RabbitMQCtl do
 
   # Catch all clauses
   defp format_error({:error, err}, %{formatter: "json"}, _) when is_map(err) do
-    {:ok, res} = :rabbit_json.try_encode(err)
+    {:ok, res} = JSON.encode(err)
     {:error, ExitCodes.exit_unavailable(), res}
   end
 
   defp format_error({:error, exit_code, err}, %{formatter: "json"}, _) when is_map(err) do
-    {:ok, res} = :rabbit_json.try_encode(err)
+    {:ok, res} = JSON.encode(err)
     {:error, exit_code, res}
   end
 
diff --git a/deps/rabbitmq_cli/mix.exs b/deps/rabbitmq_cli/mix.exs
index 2e32e32c92c2..6d07dc138df4 100644
--- a/deps/rabbitmq_cli/mix.exs
+++ b/deps/rabbitmq_cli/mix.exs
@@ -15,7 +15,6 @@ defmodule RabbitMQCtl.MixfileBase do
       build_embedded: Mix.env() == :prod,
       start_permanent: Mix.env() == :prod,
       escript: [main_module: RabbitMQCtl, emu_args: "-hidden", path: "escript/rabbitmqctl"],
-      prune_code_paths: false,
       deps: deps(Mix.env()),
       aliases: aliases(),
       xref: [
@@ -140,6 +139,10 @@ defmodule RabbitMQCtl.MixfileBase do
     is_bazel = System.get_env("IS_BAZEL") != nil
 
     [
+      {
+        :json,
+        path: Path.join(deps_dir, "json")
+      },
       {
         :csv,
         path: Path.join(deps_dir, "csv")
diff --git a/deps/rabbitmq_cli/test/ctl/export_definitions_command_test.exs b/deps/rabbitmq_cli/test/ctl/export_definitions_command_test.exs
index a429e43b9e15..d1be4f6897ad 100644
--- a/deps/rabbitmq_cli/test/ctl/export_definitions_command_test.exs
+++ b/deps/rabbitmq_cli/test/ctl/export_definitions_command_test.exs
@@ -111,7 +111,7 @@ defmodule ExportDefinitionsCommandTest do
     {:ok, nil} = @command.run([valid_file_path()], context[:opts])
 
     {:ok, bin} = File.read(valid_file_path())
-    {:ok, map} = :rabbit_json.try_decode(bin)
+    {:ok, map} = JSON.decode(bin)
     assert Map.has_key?(map, "rabbitmq_version")
   end
 
@@ -128,7 +128,7 @@ defmodule ExportDefinitionsCommandTest do
     clear_parameter("/", "federation-upstream", "up-1")
 
     {:ok, bin} = File.read(valid_file_path())
-    {:ok, map} = :rabbit_json.try_decode(bin)
+    {:ok, map} = JSON.decode(bin)
     assert Map.has_key?(map, "rabbitmq_version")
     params = map["parameters"]
     assert is_map(hd(params)["value"])
diff --git a/deps/rabbitmq_cli/test/ctl/set_user_limits_command_test.exs b/deps/rabbitmq_cli/test/ctl/set_user_limits_command_test.exs
index b57a649923c9..bb9da3588dc4 100644
--- a/deps/rabbitmq_cli/test/ctl/set_user_limits_command_test.exs
+++ b/deps/rabbitmq_cli/test/ctl/set_user_limits_command_test.exs
@@ -131,6 +131,6 @@ defmodule SetUserLimitsCommandTest do
 
   defp assert_limits(context, definition) do
     limits = get_user_limits(context[:user])
-    assert {:ok, limits} == :rabbit_json.try_decode(definition)
+    assert {:ok, limits} == JSON.decode(definition)
   end
 end
diff --git a/deps/rabbitmq_cli/test/ctl/set_vhost_limits_command_test.exs b/deps/rabbitmq_cli/test/ctl/set_vhost_limits_command_test.exs
index f591b1443b32..6a1bec75aac7 100644
--- a/deps/rabbitmq_cli/test/ctl/set_vhost_limits_command_test.exs
+++ b/deps/rabbitmq_cli/test/ctl/set_vhost_limits_command_test.exs
@@ -138,6 +138,6 @@ defmodule SetVhostLimitsCommandTest do
 
   defp assert_limits(context) do
     limits = get_vhost_limits(context[:vhost])
-    assert {:ok, limits} == :rabbit_json.try_decode(context[:definition])
+    assert {:ok, limits} == JSON.decode(context[:definition])
   end
 end
diff --git a/deps/rabbitmq_cli/test/json_formatting.exs b/deps/rabbitmq_cli/test/json_formatting.exs
index c27826b59e59..70cb6a5a04b9 100644
--- a/deps/rabbitmq_cli/test/json_formatting.exs
+++ b/deps/rabbitmq_cli/test/json_formatting.exs
@@ -29,7 +29,7 @@ defmodule JSONFormattingTest do
         error_check(command, exit_ok())
       end)
 
-    {:ok, doc} = :rabbit_json.try_decode(output)
+    {:ok, doc} = JSON.decode(output)
 
     assert Map.has_key?(doc, "memory")
     assert Map.has_key?(doc, "file_descriptors")
@@ -53,7 +53,7 @@ defmodule JSONFormattingTest do
         error_check(command, exit_ok())
       end)
 
-    {:ok, doc} = :rabbit_json.try_decode(output)
+    {:ok, doc} = JSON.decode(output)
 
     assert Enum.member?(doc["disk_nodes"], node)
     assert Map.has_key?(doc["listeners"], node)
diff --git a/deps/rabbitmq_cli/test/test_helper.exs b/deps/rabbitmq_cli/test/test_helper.exs
index 9c7a544bc1aa..d36e70f654bc 100644
--- a/deps/rabbitmq_cli/test/test_helper.exs
+++ b/deps/rabbitmq_cli/test/test_helper.exs
@@ -19,6 +19,7 @@ true = Code.append_path(Path.join([System.get_env("DEPS_DIR"), "rabbit_common",
 true = Code.append_path(Path.join([System.get_env("DEPS_DIR"), "rabbit", "ebin"]))
 
 true = Code.append_path(Path.join(["_build", Atom.to_string(Mix.env()), "lib", "amqp", "ebin"]))
+true = Code.append_path(Path.join(["_build", Atom.to_string(Mix.env()), "lib", "json", "ebin"]))
 true = Code.append_path(Path.join(["_build", Atom.to_string(Mix.env()), "lib", "x509", "ebin"]))
 
 if function_exported?(Mix, :ensure_application!, 1) do

From 6dc2cc90fc9475e8552400a589c4286e07aa68f5 Mon Sep 17 00:00:00 2001
From: Michal Kuratczyk <mkuratczyk@vmware.com>
Date: Fri, 17 Nov 2023 13:07:28 +0100
Subject: [PATCH 2/8] Revert "Bazel bits for #9926"

This reverts commit 8d402e75b758ae9f9f9848dc95b4b7607f19bddf.

(cherry picked from commit db56f662af3cef3036fcb487f46c2121d8184d2e)
(cherry picked from commit 7c7df01ee21de6ab3f20eed3aac0fd323c06ba83)
---
 deps/rabbitmq_cli/BUILD.bazel | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/deps/rabbitmq_cli/BUILD.bazel b/deps/rabbitmq_cli/BUILD.bazel
index d4c0f504ab8a..35931ebe5f54 100644
--- a/deps/rabbitmq_cli/BUILD.bazel
+++ b/deps/rabbitmq_cli/BUILD.bazel
@@ -17,6 +17,13 @@ mix_archive_build(
     archives = ["@hex//:archive"],
 )
 
+mix_archive_build(
+    name = "json_ez",
+    srcs = ["@json//:sources"],
+    out = "json.ez",
+    archives = ["@hex//:archive"],
+)
+
 # Note: All the various rabbitmq-* scripts are just copies of rabbitmqctl
 rabbitmqctl(
     name = "rabbitmqctl",
@@ -32,6 +39,7 @@ rabbitmqctl(
     license_files = glob(["LICENSE*"]),
     source_deps = {
         "@csv//:sources": "csv",
+        "@json//:sources": "json",
     },
     visibility = ["//visibility:public"],
     deps = [
@@ -101,6 +109,7 @@ plt(
     ],
     ez_deps = [
         ":csv_ez",
+        ":json_ez",
     ],
     ignore_warnings = True,
     libs = [":elixir"],
@@ -142,6 +151,7 @@ rabbitmqctl_test(
     source_deps = {
         "@amqp//:sources": "amqp",
         "@csv//:sources": "csv",
+        "@json//:sources": "json",
         "@temp//:sources": "temp",
         "@x509//:sources": "x509",
     },

From 0d973d0d1a601409a2bd142368b30b4cf0898293 Mon Sep 17 00:00:00 2001
From: Michal Kuratczyk <mkuratczyk@vmware.com>
Date: Fri, 17 Nov 2023 13:07:58 +0100
Subject: [PATCH 3/8] Revert "Remove hex.pm json package #9926 #9932"

This reverts commit dfe4f6fd70777130c3637203b1b1f707698f7c27.

(cherry picked from commit 5a51547d9ea1179672af6bf9e7949628d0a8499f)

# Conflicts:
#	MODULE.bazel
(cherry picked from commit 11de670f41f6c6f3db99d7d224b37f24260d1da8)
---
 MODULE.bazel | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/MODULE.bazel b/MODULE.bazel
index ba4f6f06f9d7..f3c3708d0d2d 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -267,6 +267,30 @@ erlang_package.git_package(
     repository = "michaelklishin/erlang-jose",
 )
 
+<<<<<<< HEAD
+=======
+erlang_package.hex_package(
+    name = "json",
+    build_file = "@rabbitmq-server//bazel:BUILD.json",
+    sha256 = "9abf218dbe4ea4fcb875e087d5f904ef263d012ee5ed21d46e9dbca63f053d16",
+    version = "1.4.1",
+)
+
+erlang_package.git_package(
+    name = "khepri",
+    build_file = "@rabbitmq-server//bazel:BUILD.khepri",
+    commit = "952a52969eaa97a4327806b4fc062238dc3e6214",
+    repository = "rabbitmq/khepri",
+)
+
+erlang_package.git_package(
+    name = "khepri_mnesia_migration",
+    build_file = "@rabbitmq-server//bazel:BUILD.khepri_mnesia_migration",
+    commit = "56d7d123cc3e9dce309582b4d45ea58f3580ee71",
+    repository = "rabbitmq/khepri_mnesia_migration",
+)
+
+>>>>>>> 5a51547d9e (Revert "Remove hex.pm json package #9926 #9932")
 erlang_package.hex_package(
     name = "thoas",
     build_file = "@rabbitmq-server//bazel:BUILD.thoas",

From 552991dfe5168d508da7ad29dceb1b9f8df18a0c Mon Sep 17 00:00:00 2001
From: Michal Kuratczyk <mkuratczyk@vmware.com>
Date: Fri, 17 Nov 2023 13:08:10 +0100
Subject: [PATCH 4/8] Revert "Drop JSON from mix.exs #9926 #9932"

This reverts commit 8de8e0c18a67f587f57622c752a6f43bdcd766a8.

(cherry picked from commit 93bb8477986e3d8fd1e90355fdfe6e0ceb8a09f2)
(cherry picked from commit f5f21a651caaabe85bf56cc2929270c337b55b32)
---
 deps/rabbitmq_cli/mix.exs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/deps/rabbitmq_cli/mix.exs b/deps/rabbitmq_cli/mix.exs
index 6d07dc138df4..c4aff6773687 100644
--- a/deps/rabbitmq_cli/mix.exs
+++ b/deps/rabbitmq_cli/mix.exs
@@ -21,6 +21,7 @@ defmodule RabbitMQCtl.MixfileBase do
         exclude: [
           CSV,
           CSV.Encode,
+          JSON,
           :mnesia,
           :msacc,
           :observer_cli,

From d7856d61a7b44affb978396347f7cad98c433790 Mon Sep 17 00:00:00 2001
From: Michal Kuratczyk <mkuratczyk@vmware.com>
Date: Fri, 17 Nov 2023 13:08:19 +0100
Subject: [PATCH 5/8] Revert "Remove Elixir json package in one more place
 #9926 #9932"

This reverts commit 342af9ab96ded700d506e62bb29a31c498760271.

(cherry picked from commit 7ef4bec607724f47513fea4dbfe1c38e32141a67)

# Conflicts:
#	MODULE.bazel
(cherry picked from commit f433e40e7d0d758b4d3af08529081f1f90936847)
---
 MODULE.bazel | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/MODULE.bazel b/MODULE.bazel
index f3c3708d0d2d..be3f02525f33 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -385,6 +385,12 @@ use_repo(
     "getopt",
     "gun",
     "jose",
+<<<<<<< HEAD
+=======
+    "json",
+    "khepri",
+    "khepri_mnesia_migration",
+>>>>>>> 7ef4bec607 (Revert "Remove Elixir json package in one more place #9926 #9932")
     "observer_cli",
     "prometheus",
     "ranch",

From 8a38e574e8f20ae76e9077559250fe08d8e61cba Mon Sep 17 00:00:00 2001
From: Michal Kuratczyk <mkuratczyk@vmware.com>
Date: Fri, 17 Nov 2023 13:08:26 +0100
Subject: [PATCH 6/8] Revert "Remove Elixir json dep in a few more places
 #9926"

This reverts commit 50e1fed344fe094aade997c95ecf57a157f26bae.

(cherry picked from commit 9373661a33e2191e5f1836b7ea3c11785a060f6d)
(cherry picked from commit 2c2013004e8994582547be9a6189a05a2ac1ce7f)
---
 BUILD.bazel |  1 +
 Makefile    |  2 ++
 dist.bzl    | 10 ++++++++++
 3 files changed, 13 insertions(+)

diff --git a/BUILD.bazel b/BUILD.bazel
index bceab3998862..ff37ed991543 100644
--- 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
index e334d6aaad3b..292b822429bd 100644
--- 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
index dfb36f009f06..bcd03269a653 100644
--- 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"),
         ],

From a506a78b4cb89cf0bcaf69581d02808f320f90d2 Mon Sep 17 00:00:00 2001
From: Michal Kuratczyk <mkuratczyk@vmware.com>
Date: Fri, 17 Nov 2023 13:09:31 +0100
Subject: [PATCH 7/8] CLI: prune_code_paths: false

(cherry picked from commit 32eba980f090ea912cc7bf0f052c6f25cba2436e)
(cherry picked from commit e34a0937037b9b401355e4e24ca04b2897a57784)
---
 deps/rabbitmq_cli/mix.exs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/deps/rabbitmq_cli/mix.exs b/deps/rabbitmq_cli/mix.exs
index c4aff6773687..409aa5fcab33 100644
--- a/deps/rabbitmq_cli/mix.exs
+++ b/deps/rabbitmq_cli/mix.exs
@@ -15,6 +15,7 @@ defmodule RabbitMQCtl.MixfileBase do
       build_embedded: Mix.env() == :prod,
       start_permanent: Mix.env() == :prod,
       escript: [main_module: RabbitMQCtl, emu_args: "-hidden", path: "escript/rabbitmqctl"],
+      prune_code_paths: false,
       deps: deps(Mix.env()),
       aliases: aliases(),
       xref: [

From 165aa60a67a85e520a03a08a7c43597415afaefa Mon Sep 17 00:00:00 2001
From: Michael Klishin <klishinm@vmware.com>
Date: Mon, 20 Nov 2023 11:44:07 -0500
Subject: [PATCH 8/8] Resolve a conflict #9952 #9957

(cherry picked from commit afe2a63d7cc7177cd8efa23964d6e27cbe94bc1e)
---
 MODULE.bazel | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/MODULE.bazel b/MODULE.bazel
index be3f02525f33..34cb6a19d229 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -267,8 +267,6 @@ erlang_package.git_package(
     repository = "michaelklishin/erlang-jose",
 )
 
-<<<<<<< HEAD
-=======
 erlang_package.hex_package(
     name = "json",
     build_file = "@rabbitmq-server//bazel:BUILD.json",
@@ -276,21 +274,6 @@ erlang_package.hex_package(
     version = "1.4.1",
 )
 
-erlang_package.git_package(
-    name = "khepri",
-    build_file = "@rabbitmq-server//bazel:BUILD.khepri",
-    commit = "952a52969eaa97a4327806b4fc062238dc3e6214",
-    repository = "rabbitmq/khepri",
-)
-
-erlang_package.git_package(
-    name = "khepri_mnesia_migration",
-    build_file = "@rabbitmq-server//bazel:BUILD.khepri_mnesia_migration",
-    commit = "56d7d123cc3e9dce309582b4d45ea58f3580ee71",
-    repository = "rabbitmq/khepri_mnesia_migration",
-)
-
->>>>>>> 5a51547d9e (Revert "Remove hex.pm json package #9926 #9932")
 erlang_package.hex_package(
     name = "thoas",
     build_file = "@rabbitmq-server//bazel:BUILD.thoas",
@@ -385,12 +368,7 @@ use_repo(
     "getopt",
     "gun",
     "jose",
-<<<<<<< HEAD
-=======
     "json",
-    "khepri",
-    "khepri_mnesia_migration",
->>>>>>> 7ef4bec607 (Revert "Remove Elixir json package in one more place #9926 #9932")
     "observer_cli",
     "prometheus",
     "ranch",