Commit Graph

11 Commits

Author SHA1 Message Date
Michael Stenta a7c92b70b3 Update Drupal core to 9.3.12. 2022-04-20 21:26:14 -04:00
Michael Stenta 254d7f67be Update Drupal core to 9.3.9. 2022-03-21 18:52:26 -04:00
Michael Stenta 4739706648 Update Drupal core to 9.3.8. 2022-03-17 14:37:47 -04:00
Michael Stenta aea9fb8528 Update Drupal core to 9.3.7. 2022-03-03 11:44:54 -05:00
Michael Stenta eb6f1043da Update Drupal core to 9.3.6 for SA-CORE-2022-003 and SA-CORE-2022-004. 2022-02-16 12:47:50 -05:00
Michael Stenta 7cd8334340 Update Drupal core to 9.3.3. 2022-01-19 13:16:17 -05:00
Michael Stenta 5d39617e49 Update Drupal core to 9.3.2. 2022-01-14 15:01:52 -05:00
Michael Stenta 7309046c81 Update Drupal core to 9.3.0. 2021-12-09 06:20:01 -05:00
Michael Stenta 39a8ce0c33 Update Drupal core to 9.2.8 and remove the core patch that was merged upstream.
See https://www.drupal.org/project/drupal/issues/3192365
2021-11-03 14:32:16 -04:00
Michael Stenta b0a45f357b Include symfony/finder in require-dev to fix version pinning issue when using composer-merge-plugin.
Resolves:

Your requirements could not be resolved to an installable set of packages.

  Problem 1
    - drupal/core-dev[9.2.0-alpha1, ..., 9.2.x-dev] require symfony/finder ^4.4 -> found symfony/finder[v4.4.0-BETA1, ..., 4.4.x-dev] but the package is fixed to v5.3.7 (lock file version) by a partial update and that version does not match. Make sure you list it as an argument for the update command.
    - Root composer.json requires drupal/core-dev ~9.2.0 -> satisfiable by drupal/core-dev[9.2.0-alpha1, ..., 9.2.x-dev].
2021-09-28 13:54:43 -04:00
Michael Stenta bd33d0f139 Issue #3239420: Use composer-merge-plugin to manage project composer.json dependencies
This enables more of the dependencies and configuration that need to be
present in the root project composer.json to be managed in the farmOS
repository itself, including drupal/core-composer-scaffold and
drupal/core-dev, which should match the drupal/core version defined in
the farmOS composer.json.

Previously these were declared in the project composer.json template
in https://github.com/farmOS/composer-project. This configuraton is
used as a template when a new farmOS project is created via
`composer create-project farmos/project`, but after initial setup it
is maintained by the end user. This means that updates to the project
composer.json generally requires the end-user to make changes
manually. This would be required every time farmOS requires a minor
version update of Drupal core.

So instead, we can manage those update in this new composer.project.json,
and use wikimedia/composer-merge-plugin to merge that into the project
composer.json. This allows the project composer.json to be much simpler,
and therefore will require less frequent manual updates.
2021-09-28 13:54:43 -04:00