From 1a30651f2a732bfb02ab0bfbd715c8fa269389ac Mon Sep 17 00:00:00 2001 From: hel-platta-automation <95360595+hel-platta-automation@users.noreply.github.com> Date: Wed, 12 Jun 2024 08:54:05 +0000 Subject: [PATCH] Update configuration --- composer.lock | 114 ++++++++++++++++++++++-------------------- tools/make/Makefile | 2 - tools/make/include.mk | 3 -- 3 files changed, 59 insertions(+), 60 deletions(-) diff --git a/composer.lock b/composer.lock index 1d5220c01..e2bbeb17d 100644 --- a/composer.lock +++ b/composer.lock @@ -1901,6 +1901,10 @@ "name": "alexpott", "homepage": "https://www.drupal.org/user/157725" }, + { + "name": "AstonVictor", + "homepage": "https://www.drupal.org/user/3466615" + }, { "name": "chr.fritsch", "homepage": "https://www.drupal.org/user/2103716" @@ -1934,16 +1938,16 @@ }, { "name": "drupal/core", - "version": "10.2.6", + "version": "10.2.7", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "cec9bc9e829e53e667da844edd5f4897be88d860" + "reference": "4416c8a86e5b57b5acc595e4855ce50fdb6a542d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/cec9bc9e829e53e667da844edd5f4897be88d860", - "reference": "cec9bc9e829e53e667da844edd5f4897be88d860", + "url": "https://api.github.com/repos/drupal/core/zipball/4416c8a86e5b57b5acc595e4855ce50fdb6a542d", + "reference": "4416c8a86e5b57b5acc595e4855ce50fdb6a542d", "shasum": "" }, "require": { @@ -2091,9 +2095,9 @@ ], "description": "Drupal is an open source content management platform powering millions of websites and applications.", "support": { - "source": "https://github.com/drupal/core/tree/10.2.6" + "source": "https://github.com/drupal/core/tree/10.2.7" }, - "time": "2024-05-01T21:00:24+00:00" + "time": "2024-06-06T07:25:42+00:00" }, { "name": "drupal/core-composer-scaffold", @@ -2375,20 +2379,20 @@ }, { "name": "drupal/diff", - "version": "1.4.0", + "version": "1.7.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/diff.git", - "reference": "8.x-1.4" + "reference": "8.x-1.7" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/diff-8.x-1.4.zip", - "reference": "8.x-1.4", - "shasum": "8f1e95e6c7f576999c5b2880023de2c2aaaf99b3" + "url": "https://ftp.drupal.org/files/projects/diff-8.x-1.7.zip", + "reference": "8.x-1.7", + "shasum": "d282bdf3350ac71f95b38576a9f397bdbab8d249" }, "require": { - "drupal/core": "^9.3 || ^10 || ^11", + "drupal/core": "^10 || ^11", "mkalkbrenner/php-htmldiff-advanced": "~0.0.8", "php": "^8.1" }, @@ -2405,8 +2409,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "8.x-1.4", - "datestamp": "1717130431", + "version": "8.x-1.7", + "datestamp": "1718073570", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -3644,16 +3648,16 @@ }, { "name": "drupal/hdbt", - "version": "6.5.19", + "version": "6.5.20", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git", - "reference": "14c0591acc5fba933ab83384905d88c3e3512c8a" + "reference": "f0a50c9225f2e0904399bb961d798f54f34e964a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/14c0591acc5fba933ab83384905d88c3e3512c8a", - "reference": "14c0591acc5fba933ab83384905d88c3e3512c8a", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/f0a50c9225f2e0904399bb961d798f54f34e964a", + "reference": "f0a50c9225f2e0904399bb961d798f54f34e964a", "shasum": "" }, "require": { @@ -3671,10 +3675,10 @@ "Drupal" ], "support": { - "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.5.19", + "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.5.20", "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues" }, - "time": "2024-06-04T13:35:36+00:00" + "time": "2024-06-11T12:33:07+00:00" }, { "name": "drupal/hdbt_admin", @@ -3968,16 +3972,16 @@ }, { "name": "drupal/helfi_platform_config", - "version": "4.3.61", + "version": "4.3.63", "source": { "type": "git", "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git", - "reference": "72db3a0c5d89bdbb29fc4d1a21173eace44ec225" + "reference": "cc8dc035535a7a5d00846b8a7f3aaebd87297926" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/72db3a0c5d89bdbb29fc4d1a21173eace44ec225", - "reference": "72db3a0c5d89bdbb29fc4d1a21173eace44ec225", + "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/cc8dc035535a7a5d00846b8a7f3aaebd87297926", + "reference": "cc8dc035535a7a5d00846b8a7f3aaebd87297926", "shasum": "" }, "require": { @@ -4088,10 +4092,10 @@ ], "description": "HELfi platform config", "support": { - "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.61", + "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.63", "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues" }, - "time": "2024-06-05T13:08:07+00:00" + "time": "2024-06-12T08:50:06+00:00" }, { "name": "drupal/helfi_proxy", @@ -6134,27 +6138,27 @@ }, { "name": "drupal/sophron", - "version": "2.0.2", + "version": "2.1.0", "source": { "type": "git", "url": "https://git.drupalcode.org/project/sophron.git", - "reference": "2.0.2" + "reference": "2.1.0" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/sophron-2.0.2.zip", - "reference": "2.0.2", - "shasum": "ed5d910d6612ea591950b67384cc5ff26c5c7cc9" + "url": "https://ftp.drupal.org/files/projects/sophron-2.1.0.zip", + "reference": "2.1.0", + "shasum": "0742562897ae9b202e472a1edef75844b6452e39" }, "require": { - "drupal/core": "^10", - "fileeye/mimemap": "^2.0.1" + "drupal/core": "^10.2 || ^11", + "fileeye/mimemap": "^2.1.1" }, "type": "drupal-module", "extra": { "drupal": { - "version": "2.0.2", - "datestamp": "1699798487", + "version": "2.1.0", + "datestamp": "1718011690", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -6710,20 +6714,20 @@ }, { "name": "drupal/views_bulk_operations", - "version": "4.2.6", + "version": "4.2.7", "source": { "type": "git", "url": "https://git.drupalcode.org/project/views_bulk_operations.git", - "reference": "4.2.6" + "reference": "4.2.7" }, "dist": { "type": "zip", - "url": "https://ftp.drupal.org/files/projects/views_bulk_operations-4.2.6.zip", - "reference": "4.2.6", - "shasum": "20c6f77c0cebda75edfa570a8dc53fb133d6283a" + "url": "https://ftp.drupal.org/files/projects/views_bulk_operations-4.2.7.zip", + "reference": "4.2.7", + "shasum": "25c9fa531ac49664a361fdd2202eec0a6e53bc61" }, "require": { - "drupal/core": "^9.4 || ^10", + "drupal/core": "^9.4 || ^10 || ^11", "php": ">=7.4.0" }, "require-dev": { @@ -6735,8 +6739,8 @@ "type": "drupal-module", "extra": { "drupal": { - "version": "4.2.6", - "datestamp": "1704281842", + "version": "4.2.7", + "datestamp": "1717665214", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -10025,16 +10029,16 @@ }, { "name": "psy/psysh", - "version": "v0.12.3", + "version": "v0.12.4", "source": { "type": "git", "url": "https://github.com/bobthecow/psysh.git", - "reference": "b6b6cce7d3ee8fbf31843edce5e8f5a72eff4a73" + "reference": "2fd717afa05341b4f8152547f142cd2f130f6818" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/bobthecow/psysh/zipball/b6b6cce7d3ee8fbf31843edce5e8f5a72eff4a73", - "reference": "b6b6cce7d3ee8fbf31843edce5e8f5a72eff4a73", + "url": "https://api.github.com/repos/bobthecow/psysh/zipball/2fd717afa05341b4f8152547f142cd2f130f6818", + "reference": "2fd717afa05341b4f8152547f142cd2f130f6818", "shasum": "" }, "require": { @@ -10098,9 +10102,9 @@ ], "support": { "issues": "https://github.com/bobthecow/psysh/issues", - "source": "https://github.com/bobthecow/psysh/tree/v0.12.3" + "source": "https://github.com/bobthecow/psysh/tree/v0.12.4" }, - "time": "2024-04-02T15:57:53+00:00" + "time": "2024-06-10T01:18:23+00:00" }, { "name": "ralouphie/getallheaders", @@ -10355,16 +10359,16 @@ }, { "name": "sentry/sentry", - "version": "4.7.0", + "version": "4.8.0", "source": { "type": "git", "url": "https://github.com/getsentry/sentry-php.git", - "reference": "d6769b2a5e6bf19ed3bbfbf52328ceaf8e6fcb1f" + "reference": "3cf5778ff425a23f2d22ed41b423691d36f47163" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/d6769b2a5e6bf19ed3bbfbf52328ceaf8e6fcb1f", - "reference": "d6769b2a5e6bf19ed3bbfbf52328ceaf8e6fcb1f", + "url": "https://api.github.com/repos/getsentry/sentry-php/zipball/3cf5778ff425a23f2d22ed41b423691d36f47163", + "reference": "3cf5778ff425a23f2d22ed41b423691d36f47163", "shasum": "" }, "require": { @@ -10428,7 +10432,7 @@ ], "support": { "issues": "https://github.com/getsentry/sentry-php/issues", - "source": "https://github.com/getsentry/sentry-php/tree/4.7.0" + "source": "https://github.com/getsentry/sentry-php/tree/4.8.0" }, "funding": [ { @@ -10440,7 +10444,7 @@ "type": "custom" } ], - "time": "2024-04-10T13:22:13+00:00" + "time": "2024-06-05T13:18:43+00:00" }, { "name": "stomp-php/stomp-php", diff --git a/tools/make/Makefile b/tools/make/Makefile index 740dd6077..fa000889d 100644 --- a/tools/make/Makefile +++ b/tools/make/Makefile @@ -34,9 +34,7 @@ debug: ## Show debug information $(call dbg,COMPOSER_JSON_EXISTS,${COMPOSER_JSON_EXISTS}) $(call dbg,IS_DRUPAL,${IS_DRUPAL}) $(call dbg,IS_SYMFONY,${IS_SYMFONY}) - $(call dbg,IS_WP,${IS_WP}) $(call dbg,LAGOON,${LAGOON}) - $(call dbg,WODBY,${WODBY}) $(call dbg,SYSTEM,${SYSTEM}) $(call dbg,WEBROOT,${WEBROOT}) $(call dbg,UNAME_S,${UNAME_S}) diff --git a/tools/make/include.mk b/tools/make/include.mk index 3f469ae6b..de30c41e6 100644 --- a/tools/make/include.mk +++ b/tools/make/include.mk @@ -36,12 +36,9 @@ endif # LAGOON := $(shell test -f .lagoon.yml && echo yes || echo no) -WODBY := $(shell test -f wodby.yml && echo yes || echo no) ifeq ($(LAGOON),yes) SYSTEM := LAGOON -else ifeq ($(WODBY),yes) - SYSTEM := WODBY else SYSTEM := WHOKNOWS endif