From 57b30359bae3fc2e2506b3409f9b31a826f783ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Thu, 24 Nov 2022 13:16:39 +0200 Subject: [PATCH 1/3] UHF-7615: Updated helfi_platform_config module --- composer.lock | 110 ++++++++++++++++++++++++-------------------------- 1 file changed, 53 insertions(+), 57 deletions(-) diff --git a/composer.lock b/composer.lock index 7245bd50..a0a63e40 100644 --- a/composer.lock +++ b/composer.lock @@ -4382,16 +4382,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "2.13.16", + "version": "2.15.0", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "cb91004f566c82a666340f19e42b11e3f0cf83df" + "reference": "139740f15aea3b783584320e7ecc19bc2c44ec7f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/cb91004f566c82a666340f19e42b11e3f0cf83df", - "reference": "cb91004f566c82a666340f19e42b11e3f0cf83df", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/139740f15aea3b783584320e7ecc19bc2c44ec7f", + "reference": "139740f15aea3b783584320e7ecc19bc2c44ec7f", "shasum": "" }, "require": { @@ -4428,7 +4428,7 @@ "drupal/matomo_reports": "^1.1", "drupal/media_entity_file_replace": "^1.0", "drupal/media_entity_soundcloud": "^3.0.0", - "drupal/menu_block_current_language": "^1.5", + "drupal/menu_block_current_language": "^2.0", "drupal/menu_link_attributes": "^1.2", "drupal/metatag": "^1.16", "drupal/oembed_providers": "^2.0", @@ -4497,10 +4497,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.13.16", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/2.15.0", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2022-11-16T14:09:33+00:00" + "time": "2022-11-24T09:44:44+00:00" }, { "name": "drupal/helfi_proxy", @@ -4545,16 +4545,16 @@ }, { "name": "drupal/helfi_tpr", - "version": "2.1.3", + "version": "2.1.4", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr.git", - "reference": "5ed2a62fb51909446690421c0a89bcee38576b63" + "reference": "df201f00eb455d6f6a5f22c573290b272c395043" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/5ed2a62fb51909446690421c0a89bcee38576b63", - "reference": "5ed2a62fb51909446690421c0a89bcee38576b63", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/df201f00eb455d6f6a5f22c573290b272c395043", + "reference": "df201f00eb455d6f6a5f22c573290b272c395043", "shasum": "" }, "require": { @@ -4579,10 +4579,10 @@ ], "description": "TPR integration", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.1.3", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.1.4", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/issues" }, - "time": "2022-10-27T05:58:29+00:00" + "time": "2022-11-23T09:13:30+00:00" }, { "name": "drupal/helfi_tunnistamo", @@ -5055,26 +5055,27 @@ }, { "name": "drupal/menu_block_current_language", - "version": "1.6.0", + "version": "2.0.0-alpha1", "source": { "type": "git", "url": "https://git.drupalcode.org/project/menu_block_current_language.git", - "reference": "8.x-1.6" + "reference": "2.0.0-alpha1" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/menu_block_current_language-8.x-1.6.zip", - "reference": "8.x-1.6", - "shasum": "02489647e17bff7c3a1b3eb4e47c5ddea50f0840" + "url": "https://ftp.drupal.org/files/projects/menu_block_current_language-2.0.0-alpha1.zip", + "reference": "2.0.0-alpha1", + "shasum": "24b3830a72635879fec6bd30d721462102cb151b" }, "require": { - "drupal/core": "^8 || ^9" + "drupal/core": "^9.3 || ^10", + "php": ">=8.0" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.6", - "datestamp": "1621416669", + "version": "2.0.0-alpha1", + "datestamp": "1667717930", "security-coverage": { "status": "not-covered", "message": "Project has not opted into security advisory coverage!" @@ -5083,7 +5084,7 @@ }, "notification-url": "https://packages.drupal.org/8/downloads", "license": [ - "GPL-2.0-or-later" + "GPL-2.0+" ], "authors": [ { @@ -5100,7 +5101,7 @@ } ], "description": "Filters out all the menu links that does not have translation for the current language.", - "homepage": "https://www.drupal.org/project/menu_block_current_language", + "homepage": "http://drupal.org/project/menu_block_current_language", "support": { "source": "https://git.drupalcode.org/project/menu_block_current_language" } @@ -5553,26 +5554,26 @@ }, { "name": "drupal/publication_date", - "version": "2.0.0-beta5", + "version": "2.0.0-beta6", "source": { "type": "git", "url": "https://git.drupalcode.org/project/publication_date.git", - "reference": "8.x-2.0-beta5" + "reference": "8.x-2.0-beta6" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/publication_date-8.x-2.0-beta5.zip", - "reference": "8.x-2.0-beta5", - "shasum": "0add730f353d15fa13a13a9a463b431e6f5a663e" + "url": "https://ftp.drupal.org/files/projects/publication_date-8.x-2.0-beta6.zip", + "reference": "8.x-2.0-beta6", + "shasum": "16038d7f204f4ab999c68740a5db596aca142fa1" }, "require": { - "drupal/core": "^8 || ^9" + "drupal/core": "^9.1 || ^10" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.0-beta5", - "datestamp": "1661984596", + "version": "8.x-2.0-beta6", + "datestamp": "1669064172", "security-coverage": { "status": "not-covered", "message": "Beta releases are not covered by Drupal security advisories." @@ -6094,32 +6095,31 @@ }, { "name": "drupal/select2", - "version": "1.13.0", + "version": "1.14.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/select2.git", - "reference": "8.x-1.13" + "reference": "8.x-1.14" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/select2-8.x-1.13.zip", - "reference": "8.x-1.13", - "shasum": "c02f8591104310a6395788c33e44dfab5ec6a2c1" + "url": "https://ftp.drupal.org/files/projects/select2-8.x-1.14.zip", + "reference": "8.x-1.14", + "shasum": "b2cca2da6ce4bada623a386ca033ab8303434e18" }, "require": { - "drupal/core": "^8.8 || ^9" + "drupal/core": "^9 || ^10" }, "require-dev": { - "drupal/better_exposed_filters": "^5.0", - "drupal/facets": "^1.5", - "drupal/form_options_attributes": "^1.2", - "drupal/search_api": "^1.17" + "drupal/facets": "2.0.x-dev", + "drupal/form_options_attributes": "^2.0", + "drupal/search_api": "^1.28" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.13", - "datestamp": "1614609946", + "version": "8.x-1.14", + "datestamp": "1669104462", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6135,10 +6135,6 @@ "name": "Christian Fritsch", "homepage": "https://www.drupal.org/user/2103716", "email": "christian.fritsch@burda.com" - }, - { - "name": "thunderbot", - "homepage": "https://www.drupal.org/user/3511180" } ], "description": "Integration with the select2 JavaScript library.", @@ -10464,12 +10460,12 @@ "source": { "type": "git", "url": "https://github.com/ruflin/Elastica.git", - "reference": "5fc25a4966b48ae9a631e345b167c867250a43c7" + "reference": "35cd0dc60e8eeadf7ef0203c084e0c316fda33c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ruflin/Elastica/zipball/5fc25a4966b48ae9a631e345b167c867250a43c7", - "reference": "5fc25a4966b48ae9a631e345b167c867250a43c7", + "url": "https://api.github.com/repos/ruflin/Elastica/zipball/35cd0dc60e8eeadf7ef0203c084e0c316fda33c7", + "reference": "35cd0dc60e8eeadf7ef0203c084e0c316fda33c7", "shasum": "" }, "require": { @@ -10526,7 +10522,7 @@ "issues": "https://github.com/ruflin/Elastica/issues", "source": "https://github.com/ruflin/Elastica/tree/master" }, - "time": "2022-10-11T06:53:58+00:00" + "time": "2022-11-23T07:39:29+00:00" }, { "name": "sentry/sdk", @@ -15547,16 +15543,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.18", + "version": "9.2.19", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "12fddc491826940cf9b7e88ad9664cf51f0f6d0a" + "reference": "c77b56b63e3d2031bd8997fcec43c1925ae46559" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/12fddc491826940cf9b7e88ad9664cf51f0f6d0a", - "reference": "12fddc491826940cf9b7e88ad9664cf51f0f6d0a", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c77b56b63e3d2031bd8997fcec43c1925ae46559", + "reference": "c77b56b63e3d2031bd8997fcec43c1925ae46559", "shasum": "" }, "require": { @@ -15612,7 +15608,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.18" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.19" }, "funding": [ { @@ -15620,7 +15616,7 @@ "type": "github" } ], - "time": "2022-10-27T13:35:33+00:00" + "time": "2022-11-18T07:47:47+00:00" }, { "name": "phpunit/php-file-iterator", From a501c18ef357bfdce23cbccdf3b65775e9b7c189 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Thu, 24 Nov 2022 13:59:26 +0200 Subject: [PATCH 2/3] UHF-7615: Downgraded modules which should not be updated in this feature. --- composer.lock | 65 ++++++++++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/composer.lock b/composer.lock index a0a63e40..b18ec40a 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": "3a2600ff3c9fb70c1673ccead543fb99", + "content-hash": "746a56513eef338a9257f79953d5c4ee", "packages": [ { "name": "asm89/stack-cors", @@ -4545,16 +4545,16 @@ }, { "name": "drupal/helfi_tpr", - "version": "2.1.4", + "version": "2.1.3", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr.git", - "reference": "df201f00eb455d6f6a5f22c573290b272c395043" + "reference": "5ed2a62fb51909446690421c0a89bcee38576b63" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/df201f00eb455d6f6a5f22c573290b272c395043", - "reference": "df201f00eb455d6f6a5f22c573290b272c395043", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tpr/zipball/5ed2a62fb51909446690421c0a89bcee38576b63", + "reference": "5ed2a62fb51909446690421c0a89bcee38576b63", "shasum": "" }, "require": { @@ -4579,10 +4579,10 @@ ], "description": "TPR integration", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.1.4", + "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/tree/2.1.3", "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tpr/issues" }, - "time": "2022-11-23T09:13:30+00:00" + "time": "2022-10-27T05:58:29+00:00" }, { "name": "drupal/helfi_tunnistamo", @@ -5554,26 +5554,26 @@ }, { "name": "drupal/publication_date", - "version": "2.0.0-beta6", + "version": "2.0.0-beta5", "source": { "type": "git", "url": "https://git.drupalcode.org/project/publication_date.git", - "reference": "8.x-2.0-beta6" + "reference": "8.x-2.0-beta5" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/publication_date-8.x-2.0-beta6.zip", - "reference": "8.x-2.0-beta6", - "shasum": "16038d7f204f4ab999c68740a5db596aca142fa1" + "url": "https://ftp.drupal.org/files/projects/publication_date-8.x-2.0-beta5.zip", + "reference": "8.x-2.0-beta5", + "shasum": "0add730f353d15fa13a13a9a463b431e6f5a663e" }, "require": { - "drupal/core": "^9.1 || ^10" + "drupal/core": "^8 || ^9" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-2.0-beta6", - "datestamp": "1669064172", + "version": "8.x-2.0-beta5", + "datestamp": "1661984596", "security-coverage": { "status": "not-covered", "message": "Beta releases are not covered by Drupal security advisories." @@ -6095,31 +6095,32 @@ }, { "name": "drupal/select2", - "version": "1.14.0", + "version": "1.13.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/select2.git", - "reference": "8.x-1.14" + "reference": "8.x-1.13" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/select2-8.x-1.14.zip", - "reference": "8.x-1.14", - "shasum": "b2cca2da6ce4bada623a386ca033ab8303434e18" + "url": "https://ftp.drupal.org/files/projects/select2-8.x-1.13.zip", + "reference": "8.x-1.13", + "shasum": "c02f8591104310a6395788c33e44dfab5ec6a2c1" }, "require": { - "drupal/core": "^9 || ^10" + "drupal/core": "^8.8 || ^9" }, "require-dev": { - "drupal/facets": "2.0.x-dev", - "drupal/form_options_attributes": "^2.0", - "drupal/search_api": "^1.28" + "drupal/better_exposed_filters": "^5.0", + "drupal/facets": "^1.5", + "drupal/form_options_attributes": "^1.2", + "drupal/search_api": "^1.17" }, "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.14", - "datestamp": "1669104462", + "version": "8.x-1.13", + "datestamp": "1614609946", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -15543,16 +15544,16 @@ }, { "name": "phpunit/php-code-coverage", - "version": "9.2.19", + "version": "9.2.18", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "c77b56b63e3d2031bd8997fcec43c1925ae46559" + "reference": "12fddc491826940cf9b7e88ad9664cf51f0f6d0a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/c77b56b63e3d2031bd8997fcec43c1925ae46559", - "reference": "c77b56b63e3d2031bd8997fcec43c1925ae46559", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/12fddc491826940cf9b7e88ad9664cf51f0f6d0a", + "reference": "12fddc491826940cf9b7e88ad9664cf51f0f6d0a", "shasum": "" }, "require": { @@ -15608,7 +15609,7 @@ ], "support": { "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", - "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.19" + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.18" }, "funding": [ { @@ -15616,7 +15617,7 @@ "type": "github" } ], - "time": "2022-11-18T07:47:47+00:00" + "time": "2022-10-27T13:35:33+00:00" }, { "name": "phpunit/php-file-iterator", From 22dd283da4c43345c649e2ad0c986a7d86e8965d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Kalij=C3=A4rvi?= Date: Thu, 24 Nov 2022 14:10:04 +0200 Subject: [PATCH 3/3] UHF-7615: Revert rufflin/elastica package. --- composer.lock | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/composer.lock b/composer.lock index b18ec40a..499197c6 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": "746a56513eef338a9257f79953d5c4ee", + "content-hash": "4d4572e1cb26c0222c43adb8b12eebf0", "packages": [ { "name": "asm89/stack-cors", @@ -10461,12 +10461,12 @@ "source": { "type": "git", "url": "https://github.com/ruflin/Elastica.git", - "reference": "35cd0dc60e8eeadf7ef0203c084e0c316fda33c7" + "reference": "5fc25a4966b48ae9a631e345b167c867250a43c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/ruflin/Elastica/zipball/35cd0dc60e8eeadf7ef0203c084e0c316fda33c7", - "reference": "35cd0dc60e8eeadf7ef0203c084e0c316fda33c7", + "url": "https://api.github.com/repos/ruflin/Elastica/zipball/5fc25a4966b48ae9a631e345b167c867250a43c7", + "reference": "5fc25a4966b48ae9a631e345b167c867250a43c7", "shasum": "" }, "require": { @@ -17640,7 +17640,8 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { - "drupal/helfi_drupal_tools": 20 + "drupal/helfi_drupal_tools": 20, + "ruflin/elastica": 20 }, "prefer-stable": true, "prefer-lowest": false,