UHF-9151: Merge dev into UHF-9151-update-comprehensive-school-elastic…

…-index.

composer.json

@@ -10,30 +10,31 @@
         "composer/installers": "^2.0",
         "cweagans/composer-patches": "^1.6.7",
         "drupal/better_exposed_filters": "^6.0",
-        "drupal/core": "^9.4",
-        "drupal/core-composer-scaffold": "^9.4",
+        "drupal/core": "^10.0",
+        "drupal/core-composer-scaffold": "^10.0",
         "drupal/flexible_permissions": "^1.0",
+        "drupal/gin": "^3.0@RC",
         "drupal/group": "^2.0",
         "drupal/group_content_menu": "^2.0",
-        "drupal/hdbt": "^5.0",
-        "drupal/hdbt_admin": "^2.0",
-        "drupal/helfi_azure_fs": "^1.1",
+        "drupal/hdbt": "^6.0",
+        "drupal/hdbt_admin": "^3.0",
+        "drupal/helfi_azure_fs": "^2.0",
         "drupal/helfi_drupal_tools": "dev-main",
         "drupal/helfi_navigation": "^2.0",
-        "drupal/helfi_platform_config": "^3.0",
+        "drupal/helfi_platform_config": "^4.0",
         "drupal/helfi_proxy": "^3.0",
         "drupal/helfi_tpr": "^2.0",
         "drupal/helfi_tunnistamo": "^3.0",
         "drupal/override_node_options": "^2.6",
         "drupal/raven": "^4.0",
         "drupal/redis": "^1.5",
         "drupal/stage_file_proxy": "^2.0",
-        "drush/drush": "^11"
+        "drush/drush": "^12.0"
     },
     "require-dev": {
         "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0",
         "drupal/coder": "^8.3",
-        "drupal/core-dev": "^9.1",
+        "drupal/core-dev": "^10",
         "jangregor/phpstan-prophecy": "^1.0",
         "mglaman/phpstan-drupal": "^1.2",
         "phpspec/prophecy-phpunit": "^2",
@@ -108,6 +109,9 @@
             "drupal/group_content_menu": {
                 "https://www.drupal.org/project/group_content_menu/issues/3209011": "https://www.drupal.org/files/issues/2021-04-21/group_content_menu-active_trail_cache_problem-3209011-10.patch",
                 "concat array with null fix": "./patches/group_menu_content_array_concat_error.patch"
+            },
+            "drupal/override_node_options": {
+                "Fix for Adding non-existent permissions to a role is not allowed error during site install.": "./patches/override_node_permissions_missing_dependencies.patch"
             }
         }
     },