From f3422c54e07c9619949d4d5a21afd31b179af8ce Mon Sep 17 00:00:00 2001 From: Paul Weidner Date: Wed, 3 Jan 2024 09:23:52 -0800 Subject: [PATCH] Update Drupal core to 10.2.0 --- CHANGELOG.md | 1 + composer.json | 9 ++++----- composer.project.json | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 47aeffef7..ebd266b9b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed - [Increase weight of Asset and Log tasks on canonical user route #757](https://github.com/farmOS/farmOS/pull/757) +- Update Drupal core to 10.2.0. ### Deprecated diff --git a/composer.json b/composer.json index 5a71e0add..fc29b161a 100644 --- a/composer.json +++ b/composer.json @@ -18,7 +18,7 @@ "require": { "cweagans/composer-patches": "^1.6", "drupal/admin_toolbar": "^3.3", - "drupal/core": "10.1.6", + "drupal/core": "10.2.0", "drupal/config_update": "^2.0@alpha", "drupal/consumers": "^1.15", "drupal/csv_serialization": "^4.0", @@ -48,7 +48,7 @@ "drupal/subrequests": "^3.0.6", "drupal/token": "^1.11", "drupal/views_geojson": "^1.2", - "drush/drush": "^11.3", + "drush/drush": "^12.4.3", "ext-simplexml": "*", "itamair/geophp": "1.3" }, @@ -59,10 +59,9 @@ "patches": { "drupal/core": { "Issue #2429699: Add Views EntityReference filter to be available for all entity reference fields.": "https://www.drupal.org/files/issues/2021-12-02/2429699-453-9.3.x.patch", - "Issue #2339235: Remove taxonomy hard dependency on node module": "https://www.drupal.org/files/issues/2023-10-05/2339235-10.1.x-80.patch", + "Issue #2339235: Remove taxonomy hard dependency on node module": "https://www.drupal.org/files/issues/2024-01-03/2339235-10.2.0-81.patch", "Issue #1874838: Allow exposed blocks to use 'Link display' settings": "https://www.drupal.org/files/issues/2021-11-11/1874838-26.patch", - "Issue #2909128: Autocomplete not working on Chrome Android": "https://www.drupal.org/files/issues/2023-07-11/2909128-92.patch", - "Issue #3349973: Automatically install pg_trgm extension on PostgreSQL 13+": "https://www.drupal.org/files/issues/2023-05-08/3349973-26.patch" + "Issue #2909128: Autocomplete not working on Chrome Android": "https://www.drupal.org/files/issues/2023-07-11/2909128-92.patch" }, "drupal/entity": { "Issue #3206703: Provide reverse relationships for bundle plugin entity_reference fields.": "https://www.drupal.org/files/issues/2022-05-11/3206703-10.patch" diff --git a/composer.project.json b/composer.project.json index e96ce5bda..055612715 100644 --- a/composer.project.json +++ b/composer.project.json @@ -1,7 +1,7 @@ { "require": { "cweagans/composer-patches": "^1.7", - "drupal/core-composer-scaffold": "10.1.6" + "drupal/core-composer-scaffold": "10.2.0" }, "require-dev": { "behat/mink": "^1.10",