diff --git a/bazel/BUILD.cowboy b/bazel/BUILD.cowboy index 247f07fd425f..bd5ec4fb0c85 100644 --- a/bazel/BUILD.cowboy +++ b/bazel/BUILD.cowboy @@ -49,6 +49,7 @@ erlang_bytecode( "src/cowboy_clock.erl", "src/cowboy_compress_h.erl", "src/cowboy_constraints.erl", + "src/cowboy_decompress_h.erl", "src/cowboy_handler.erl", "src/cowboy_http.erl", "src/cowboy_http2.erl", @@ -94,6 +95,7 @@ filegroup( "src/cowboy_clock.erl", "src/cowboy_compress_h.erl", "src/cowboy_constraints.erl", + "src/cowboy_decompress_h.erl", "src/cowboy_handler.erl", "src/cowboy_http.erl", "src/cowboy_http2.erl", @@ -145,10 +147,10 @@ erlang_app( name = "erlang_app", srcs = [":all_srcs"], hdrs = [":public_hdrs"], - app_name = "cowboy", app_description = "Small, fast, modern HTTP server.", - app_version = "2.10.0", + app_name = "cowboy", app_registered = ["cowboy_clock"], + app_version = "2.12.0", beam_files = [":beam_files"], extra_apps = ["crypto"], license_files = [":license_files"], diff --git a/bazel/BUILD.cowlib b/bazel/BUILD.cowlib index f56aea23955b..130cb5b98bc0 100644 --- a/bazel/BUILD.cowlib +++ b/bazel/BUILD.cowlib @@ -39,35 +39,9 @@ erlang_bytecode( "src/cow_uri_template.erl", "src/cow_ws.erl", ], - outs = [ - "ebin/cow_base64url.beam", - "ebin/cow_cookie.beam", - "ebin/cow_date.beam", - "ebin/cow_hpack.beam", - "ebin/cow_http.beam", - "ebin/cow_http2.beam", - "ebin/cow_http2_machine.beam", - "ebin/cow_http_hd.beam", - "ebin/cow_http_struct_hd.beam", - "ebin/cow_http_te.beam", - "ebin/cow_iolists.beam", - "ebin/cow_link.beam", - "ebin/cow_mimetypes.beam", - "ebin/cow_multipart.beam", - "ebin/cow_qs.beam", - "ebin/cow_spdy.beam", - "ebin/cow_sse.beam", - "ebin/cow_uri.beam", - "ebin/cow_uri_template.beam", - "ebin/cow_ws.beam", - ], - hdrs = [ - "include/cow_inline.hrl", - "include/cow_parse.hrl", - "src/cow_hpack_dec_huffman_lookup.hrl", - "src/cow_spdy.hrl", - ], + hdrs = [":public_and_private_hdrs"], app_name = "cowlib", + dest = "ebin", erlc_opts = "//:erlc_opts", ) @@ -147,11 +121,13 @@ erlang_app( name = "erlang_app", srcs = [":all_srcs"], hdrs = [":public_hdrs"], - app_name = "cowlib", app_description = "Support library for manipulating Web protocols.", - app_version = "2.12.1", + app_name = "cowlib", + app_version = "2.13.0", beam_files = [":beam_files"], extra_apps = ["crypto"], + license_files = [":license_files"], + priv = [":priv"], ) alias( @@ -159,3 +135,10 @@ alias( actual = ":erlang_app", visibility = ["//visibility:public"], ) + +filegroup( + name = "license_files", + srcs = [ + "LICENSE", + ], +) diff --git a/deps/rabbitmq_amqp1_0/BUILD.bazel b/deps/rabbitmq_amqp1_0/BUILD.bazel index 969d063ebe59..3c5a1d767c07 100644 --- a/deps/rabbitmq_amqp1_0/BUILD.bazel +++ b/deps/rabbitmq_amqp1_0/BUILD.bazel @@ -2,7 +2,6 @@ load("@rules_erlang//:xref2.bzl", "xref") load("@rules_erlang//:dialyze.bzl", "dialyze", "plt") load( "//:rabbitmq.bzl", - "BROKER_VERSION_REQUIREMENTS_ANY", "assert_suites", "rabbitmq_app", ) @@ -29,7 +28,6 @@ rabbitmq_app( srcs = [":all_srcs"], hdrs = [":public_hdrs"], app_description = APP_DESCRIPTION, - app_extra_keys = BROKER_VERSION_REQUIREMENTS_ANY, app_name = APP_NAME, beam_files = [":beam_files"], license_files = [":license_files"], diff --git a/deps/rabbitmq_auth_backend_oauth2/Makefile b/deps/rabbitmq_auth_backend_oauth2/Makefile index 378d022d91e5..cffbaf782d71 100644 --- a/deps/rabbitmq_auth_backend_oauth2/Makefile +++ b/deps/rabbitmq_auth_backend_oauth2/Makefile @@ -7,8 +7,8 @@ export BUILD_WITHOUT_QUIC LOCAL_DEPS = inets public_key BUILD_DEPS = rabbit_common oauth2_client -DEPS = rabbit cowlib jose base64url -TEST_DEPS = cowboy rabbitmq_web_dispatch rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client rabbitmq_mqtt emqtt oauth2_client +DEPS = rabbit cowlib jose base64url oauth2_client +TEST_DEPS = cowboy rabbitmq_web_dispatch rabbitmq_ct_helpers rabbitmq_ct_client_helpers amqp_client rabbitmq_mqtt emqtt DEP_EARLY_PLUGINS = rabbit_common/mk/rabbitmq-early-plugin.mk DEP_PLUGINS = rabbit_common/mk/rabbitmq-plugin.mk diff --git a/deps/rabbitmq_prometheus/Makefile b/deps/rabbitmq_prometheus/Makefile index 8380e81b9a7b..abfb4195f722 100644 --- a/deps/rabbitmq_prometheus/Makefile +++ b/deps/rabbitmq_prometheus/Makefile @@ -9,7 +9,7 @@ endef PROJECT := rabbitmq_prometheus PROJECT_DESCRIPTION = Prometheus metrics for RabbitMQ PROJECT_MOD := rabbit_prometheus_app -DEPS = accept cowboy rabbit rabbitmq_management_agent prometheus rabbitmq_web_dispatch +DEPS = accept cowboy rabbit rabbitmq_management_agent prometheus rabbitmq_web_dispatch rabbitmq_federation BUILD_DEPS = amqp_client rabbit_common rabbitmq_management TEST_DEPS = rabbitmq_ct_helpers rabbitmq_ct_client_helpers eunit_formatters diff --git a/moduleindex.yaml b/moduleindex.yaml index 6b413170d6cf..1a2524fc047b 100755 --- a/moduleindex.yaml +++ b/moduleindex.yaml @@ -64,6 +64,7 @@ cowboy: - cowboy_clock - cowboy_compress_h - cowboy_constraints +- cowboy_decompress_h - cowboy_handler - cowboy_http - cowboy_http2