diff --git a/composer.lock b/composer.lock index a67a3be1e..8fa9574a5 100644 --- a/composer.lock +++ b/composer.lock @@ -2315,16 +2315,16 @@ }, { "name": "drupal/core", - "version": "9.5.1", + "version": "9.5.2", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "083636264b027984694eb6d1e592f148ec24c637" + "reference": "2ce2d9dbc3d248d7fd6bf9c9a50cce7e8dc799a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/083636264b027984694eb6d1e592f148ec24c637", - "reference": "083636264b027984694eb6d1e592f148ec24c637", + "url": "https://api.github.com/repos/drupal/core/zipball/2ce2d9dbc3d248d7fd6bf9c9a50cce7e8dc799a6", + "reference": "2ce2d9dbc3d248d7fd6bf9c9a50cce7e8dc799a6", "shasum": "" }, "require": { @@ -2476,9 +2476,9 @@ ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", "support": { - "source": "https://github.com/drupal/core/tree/9.5.1" + "source": "https://github.com/drupal/core/tree/9.5.2" }, - "time": "2023-01-04T15:53:28+00:00" + "time": "2023-01-18T12:48:20+00:00" }, { "name": "drupal/core-composer-scaffold", @@ -2532,16 +2532,16 @@ }, { "name": "drupal/core-recommended", - "version": "9.5.1", + "version": "9.5.2", "source": { "type": "git", "url": "https://github.com/drupal/core-recommended.git", - "reference": "9004418593163c787ff9057e31cf76063dd282dc" + "reference": "eab84e96280017f11e0dfba7f9995facaa803d13" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-recommended/zipball/9004418593163c787ff9057e31cf76063dd282dc", - "reference": "9004418593163c787ff9057e31cf76063dd282dc", + "url": "https://api.github.com/repos/drupal/core-recommended/zipball/eab84e96280017f11e0dfba7f9995facaa803d13", + "reference": "eab84e96280017f11e0dfba7f9995facaa803d13", "shasum": "" }, "require": { @@ -2550,7 +2550,7 @@ "doctrine/annotations": "~1.13.3", "doctrine/lexer": "~1.2.3", "doctrine/reflection": "~1.2.3", - "drupal/core": "9.5.1", + "drupal/core": "9.5.2", "egulias/email-validator": "~3.2.1", "guzzlehttp/guzzle": "~6.5.8", "guzzlehttp/promises": "~1.5.2", @@ -2612,9 +2612,9 @@ ], "description": "Core and its dependencies with known-compatible minor versions. Require this project INSTEAD OF drupal/core.", "support": { - "source": "https://github.com/drupal/core-recommended/tree/9.5.1" + "source": "https://github.com/drupal/core-recommended/tree/9.5.2" }, - "time": "2023-01-04T15:53:28+00:00" + "time": "2023-01-18T12:48:20+00:00" }, { "name": "drupal/crop", @@ -3208,17 +3208,17 @@ }, { "name": "drupal/entity_browser", - "version": "2.8.0", + "version": "2.9.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/entity_browser.git", - "reference": "8.x-2.8" + "reference": "8.x-2.9" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/entity_browser-8.x-2.8.zip", - "reference": "8.x-2.8", - "shasum": "151433fb7681f3e844010072285a374a5e46cf2a" + "url": "https://ftp.drupal.org/files/projects/entity_browser-8.x-2.9.zip", + "reference": "8.x-2.9", + "shasum": "251afad80cde9fa547501a8d9de5d94b9f5bacff" }, "require": { "drupal/core": "^9.2 || ^10" @@ -3235,8 +3235,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.8", - "datestamp": "1658509699", + "version": "8.x-2.9", + "datestamp": "1674070933", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3362,24 +3362,25 @@ }, { "name": "drupal/entity_usage", - "version": "2.0.0-beta7", + "version": "2.0.0-beta8", "source": { "type": "git", "url": "https://git.drupalcode.org/project/entity_usage.git", - "reference": "8.x-2.0-beta7" + "reference": "8.x-2.0-beta8" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/entity_usage-8.x-2.0-beta7.zip", - "reference": "8.x-2.0-beta7", - "shasum": "ce2a51b024082100442c0736f3c9d137af7c5b0a" + "url": "https://ftp.drupal.org/files/projects/entity_usage-8.x-2.0-beta8.zip", + "reference": "8.x-2.0-beta8", + "shasum": "02985c643f5283793e753f8cbdeaa0ec40250cf3" }, "require": { "drupal/core": "^9.1 || ^10" }, "require-dev": { "drupal/block_field": "~1.0", - "drupal/dynamic_entity_reference": "~1.0", + "drupal/ckeditor": "^1.0", + "drupal/dynamic_entity_reference": "~1.0 || ^2.0 || ^4.0", "drupal/entity_browser": "~2.0", "drupal/entity_browser_block": "~1.0", "drupal/entity_embed": "~1.0", @@ -3391,8 +3392,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.0-beta7", - "datestamp": "1662722179", + "version": "8.x-2.0-beta8", + "datestamp": "1674236921", "security-coverage": { "status": "not-covered", "message": "Beta releases are not covered by Drupal security advisories." @@ -3400,7 +3401,7 @@ }, "drush": { "services": { - "drush.services.yml": "^9" + "drush.services.yml": "^9 || ^10 || ^11" } } }, @@ -4281,16 +4282,16 @@ }, { "name": "drupal/hdbt", - "version": "4.3.14", + "version": "4.3.15", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "cd189d6854bebf066926258641eb9e62cbc30516" + "reference": "7164a22af2de5c5326286a5ae85328ed408515dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/cd189d6854bebf066926258641eb9e62cbc30516", - "reference": "cd189d6854bebf066926258641eb9e62cbc30516", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/7164a22af2de5c5326286a5ae85328ed408515dd", + "reference": "7164a22af2de5c5326286a5ae85328ed408515dd", "shasum": "" }, "require": { @@ -4305,10 +4306,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/4.3.14", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/4.3.15", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2023-01-16T11:58:48+00:00" + "time": "2023-01-20T07:15:06+00:00" }, { "name": "drupal/hdbt_admin", @@ -4660,16 +4661,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "2.16.5", + "version": "2.16.6", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "a3506410d1ddfe6bb51d3b849d69415eec11a407" + "reference": "5881d8df791aedc4bdb9ca67d9d18d96fd386fdc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/a3506410d1ddfe6bb51d3b849d69415eec11a407", - "reference": "a3506410d1ddfe6bb51d3b849d69415eec11a407", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/5881d8df791aedc4bdb9ca67d9d18d96fd386fdc", + "reference": "5881d8df791aedc4bdb9ca67d9d18d96fd386fdc", "shasum": "" }, "require": { @@ -4780,10 +4781,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.16.5", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.16.6", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2023-01-10T06:20:07+00:00" + "time": "2023-01-23T06:35:39+00:00" }, { "name": "drupal/helfi_proxy", @@ -4828,16 +4829,16 @@ }, { "name": "drupal/helfi_tpr", - "version": "2.1.6", + "version": "2.1.7", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr.git", - "reference": "ff784101bd2d3de30f18c04e4afcc9fa9a659820" + "reference": "23e83203cd24a27f719f5f476b746ec3648640fb" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/ff784101bd2d3de30f18c04e4afcc9fa9a659820", - "reference": "ff784101bd2d3de30f18c04e4afcc9fa9a659820", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/23e83203cd24a27f719f5f476b746ec3648640fb", + "reference": "23e83203cd24a27f719f5f476b746ec3648640fb", "shasum": "" }, "require": { @@ -4863,10 +4864,10 @@ ], "description": "TPR integration", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.1.6", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.1.7", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/issues" }, - "time": "2022-12-13T07:20:55+00:00" + "time": "2023-01-19T12:01:41+00:00" }, { "name": "drupal/helfi_tunnistamo", @@ -5450,20 +5451,20 @@ }, { "name": "drupal/matomo", - "version": "1.19.0", + "version": "1.20.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/matomo.git", - "reference": "8.x-1.19" + "reference": "8.x-1.20" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/matomo-8.x-1.19.zip", - "reference": "8.x-1.19", - "shasum": "87fde54ef969522afba2cbf6847520c457055808" + "url": "https://ftp.drupal.org/files/projects/matomo-8.x-1.20.zip", + "reference": "8.x-1.20", + "shasum": "e440f1ab7498bea607dbeb00dc0fa979e0976147" }, "require": { - "drupal/core": "^8.8.0 || ^9.0.0" + "drupal/core": "^9.0 || ^10" }, "conflict": { "drupal/csp": "<1.12" @@ -5476,8 +5477,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.19", - "datestamp": "1653236432", + "version": "8.x-1.20", + "datestamp": "1674152478", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6805,17 +6806,17 @@ }, { "name": "drupal/simple_sitemap", - "version": "4.1.3", + "version": "4.1.4", "source": { "type": "git", "url": "https://git.drupalcode.org/project/simple_sitemap.git", - "reference": "4.1.3" + "reference": "4.1.4" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/simple_sitemap-4.1.3.zip", - "reference": "4.1.3", - "shasum": "18eda442709f32102416a0112abc33649658f8e9" + "url": "https://ftp.drupal.org/files/projects/simple_sitemap-4.1.4.zip", + "reference": "4.1.4", + "shasum": "55986f9819c60216ad6401941ca4176a1e086c8b" }, "require": { "drupal/core": "^9.3 || ^10", @@ -6824,8 +6825,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "4.1.3", - "datestamp": "1665573795", + "version": "4.1.4", + "datestamp": "1674226567", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news.yml b/conf/cmi/external_entities.external_entity_type.helfi_news.yml index 831406899..a8e0232d5 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_news.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_news.yml @@ -35,7 +35,7 @@ field_mapper_config: value: '$.attributes[''short_title'']' storage_client_id: helfi_news storage_client_config: { } -persistent_cache_max_age: -1 +persistent_cache_max_age: 10800 annotation_entity_type_id: null annotation_bundle_id: null annotation_field_name: null diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml index 7e1a58881..28ef03cf6 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_news_groups.yml @@ -20,7 +20,7 @@ field_mapper_config: value: '$.attributes["name"]' storage_client_id: helfi_news_groups storage_client_config: { } -persistent_cache_max_age: -1 +persistent_cache_max_age: 86400 annotation_entity_type_id: null annotation_bundle_id: null annotation_field_name: null diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml index 09c076c45..a39e59614 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_news_neighbourhoods.yml @@ -20,7 +20,7 @@ field_mapper_config: value: '$.attributes["name"]' storage_client_id: helfi_news_neighbourhoods storage_client_config: { } -persistent_cache_max_age: -1 +persistent_cache_max_age: 86400 annotation_entity_type_id: null annotation_bundle_id: null annotation_field_name: null diff --git a/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml b/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml index 9f1364ad8..f980c0bc3 100644 --- a/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml +++ b/conf/cmi/external_entities.external_entity_type.helfi_news_tags.yml @@ -20,7 +20,7 @@ field_mapper_config: value: '$.attributes["name"]' storage_client_id: helfi_news_tags storage_client_config: { } -persistent_cache_max_age: -1 +persistent_cache_max_age: 86400 annotation_entity_type_id: null annotation_bundle_id: null annotation_field_name: null diff --git a/docker-compose.yml b/docker-compose.yml index 425f4b358..015a54533 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -51,7 +51,7 @@ services: - internal db: container_name: "${COMPOSE_PROJECT_NAME}-db" - image: druidfi/mariadb:10.7-drupal + image: druidfi/mariadb:10.9-drupal volumes: - db_data:/var/lib/mysql ports: