From be149ca50acf3d171ff0d86ed59fb02a3f9f9341 Mon Sep 17 00:00:00 2001 From: CiviCRM Date: Thu, 8 Jul 2021 03:51:15 +0000 Subject: [PATCH] Set version to 5.41.alpha1 --- CRM/Upgrade/Incremental/php/FiveFortyOne.php | 75 +++++++++++++++++++ .../Incremental/sql/5.41.alpha1.mysql.tpl | 1 + ext/afform/admin/info.xml | 2 +- ext/afform/core/info.xml | 2 +- ext/afform/html/info.xml | 2 +- ext/afform/mock/info.xml | 2 +- ext/authx/info.xml | 2 +- ext/ckeditor4/info.xml | 2 +- ext/contributioncancelactions/info.xml | 2 +- ext/eventcart/info.xml | 2 +- ext/ewaysingle/info.xml | 2 +- ext/financialacls/info.xml | 2 +- ext/flexmailer/info.xml | 2 +- ext/greenwich/info.xml | 2 +- ext/oauth-client/info.xml | 2 +- ext/payflowpro/info.xml | 2 +- ext/recaptcha/info.xml | 2 +- ext/search_kit/info.xml | 2 +- ext/sequentialcreditnotes/info.xml | 2 +- sql/civicrm_generated.mysql | 2 +- sql/test_data_second_domain.mysql | 2 +- xml/version.xml | 2 +- 22 files changed, 96 insertions(+), 20 deletions(-) create mode 100644 CRM/Upgrade/Incremental/php/FiveFortyOne.php create mode 100644 CRM/Upgrade/Incremental/sql/5.41.alpha1.mysql.tpl diff --git a/CRM/Upgrade/Incremental/php/FiveFortyOne.php b/CRM/Upgrade/Incremental/php/FiveFortyOne.php new file mode 100644 index 0000000000..c77a863a16 --- /dev/null +++ b/CRM/Upgrade/Incremental/php/FiveFortyOne.php @@ -0,0 +1,75 @@ +' . ts('A new permission, "%1", has been added. This permission is now used to control access to the Manage Tags screen.', array(1 => ts('manage tags'))) . '

'; + // } + } + + /** + * Compute any messages which should be displayed after upgrade. + * + * Note: This function is called iteratively for each incremental upgrade step. + * There must be a concrete step (eg 'X.Y.Z.mysql.tpl' or 'upgrade_X_Y_Z()'). + * + * @param string $postUpgradeMessage + * alterable. + * @param string $rev + * an intermediate version; note that setPostUpgradeMessage is called repeatedly with different $revs. + */ + public function setPostUpgradeMessage(&$postUpgradeMessage, $rev) { + // Example: Generate a post-upgrade message. + // if ($rev == '5.12.34') { + // $postUpgradeMessage .= '

' . ts("By default, CiviCRM now disables the ability to import directly from SQL. To use this feature, you must explicitly grant permission 'import SQL datasource'."); + // } + } + + /* + * Important! All upgrade functions MUST add a 'runSql' task. + * Uncomment and use the following template for a new upgrade version + * (change the x in the function name): + */ + + // /** + // * Upgrade function. + // * + // * @param string $rev + // */ + // public function upgrade_5_0_x($rev) { + // $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); + // $this->addTask('Do the foo change', 'taskFoo', ...); + // // Additional tasks here... + // // Note: do not use ts() in the addTask description because it adds unnecessary strings to transifex. + // // The above is an exception because 'Upgrade DB to %1: SQL' is generic & reusable. + // } + + // public static function taskFoo(CRM_Queue_TaskContext $ctx, ...) { + // return TRUE; + // } + +} diff --git a/CRM/Upgrade/Incremental/sql/5.41.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.41.alpha1.mysql.tpl new file mode 100644 index 0000000000..37bd74bb3e --- /dev/null +++ b/CRM/Upgrade/Incremental/sql/5.41.alpha1.mysql.tpl @@ -0,0 +1 @@ +{* file to handle db changes in 5.41.alpha1 during upgrade *} diff --git a/ext/afform/admin/info.xml b/ext/afform/admin/info.xml index 5dc463e9be..1a5f0cadb2 100644 --- a/ext/afform/admin/info.xml +++ b/ext/afform/admin/info.xml @@ -15,7 +15,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-01-09 - 5.40.beta1 + 5.41.alpha1 alpha 5.23 diff --git a/ext/afform/core/info.xml b/ext/afform/core/info.xml index d10d5fe24e..a739c9cb4c 100644 --- a/ext/afform/core/info.xml +++ b/ext/afform/core/info.xml @@ -15,7 +15,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-01-09 - 5.40.beta1 + 5.41.alpha1 alpha 5.23 diff --git a/ext/afform/html/info.xml b/ext/afform/html/info.xml index a60bd5cab0..15c72c9540 100644 --- a/ext/afform/html/info.xml +++ b/ext/afform/html/info.xml @@ -15,7 +15,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-01-09 - 5.40.beta1 + 5.41.alpha1 alpha 5.23 diff --git a/ext/afform/mock/info.xml b/ext/afform/mock/info.xml index e8d2565321..be074b1e73 100644 --- a/ext/afform/mock/info.xml +++ b/ext/afform/mock/info.xml @@ -15,7 +15,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-01-09 - 5.40.beta1 + 5.41.alpha1 mgmt:hidden diff --git a/ext/authx/info.xml b/ext/authx/info.xml index 3888811a02..c81fc8d160 100644 --- a/ext/authx/info.xml +++ b/ext/authx/info.xml @@ -15,7 +15,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2021-02-11 - 5.40.beta1 + 5.41.alpha1 alpha 5.0 diff --git a/ext/ckeditor4/info.xml b/ext/ckeditor4/info.xml index f281243571..a9e1778c31 100644 --- a/ext/ckeditor4/info.xml +++ b/ext/ckeditor4/info.xml @@ -15,7 +15,7 @@ https://www.gnu.org/licenses/agpl-3.0.html 2021-05-23 - 5.40.beta1 + 5.41.alpha1 stable 5.39 diff --git a/ext/contributioncancelactions/info.xml b/ext/contributioncancelactions/info.xml index 2b5f45911b..7babb232d3 100644 --- a/ext/contributioncancelactions/info.xml +++ b/ext/contributioncancelactions/info.xml @@ -15,7 +15,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-10-12 - 5.40.beta1 + 5.41.alpha1 stable 5.32 diff --git a/ext/eventcart/info.xml b/ext/eventcart/info.xml index b0cde4d778..e662019096 100644 --- a/ext/eventcart/info.xml +++ b/ext/eventcart/info.xml @@ -13,7 +13,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-08-03 - 5.40.beta1 + 5.41.alpha1 mgmt:hidden diff --git a/ext/ewaysingle/info.xml b/ext/ewaysingle/info.xml index 94db5929c7..5b5d3f7f60 100644 --- a/ext/ewaysingle/info.xml +++ b/ext/ewaysingle/info.xml @@ -15,7 +15,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-10-07 - 5.40.beta1 + 5.41.alpha1 mgmt:hidden diff --git a/ext/financialacls/info.xml b/ext/financialacls/info.xml index 0c5bbe3de8..a383d69be7 100644 --- a/ext/financialacls/info.xml +++ b/ext/financialacls/info.xml @@ -15,7 +15,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-08-27 - 5.40.beta1 + 5.41.alpha1 stable 5.30 diff --git a/ext/flexmailer/info.xml b/ext/flexmailer/info.xml index 0836abd27f..16b8cd5d36 100644 --- a/ext/flexmailer/info.xml +++ b/ext/flexmailer/info.xml @@ -15,7 +15,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-08-05 - 5.40.beta1 + 5.41.alpha1 stable FlexMailer is an email delivery engine which replaces the internal guts diff --git a/ext/greenwich/info.xml b/ext/greenwich/info.xml index f10c4f7a98..90b895027f 100644 --- a/ext/greenwich/info.xml +++ b/ext/greenwich/info.xml @@ -15,7 +15,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-07-21 - 5.40.beta1 + 5.41.alpha1 mgmt:hidden diff --git a/ext/oauth-client/info.xml b/ext/oauth-client/info.xml index 1fa743d1ef..dab350627c 100644 --- a/ext/oauth-client/info.xml +++ b/ext/oauth-client/info.xml @@ -15,7 +15,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-10-23 - 5.40.beta1 + 5.41.alpha1 stable 5.38 diff --git a/ext/payflowpro/info.xml b/ext/payflowpro/info.xml index b5cff37688..5c5510b967 100644 --- a/ext/payflowpro/info.xml +++ b/ext/payflowpro/info.xml @@ -15,7 +15,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2021-04-13 - 5.40.beta1 + 5.41.alpha1 stable 5.0 diff --git a/ext/recaptcha/info.xml b/ext/recaptcha/info.xml index 738afd6f89..b39acadb0f 100644 --- a/ext/recaptcha/info.xml +++ b/ext/recaptcha/info.xml @@ -13,7 +13,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2021-04-03 - 5.40.beta1 + 5.41.alpha1 mgmt:hidden diff --git a/ext/search_kit/info.xml b/ext/search_kit/info.xml index 5b97ccb74c..19990c5c05 100644 --- a/ext/search_kit/info.xml +++ b/ext/search_kit/info.xml @@ -14,7 +14,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2021-01-06 - 5.40.beta1 + 5.41.alpha1 beta 5.38 diff --git a/ext/sequentialcreditnotes/info.xml b/ext/sequentialcreditnotes/info.xml index 49a30c66ba..85b87641ee 100644 --- a/ext/sequentialcreditnotes/info.xml +++ b/ext/sequentialcreditnotes/info.xml @@ -15,7 +15,7 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-01-28 - 5.40.beta1 + 5.41.alpha1 mgmt:hidden diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql index 9bdb626ca2..b649dbccef 100644 --- a/sql/civicrm_generated.mysql +++ b/sql/civicrm_generated.mysql @@ -2869,7 +2869,7 @@ UNLOCK TABLES; LOCK TABLES `civicrm_domain` WRITE; /*!40000 ALTER TABLE `civicrm_domain` DISABLE KEYS */; INSERT INTO `civicrm_domain` (`id`, `name`, `description`, `version`, `contact_id`, `locales`, `locale_custom_strings`) VALUES - (1,'Default Domain Name',NULL,'5.40.beta1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}'); + (1,'Default Domain Name',NULL,'5.41.alpha1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}'); /*!40000 ALTER TABLE `civicrm_domain` ENABLE KEYS */; UNLOCK TABLES; diff --git a/sql/test_data_second_domain.mysql b/sql/test_data_second_domain.mysql index 4d623a56f7..579e80fbe9 100644 --- a/sql/test_data_second_domain.mysql +++ b/sql/test_data_second_domain.mysql @@ -963,4 +963,4 @@ INSERT INTO civicrm_navigation VALUES ( @domainID, CONCAT('civicrm/report/instance/', @instanceID,'&reset=1'), 'Mailing Detail Report', 'Mailing Detail Report', 'administer CiviMail', 'OR', @reportlastID, '1', NULL, @instanceID+2 ); UPDATE civicrm_report_instance SET navigation_id = LAST_INSERT_ID() WHERE id = @instanceID; -UPDATE civicrm_domain SET version = '5.40.beta1'; +UPDATE civicrm_domain SET version = '5.41.alpha1'; diff --git a/xml/version.xml b/xml/version.xml index 1fc2707c47..81c7ef5de8 100644 --- a/xml/version.xml +++ b/xml/version.xml @@ -1,4 +1,4 @@ - 5.40.beta1 + 5.41.alpha1 -- 2.25.1