Skip to content

Commit 44dce9a

Browse files
Ali HaiderAli Haider
authored andcommitted
Merge branch 'release/4.x/4.3.0' into 4.x-master
2 parents 049b64b + c07e576 commit 44dce9a

5 files changed

Lines changed: 67 additions & 31 deletions

File tree

.github/dependabot.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,18 @@ version: 2
22
updates:
33
- package-ecosystem: composer
44
directory: "/"
5+
ignore:
6+
- dependency-name: "drupal/core*"
7+
update-types: ["version-update:semver-major"]
8+
groups:
9+
drupal-core:
10+
patterns:
11+
- "drupal/core*"
512
schedule:
613
interval: daily
714
time: "06:00"
815
timezone: "Australia/Sydney"
916
open-pull-requests-limit: 50
10-
target-branch: 3.x-develop
17+
target-branch: 4.x-develop
1118
reviewers:
1219
- pandaskii

.github/renovate.json

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
{
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"extends": ["config:recommended"],
4+
"enabledManagers": ["composer"],
5+
"baseBranchPatterns": [
6+
"4.x-develop"
7+
],
8+
9+
"commitHourlyLimit": 0,
10+
"prConcurrentLimit": 0,
11+
"prHourlyLimit": 0,
12+
13+
"timezone": "Australia/Sydney",
14+
"schedule": ["* 22-23,0-6 * * *"],
15+
16+
"commitMessageAction": "Update",
17+
"commitMessageTopic": "{{depName}}",
18+
"commitMessageExtra": "from {{currentVersion}} to {{newVersion}}",
19+
20+
"labels": ["drupal11"],
21+
22+
"packageRules": [
23+
{
24+
"groupName": "Drupal core",
25+
"matchPackageNames": [
26+
"/^drupal/core/"
27+
]
28+
},
29+
{
30+
"commitMessageTopic": "{{depName}} module",
31+
"matchPackageNames": [
32+
"/^drupal//"
33+
]
34+
},
35+
{
36+
"matchUpdateTypes": ["major"],
37+
"enabled": false,
38+
"matchPackageNames": [
39+
"/^drupal/core/"
40+
]
41+
}
42+
]
43+
}

composer.json

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@
2121
"composer/installers": "^2.0",
2222
"cweagans/composer-patches": "^1.7",
2323
"drupal/address": "2.0.4",
24-
"drupal/admin_toolbar": "3.6.2",
24+
"drupal/admin_toolbar": "3.6.3",
2525
"drupal/anchor_link": "3.0.4",
2626
"drupal/bigmenu": "2.1.0",
27-
"drupal/book": "3.0.0",
27+
"drupal/book": "3.0.1",
2828
"drupal/captcha": "2.0.10",
29-
"drupal/chosen": "5.0.3",
29+
"drupal/chosen": "5.0.4",
3030
"drupal/components": "3.2.0",
3131
"drupal/config_ignore": "3.3.0",
3232
"drupal/config_perms": "2.3.0",
@@ -36,9 +36,9 @@
3636
"drupal/consumers": "1.24.0",
3737
"drupal/contact_storage": "1.5.0",
3838
"drupal/context": "5.0.0-rc2",
39-
"drupal/core-composer-scaffold": "11.3.2",
40-
"drupal/core-recommended": "11.3.2",
41-
"drupal/crop": "2.5.0",
39+
"drupal/core-composer-scaffold": "11.3.7",
40+
"drupal/core-recommended": "11.3.7",
41+
"drupal/crop": "2.6.0",
4242
"drupal/ctools": "4.1.0",
4343
"drupal/devel": "5.5.0",
4444
"drupal/diff": "1.10.0",
@@ -55,7 +55,7 @@
5555
"drupal/entity_reference_revisions": "1.12.0",
5656
"drupal/environment_indicator": "4.0.25",
5757
"drupal/events_log_track": "4.0.2",
58-
"drupal/externalauth": "2.0.9",
58+
"drupal/externalauth": "2.0.11",
5959
"drupal/facets": "2.0.10",
6060
"drupal/fakeobjects": "2.0.1",
6161
"drupal/field_group": "4.0.0",
@@ -73,7 +73,7 @@
7373
"drupal/layout_builder_modal": "2.0.0",
7474
"drupal/layout_builder_restrictions": "3.0.4",
7575
"drupal/linked_field": "1.7.0",
76-
"drupal/linkit": "7.0.12",
76+
"drupal/linkit": "7.0.13",
7777
"drupal/login_security": "2.0.7",
7878
"drupal/mailsystem": "4.5.0",
7979
"drupal/media_bulk_upload": "3.0.5",
@@ -87,7 +87,7 @@
8787
"drupal/migrate_plus": "6.0.9",
8888
"drupal/migrate_source_csv": "3.7.0",
8989
"drupal/migrate_tools": "6.1.3",
90-
"drupal/minisite": "3.0.2",
90+
"drupal/minisite": "3.0.3",
9191
"drupal/modifiers": "1.6.0",
9292
"drupal/module_permissions": "4.0.0",
9393
"drupal/paragraphs": "1.20.0",
@@ -100,30 +100,30 @@
100100
"drupal/rest_menu_items": "3.0.6",
101101
"drupal/robotstxt": "1.6.0",
102102
"drupal/role_delegation": "1.6.0",
103-
"drupal/scheduled_transitions": "2.8.3",
103+
"drupal/scheduled_transitions": "2.8.4",
104104
"drupal/search_api": "1.40.0",
105-
"drupal/search_api_attachments": "10.0.7",
105+
"drupal/search_api_attachments": "10.0.8",
106106
"drupal/search_api_autocomplete": "1.11.0",
107107
"drupal/search_api_solr": "4.3.10",
108108
"drupal/search_api_spellcheck": "4.0.1",
109109
"drupal/seckit": "2.0.3",
110110
"drupal/securitytxt": "1.6.0",
111111
"drupal/shield": "1.8.0",
112112
"drupal/simple_oauth": "6.1.0",
113-
"drupal/simple_sitemap": "4.2.2",
113+
"drupal/simple_sitemap": "4.2.3",
114114
"drupal/simplesamlphp_auth": "4.1.0",
115115
"drupal/symfony_mailer": "1.6.2",
116116
"drupal/tfa": "1.12.0",
117117
"drupal/token": "1.17.0",
118118
"drupal/twig_tweak": "3.4.1",
119119
"drupal/username_enumeration_prevention": "1.4.0",
120-
"drupal/views_data_export": "1.8.0",
121-
"drupal/webform": "6.3.0-beta7",
120+
"drupal/views_data_export": "1.9.0",
121+
"drupal/webform": "6.3.0-beta8",
122122
"drupal/workbench_access": "2.0.4",
123123
"govcms-assets/chosen": "3.0.1",
124124
"govcms-assets/dropzone": "5.9.3",
125125
"oomphinc/composer-installers-extender": "^2.0",
126-
"simplesamlphp/simplesamlphp": "2.5.0-rc5",
126+
"simplesamlphp/simplesamlphp": "2.5.0",
127127
"webflo/drupal-finder": "^1.2"
128128
},
129129
"require-dev": {

govcms.info.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ type: profile
33
description: 'A GovCMS Drupal Distribution for government and the public sector in Australia.'
44
core_version_requirement: ^11
55
project: 'govcms'
6-
version: '4.2.0'
6+
version: '4.3.0'
77

88
distribution:
99
name: GovCMS

src/Modules/Lifecycle.php

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,14 @@ class Lifecycle {
1515

1616
// Obsolete modules.
1717
const OBSOLETE_MODULES = [
18-
'block_inactive_users',
1918
'clamav',
20-
'config_filter',
2119
'event_log_track_ui',
2220
'field_layout',
2321
'govcms8_foundations',
2422
'govcms8_layouts',
25-
'graphql',
26-
'jquery_ui_accordion',
27-
'jquery_ui_resizable',
2823
'mailsystem',
29-
'page_manager',
30-
'page_manager_ui',
31-
'panelizer',
32-
'panels',
33-
'permissions_by_entity',
34-
'permissions_by_term',
35-
'purge_purger_http',
3624
'redirect_404',
37-
'restui',
3825
'services_tfa',
39-
'video_embed_field',
4026
];
4127

4228
/**

0 commit comments

Comments
 (0)