From c9bbecc53e18c9b4b906ccb2a6d26334cefdfb20 Mon Sep 17 00:00:00 2001 From: Tasha Harrison Date: Thu, 21 May 2020 16:44:15 +0100 Subject: [PATCH 1/7] CMS-1243 remove everything from profile, put at site level --- composer.json | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/composer.json b/composer.json index 32a9b48..7f03974 100644 --- a/composer.json +++ b/composer.json @@ -19,17 +19,5 @@ } ], "require": { - "drupal/core": "~8.7.0", - "drupal/ctools": "3.0-alpha26", - "drupal/config_update": "~1.3.0", - "drupal/metatag": "~1.8.0", - "drupal/token": "~1.1.0", - "drupal/pathauto": "~1.0.0", - "drupal/role_delegation": "~1.0.0", - "drupal/google_tag": "~2.0.1", - "drupal/diff": "~1.0.0", - "drupal/memcache": "dennis-8.x-2.x-dev#7698c9b5d57d66eb10a67c9789a4aef5047bf442", - "drupal/cdn": "~3.0.0", - "drupal/stage_file_proxy": "1.0.0-alpha2" } } From 10509e930aa343b759114ae02859c18cd36d3e7a Mon Sep 17 00:00:00 2001 From: Tasha Harrison Date: Thu, 21 May 2020 16:52:48 +0100 Subject: [PATCH 2/7] CMS-1243 add memcache back --- composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/composer.json b/composer.json index 7f03974..26b387f 100644 --- a/composer.json +++ b/composer.json @@ -19,5 +19,6 @@ } ], "require": { + "drupal/memcache": "dennis-8.x-2.x-dev#7698c9b5d57d66eb10a67c9789a4aef5047bf442" } } From dd28a3c4efbb68953d9f94681e3a299effdee273 Mon Sep 17 00:00:00 2001 From: Simon Peacock Date: Fri, 22 May 2020 12:02:50 +0000 Subject: [PATCH 3/7] CMS-1243-security-update - adding back requirements --- composer.json | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 26b387f..d05916e 100644 --- a/composer.json +++ b/composer.json @@ -19,6 +19,17 @@ } ], "require": { - "drupal/memcache": "dennis-8.x-2.x-dev#7698c9b5d57d66eb10a67c9789a4aef5047bf442" + "drupal/core": "~8.8.0", + "drupal/ctools": "~3.4.0", + "drupal/config_update": "~1.3.0", + "drupal/metatag": "~1.8.0", + "drupal/token": "~1.1.0", + "drupal/pathauto": "~1.0.0", + "drupal/role_delegation": "~1.0.0", + "drupal/google_tag": "~2.0.1", + "drupal/diff": "~1.0.0", + "drupal/memcache": "dennis-8.x-2.x-dev#7698c9b5d57d66eb10a67c9789a4aef5047bf442", + "drupal/cdn": "~3.0.0", + "drupal/stage_file_proxy": "1.0.0-alpha2" } } From dd1578374420fb8e7fc01c790ab578349da99139 Mon Sep 17 00:00:00 2001 From: Simon Peacock Date: Fri, 22 May 2020 12:28:36 +0000 Subject: [PATCH 4/7] CMS-1243-security-update - updating drupal version --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index d05916e..ea76134 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ } ], "require": { - "drupal/core": "~8.8.0", + "drupal/core": "^8.8", "drupal/ctools": "~3.4.0", "drupal/config_update": "~1.3.0", "drupal/metatag": "~1.8.0", From a4fe21f784333d8996a5ae43860c18ced792f836 Mon Sep 17 00:00:00 2001 From: Simon Peacock Date: Fri, 22 May 2020 12:43:25 +0000 Subject: [PATCH 5/7] CMS-1243-security-update - updating core --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index ea76134..2d427e4 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ } ], "require": { - "drupal/core": "^8.8", + "drupal/core": "8.8.6", "drupal/ctools": "~3.4.0", "drupal/config_update": "~1.3.0", "drupal/metatag": "~1.8.0", From 3402c9cdb853e2fa51867752908c916a8eec5a8f Mon Sep 17 00:00:00 2001 From: Simon Peacock Date: Fri, 22 May 2020 12:56:17 +0000 Subject: [PATCH 6/7] CMS-1243-security-update - updating composer --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 2d427e4..f6a04a4 100644 --- a/composer.json +++ b/composer.json @@ -19,12 +19,12 @@ } ], "require": { - "drupal/core": "8.8.6", + "drupal/core": "~8.8.0", "drupal/ctools": "~3.4.0", "drupal/config_update": "~1.3.0", "drupal/metatag": "~1.8.0", "drupal/token": "~1.1.0", - "drupal/pathauto": "~1.0.0", + "drupal/pathauto": "^1.4", "drupal/role_delegation": "~1.0.0", "drupal/google_tag": "~2.0.1", "drupal/diff": "~1.0.0", From 6a7a9be7dddb6c2030b40efd487c173a2c978e16 Mon Sep 17 00:00:00 2001 From: Simon Peacock Date: Fri, 22 May 2020 13:15:25 +0000 Subject: [PATCH 7/7] CMS-1243-security-update - putting ctools pin back --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index f6a04a4..d02b650 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,7 @@ ], "require": { "drupal/core": "~8.8.0", - "drupal/ctools": "~3.4.0", + "drupal/ctools": "3.0-alpha26", "drupal/config_update": "~1.3.0", "drupal/metatag": "~1.8.0", "drupal/token": "~1.1.0",