root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

rabbitmq-components.mk: Import changes from `master` 

Namely:
 * Depend on ranch_proxy_protocol 1.4.4 (which depends on ranch 1.4.0,
   the same as us).
 * Fix `check-rabbitmq-components.mk` for rabbitmq-common.
This commit is contained in:
Jean-Sébastien Pédron 2017-12-01 15:04:35 +01:00
parent 77e66bba35
commit df3f2af3f3
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
deps/rabbit_common/mk/rabbitmq-components.mk vendored
View File

@ -115,7 +115,7 @@ dep_cowlib = hex 2.0.0
dep_jsx = hex 2.8.2
dep_lager = hex 3.5.1
dep_ranch = hex 1.4.0
dep_ranch_proxy_protocol = hex 1.4.2
dep_ranch_proxy_protocol = hex 1.4.4
dep_recon = hex 2.3.2
dep_sockjs = git https://github.com/rabbitmq/sockjs-erlang.git 405990ea62353d98d36dbf5e1e64942d9b0a1daf
@ -326,11 +326,16 @@ endif
UPSTREAM_RMQ_COMPONENTS_MK = $(DEPS_DIR)/rabbit_common/mk/rabbitmq-components.mk
ifeq ($(PROJECT),rabbit_common)
check-rabbitmq-components.mk:
@:
else
check-rabbitmq-components.mk:
$(verbose) cmp -s rabbitmq-components.mk \
$(UPSTREAM_RMQ_COMPONENTS_MK) || \
(echo "error: rabbitmq-components.mk must be updated!" 1>&2; \
false)
endif
ifeq ($(PROJECT),rabbit_common)
rabbitmq-components-mk: