From 9f6e968027dd863ff6c9ae51e13da45f826c34f9 Mon Sep 17 00:00:00 2001 From: teroelonen <2276077+teroelonen@users.noreply.github.com> Date: Thu, 15 Aug 2024 09:04:14 +0000 Subject: [PATCH 1/2] Update configuration --- composer.lock | 12 ++++++------ ...ties.external_entity_type.helfi_announcements.yml | 2 +- ...l_entities.external_entity_type.helfi_surveys.yml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.lock b/composer.lock index 5d91bff9..a5e8e794 100644 --- a/composer.lock +++ b/composer.lock @@ -4117,16 +4117,16 @@ }, { "name": "drupal/hdbt", - "version": "6.6.3", + "version": "6.6.4", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "260ed89837be3b1ae9a19248a0e21717b9597885" + "reference": "d8e011aa97b4449d3c7eaca723fff9d2111c6db4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/260ed89837be3b1ae9a19248a0e21717b9597885", - "reference": "260ed89837be3b1ae9a19248a0e21717b9597885", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/d8e011aa97b4449d3c7eaca723fff9d2111c6db4", + "reference": "d8e011aa97b4449d3c7eaca723fff9d2111c6db4", "shasum": "" }, "require": { @@ -4144,10 +4144,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.6.3", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.6.4", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-08-14T08:40:02+00:00" + "time": "2024-08-15T08:46:48+00:00" }, { "name": "drupal/hdbt_admin", diff --git a/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml b/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml index 8bd8bfb7..c607771d 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_announcements.yml @@ -8,8 +8,8 @@ id: helfi_announcements label: 'Helfi: Announcements' label_plural: 'Helfi: Announcements' description: '' -generate_aliases: null read_only: true +generate_aliases: null field_mapper_id: jsonpath field_mapper_config: field_mappings: diff --git a/conf/cmi/external_entities.external_entity_type.helfi_surveys.yml b/conf/cmi/external_entities.external_entity_type.helfi_surveys.yml index 2a9fc569..8308d9f6 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_surveys.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_surveys.yml @@ -8,8 +8,8 @@ id: helfi_surveys label: 'Helfi: Survey' label_plural: 'Helfi: Surveys' description: '' -generate_aliases: null read_only: true +generate_aliases: null field_mapper_id: jsonpath field_mapper_config: field_mappings: From a9ac35457b387d033fbed90c9ff9b1b8cd93f12a Mon Sep 17 00:00:00 2001 From: hyrsky <732227+hyrsky@users.noreply.github.com> Date: Fri, 16 Aug 2024 11:06:43 +0000 Subject: [PATCH 2/2] Update configuration --- .platform/schema | 2 +- composer.json | 1 - composer.lock | 85 +++++++++++++++++++++++++----------------------- 3 files changed, 46 insertions(+), 42 deletions(-) diff --git a/.platform/schema b/.platform/schema index c7930257..301160a9 100644 --- a/.platform/schema +++ b/.platform/schema @@ -1 +1 @@ -7 \ No newline at end of file +8 \ No newline at end of file diff --git a/composer.json b/composer.json index e85636de..45d1d919 100644 --- a/composer.json +++ b/composer.json @@ -23,7 +23,6 @@ "drupal/helfi_tunnistamo": "^3.0", "drupal/raven": "^5.0", "drupal/redis": "^1.5", - "drupal/stage_file_proxy": "^2.0", "drush/drush": "^12" }, "require-dev": { diff --git a/composer.lock b/composer.lock index a5e8e794..9e014208 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": "6869a9f797ac399a41b088a8f0c7715a", + "content-hash": "ea915143da8661b86d0f1ef7eb3d0256", "packages": [ { "name": "asm89/stack-cors", @@ -4283,22 +4283,25 @@ }, { "name": "drupal/helfi_azure_fs", - "version": "2.0.2", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs.git", - "reference": "bfd7671b58300db948d8cd230b4756ecca73c237" + "reference": "25c7b80d6d1dc71176a576102665704b7e8fedeb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-azure-fs/zipball/bfd7671b58300db948d8cd230b4756ecca73c237", - "reference": "bfd7671b58300db948d8cd230b4756ecca73c237", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-azure-fs/zipball/25c7b80d6d1dc71176a576102665704b7e8fedeb", + "reference": "25c7b80d6d1dc71176a576102665704b7e8fedeb", "shasum": "" }, "require": { "drupal/flysystem": "^2.1@RC", "microsoft/azure-storage-blob": "^1.1" }, + "conflict": { + "drupal/core": "<10.3" + }, "require-dev": { "dealerdirect/phpcodesniffer-composer-installer": "^0.7.0", "drupal/coder": "^8.3" @@ -4316,10 +4319,10 @@ ], "description": "Helfi - Azure FS", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/tree/2.0.2", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/tree/2.0.3", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-azure-fs/issues" }, - "time": "2023-11-21T07:23:44+00:00" + "time": "2024-08-16T08:49:23+00:00" }, { "name": "drupal/helfi_drupal_tools", @@ -4327,12 +4330,12 @@ "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-tools.git", - "reference": "eadca37ff757c3de0b1a309d37ddd2c6d4910740" + "reference": "5c46212ec813932eb9f8e94bbf2d14e1e92b2a39" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/eadca37ff757c3de0b1a309d37ddd2c6d4910740", - "reference": "eadca37ff757c3de0b1a309d37ddd2c6d4910740", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/5c46212ec813932eb9f8e94bbf2d14e1e92b2a39", + "reference": "5c46212ec813932eb9f8e94bbf2d14e1e92b2a39", "shasum": "" }, "require": { @@ -4404,7 +4407,7 @@ "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main", "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues" }, - "time": "2024-08-12T09:17:00+00:00" + "time": "2024-08-16T09:24:27+00:00" }, { "name": "drupal/helfi_navigation", @@ -4442,16 +4445,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.4.8", + "version": "4.4.10", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "10ca013c3e13c112eb9827fd1b91ed52833b2712" + "reference": "97338d748ace88329505d3a79eb3e03d98ef648f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/10ca013c3e13c112eb9827fd1b91ed52833b2712", - "reference": "10ca013c3e13c112eb9827fd1b91ed52833b2712", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/97338d748ace88329505d3a79eb3e03d98ef648f", + "reference": "97338d748ace88329505d3a79eb3e03d98ef648f", "shasum": "" }, "require": { @@ -4506,6 +4509,7 @@ "drupal/simple_sitemap": "^4.0", "drupal/siteimprove": "^2.0", "drupal/social_media": "^2.0", + "drupal/stage_file_proxy": "^2", "drupal/stomp": "^2.0", "drupal/tfa": "^1.7", "drupal/token": "^1.9", @@ -4523,6 +4527,7 @@ "drupal/ctools": "<3.11 || ^4.0.1", "drupal/gin_toolbar": ">1.0.0-rc6", "drupal/helfi_media_map": "*", + "drupal/stage_file_proxy": "<2.1.5", "drush/drush": "<12" }, "type": "drupal-module", @@ -4566,10 +4571,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.4.8", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.4.10", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-08-12T09:33:04+00:00" + "time": "2024-08-16T08:50:18+00:00" }, { "name": "drupal/helfi_proxy", @@ -5930,17 +5935,17 @@ }, { "name": "drupal/raven", - "version": "5.0.16", + "version": "5.0.17", "source": { "type": "git", "url": "https://git.drupalcode.org/project/raven.git", - "reference": "5.0.16" + "reference": "5.0.17" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/raven-5.0.16.zip", - "reference": "5.0.16", - "shasum": "cd4d545b74ad7d22691dd06177a164bc12074201" + "url": "https://ftp.drupal.org/files/projects/raven-5.0.17.zip", + "reference": "5.0.17", + "shasum": "3be77024ab4edac4964ed5a4590f4e9eb5031346" }, "require": { "drupal/core": "^10.1 || ^11", @@ -5955,8 +5960,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "5.0.16", - "datestamp": "1723001088", + "version": "5.0.17", + "datestamp": "1723776489", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6537,27 +6542,27 @@ }, { "name": "drupal/simple_sitemap", - "version": "4.1.9", + "version": "4.2.1", "source": { "type": "git", "url": "https://git.drupalcode.org/project/simple_sitemap.git", - "reference": "4.1.9" + "reference": "4.2.1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/simple_sitemap-4.1.9.zip", - "reference": "4.1.9", - "shasum": "d86d90408b334cd7470ea631e3be5acca2103377" + "url": "https://ftp.drupal.org/files/projects/simple_sitemap-4.2.1.zip", + "reference": "4.2.1", + "shasum": "d96b481571ca2fecdb305e87d2557f9338116864" }, "require": { - "drupal/core": "^9.3 || ^10", + "drupal/core": "^10.2 || ^11", "ext-xmlwriter": "*" }, "type": "drupal-module", "extra": { "drupal": { - "version": "4.1.9", - "datestamp": "1712441608", + "version": "4.2.1", + "datestamp": "1723802052", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6581,7 +6586,7 @@ "role": "Maintainer" }, { - "name": "WalkingDexter", + "name": "walkingdexter", "homepage": "https://www.drupal.org/user/3251330" } ], @@ -6779,17 +6784,17 @@ }, { "name": "drupal/stage_file_proxy", - "version": "2.1.4", + "version": "2.1.5", "source": { "type": "git", "url": "https://git.drupalcode.org/project/stage_file_proxy.git", - "reference": "2.1.4" + "reference": "2.1.5" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/stage_file_proxy-2.1.4.zip", - "reference": "2.1.4", - "shasum": "85f8451f123fcfb1b272f5a0cc11e6bd1673476c" + "url": "https://ftp.drupal.org/files/projects/stage_file_proxy-2.1.5.zip", + "reference": "2.1.5", + "shasum": "6f5974c106d45211e54945e4d9f5bbf8ec6699de" }, "require": { "drupal/core": "^9 || ^10", @@ -6802,8 +6807,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.1.4", - "datestamp": "1706627704", + "version": "2.1.5", + "datestamp": "1719499510", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy"