From bb6c3393c9b9d8cdaa1ceb86e16b696b225e3c18 Mon Sep 17 00:00:00 2001 From: Suhyeon Hong Date: Thu, 1 Oct 2020 15:31:14 +1000 Subject: [PATCH 01/16] [GOVCMSD8-708] update drupal/ds to latest version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a2034839c..8cd76f64b 100644 --- a/composer.json +++ b/composer.json @@ -45,7 +45,7 @@ "drupal/diff": "1.0-rc2", "drupal/devel": "2.0", "drupal/dropzonejs": "2.1", - "drupal/ds": "3.2", + "drupal/ds": "3.9", "drupal/encrypt": "3.0-rc2", "drupal/dynamic_entity_reference": "1.7.0", "drupal/entity_browser": "2.1", From 1d93e522714569170db32d0c91a3b4d5321857d4 Mon Sep 17 00:00:00 2001 From: Suhyeon Hong Date: Thu, 1 Oct 2020 16:27:16 +1000 Subject: [PATCH 02/16] [GOVCMSD8-480] update entity_reference_revisions 8.x-1.8 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a2034839c..8b8aa65af 100644 --- a/composer.json +++ b/composer.json @@ -52,7 +52,7 @@ "drupal/entity_class_formatter": "1.3", "drupal/entity_embed": "1.0", "drupal/entity_reference_display": "1.3", - "drupal/entity_reference_revisions": "1.6", + "drupal/entity_reference_revisions": "1.8", "drupal/environment_indicator": "3.5", "drupal/events_log_track": "1.1", "drupal/facets": "1.3", From bd99a9b3bb40641f5aa1a21a79341c0c70fa2de9 Mon Sep 17 00:00:00 2001 From: Suhyeon Hong Date: Thu, 1 Oct 2020 16:31:50 +1000 Subject: [PATCH 03/16] [GOVCMSD8-490] update inline_entity_form 8.x-1.0-rc7 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a2034839c..bb69383aa 100644 --- a/composer.json +++ b/composer.json @@ -66,7 +66,7 @@ "drupal/govcms8_uikit_starter": "1.0-alpha2", "drupal/graphql": "3.0.0-rc2", "drupal/honeypot": "1.29", - "drupal/inline_entity_form": "1.0-rc1", + "drupal/inline_entity_form": "1.0-rc7", "drupal/key": "1.14", "drupal/linked_field": "1.1.0", "drupal/linkit": "5.0-beta9", From 0d865d06d290ae4f8bc61398cb765714c7e7c8cb Mon Sep 17 00:00:00 2001 From: Joseph Zhao Date: Fri, 2 Oct 2020 09:26:45 +1000 Subject: [PATCH 04/16] Pin tugboat php image to 7.4-apache --- .tugboat/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tugboat/config.yml b/.tugboat/config.yml index b0d1be7af..ef070759b 100644 --- a/.tugboat/config.yml +++ b/.tugboat/config.yml @@ -4,7 +4,7 @@ services: image: tugboatqa/mysql:5 app: - image: tugboatqa/php:7.3-apache + image: tugboatqa/php:7.4-apache # Set this as the default service. This does a few things # 1. Clones the git repository into the service container # 2. Exposes port 80 to the Tugboat HTTP proxy From 2ce29f503e7768e1e8bd13c66e27beee7f85f37f Mon Sep 17 00:00:00 2001 From: Joseph Zhao Date: Fri, 2 Oct 2020 09:43:56 +1000 Subject: [PATCH 05/16] Update PHP version from 7.3 to 7.4 --- .docker/Dockerfile.govcms8 | 4 ++-- .docker/Dockerfile.php | 2 +- .docker/Dockerfile.test | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.docker/Dockerfile.govcms8 b/.docker/Dockerfile.govcms8 index ac9ce3c26..a5a9b97a8 100644 --- a/.docker/Dockerfile.govcms8 +++ b/.docker/Dockerfile.govcms8 @@ -1,4 +1,4 @@ -FROM amazeeio/php:7.3-cli-drupal as builder +FROM amazeeio/php:7.4-cli-drupal as builder COPY . /src COPY composer-lagoon.json /app/composer.json @@ -7,7 +7,7 @@ COPY scripts /app/scripts RUN COMPOSER_MEMORY_LIMIT=-1 composer --profile install --no-dev \ && mkdir -p /app/config/default -FROM amazeeio/php:7.3-cli-drupal +FROM amazeeio/php:7.4-cli-drupal COPY --from=builder /app /app # Add composer bin to PATH diff --git a/.docker/Dockerfile.php b/.docker/Dockerfile.php index 587c74257..d3e14878e 100644 --- a/.docker/Dockerfile.php +++ b/.docker/Dockerfile.php @@ -1,6 +1,6 @@ ARG CLI_IMAGE FROM ${CLI_IMAGE} as cli -FROM amazeeio/php:7.3-fpm +FROM amazeeio/php:7.4-fpm COPY --from=cli /app /app diff --git a/.docker/Dockerfile.test b/.docker/Dockerfile.test index 92327b61c..1cd5ec62f 100644 --- a/.docker/Dockerfile.test +++ b/.docker/Dockerfile.test @@ -1,7 +1,7 @@ ARG CLI_IMAGE FROM ${CLI_IMAGE} as cli -FROM amazeeio/php:7.3-cli-drupal +FROM amazeeio/php:7.4-cli-drupal ENV DOCKERIZE_VERSION v0.6.1 RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \ From 3dee2338c70bff9c52362a45d055420cb16e8b67 Mon Sep 17 00:00:00 2001 From: Suhyeon Hong Date: Fri, 2 Oct 2020 11:29:16 +1000 Subject: [PATCH 06/16] [GOVCMSD8-509] update scheduled_transitions 2.0.0 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a2034839c..4ae0be913 100644 --- a/composer.json +++ b/composer.json @@ -91,7 +91,7 @@ "drupal/redirect": "1.3", "drupal/restui": "1.16.0", "drupal/robotstxt": "1.4", - "drupal/scheduled_transitions": "1.0.0-rc1", + "drupal/scheduled_transitions": "2.0", "drupal/search_api": "1.16", "drupal/search_api_solr": "3.9", "drupal/search_api_attachments": "1.0-beta16", From 2802b46ba0bdb3fd5fc946e1c59416dfc757065e Mon Sep 17 00:00:00 2001 From: Suhyeon Hong Date: Fri, 2 Oct 2020 11:44:12 +1000 Subject: [PATCH 07/16] [GOVCMSD8-491] update linked_field 1.3 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a2034839c..16ab30c33 100644 --- a/composer.json +++ b/composer.json @@ -68,7 +68,7 @@ "drupal/honeypot": "1.29", "drupal/inline_entity_form": "1.0-rc1", "drupal/key": "1.14", - "drupal/linked_field": "1.1.0", + "drupal/linked_field": "1.3.0", "drupal/linkit": "5.0-beta9", "drupal/login_security": "1.5", "drupal/media_entity_file_replace": "1.0-beta2", From 210b9b32178938aaa3038e06a4274a3e38f13196 Mon Sep 17 00:00:00 2001 From: Mingsong Hu Date: Wed, 7 Oct 2020 10:27:57 +1100 Subject: [PATCH 08/16] [GOVCMSD8-460] Update Chosen module to 2.9 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 8cd76f64b..efffc665f 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,7 @@ "drupal/admin_toolbar": "2.3", "drupal/adminimal_admin_toolbar": "1.11.0", "drupal/adminimal_theme": "1.4", - "drupal/chosen": "2.6.0", + "drupal/chosen": "2.9.0", "drupal/components": "1.0.0", "drupal/config_filter": "1.5", "drupal/config_ignore": "2.1", From 3d53d34a026a30bf3f767d62aa41633e2142dea8 Mon Sep 17 00:00:00 2001 From: Mingsong Hu Date: Wed, 7 Oct 2020 10:36:29 +1100 Subject: [PATCH 09/16] [GOVCMSD8-472] Update Diff module to 8.x-1.0 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index efffc665f..1805df8b6 100644 --- a/composer.json +++ b/composer.json @@ -42,7 +42,7 @@ "drupal/core-recommended": "8.9.6", "drupal/crop":"2.1", "drupal/ctools": "3.2.0", - "drupal/diff": "1.0-rc2", + "drupal/diff": "1.0", "drupal/devel": "2.0", "drupal/dropzonejs": "2.1", "drupal/ds": "3.9", From 55477f32554119f3535085d23ff47e830553c397 Mon Sep 17 00:00:00 2001 From: Mingsong Hu Date: Wed, 7 Oct 2020 10:49:46 +1100 Subject: [PATCH 10/16] [GOVCMSD8-477] Update entity_browser module to 2.5 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1805df8b6..f1371ce0a 100644 --- a/composer.json +++ b/composer.json @@ -48,7 +48,7 @@ "drupal/ds": "3.9", "drupal/encrypt": "3.0-rc2", "drupal/dynamic_entity_reference": "1.7.0", - "drupal/entity_browser": "2.1", + "drupal/entity_browser": "2.5", "drupal/entity_class_formatter": "1.3", "drupal/entity_embed": "1.0", "drupal/entity_reference_display": "1.3", From 512e773781ad1f33c558ff05a8adf666ee566561 Mon Sep 17 00:00:00 2001 From: Mingsong Hu Date: Wed, 7 Oct 2020 11:12:27 +1100 Subject: [PATCH 11/16] [GOVCMSD8-578] Addition of Big Menu module --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 7d77dfb6a..c095a1635 100644 --- a/composer.json +++ b/composer.json @@ -29,6 +29,7 @@ "drupal/admin_toolbar": "2.3", "drupal/adminimal_admin_toolbar": "1.11.0", "drupal/adminimal_theme": "1.4", + "drupal/bigmenu": "2.0.0-rc1", "drupal/chosen": "2.9.0", "drupal/components": "1.0.0", "drupal/config_filter": "1.5", From 521867ccc74317d2b626dbd3c1c95b22a6505200 Mon Sep 17 00:00:00 2001 From: Mingsong Hu Date: Thu, 8 Oct 2020 10:00:14 +1100 Subject: [PATCH 12/16] [GOVCMSD8-481] update environment_indicator 4.0.0 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index c095a1635..df87d3261 100644 --- a/composer.json +++ b/composer.json @@ -54,7 +54,7 @@ "drupal/entity_embed": "1.0", "drupal/entity_reference_display": "1.3", "drupal/entity_reference_revisions": "1.8", - "drupal/environment_indicator": "3.5", + "drupal/environment_indicator": "4.0", "drupal/events_log_track": "1.1", "drupal/facets": "1.3", "drupal/features": "3.8", From 4d040e03d2dc9259d32f02052ef9cc34a4b4f3fe Mon Sep 17 00:00:00 2001 From: Mingsong Hu Date: Fri, 9 Oct 2020 12:27:54 +1100 Subject: [PATCH 13/16] [GOVCMSD8-515] update simple_sitemap module to 3.7 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index df87d3261..e2827202f 100644 --- a/composer.json +++ b/composer.json @@ -99,7 +99,7 @@ "drupal/seckit": "1.1", "drupal/shield": "1.4", "drupal/simple_oauth": "4.5", - "drupal/simple_sitemap": "3.4", + "drupal/simple_sitemap": "3.7", "drupal/swiftmailer": "1.0-beta2", "drupal/tfa":"1.0-alpha4", "drupal/token": "1.7", From 58ed9bc6533f5393b212d412cee215e0847452af Mon Sep 17 00:00:00 2001 From: Mingsong Hu Date: Mon, 12 Oct 2020 11:54:32 +1100 Subject: [PATCH 14/16] Patch to fix Undefined index: changefreq Notice message for simple sitemap --- composer.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/composer.json b/composer.json index e2827202f..54bd7fd32 100644 --- a/composer.json +++ b/composer.json @@ -181,6 +181,9 @@ "drupal/simple_oauth": { "Drupal 9 Readiness": "https://www.drupal.org/files/issues/2020-05-21/3138497-6.patch" }, + "drupal/simple_sitemap": { + "Undefined index: changefreq Notice message - https://www.drupal.org/project/simple_sitemap/issues/3070132": "https://www.drupal.org/files/issues/2020-03-04/3070132-changefreq-notice-message.patch" + }, "drupal/tfa": { "The tfa.settings route should use the permission 'admin tfa settings' - https://www.drupal.org/project/tfa/issues/2943972": "https://www.drupal.org/files/issues/2943972-2.patch", "Bad UX around 'required to setup TFA' concept and users who have skipped validation too many times - https://www.drupal.org/project/tfa/issues/2937336": "https://www.drupal.org/files/issues/2019-03-01/2937336-17.patch", From 248f0e712588d5c2436b747342a0a3cd7bb636e0 Mon Sep 17 00:00:00 2001 From: Mingsong Hu Date: Mon, 12 Oct 2020 15:32:23 +1100 Subject: [PATCH 15/16] Roll back to PHP 7.3 --- .docker/Dockerfile.govcms8 | 4 ++-- .docker/Dockerfile.php | 2 +- .docker/Dockerfile.test | 2 +- .tugboat/config.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.docker/Dockerfile.govcms8 b/.docker/Dockerfile.govcms8 index a5a9b97a8..ac9ce3c26 100644 --- a/.docker/Dockerfile.govcms8 +++ b/.docker/Dockerfile.govcms8 @@ -1,4 +1,4 @@ -FROM amazeeio/php:7.4-cli-drupal as builder +FROM amazeeio/php:7.3-cli-drupal as builder COPY . /src COPY composer-lagoon.json /app/composer.json @@ -7,7 +7,7 @@ COPY scripts /app/scripts RUN COMPOSER_MEMORY_LIMIT=-1 composer --profile install --no-dev \ && mkdir -p /app/config/default -FROM amazeeio/php:7.4-cli-drupal +FROM amazeeio/php:7.3-cli-drupal COPY --from=builder /app /app # Add composer bin to PATH diff --git a/.docker/Dockerfile.php b/.docker/Dockerfile.php index d3e14878e..587c74257 100644 --- a/.docker/Dockerfile.php +++ b/.docker/Dockerfile.php @@ -1,6 +1,6 @@ ARG CLI_IMAGE FROM ${CLI_IMAGE} as cli -FROM amazeeio/php:7.4-fpm +FROM amazeeio/php:7.3-fpm COPY --from=cli /app /app diff --git a/.docker/Dockerfile.test b/.docker/Dockerfile.test index 1cd5ec62f..92327b61c 100644 --- a/.docker/Dockerfile.test +++ b/.docker/Dockerfile.test @@ -1,7 +1,7 @@ ARG CLI_IMAGE FROM ${CLI_IMAGE} as cli -FROM amazeeio/php:7.4-cli-drupal +FROM amazeeio/php:7.3-cli-drupal ENV DOCKERIZE_VERSION v0.6.1 RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \ diff --git a/.tugboat/config.yml b/.tugboat/config.yml index ef070759b..b0d1be7af 100644 --- a/.tugboat/config.yml +++ b/.tugboat/config.yml @@ -4,7 +4,7 @@ services: image: tugboatqa/mysql:5 app: - image: tugboatqa/php:7.4-apache + image: tugboatqa/php:7.3-apache # Set this as the default service. This does a few things # 1. Clones the git repository into the service container # 2. Exposes port 80 to the Tugboat HTTP proxy From 964a63c1586fc29e79ecd9e39dd0735534dd2851 Mon Sep 17 00:00:00 2001 From: Mingsong Hu Date: Wed, 14 Oct 2020 16:56:48 +1100 Subject: [PATCH 16/16] [GOVCMSD8-515] Patch for Simple sitemap issue --- composer.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 54bd7fd32..02b91abb2 100644 --- a/composer.json +++ b/composer.json @@ -182,7 +182,9 @@ "Drupal 9 Readiness": "https://www.drupal.org/files/issues/2020-05-21/3138497-6.patch" }, "drupal/simple_sitemap": { - "Undefined index: changefreq Notice message - https://www.drupal.org/project/simple_sitemap/issues/3070132": "https://www.drupal.org/files/issues/2020-03-04/3070132-changefreq-notice-message.patch" + "Undefined index: changefreq Notice message - https://www.drupal.org/project/simple_sitemap/issues/3070132": "https://www.drupal.org/files/issues/2020-03-04/3070132-changefreq-notice-message.patch", + "Undefined index: include_images in FormHelper.php on line 361 - https://www.drupal.org/project/simple_sitemap/issues/3114593": + "https://www.drupal.org/files/issues/2020-02-19/include_images.patch" }, "drupal/tfa": { "The tfa.settings route should use the permission 'admin tfa settings' - https://www.drupal.org/project/tfa/issues/2943972": "https://www.drupal.org/files/issues/2943972-2.patch",