Skip to content

Commit

Permalink
Merge pull request #504 from os2ulf/release/2024-14
Browse files Browse the repository at this point in the history
Release/2024 14
  • Loading branch information
madsnorgaard authored Dec 18, 2024
2 parents 4963fd5 + 10fcbb5 commit 29c0c3c
Show file tree
Hide file tree
Showing 127 changed files with 1,688 additions and 1,435 deletions.
2 changes: 1 addition & 1 deletion .ddev/config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: os2udoglaer
type: drupal10
docroot: webroot
php_version: "8.2"
php_version: "8.3"
webserver_type: nginx-fpm
router_http_port: "80"
router_https_port: "443"
Expand Down
2 changes: 1 addition & 1 deletion .ddev/providers/acquia.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ db_pull_command:
# just using `acli pull:db ${ACQUIA_ENVIRONMENT_ID}`
echo "Using ACQUIA_ENVIRONMENT_ID=${ACQUIA_ENVIRONMENT_ID}"
set -x # You can enable bash debugging output by uncommenting
db_dump=$(acli pull:db ${ACQUIA_ENVIRONMENT_ID} --no-interaction --no-import | tail -2l | xargs)
db_dump=$(acli pull:db ${ACQUIA_ENVIRONMENT_ID} --no-interaction --no-import | tail -2l | xargs | sed 's/^.* //')
ls /var/www/html/.ddev >/dev/null # This just refreshes stale NFS if possible
cp ${db_dump} /var/www/html/.ddev/.downloads/db.sql.gz
Expand Down
1 change: 0 additions & 1 deletion .ddev/solr/configsets/dev/nouns_da.txt
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@

5 changes: 4 additions & 1 deletion .ddev/solr/configsets/dev/schema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
that avoids logging every request
-->

<schema name="drupal-4.3.2-solr-9.x-0" version="1.6">
<schema name="drupal-4.3.7-solr-9.x-0" version="1.6">
<!-- attribute "name" is the name of this schema and is only used for display purposes.
version="x.y" is Solr's version number for the schema syntax and
semantics. It should not normally be changed by applications.
Expand Down Expand Up @@ -219,6 +219,9 @@
<dynamicField name="hts_*" type="pint" indexed="true" stored="false" docValues="true"/>
<dynamicField name="htm_*" type="pints" indexed="true" stored="false" docValues="true"/>

<!-- Unindexed string fields that can be used to store values that won't be searchable but have docValues -->
<dynamicField name="zdvs_*" type="string" indexed="false" stored="true" docValues="true"/>
<dynamicField name="zdvm_*" type="strings" indexed="false" stored="true" docValues="true"/>
<!-- Unindexed string fields that can be used to store values that won't be searchable -->
<dynamicField name="zs_*" type="string" indexed="false" stored="true"/>
<dynamicField name="zm_*" type="strings" indexed="false" stored="true"/>
Expand Down
2 changes: 1 addition & 1 deletion .ddev/solr/configsets/dev/solrconfig.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
For more details about configurations options that may appear in
this file, see https://solr.apache.org/guide/solr/latest/configuration-guide/configuring-solrconfig-xml.html
-->
<config name="drupal-4.3.2-solr-9.x-0" >
<config name="drupal-4.3.7-solr-9.x-0" >
<!-- In all configuration below, a prefix of "solr." for class names
is an alias that causes solr to search appropriate packages,
including org.apache.solr.(search|update|request|core|analysis)
Expand Down
2 changes: 1 addition & 1 deletion .ddev/solr/configsets/dev/solrcore.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ solr.autoCommit.MaxTime=15000
solr.autoSoftCommit.MaxDocs=-1
solr.autoSoftCommit.MaxTime=5000

solr.luceneMatchVersion=9.1.0
solr.luceneMatchVersion=9.10.0
2 changes: 1 addition & 1 deletion .platform.app.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: backend
type: "php:8.2"
type: "php:8.3"
runtime:
extensions:
- imagick
Expand Down
5 changes: 4 additions & 1 deletion .platform/solr-conf/os2uol/schema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
that avoids logging every request
-->

<schema name="drupal-4.3.2-solr-9.x-0" version="1.6">
<schema name="drupal-4.3.7-solr-9.x-0" version="1.6">
<!-- attribute "name" is the name of this schema and is only used for display purposes.
version="x.y" is Solr's version number for the schema syntax and
semantics. It should not normally be changed by applications.
Expand Down Expand Up @@ -219,6 +219,9 @@
<dynamicField name="hts_*" type="pint" indexed="true" stored="false" docValues="true"/>
<dynamicField name="htm_*" type="pints" indexed="true" stored="false" docValues="true"/>

<!-- Unindexed string fields that can be used to store values that won't be searchable but have docValues -->
<dynamicField name="zdvs_*" type="string" indexed="false" stored="true" docValues="true"/>
<dynamicField name="zdvm_*" type="strings" indexed="false" stored="true" docValues="true"/>
<!-- Unindexed string fields that can be used to store values that won't be searchable -->
<dynamicField name="zs_*" type="string" indexed="false" stored="true"/>
<dynamicField name="zm_*" type="strings" indexed="false" stored="true"/>
Expand Down
2 changes: 1 addition & 1 deletion .platform/solr-conf/os2uol/solrconfig.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
For more details about configurations options that may appear in
this file, see https://solr.apache.org/guide/solr/latest/configuration-guide/configuring-solrconfig-xml.html
-->
<config name="drupal-4.3.2-solr-9.x-0" >
<config name="drupal-4.3.7-solr-9.x-0" >
<!-- In all configuration below, a prefix of "solr." for class names
is an alias that causes solr to search appropriate packages,
including org.apache.solr.(search|update|request|core|analysis)
Expand Down
2 changes: 1 addition & 1 deletion .platform/solr-conf/os2uol/solrcore.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ solr.autoCommit.MaxTime=15000
solr.autoSoftCommit.MaxDocs=-1
solr.autoSoftCommit.MaxTime=5000

solr.luceneMatchVersion=9.1.0
solr.luceneMatchVersion=9.10.0
37 changes: 17 additions & 20 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
}
],
"require": {
"php": ">=8.1",
"php": ">=8.3",
"ext-json": "*",
"ext-pdo": "*",
"bower-asset/jquery-simple-color": "^1.2",
Expand All @@ -43,10 +43,10 @@
"drupal/config_split": "^1.7.0",
"drupal/content_moderation_bypass": "^1.0@alpha",
"drupal/content_moderation_notifications": "^3.6",
"drupal/core-composer-scaffold": "^10",
"drupal/core-project-message": "^10",
"drupal/core-recommended": "^10",
"drupal/core-vendor-hardening": "^9.0",
"drupal/core-composer-scaffold": "^10.3",
"drupal/core-project-message": "^10.3",
"drupal/core-recommended": "^10.3",
"drupal/core-vendor-hardening": "^10.3",
"drupal/date_popup": "^2.0",
"drupal/diff": "^1.7",
"drupal/domain": "^2.0@beta",
Expand Down Expand Up @@ -106,7 +106,7 @@
"drupal/view_profiles_perms": "^2.1",
"drupal/view_unpublished": "^1.0",
"drupal/views_base_url": "^2.1@beta",
"drupal/views_bulk_operations": "^4.2",
"drupal/views_bulk_operations": "^4.3",
"drupal/views_contextual_filters_or": "^1.4",
"drupal/views_data_export": "^1.4",
"drupal/views_simple_math_field": "^3.0",
Expand Down Expand Up @@ -146,7 +146,7 @@
"prefer-stable": true,
"config": {
"platform": {
"php": "8.2"
"php": "8.3"
},
"optimize-autoloader": true,
"sort-packages": true,
Expand Down Expand Up @@ -218,7 +218,7 @@
},
"patches": {
"drupal/core": {
"(#2999491) Allow creation of reuseable inline blocks": "https://www.drupal.org/files/issues/2020-05-21/2999491--reusable-title-display--49.patch",
"(#2999491) Allow creation of reuseable inline blocks": "https://www.drupal.org/files/issues/2024-07-17/drupal-2999491-162.patch",
"Configure limit method on titles and link fields": "patches/configure_limit_method_on_titles_and_link_fields.patch"
},
"drupal/autosave_form": {
Expand All @@ -228,35 +228,26 @@
"(#2988937) An invalid form control with name='body[0][value]' is not focusable. with ckeditor enabled": "https://www.drupal.org/files/issues/2023-04-25/dependency-using-body-as-target-2988937-12.patch"
},
"drupal/content_moderation_notifications": {
"(#3319124) Enable token support for ad-hoc email addresses": "https://www.drupal.org/files/issues/2024-02-15/content_moderation_notifications-support_tokens_in_adhoc_emails-3319124-8.patch",
"(#3010067) Option to put email addresses in To: instead of in Bcc:": "https://www.drupal.org/files/issues/2023-11-29/3010067-option-to-put-addresses-in-to-instead-of-bcc-33.patch"
"(#3419565) Allow a notification to bypass the content access check": "https://www.drupal.org/files/issues/2024-02-06/content_moderation_notifications-bypass_access_check-3419565-2.patch"
},
"drupal/diff": {
"(#3165141) Set the default filter to 'Strip Tags'": "https://www.drupal.org/files/issues/2024-09-16/3165141-21.patch"
},
"drupal/domain": {
"(#3367785) Available on Current Domain doesn't instantiate": "https://www.drupal.org/files/issues/2023-11-10/3367785-domain-php8-boolean-14.patch",
"(#3359253) Use core route provider with addExtraCacheKeyPart for route caching?": "https://www.drupal.org/files/issues/2023-05-09/domain-route-provider-addextracachekeypart-3359253-02.patch",
"(#3397693) Add domain-specific cache tags to config overrides": "https://git.drupalcode.org/project/domain/-/merge_requests/54.diff"
},
"drupal/domain_entity" : {
"(#3405907) Make module compatible with PHP 8.2": "https://www.drupal.org/files/issues/2023-12-04/3405907-1.patch"
},
"drupal/domain_login_restrict" : {
"(#3336184) The configuration is not exported": "https://www.drupal.org/files/issues/2024-02-12/domain_login_restrict-3336184-9.patch"
},
"drupal/paragraphs": {
"(#2901390) Integrity constraint violation: 1048 Column 'langcode' cannot be null": "https://www.drupal.org/files/issues/2020-06-25/paragraphs-2901390-51.patch"
"(#2901390) Integrity constraint violation: 1048 Column 'langcode' cannot be null": "https://www.drupal.org/files/issues/2023-07-20/2901390-9-109.patch"
},
"drupal/redis": {
"(#3337750) DivisionByZeroError - Problem to access Status Page on PHP 8.1.14": "https://www.drupal.org/files/issues/2023-02-24/redis_status_page_divizion_by_zero_error_php8_1_14_3337750-11.patch"
"(#3337750) DivisionByZeroError - Problem to access Status Page on PHP 8.1.14": "https://www.drupal.org/files/issues/2024-09-05/redis_status_page_divizion_by_zero_error_php8_1_14_3337750-13.patch"
},
"drupal/scheduled_transitions": {
"(#3264674) Field groups are added to the scheduled transitions add form": "https://www.drupal.org/files/issues/2022-02-16/scheduled_transitions-field_groups_add_form-3264674-2.patch"
},
"drupal/sharedemail": {
"(#3420685) Error when creating a new user.": "https://www.drupal.org/files/issues/2024-06-06/3420685-user-create-error-6.patch"
},
"drupal/transform_api": {
"Fix access check for non-bundled entity types": "patches/transform_api_non_bundled_entity_access_fix.patch",
"Add getter for field transform": "patches/transform_api_add_field_transform_getter.patch",
Expand All @@ -276,6 +267,12 @@
},
"drupal/webform": {
"(#3435903) Fix incompatibility with devel ^5.2": "https://www.drupal.org/files/issues/2024-08-01/fix_incompatibility_with_devel_5.2.patch"
},
"drupal/workbench": {
"Apply patch from branch 3484630-mismatched-views-area": "https://git.drupalcode.org/issue/workbench-3484630/-/commit/41ff2be540e760aec54e06cd35c5e5a75e21f502.diff"
},
"drupal/workflow_buttons": {
"(#3451409) Automated Drupal 11 compatibility fixes for workflow_buttons": "https://www.drupal.org/files/issues/2024-11-25/workflow_buttons_3451409_git_theme.patch"
}
}
}
Expand Down
Loading

0 comments on commit 29c0c3c

Please sign in to comment.