From 98513a8bf98892b75edafe42c71d48bd3461006e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Mon, 17 Oct 2022 13:29:43 +0300 Subject: [PATCH 1/3] Updated helfi_* modules and Drupal core. --- composer.lock | 84 +++++++++++++++++++++++++-------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/composer.lock b/composer.lock index f06fe351..5904a117 100644 --- a/composer.lock +++ b/composer.lock @@ -2284,7 +2284,7 @@ }, { "name": "drupal/core-composer-scaffold", - "version": "9.4.7", + "version": "9.4.8", "source": { "type": "git", "url": "https://github.com/drupal/core-composer-scaffold.git", @@ -2328,7 +2328,7 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-composer-scaffold/tree/9.4.7" + "source": "https://github.com/drupal/core-composer-scaffold/tree/9.4.8" }, "time": "2022-06-19T16:14:23+00:00" }, @@ -3925,16 +3925,16 @@ }, { "name": "drupal/hdbt", - "version": "4.1.3", + "version": "4.1.5", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "6cdf8c063dd4128736a90e3fc01206d342333c5d" + "reference": "50e66c665970f0998aa3b10cdbca3fd072f68443" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/6cdf8c063dd4128736a90e3fc01206d342333c5d", - "reference": "6cdf8c063dd4128736a90e3fc01206d342333c5d", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/50e66c665970f0998aa3b10cdbca3fd072f68443", + "reference": "50e66c665970f0998aa3b10cdbca3fd072f68443", "shasum": "" }, "require": { @@ -3949,23 +3949,23 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/4.1.3", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/4.1.5", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2022-10-13T08:00:02+00:00" + "time": "2022-10-17T09:27:18+00:00" }, { "name": "drupal/hdbt_admin", - "version": "1.7.0", + "version": "1.7.1", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt-admin.git", - "reference": "014b1c6b855ff602e6afdf886d1216db255649a9" + "reference": "96cbfd700b2076bc1a0a9b60948dfb47ca445bbd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/014b1c6b855ff602e6afdf886d1216db255649a9", - "reference": "014b1c6b855ff602e6afdf886d1216db255649a9", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt-admin/zipball/96cbfd700b2076bc1a0a9b60948dfb47ca445bbd", + "reference": "96cbfd700b2076bc1a0a9b60948dfb47ca445bbd", "shasum": "" }, "require": { @@ -3981,23 +3981,23 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/1.7.0", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/tree/1.7.1", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt-admin/issues" }, - "time": "2022-10-11T10:55:57+00:00" + "time": "2022-10-14T06:09:35+00:00" }, { "name": "drupal/helfi_api_base", - "version": "2.3.1", + "version": "2.3.2", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base.git", - "reference": "106bf63ca52ec2495c5a5629e5213ce44a0e5704" + "reference": "43048a8a41a3e28cd3f8de6c6282a84bbbe09fab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/106bf63ca52ec2495c5a5629e5213ce44a0e5704", - "reference": "106bf63ca52ec2495c5a5629e5213ce44a0e5704", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-api-base/zipball/43048a8a41a3e28cd3f8de6c6282a84bbbe09fab", + "reference": "43048a8a41a3e28cd3f8de6c6282a84bbbe09fab", "shasum": "" }, "require": { @@ -4020,10 +4020,10 @@ ], "description": "Helfi - API Base", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.3.1", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/tree/2.3.2", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-api-base/issues" }, - "time": "2022-09-10T05:24:52+00:00" + "time": "2022-10-14T09:42:58+00:00" }, { "name": "drupal/helfi_azure_fs", @@ -4152,16 +4152,16 @@ }, { "name": "drupal/helfi_navigation", - "version": "1.0.5", + "version": "1.0.6", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation.git", - "reference": "fb792197ab09f73955cd384a50455711151def42" + "reference": "3003eb95f3c51800391009bdbdd58cb1092ed945" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-navigation/zipball/fb792197ab09f73955cd384a50455711151def42", - "reference": "fb792197ab09f73955cd384a50455711151def42", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-navigation/zipball/3003eb95f3c51800391009bdbdd58cb1092ed945", + "reference": "3003eb95f3c51800391009bdbdd58cb1092ed945", "shasum": "" }, "require": { @@ -4178,23 +4178,23 @@ ], "description": "Helfi - Navigation", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/tree/1.0.5", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/tree/1.0.6", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-navigation/issues" }, - "time": "2022-10-11T06:52:09+00:00" + "time": "2022-10-14T11:05:06+00:00" }, { "name": "drupal/helfi_platform_config", - "version": "2.13.4", + "version": "2.13.5", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "175ba33e34de18d0dee5fa715a887cbbea6d912e" + "reference": "567af1eab1c3ebf0012a7ad2c308a08dfe7a87ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/175ba33e34de18d0dee5fa715a887cbbea6d912e", - "reference": "175ba33e34de18d0dee5fa715a887cbbea6d912e", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/567af1eab1c3ebf0012a7ad2c308a08dfe7a87ba", + "reference": "567af1eab1c3ebf0012a7ad2c308a08dfe7a87ba", "shasum": "" }, "require": { @@ -4304,10 +4304,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.13.4", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.13.5", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2022-10-13T08:54:33+00:00" + "time": "2022-10-14T11:00:01+00:00" }, { "name": "drupal/helfi_proxy", @@ -5022,17 +5022,17 @@ }, { "name": "drupal/openid_connect", - "version": "2.0.0-alpha12", + "version": "2.0.0-beta2", "source": { "type": "git", "url": "https://git.drupalcode.org/project/openid_connect.git", - "reference": "2.0.0-alpha12" + "reference": "2.0.0-beta2" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/openid_connect-2.0.0-alpha12.zip", - "reference": "2.0.0-alpha12", - "shasum": "6680cdd5875c80cb6e9f28bd0bea7d0278230931" + "url": "https://ftp.drupal.org/files/projects/openid_connect-2.0.0-beta2.zip", + "reference": "2.0.0-beta2", + "shasum": "a03b329c0d8c4be45d5eb3ca09e90a72a97d8c95" }, "require": { "drupal/core": "^8.8 || ^9", @@ -5043,11 +5043,11 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.0-alpha12", - "datestamp": "1640197185", + "version": "2.0.0-beta2", + "datestamp": "1665935100", "security-coverage": { "status": "not-covered", - "message": "Alpha releases are not covered by Drupal security advisories." + "message": "Beta releases are not covered by Drupal security advisories." } } }, @@ -13621,7 +13621,7 @@ }, { "name": "drupal/core-dev", - "version": "9.4.6", + "version": "9.4.8", "source": { "type": "git", "url": "https://github.com/drupal/core-dev.git", @@ -13665,7 +13665,7 @@ ], "description": "require-dev dependencies from drupal/drupal; use in addition to drupal/core-recommended to run tests from drupal/core.", "support": { - "source": "https://github.com/drupal/core-dev/tree/9.4.6" + "source": "https://github.com/drupal/core-dev/tree/9.4.8" }, "time": "2022-04-14T00:37:13+00:00" }, From b06219a19493f5df732cf5dd6209ccf784b40a44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Mon, 17 Oct 2022 14:07:43 +0300 Subject: [PATCH 2/3] Downgraded OpenID Connect module to alpha12. --- composer.json | 1 + composer.lock | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/composer.json b/composer.json index 4d963b31..a6d3a875 100644 --- a/composer.json +++ b/composer.json @@ -20,6 +20,7 @@ "drupal/helfi_proxy": "^2.0", "drupal/helfi_tpr": "^2.0", "drupal/helfi_tunnistamo": "^2.0", + "drupal/openid_connect": "2.0.0-alpha12", "drupal/redis": "^1.5", "drupal/stage_file_proxy": "^1.2", "drush/drush": "^10.4 || ^11" diff --git a/composer.lock b/composer.lock index 5904a117..582cf40b 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": "ac6fc2a67e66b98668a3821cf9782919", + "content-hash": "4b281b60df341206d951f155cf51a752", "packages": [ { "name": "asm89/stack-cors", @@ -4185,16 +4185,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "2.13.5", + "version": "2.13.4", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "567af1eab1c3ebf0012a7ad2c308a08dfe7a87ba" + "reference": "175ba33e34de18d0dee5fa715a887cbbea6d912e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/567af1eab1c3ebf0012a7ad2c308a08dfe7a87ba", - "reference": "567af1eab1c3ebf0012a7ad2c308a08dfe7a87ba", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/175ba33e34de18d0dee5fa715a887cbbea6d912e", + "reference": "175ba33e34de18d0dee5fa715a887cbbea6d912e", "shasum": "" }, "require": { @@ -4304,10 +4304,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.13.5", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.13.4", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2022-10-14T11:00:01+00:00" + "time": "2022-10-13T08:54:33+00:00" }, { "name": "drupal/helfi_proxy", @@ -5022,17 +5022,17 @@ }, { "name": "drupal/openid_connect", - "version": "2.0.0-beta2", + "version": "2.0.0-alpha12", "source": { "type": "git", "url": "https://git.drupalcode.org/project/openid_connect.git", - "reference": "2.0.0-beta2" + "reference": "2.0.0-alpha12" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/openid_connect-2.0.0-beta2.zip", - "reference": "2.0.0-beta2", - "shasum": "a03b329c0d8c4be45d5eb3ca09e90a72a97d8c95" + "url": "https://ftp.drupal.org/files/projects/openid_connect-2.0.0-alpha12.zip", + "reference": "2.0.0-alpha12", + "shasum": "6680cdd5875c80cb6e9f28bd0bea7d0278230931" }, "require": { "drupal/core": "^8.8 || ^9", @@ -5043,11 +5043,11 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.0-beta2", - "datestamp": "1665935100", + "version": "2.0.0-alpha12", + "datestamp": "1640197185", "security-coverage": { "status": "not-covered", - "message": "Beta releases are not covered by Drupal security advisories." + "message": "Alpha releases are not covered by Drupal security advisories." } } }, From c9eb09c04e5e3ef654f8d215dbeb0e63078a93f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Mon, 17 Oct 2022 14:25:57 +0300 Subject: [PATCH 3/3] Updated HELfi platform config. --- composer.lock | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/composer.lock b/composer.lock index 582cf40b..8c224a51 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": "4b281b60df341206d951f155cf51a752", + "content-hash": "aff11743978d1d2b208218c9d0ec6e3b", "packages": [ { "name": "asm89/stack-cors", @@ -4185,16 +4185,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "2.13.4", + "version": "2.13.5", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "175ba33e34de18d0dee5fa715a887cbbea6d912e" + "reference": "567af1eab1c3ebf0012a7ad2c308a08dfe7a87ba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/175ba33e34de18d0dee5fa715a887cbbea6d912e", - "reference": "175ba33e34de18d0dee5fa715a887cbbea6d912e", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/567af1eab1c3ebf0012a7ad2c308a08dfe7a87ba", + "reference": "567af1eab1c3ebf0012a7ad2c308a08dfe7a87ba", "shasum": "" }, "require": { @@ -4304,10 +4304,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.13.4", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.13.5", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2022-10-13T08:54:33+00:00" + "time": "2022-10-14T11:00:01+00:00" }, { "name": "drupal/helfi_proxy",