@@ -111,8 +111,8 @@ dep_rabbitmq_public_umbrella = git_rmq rabbitmq-public-umbrella $(curre
111111# all projects use the same versions. It avoids conflicts and makes it
112112# possible to work with rabbitmq-public-umbrella.
113113
114- dep_cowboy = hex 2.0.0
115- dep_cowlib = hex 2.0 .0
114+ dep_cowboy = hex 2.2.2
115+ dep_cowlib = hex 2.1 .0
116116dep_jsx = hex 2.8.2
117117dep_lager = hex 3.5.1
118118dep_ranch = hex 1.4.0
@@ -303,7 +303,7 @@ prepare-dist::
303303 @:
304304
305305# --------------------------------------------------------------------
306- # rabbitmq-components.mk checks .
306+ # Umbrella-specific settings .
307307# --------------------------------------------------------------------
308308
309309# If this project is under the Umbrella project, we override $(DEPS_DIR)
@@ -325,28 +325,3 @@ ifneq ($(filter distclean distclean-deps,$(MAKECMDGOALS)),)
325325SKIP_DEPS = 1
326326endif
327327endif
328-
329- UPSTREAM_RMQ_COMPONENTS_MK = $(DEPS_DIR ) /rabbit_common/mk/rabbitmq-components.mk
330-
331- ifeq ($(PROJECT ) ,rabbit_common)
332- check-rabbitmq-components.mk :
333- @:
334- else
335- check-rabbitmq-components.mk :
336- $(verbose ) cmp -s rabbitmq-components.mk \
337- $(UPSTREAM_RMQ_COMPONENTS_MK ) || \
338- (echo " error: rabbitmq-components.mk must be updated!" 1>&2 ; \
339- false)
340- endif
341-
342- ifeq ($(PROJECT ) ,rabbit_common)
343- rabbitmq-components-mk :
344- @:
345- else
346- rabbitmq-components-mk :
347- $(gen_verbose ) cp -a $(UPSTREAM_RMQ_COMPONENTS_MK ) .
348- ifeq ($(DO_COMMIT ) ,yes)
349- $(verbose) git diff --quiet rabbitmq-components.mk \
350- || git commit -m 'Update rabbitmq-components.mk' rabbitmq-components.mk
351- endif
352- endif
0 commit comments