From 0bae99b70b6cda597180811638ac357a9bb53445 Mon Sep 17 00:00:00 2001 From: CiviCRM Date: Thu, 2 Feb 2023 01:40:54 +0000 Subject: [PATCH] Set version to 5.60.alpha1 --- CRM/Upgrade/Incremental/php/FiveSixty.php | 34 +++++++++++++++++++ .../Incremental/sql/5.60.alpha1.mysql.tpl | 1 + ext/afform/admin/info.xml | 4 +-- ext/afform/core/info.xml | 4 +-- ext/afform/html/info.xml | 4 +-- ext/afform/mock/info.xml | 4 +-- ext/authx/info.xml | 4 +-- ext/civicrm_admin_ui/info.xml | 4 +-- ext/civigrant/info.xml | 4 +-- ext/civiimport/info.xml | 4 +-- ext/ckeditor4/info.xml | 4 +-- ext/contributioncancelactions/info.xml | 4 +-- ext/elavon/info.xml | 4 +-- ext/eventcart/info.xml | 4 +-- ext/ewaysingle/info.xml | 4 +-- ext/financialacls/info.xml | 4 +-- ext/flexmailer/info.xml | 4 +-- ext/greenwich/info.xml | 4 +-- ext/legacycustomsearches/info.xml | 4 +-- ext/message_admin/info.xml | 4 +-- ext/oauth-client/info.xml | 4 +-- ext/payflowpro/info.xml | 4 +-- ext/recaptcha/info.xml | 4 +-- ext/search_kit/info.xml | 4 +-- ext/sequentialcreditnotes/info.xml | 4 +-- sql/civicrm_generated.mysql | 2 +- sql/test_data_second_domain.mysql | 2 +- xml/version.xml | 2 +- 28 files changed, 84 insertions(+), 49 deletions(-) create mode 100644 CRM/Upgrade/Incremental/php/FiveSixty.php create mode 100644 CRM/Upgrade/Incremental/sql/5.60.alpha1.mysql.tpl diff --git a/CRM/Upgrade/Incremental/php/FiveSixty.php b/CRM/Upgrade/Incremental/php/FiveSixty.php new file mode 100644 index 0000000000..977d68b077 --- /dev/null +++ b/CRM/Upgrade/Incremental/php/FiveSixty.php @@ -0,0 +1,34 @@ +addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); + } + +} diff --git a/CRM/Upgrade/Incremental/sql/5.60.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.60.alpha1.mysql.tpl new file mode 100644 index 0000000000..d1ecc1174d --- /dev/null +++ b/CRM/Upgrade/Incremental/sql/5.60.alpha1.mysql.tpl @@ -0,0 +1 @@ +{* file to handle db changes in 5.60.alpha1 during upgrade *} diff --git a/ext/afform/admin/info.xml b/ext/afform/admin/info.xml index 7cb1e48524..52825de298 100644 --- a/ext/afform/admin/info.xml +++ b/ext/afform/admin/info.xml @@ -13,10 +13,10 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-01-09 - 5.59.beta1 + 5.60.alpha1 beta - 5.59 + 5.60 FormBuilder provides a UI to administer and edit forms. It is an optional admin tool and not required for the forms to function. diff --git a/ext/afform/core/info.xml b/ext/afform/core/info.xml index 0837d90c11..7560761486 100644 --- a/ext/afform/core/info.xml +++ b/ext/afform/core/info.xml @@ -13,10 +13,10 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-01-09 - 5.59.beta1 + 5.60.alpha1 beta - 5.59 + 5.60 The Form Core extension is required to use any dynamic form. To administer and edit forms, also install the FormBuilder extension. diff --git a/ext/afform/html/info.xml b/ext/afform/html/info.xml index b3d3f961e8..2dffa4b841 100644 --- a/ext/afform/html/info.xml +++ b/ext/afform/html/info.xml @@ -13,10 +13,10 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-01-09 - 5.59.beta1 + 5.60.alpha1 alpha - 5.59 + 5.60 org.civicrm.afform diff --git a/ext/afform/mock/info.xml b/ext/afform/mock/info.xml index 3f62ae298b..1d1ef3168c 100644 --- a/ext/afform/mock/info.xml +++ b/ext/afform/mock/info.xml @@ -12,13 +12,13 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-01-09 - 5.59.beta1 + 5.60.alpha1 mgmt:hidden alpha - 5.59 + 5.60 org.civicrm.afform diff --git a/ext/authx/info.xml b/ext/authx/info.xml index 6f8d22522d..c052fb99b6 100644 --- a/ext/authx/info.xml +++ b/ext/authx/info.xml @@ -15,10 +15,10 @@ http://www.gnu.org/licenses/agpl-3.0.html 2021-02-11 - 5.59.beta1 + 5.60.alpha1 stable - 5.59 + 5.60 AuthX enables remote applications to connect to CiviCRM. Use it to enable and disable different forms of authentication (such as username-password, API key, and/or JWT). diff --git a/ext/civicrm_admin_ui/info.xml b/ext/civicrm_admin_ui/info.xml index 70bfe402c8..b8aa5cb043 100644 --- a/ext/civicrm_admin_ui/info.xml +++ b/ext/civicrm_admin_ui/info.xml @@ -15,10 +15,10 @@ http://www.gnu.org/licenses/agpl-3.0.html 2022-01-02 - 5.59.beta1 + 5.60.alpha1 alpha - 5.59 + 5.60 org.civicrm.search_kit diff --git a/ext/civigrant/info.xml b/ext/civigrant/info.xml index 16cf14ab9c..6d6be82dc0 100644 --- a/ext/civigrant/info.xml +++ b/ext/civigrant/info.xml @@ -13,10 +13,10 @@ http://www.gnu.org/licenses/agpl-3.0.html 2021-11-11 - 5.59.beta1 + 5.60.alpha1 stable - 5.59 + 5.60 CiviGrant was originally a core component before migrating to an extension diff --git a/ext/civiimport/info.xml b/ext/civiimport/info.xml index 2254557638..e758359306 100644 --- a/ext/civiimport/info.xml +++ b/ext/civiimport/info.xml @@ -15,10 +15,10 @@ http://www.gnu.org/licenses/agpl-3.0.html 2022-08-11 - 5.59.beta1 + 5.60.alpha1 alpha - 5.59 + 5.60 Core extension for us to start moving import logic into, has more functionality diff --git a/ext/ckeditor4/info.xml b/ext/ckeditor4/info.xml index 632479f1e6..bffa3dd08c 100644 --- a/ext/ckeditor4/info.xml +++ b/ext/ckeditor4/info.xml @@ -15,10 +15,10 @@ https://www.gnu.org/licenses/agpl-3.0.html 2021-05-23 - 5.59.beta1 + 5.60.alpha1 stable - 5.59 + 5.60 This is the version of CKEditor that originally shipped with CiviCRM core diff --git a/ext/contributioncancelactions/info.xml b/ext/contributioncancelactions/info.xml index 7f37ce0f7a..9660f431b8 100644 --- a/ext/contributioncancelactions/info.xml +++ b/ext/contributioncancelactions/info.xml @@ -15,10 +15,10 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-10-12 - 5.59.beta1 + 5.60.alpha1 stable - 5.59 + 5.60 This code has been moved from core to a separate extension in 5.32. Note that if you disable it failed or cancelled contributions will not cause related memberships and participant records to be updated diff --git a/ext/elavon/info.xml b/ext/elavon/info.xml index b5b666c5a6..c9ef124d94 100644 --- a/ext/elavon/info.xml +++ b/ext/elavon/info.xml @@ -15,10 +15,10 @@ http://www.gnu.org/licenses/agpl-3.0.html 2022-08-05 - 5.59.beta1 + 5.60.alpha1 stable - 5.59 + 5.60 diff --git a/ext/eventcart/info.xml b/ext/eventcart/info.xml index 48a63e5d59..eeb2a01002 100644 --- a/ext/eventcart/info.xml +++ b/ext/eventcart/info.xml @@ -13,13 +13,13 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-08-03 - 5.59.beta1 + 5.60.alpha1 mgmt:hidden stable - 5.59 + 5.60 diff --git a/ext/ewaysingle/info.xml b/ext/ewaysingle/info.xml index 0f2eef4907..07e6084173 100644 --- a/ext/ewaysingle/info.xml +++ b/ext/ewaysingle/info.xml @@ -15,13 +15,13 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-10-07 - 5.59.beta1 + 5.60.alpha1 mgmt:hidden stable - 5.59 + 5.60 This is an extension to contain the eWAY Single Currency Payment Processor diff --git a/ext/financialacls/info.xml b/ext/financialacls/info.xml index 51bea3e54f..7ac6a78df1 100644 --- a/ext/financialacls/info.xml +++ b/ext/financialacls/info.xml @@ -15,10 +15,10 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-08-27 - 5.59.beta1 + 5.60.alpha1 stable - 5.59 + 5.60 mgmt:hidden diff --git a/ext/flexmailer/info.xml b/ext/flexmailer/info.xml index 6e3bf6db42..3eeff3ca09 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.59.beta1 + 5.60.alpha1 stable FlexMailer is an email delivery engine which replaces the internal guts @@ -23,7 +23,7 @@ to provide richer email features. - 5.59 + 5.60 mgmt:required diff --git a/ext/greenwich/info.xml b/ext/greenwich/info.xml index 7e3ba3d857..323a6e3aa9 100644 --- a/ext/greenwich/info.xml +++ b/ext/greenwich/info.xml @@ -15,13 +15,13 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-07-21 - 5.59.beta1 + 5.60.alpha1 mgmt:hidden stable - 5.59 + 5.60 diff --git a/ext/legacycustomsearches/info.xml b/ext/legacycustomsearches/info.xml index 4a2e0ea19c..fda07e973e 100644 --- a/ext/legacycustomsearches/info.xml +++ b/ext/legacycustomsearches/info.xml @@ -15,13 +15,13 @@ http://www.gnu.org/licenses/agpl-3.0.html 2021-07-25 - 5.59.beta1 + 5.60.alpha1 stable mgmt:hidden - 5.59 + 5.60 This is hidden on install to give extensions that require it time to add it to their requires and to allow us to get it out of GroupContact load diff --git a/ext/message_admin/info.xml b/ext/message_admin/info.xml index c46ad3983b..1b9189b125 100644 --- a/ext/message_admin/info.xml +++ b/ext/message_admin/info.xml @@ -15,10 +15,10 @@ http://www.gnu.org/licenses/agpl-3.0.html 2021-06-12 - 5.59.beta1 + 5.60.alpha1 alpha - 5.59 + 5.60 org.civicrm.afform diff --git a/ext/oauth-client/info.xml b/ext/oauth-client/info.xml index bb2b717fb2..3dc1a6e6dc 100644 --- a/ext/oauth-client/info.xml +++ b/ext/oauth-client/info.xml @@ -15,10 +15,10 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-10-23 - 5.59.beta1 + 5.60.alpha1 stable - 5.59 + 5.60 org.civicrm.afform diff --git a/ext/payflowpro/info.xml b/ext/payflowpro/info.xml index c49a8c33e0..556d670375 100644 --- a/ext/payflowpro/info.xml +++ b/ext/payflowpro/info.xml @@ -15,10 +15,10 @@ http://www.gnu.org/licenses/agpl-3.0.html 2021-04-13 - 5.59.beta1 + 5.60.alpha1 stable - 5.59 + 5.60 This extension is extraction of the original Core Payflow Pro Payment Processor diff --git a/ext/recaptcha/info.xml b/ext/recaptcha/info.xml index b7c6fcb28b..b6dd91f56e 100644 --- a/ext/recaptcha/info.xml +++ b/ext/recaptcha/info.xml @@ -13,13 +13,13 @@ http://www.gnu.org/licenses/agpl-3.0.html 2021-04-03 - 5.59.beta1 + 5.60.alpha1 mgmt:hidden stable - 5.59 + 5.60 diff --git a/ext/search_kit/info.xml b/ext/search_kit/info.xml index ebee685afd..55825d9aec 100644 --- a/ext/search_kit/info.xml +++ b/ext/search_kit/info.xml @@ -15,13 +15,13 @@ http://www.gnu.org/licenses/agpl-3.0.html 2021-01-06 - 5.59.beta1 + 5.60.alpha1 stable mgmt:required - 5.59 + 5.60 Click on the chat link above to discuss development, report problems or ask questions. diff --git a/ext/sequentialcreditnotes/info.xml b/ext/sequentialcreditnotes/info.xml index 864fdabafc..bdfa0a477e 100644 --- a/ext/sequentialcreditnotes/info.xml +++ b/ext/sequentialcreditnotes/info.xml @@ -15,13 +15,13 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-01-28 - 5.59.beta1 + 5.60.alpha1 mgmt:hidden stable - 5.59 + 5.60 setting-php@1.0.0 diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql index 0e1d209e54..16d2bdbe7b 100644 --- a/sql/civicrm_generated.mysql +++ b/sql/civicrm_generated.mysql @@ -3055,7 +3055,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.59.beta1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}'); + (1,'Default Domain Name',NULL,'5.60.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 fb2434b6e1..aef9206afc 100644 --- a/sql/test_data_second_domain.mysql +++ b/sql/test_data_second_domain.mysql @@ -902,4 +902,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.59.beta1'; +UPDATE civicrm_domain SET version = '5.60.alpha1'; diff --git a/xml/version.xml b/xml/version.xml index d0cb8cb16e..b721132417 100644 --- a/xml/version.xml +++ b/xml/version.xml @@ -1,4 +1,4 @@ - 5.59.beta1 + 5.60.alpha1 -- 2.25.1