From 2b44f292fac507ace90b62e063f12035236bacd4 Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Tue, 18 Jun 2024 12:38:25 +0000 Subject: [PATCH 1/2] Update configuration --- composer.lock | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/composer.lock b/composer.lock index 15b5fddc..4767b8fa 100644 --- a/composer.lock +++ b/composer.lock @@ -4037,16 +4037,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.3.63", + "version": "4.3.64", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "cc8dc035535a7a5d00846b8a7f3aaebd87297926" + "reference": "b6246e6703ea4aa22cc635a29156fcbb5924b5fe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/cc8dc035535a7a5d00846b8a7f3aaebd87297926", - "reference": "cc8dc035535a7a5d00846b8a7f3aaebd87297926", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/b6246e6703ea4aa22cc635a29156fcbb5924b5fe", + "reference": "b6246e6703ea4aa22cc635a29156fcbb5924b5fe", "shasum": "" }, "require": { @@ -4149,6 +4149,9 @@ }, "drupal/view_unpublished": { "[#UHF-9256] Fix missing dynamic permission dependencies.": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/cbb944ae79643ba7ed895db3fac7f3b3d90ac850/patches/view_unpublished_permissions_missing_dependencies.patch" + }, + "drupal/elasticsearch_connector": { + "https://www.drupal.org/project/elasticsearch_connector/issues/3454977": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/959fd61553c8827b7350e53de4f66b2f6b8c97a1/patches/issue-3454977.patch" } } }, @@ -4157,10 +4160,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.63", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.64", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-06-12T08:50:06+00:00" + "time": "2024-06-18T12:35:32+00:00" }, { "name": "drupal/helfi_proxy", From 9763ccee6c79123a7d87f633283514cb9f80119c Mon Sep 17 00:00:00 2001 From: Santeri Hurnanen Date: Tue, 18 Jun 2024 15:45:14 +0300 Subject: [PATCH 2/2] Revert #506 --- composer.json | 3 +-- composer.lock | 16 ++++++++-------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index d7e28549..a16e6bed 100644 --- a/composer.json +++ b/composer.json @@ -41,8 +41,7 @@ "weitzman/drupal-test-traits": "^2.0" }, "conflict": { - "drupal/drupal": "*", - "drupal/search_api": "1.35" + "drupal/drupal": "*" }, "config": { "optimize-autoloader": true, diff --git a/composer.lock b/composer.lock index 4767b8fa..3b413bf8 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d1050c88d169e2047d4b25b376b1dc00", + "content-hash": "492706418e2eb18c62efa55339ab01f5", "packages": [ { "name": "asm89/stack-cors", @@ -5953,17 +5953,17 @@ }, { "name": "drupal/search_api", - "version": "1.34.0", + "version": "1.35.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/search_api.git", - "reference": "8.x-1.34" + "reference": "8.x-1.35" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.34.zip", - "reference": "8.x-1.34", - "shasum": "dd08166888f90adaf01cc1a759266097709efe7c" + "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.35.zip", + "reference": "8.x-1.35", + "shasum": "d119726e870f793c6470d2a4fa9286662c5eb45d" }, "require": { "drupal/core": "^10.1 || ^11" @@ -5984,8 +5984,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.34", - "datestamp": "1714899074", + "version": "8.x-1.35", + "datestamp": "1718551025", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy"