Skip to content

Commit 03163ea

Browse files
Merge pull request #9933 from rabbitmq/mergify/bp/v3.12.x/pr-9932
Bazel bits for #9926 (backport #9932)
2 parents a553da8 + a30430d commit 03163ea

File tree

6 files changed

+0
-32
lines changed

6 files changed

+0
-32
lines changed

BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ exports_files([
5353
# gazelle:exclude deps/gun
5454
# gazelle:exclude deps/inet_tcp_proxy
5555
# gazelle:exclude deps/jose
56-
# gazelle:exclude deps/json
5756
# gazelle:exclude deps/meck
5857
# gazelle:exclude deps/observer_cli
5958
# gazelle:exclude deps/osiris

MODULE.bazel

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -270,13 +270,6 @@ erlang_package.git_package(
270270
repository = "michaelklishin/erlang-jose",
271271
)
272272

273-
erlang_package.hex_package(
274-
name = "json",
275-
build_file = "@rabbitmq-server//bazel:BUILD.json",
276-
sha256 = "9abf218dbe4ea4fcb875e087d5f904ef263d012ee5ed21d46e9dbca63f053d16",
277-
version = "1.4.1",
278-
)
279-
280273
erlang_package.hex_package(
281274
name = "thoas",
282275
build_file = "@rabbitmq-server//bazel:BUILD.thoas",
@@ -371,7 +364,6 @@ use_repo(
371364
"getopt",
372365
"gun",
373366
"jose",
374-
"json",
375367
"observer_cli",
376368
"prometheus",
377369
"ranch",

Makefile

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ XREF_EXTRA_APP_DIRS = $(filter-out deps/rabbitmq_cli/_build/dev/lib/rabbit_commo
4141
# protocols directly.
4242
XREF_IGNORE = [ \
4343
{'Elixir.CSV.Encode',impl_for,1}, \
44-
{'Elixir.JSON.Decoder',impl_for,1}, \
45-
{'Elixir.JSON.Encoder',impl_for,1}, \
4644
{'Elixir.RabbitMQ.CLI.Core.DataCoercion',impl_for,1}]
4745

4846
# Include Elixir libraries in the Xref checks.

deps/rabbitmq_cli/BUILD.bazel

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,6 @@ mix_archive_build(
1717
archives = ["@hex//:archive"],
1818
)
1919

20-
mix_archive_build(
21-
name = "json_ez",
22-
srcs = ["@json//:sources"],
23-
out = "json.ez",
24-
archives = ["@hex//:archive"],
25-
)
26-
2720
# Note: All the various rabbitmq-* scripts are just copies of rabbitmqctl
2821
rabbitmqctl(
2922
name = "rabbitmqctl",
@@ -39,7 +32,6 @@ rabbitmqctl(
3932
license_files = glob(["LICENSE*"]),
4033
source_deps = {
4134
"@csv//:sources": "csv",
42-
"@json//:sources": "json",
4335
},
4436
visibility = ["//visibility:public"],
4537
deps = [
@@ -109,7 +101,6 @@ plt(
109101
],
110102
ez_deps = [
111103
":csv_ez",
112-
":json_ez",
113104
],
114105
ignore_warnings = True,
115106
libs = [":elixir"],
@@ -151,7 +142,6 @@ rabbitmqctl_test(
151142
source_deps = {
152143
"@amqp//:sources": "amqp",
153144
"@csv//:sources": "csv",
154-
"@json//:sources": "json",
155145
"@temp//:sources": "temp",
156146
"@x509//:sources": "x509",
157147
},

deps/rabbitmq_cli/mix.exs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ defmodule RabbitMQCtl.MixfileBase do
2222
exclude: [
2323
CSV,
2424
CSV.Encode,
25-
JSON,
2625
:mnesia,
2726
:msacc,
2827
:observer_cli,

dist.bzl

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -335,15 +335,6 @@ def source_archive(
335335
prefix = "deps",
336336
)
337337

338-
pkg_files(
339-
name = "json-files",
340-
srcs = [
341-
"@json//:sources",
342-
],
343-
strip_prefix = "",
344-
prefix = "deps/json",
345-
)
346-
347338
pkg_files(
348339
name = "csv-files",
349340
srcs = [
@@ -358,7 +349,6 @@ def source_archive(
358349
extension = extension,
359350
srcs = [
360351
":deps-files",
361-
":json-files",
362352
":csv-files",
363353
Label("@rabbitmq-server//:root-licenses"),
364354
],

0 commit comments

Comments
 (0)