Merge branch 'release/3.x/3.15.0' into 3.x-master

composer.json

@@ -6,8 +6,8 @@
     "license": "GPL-2.0-or-later",
     "homepage": "https://www.govcms.gov.au",
     "support": {
-        "issues:": "https://github.com/GovCMS/GovCMS/issues",
-        "wik": "https://github.com/GovCMS/GovCMS/wiki",
+        "issues": "https://github.com/GovCMS/GovCMS/issues",
+        "wiki": "https://github.com/GovCMS/GovCMS/wiki",
         "source": "https://github.com/GovCMS/GovCMS/releases"
     },
     "repositories": [
@@ -21,11 +21,11 @@
         "composer/installers": "^2.0",
         "cweagans/composer-patches": "^1.7",
         "govcms-assets/dropzone": "5.7.2",
-        "drupal/address": "2.0.1",
+        "drupal/address": "2.0.2",
         "drupal/admin_toolbar": "3.4.2",
         "drupal/bigmenu": "2.0.0-rc3",
         "drupal/block_inactive_users": "2.7.0",
-        "drupal/captcha": "2.0.5",
+        "drupal/captcha": "2.0.6",
         "drupal/chosen": "4.0.1",
         "drupal/components": "3.0.0-beta3",
         "drupal/config_filter": "2.6.0",
@@ -64,7 +64,7 @@
         "drupal/govcms_dlm": "2.0.0",
         "drupal/inline_entity_form": "3.0.0-rc19",
         "drupal/honeypot": "2.1.3",
-        "drupal/key": "1.18.0",
+        "drupal/key": "1.19.0",
         "drupal/layout_builder_modal": "1.2.0",
         "drupal/layout_builder_restrictions": "2.20.0",
         "drupal/linked_field": "1.5.0",
@@ -82,24 +82,24 @@
         "drupal/migrate_plus": "6.0.2",
         "drupal/migrate_source_csv": "3.6.0",
         "drupal/migrate_tools": "6.0.4",
-        "drupal/minisite": "2.1.0",
-        "drupal/modifiers": "1.5.0",
+        "drupal/minisite": "2.2.0",
+        "drupal/modifiers": "1.6.0",
         "drupal/module_permissions": "3.2.0",
         "drupal/panels": "4.8.0",
         "drupal/paragraphs": "1.17.0",
         "drupal/password_policy": "4.0.1",
         "drupal/pathauto": "1.12.0",
-        "drupal/real_aes": "2.5.0",
+        "drupal/real_aes": "2.6.0",
         "drupal/recaptcha": "3.2.0",
         "drupal/recaptcha_v3": "2.0.2",
         "drupal/redirect": "1.9.0",
         "drupal/rest_menu_items": "3.0.3",
         "drupal/robotstxt": "1.5.0",
         "drupal/role_delegation": "1.2.0",
-        "drupal/scheduled_transitions": "2.4.1",
-        "drupal/search_api": "1.34.0",
-        "drupal/search_api_attachments": "9.0.2",
-        "drupal/search_api_solr": "4.3.3",
+        "drupal/search_api": "1.35.0",
+        "drupal/search_api_solr": "4.3.4",
+        "drupal/scheduled_transitions": "2.5.0",
+        "drupal/search_api_attachments": "9.0.3",
         "drupal/seckit": "2.0.1",
         "drupal/securitytxt": "1.6.0",
         "drupal/shield": "1.7.0",

config/install/securitytxt.settings.yml

@@ -1,9 +1,10 @@
-enabled: true
+enabled: TRUE
 enabled_signature: FALSE
 contact_email: ''
 contact_phone: ''
 contact_page_url: 'https://www.govcms.gov.au/support/security/disclosure'
 encryption_key_url: ''
 policy_url: ''
-acknowledgement_url: ''
+acknowledgments_url: ''
 signature_text: ''
+

govcms.info.yml

@@ -3,7 +3,7 @@ type: profile
 description: 'A GovCMS Drupal Distribution for government and the public sector in Australia.'
 core_version_requirement: ^10
 project: 'govcms'
-version: '3.14.0'
+version: '3.15.0'
 
 distribution:
   name: GovCMS

includes/govcms.update.inc

@@ -136,3 +136,18 @@ function govcms_update_10006() {
   // Call the service method to uninstall specified modules marked as 'obsolete'.
   $lifecycle_service->uninstallObsoleteModules($modules_to_uninstall);
 }
+
+/**
+ * Implements hook_update_N().
+ * Uninstall rdf, quickedit, and adminimal_admin_toolbar module if marked as 'obsolete'.
+ */
+function govcms_update_10007() {
+  // Get the Lifecycle service.
+  $lifecycle_service = \Drupal::service('govcms.modules.lifecycle');
+
+  // List of modules to uninstall.
+  $modules_to_uninstall = ['block_place'];
+
+  // Call the service method to uninstall specified modules marked as 'obsolete'.
+  $lifecycle_service->uninstallObsoleteModules($modules_to_uninstall);
+}

modules/obsolete/aggregator/aggregator.info.yml

@@ -0,0 +1,18 @@
+name: Aggregator
+type: module
+description: 'Gathers and displays syndicated content (RSS, RDF, and Atom feeds) from external sources.'
+lifecycle: obsolete
+lifecycle_link: 'https://github.com/GovCMS/GovCMS'
+package: Core
+core_version_requirement: '>=10.0'
+configure: aggregator.admin_settings
+dependencies:
+  - drupal:file
+  - drupal:options
+test_dependencies:
+  - drupal:classy
+
+# Information added by Drupal.org packaging script on 2023-05-18
+version: '2.0.2'
+project: 'aggregator'
+datestamp: 1684453774

src/Modules/Lifecycle.php

@@ -22,6 +22,8 @@ class Lifecycle {
     'panelizer',
     'swiftmailer',
     'tracker',
+    'block_place',
+    'aggregator'
   ];
 
   /**