From fa04586787d883fde60e7332883dc52590387a91 Mon Sep 17 00:00:00 2001 From: ravineet <rajula.vineet.reddy@cern.ch> Date: Mon, 31 Oct 2022 15:08:34 +0100 Subject: [PATCH 1/8] Update modules to stable version & also php requriement --- composer.json | 134 +++++++++++++++++++++++++------------------------- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/composer.json b/composer.json index c942639c6..8f042ecaa 100644 --- a/composer.json +++ b/composer.json @@ -94,30 +94,30 @@ } ], "require": { - "php": ">=7.4", + "php": ">=8.4", "bower-asset/bootstrap": "~5.1.0", "bower-asset/ckeditor": "dev-full/4.18.x", "bower-asset/jquery-cycle": "~3.0.0", "bower-asset/jquery-hoverintent": "~1.10.0", "bower-asset/json2": "dev-master", "ckeditor/ckeditor": "dev-full/4.18.x", - "composer/installers": "~2.0.0", - "cweagans/composer-patches": "~1.7.0", - "dompdf/dompdf": "~2", - "drupal/admin_toolbar": "~3.1.0", + "composer/installers": "^2.2", + "cweagans/composer-patches": "^1.7", + "dompdf/dompdf": "^2.0", + "drupal/admin_toolbar": "^3.2", "drupal/adminimal_theme": "~1.6.0", - "drupal/allowed_formats": "~1.4.0", - "drupal/bootstrap": "~3.23.0", + "drupal/allowed_formats": "^1.5", + "drupal/bootstrap": "^3.25", "drupal/captcha": "~1.2.0", "drupal/cern-adminimal-subtheme": "~2.1.0", - "drupal/cern-base-theme": "~2.6.13", + "drupal/cern-base-theme": "^2.6", "drupal/cern-cds-media": "~3.0.0", "drupal/cern-components": "~3.0.0", "drupal/cern-dev-status": "~3.0.0", "drupal/cern-display-formats": "~3.0.0", "drupal/cern-full-html-format": "~3.0.0", "drupal/cern-indico-feeds": "~3.0.0", - "drupal/cern-install-profiles": "~8.1.12", + "drupal/cern-install-profiles": "~8.1.11", "drupal/cern-integration": "~1.1.1", "drupal/cern-landing-page": "~3.0.0", "drupal/cern-ldap-api": "~1.0.0", @@ -127,104 +127,104 @@ "drupal/cern-theme": "~2.7.0", "drupal/cern-toolbar": "~3.0.0", "drupal/cern-webcast-feeds": "~3.0.0", - "drupal/ckeditor_font": "~1.2.0", - "drupal/codesnippet": "~1.7.0", - "drupal/color_field": "~2.5.0", - "drupal/colorbox": "~1.8.0", - "drupal/colorbutton": "~1.3.0", + "drupal/ckeditor_font": "^1.3", + "drupal/codesnippet": "^1.8", + "drupal/color_field": "^2.5", + "drupal/colorbox": "^2.0", + "drupal/colorbutton": "^1.4", "drupal/components": "^3.0@beta", "drupal/config_update": "~1.7.0", - "drupal/content_access": "~1.0@alpha", - "drupal/context": "~4.1.0", + "drupal/content_access": "^1.0@alpha", + "drupal/context": "^4.1", "drupal/contribute": "~1.x-dev@dev", "drupal/cookieconsent": "~1.6.0", - "drupal/core-composer-scaffold": "9.4.7", - "drupal/core-project-message": "9.4.7", - "drupal/core-recommended": "9.4.7", - "drupal/ctools": "~3.7.0", - "drupal/devel": "~4.1.1", - "drupal/ds": "~3.13.0", + "drupal/core-composer-scaffold": "^9.4", + "drupal/core-dev": "^9.4", + "drupal/core-project-message": "^9.4", + "drupal/core-recommended": "^9.4", + "drupal/ctools": "^4.0", + "drupal/devel": "^5.0", + "drupal/ds": "^3.15", "drupal/easy_breadcrumb": "~1.15.0", - "drupal/entity_browser": "~2.6.0", - "drupal/entity_print": "~2", - "drupal/entity_reference_revisions": "~1.9.0", - "drupal/externalauth": "~2.0.0", - "drupal/extlink": "~1.6.0", - "drupal/facets": "~2.0.0", - "drupal/fast_404": "~2.0@alpha", + "drupal/entity_browser": "^2.8", + "drupal/entity_print": "^2.7", + "drupal/entity_reference_revisions": "^1.10", + "drupal/externalauth": "^2.0", + "drupal/extlink": "^1.7", + "drupal/facets": "^2.0", + "drupal/fast_404": "^2.0@alpha", "drupal/features": "~3.12.0", - "drupal/feeds": "3.0-alpha11", - "drupal/fences": "~2.0@RC", + "drupal/feeds": "^3.0@beta", + "drupal/fences": "^3.0", "drupal/field_formatter_class": "~1.5.0", - "drupal/field_group": "~3.2.0", - "drupal/field_permissions": "~1.1.0", + "drupal/field_group": "^3.3", + "drupal/field_permissions": "^1.2", "drupal/filefield_paths": "~1.0@beta", "drupal/filelog": "~2.0.2", - "drupal/honeypot": "~2.0.1", - "drupal/hook_event_dispatcher": "~3.0.0", - "drupal/hotjar": "~2.2.0", - "drupal/imagemagick": "~3.3.0", - "drupal/imce": "~2.4.0", + "drupal/honeypot": "^2.1", + "drupal/hook_event_dispatcher": "^3.3", + "drupal/hotjar": "^3.0", + "drupal/imagemagick": "^3.4", + "drupal/imce": "^2.5", "drupal/jquery_ui": "~1.4.0", "drupal/jquery_ui_accordion": "~1.1.0", "drupal/jquery_ui_datepicker": "~1.2.0", "drupal/jquery_ui_draggable": "~1.2.0", "drupal/jquery_ui_droppable": "~1.2.0", - "drupal/ludwig": "~2.0.0", - "drupal/mailsystem": "~4.3.0", - "drupal/matomo": "~1.14.0", - "drupal/memcache": "~2.3.0", - "drupal/menu_block": "~1.7.0", - "drupal/menu_breadcrumb": "~1.16.0", + "drupal/ludwig": "^2.0", + "drupal/mailsystem": "^4.4", + "drupal/matomo": "^1.19", + "drupal/memcache": "^2.5", + "drupal/menu_block": "^1.8", + "drupal/menu_breadcrumb": "^1.16", "drupal/menu_force": "~1.2.0", - "drupal/metatag": "~1.19.0", + "drupal/metatag": "^1.22", "drupal/migrate_plus": "~5.2.0", - "drupal/migrate_tools": "~5.1.0", - "drupal/migrate_upgrade": "~3.2.0", + "drupal/migrate_tools": "^6.0", + "drupal/migrate_upgrade": "^4.0", "drupal/module_filter": "~3.2.0", - "drupal/node_view_permissions": "~1.5.0", + "drupal/node_view_permissions": "^1.5", "drupal/openid_connect": "^1.2", - "drupal/panelbutton": "~1.4.0", + "drupal/panelbutton": "^1.5", "drupal/panelizer": "~4.4.0", "drupal/panels": "~4.6.0", "drupal/paragraphs": "~1.12.0", - "drupal/pathauto": "~1.8.0", - "drupal/permissions_by_term": "~3.1.16", + "drupal/pathauto": "^1.11", + "drupal/permissions_by_term": "^3.1", "drupal/r4032login": "~2.1.0", "drupal/recaptcha": "~3.0.0", - "drupal/redirect": "~1.7.0", + "drupal/redirect": "^1.8", "drupal/redis": "~1.5.0", - "drupal/require_login": "~2.4.0", - "drupal/rules": "~3.0@alpha", + "drupal/require_login": "^3.0", + "drupal/rules": "^3.0@alpha", "drupal/scheduler": "~1.4.0", - "drupal/search_api": "~1.23.0", + "drupal/search_api": "^1.27", "drupal/smart_trim": "~1.3.0", - "drupal/sticky": "~2.0.0", - "drupal/token": "~1.10.0", - "drupal/twig_tweak": "~3.1.3", - "drupal/ui_patterns": "~1.2.0", + "drupal/sticky": "^2.0", + "drupal/token": "^1.11", + "drupal/twig_tweak": "^3.2", + "drupal/ui_patterns": "^1.3", "drupal/ui_patterns_ds": "~1.2.0", "drupal/ui_patterns_field_group": "~1.2.0", "drupal/ui_patterns_layouts": "~1.2.0", "drupal/ui_patterns_library": "~1.2.0", "drupal/upgrade_status": "~3.13.0", "drupal/userprotect": "~1.1.0", - "drupal/views_bulk_operations": "~4.0.0", + "drupal/views_bulk_operations": "^4.2", "drupal/views_slideshow": "~4.8.0", - "drupal/views_taxonomy_term_name_depth": "~7.0.2", - "drupal/viewsreference": "~1.8.0", - "drupal/webform": "~6.1.0", - "drupal/workbench": "~1.3.0", - "drupal/workbench_access": "~1.0@beta", + "drupal/views_taxonomy_term_name_depth": "^7.1", + "drupal/viewsreference": "^1.8", + "drupal/webform": "^6.1", + "drupal/workbench": "^1.4", + "drupal/workbench_access": "^1.1", "drupal/workbench_moderation": "~1.6.0", "drush/drush": "~10.6.2", "npm-asset/jquery": "~3.6.0", - "vlucas/phpdotenv": "~5.4.0", + "vlucas/phpdotenv": "^5.5", "webflo/drupal-finder": "~1.2.0", "wikimedia/composer-merge-plugin": "~2.0.1" }, "require-dev": { - "drupal/core-dev": "^9.3", "zaporylie/composer-drupal-optimizations": "^1.2" }, "conflict": { -- GitLab From 78a2be113f57d7a5ac829073316880a821104104 Mon Sep 17 00:00:00 2001 From: ravineet <rajula.vineet.reddy@cern.ch> Date: Mon, 31 Oct 2022 15:09:32 +0100 Subject: [PATCH 2/8] Remove modules requested in #9 --- composer.json | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/composer.json b/composer.json index 8f042ecaa..2c899b79c 100644 --- a/composer.json +++ b/composer.json @@ -94,7 +94,7 @@ } ], "require": { - "php": ">=8.4", + "php": ">=8.1", "bower-asset/bootstrap": "~5.1.0", "bower-asset/ckeditor": "dev-full/4.18.x", "bower-asset/jquery-cycle": "~3.0.0", @@ -135,8 +135,6 @@ "drupal/components": "^3.0@beta", "drupal/config_update": "~1.7.0", "drupal/content_access": "^1.0@alpha", - "drupal/context": "^4.1", - "drupal/contribute": "~1.x-dev@dev", "drupal/cookieconsent": "~1.6.0", "drupal/core-composer-scaffold": "^9.4", "drupal/core-dev": "^9.4", @@ -152,7 +150,6 @@ "drupal/externalauth": "^2.0", "drupal/extlink": "^1.7", "drupal/facets": "^2.0", - "drupal/fast_404": "^2.0@alpha", "drupal/features": "~3.12.0", "drupal/feeds": "^3.0@beta", "drupal/fences": "^3.0", @@ -163,9 +160,7 @@ "drupal/filelog": "~2.0.2", "drupal/honeypot": "^2.1", "drupal/hook_event_dispatcher": "^3.3", - "drupal/hotjar": "^3.0", "drupal/imagemagick": "^3.4", - "drupal/imce": "^2.5", "drupal/jquery_ui": "~1.4.0", "drupal/jquery_ui_accordion": "~1.1.0", "drupal/jquery_ui_datepicker": "~1.2.0", @@ -186,7 +181,6 @@ "drupal/node_view_permissions": "^1.5", "drupal/openid_connect": "^1.2", "drupal/panelbutton": "^1.5", - "drupal/panelizer": "~4.4.0", "drupal/panels": "~4.6.0", "drupal/paragraphs": "~1.12.0", "drupal/pathauto": "^1.11", @@ -200,7 +194,6 @@ "drupal/scheduler": "~1.4.0", "drupal/search_api": "^1.27", "drupal/smart_trim": "~1.3.0", - "drupal/sticky": "^2.0", "drupal/token": "^1.11", "drupal/twig_tweak": "^3.2", "drupal/ui_patterns": "^1.3", @@ -215,9 +208,6 @@ "drupal/views_taxonomy_term_name_depth": "^7.1", "drupal/viewsreference": "^1.8", "drupal/webform": "^6.1", - "drupal/workbench": "^1.4", - "drupal/workbench_access": "^1.1", - "drupal/workbench_moderation": "~1.6.0", "drush/drush": "~10.6.2", "npm-asset/jquery": "~3.6.0", "vlucas/phpdotenv": "^5.5", -- GitLab From e18c9ae4516c0609e455a4c3edce74650bbdf932 Mon Sep 17 00:00:00 2001 From: ravineet <rajula.vineet.reddy@cern.ch> Date: Mon, 31 Oct 2022 17:02:22 +0100 Subject: [PATCH 3/8] Bump cern-install-profiles to 8.1.12 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 2c899b79c..541dffb74 100644 --- a/composer.json +++ b/composer.json @@ -117,7 +117,7 @@ "drupal/cern-display-formats": "~3.0.0", "drupal/cern-full-html-format": "~3.0.0", "drupal/cern-indico-feeds": "~3.0.0", - "drupal/cern-install-profiles": "~8.1.11", + "drupal/cern-install-profiles": "~8.1.12", "drupal/cern-integration": "~1.1.1", "drupal/cern-landing-page": "~3.0.0", "drupal/cern-ldap-api": "~1.0.0", -- GitLab From 43d3cad2c14f3bc30949f11444df1383450df133 Mon Sep 17 00:00:00 2001 From: ravineet <rajula.vineet.reddy@cern.ch> Date: Tue, 1 Nov 2022 10:05:01 +0100 Subject: [PATCH 4/8] Bump up indico feeds & webcast feeds modules --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 541dffb74..d1f13914c 100644 --- a/composer.json +++ b/composer.json @@ -116,7 +116,7 @@ "drupal/cern-dev-status": "~3.0.0", "drupal/cern-display-formats": "~3.0.0", "drupal/cern-full-html-format": "~3.0.0", - "drupal/cern-indico-feeds": "~3.0.0", + "drupal/cern-indico-feeds": "~3.0.1", "drupal/cern-install-profiles": "~8.1.12", "drupal/cern-integration": "~1.1.1", "drupal/cern-landing-page": "~3.0.0", @@ -126,7 +126,7 @@ "drupal/cern-profile-displayname": "~3.0.0", "drupal/cern-theme": "~2.7.0", "drupal/cern-toolbar": "~3.0.0", - "drupal/cern-webcast-feeds": "~3.0.0", + "drupal/cern-webcast-feeds": "~3.0.1", "drupal/ckeditor_font": "^1.3", "drupal/codesnippet": "^1.8", "drupal/color_field": "^2.5", -- GitLab From a2eedd5b0f282dfa2e621cc8d7ea35aa8e506ba5 Mon Sep 17 00:00:00 2001 From: ravineet <rajula.vineet.reddy@cern.ch> Date: Tue, 1 Nov 2022 12:03:07 +0100 Subject: [PATCH 5/8] Bump up cern-cds-media & cern-components --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index d1f13914c..a7ca75991 100644 --- a/composer.json +++ b/composer.json @@ -111,8 +111,8 @@ "drupal/captcha": "~1.2.0", "drupal/cern-adminimal-subtheme": "~2.1.0", "drupal/cern-base-theme": "^2.6", - "drupal/cern-cds-media": "~3.0.0", - "drupal/cern-components": "~3.0.0", + "drupal/cern-cds-media": "~3.0.2", + "drupal/cern-components": "~3.0.1", "drupal/cern-dev-status": "~3.0.0", "drupal/cern-display-formats": "~3.0.0", "drupal/cern-full-html-format": "~3.0.0", -- GitLab From b24a7843868d5594b72dfc486b12373369638833 Mon Sep 17 00:00:00 2001 From: ravineet <rajula.vineet.reddy@cern.ch> Date: Tue, 1 Nov 2022 16:23:46 +0100 Subject: [PATCH 6/8] Bump modules cern-cds-media & cern-components --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a7ca75991..171695f7e 100644 --- a/composer.json +++ b/composer.json @@ -112,7 +112,7 @@ "drupal/cern-adminimal-subtheme": "~2.1.0", "drupal/cern-base-theme": "^2.6", "drupal/cern-cds-media": "~3.0.2", - "drupal/cern-components": "~3.0.1", + "drupal/cern-components": "~3.0.2", "drupal/cern-dev-status": "~3.0.0", "drupal/cern-display-formats": "~3.0.0", "drupal/cern-full-html-format": "~3.0.0", -- GitLab From c4d3ba6b299e67fed84d152ba4ce317ff47d85f4 Mon Sep 17 00:00:00 2001 From: ravineet <rajula.vineet.reddy@cern.ch> Date: Tue, 1 Nov 2022 16:42:37 +0100 Subject: [PATCH 7/8] Bump cern-full-html-format --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 171695f7e..db22f27f2 100644 --- a/composer.json +++ b/composer.json @@ -115,7 +115,7 @@ "drupal/cern-components": "~3.0.2", "drupal/cern-dev-status": "~3.0.0", "drupal/cern-display-formats": "~3.0.0", - "drupal/cern-full-html-format": "~3.0.0", + "drupal/cern-full-html-format": "~3.0.1", "drupal/cern-indico-feeds": "~3.0.1", "drupal/cern-install-profiles": "~8.1.12", "drupal/cern-integration": "~1.1.1", -- GitLab From c28190dab33466a98c0d6a28b1af4abd946c867f Mon Sep 17 00:00:00 2001 From: ravineet <rajula.vineet.reddy@cern.ch> Date: Tue, 1 Nov 2022 17:01:40 +0100 Subject: [PATCH 8/8] Bump cern_components --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index db22f27f2..b27498055 100644 --- a/composer.json +++ b/composer.json @@ -112,7 +112,7 @@ "drupal/cern-adminimal-subtheme": "~2.1.0", "drupal/cern-base-theme": "^2.6", "drupal/cern-cds-media": "~3.0.2", - "drupal/cern-components": "~3.0.2", + "drupal/cern-components": "~3.0.4", "drupal/cern-dev-status": "~3.0.0", "drupal/cern-display-formats": "~3.0.0", "drupal/cern-full-html-format": "~3.0.1", -- GitLab