Merge branch 'v3.13.x' into su_aws/update_dependencies

rabbitmq · Oct 2, 2024 · f9bd2db · f9bd2db
2 parents 26ac318 + da8adf5
commit f9bd2db
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/deps/rabbit/BUILD.bazel b/deps/rabbit/BUILD.bazel
@@ -142,13 +142,10 @@ _APP_ENV = """[
         {credentials_obfuscation_fallback_secret, <<"nocookie">>},
         {dead_letter_worker_consumer_prefetch, 32},
         {dead_letter_worker_publisher_confirm_timeout, 180000},
-
-        %% EOL date for the current release series, if known/announced
-		{release_series_eol_date, none},
-
 		{vhost_process_reconciliation_run_interval, 30},
         %% for testing
-        {vhost_process_reconciliation_enabled, true}
+        {vhost_process_reconciliation_enabled, true},
+        {license_line, "Licensed under the MPL 2.0. Website: https://rabbitmq.com"}
 	  ]
 """
 

diff --git a/deps/rabbit/Makefile b/deps/rabbit/Makefile
@@ -125,11 +125,10 @@ define PROJECT_ENV
 		{credentials_obfuscation_fallback_secret, <<"nocookie">>},
       	{dead_letter_worker_consumer_prefetch, 32},
       	{dead_letter_worker_publisher_confirm_timeout, 180000},
-		%% EOL date for the current release series, if known/announced
-		{release_series_eol_date, none},
 		{vhost_process_reconciliation_run_interval, 30},
 		%% for testing
-		{vhost_process_reconciliation_enabled, true}
+		{vhost_process_reconciliation_enabled, true},
+		{license_line, "Licensed under the MPL 2.0. Website: https://rabbitmq.com"}
 	  ]
 endef