From c43015d25648aafdd8a547d372d4f4cee26efe2a Mon Sep 17 00:00:00 2001 From: CiviCRM Date: Thu, 5 Oct 2023 05:30:26 +0000 Subject: [PATCH] Set version to 5.68.alpha1 --- .../Incremental/php/FiveSixtyEight.php | 34 +++++++++++++++++++ .../Incremental/sql/5.68.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/civi_campaign/info.xml | 4 +-- ext/civi_case/info.xml | 4 +-- ext/civi_contribute/info.xml | 4 +-- ext/civi_event/info.xml | 4 +-- ext/civi_mail/info.xml | 4 +-- ext/civi_member/info.xml | 4 +-- ext/civi_pledge/info.xml | 4 +-- ext/civi_report/info.xml | 4 +-- ext/civicrm_admin_ui/info.xml | 4 +-- ext/civicrm_search_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/scheduled_communications/info.xml | 4 +-- ext/search_kit/info.xml | 4 +-- ext/sequentialcreditnotes/info.xml | 4 +-- ext/standaloneusers/info.xml | 4 +-- sql/civicrm_generated.mysql | 2 +- sql/test_data_second_domain.mysql | 2 +- xml/version.xml | 2 +- 39 files changed, 106 insertions(+), 71 deletions(-) create mode 100644 CRM/Upgrade/Incremental/php/FiveSixtyEight.php create mode 100644 CRM/Upgrade/Incremental/sql/5.68.alpha1.mysql.tpl diff --git a/CRM/Upgrade/Incremental/php/FiveSixtyEight.php b/CRM/Upgrade/Incremental/php/FiveSixtyEight.php new file mode 100644 index 0000000000..c974bd67be --- /dev/null +++ b/CRM/Upgrade/Incremental/php/FiveSixtyEight.php @@ -0,0 +1,34 @@ +addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev); + } + +} diff --git a/CRM/Upgrade/Incremental/sql/5.68.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.68.alpha1.mysql.tpl new file mode 100644 index 0000000000..4e284bc85b --- /dev/null +++ b/CRM/Upgrade/Incremental/sql/5.68.alpha1.mysql.tpl @@ -0,0 +1 @@ +{* file to handle db changes in 5.68.alpha1 during upgrade *} diff --git a/ext/afform/admin/info.xml b/ext/afform/admin/info.xml index 2630c0971c..c56421d095 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.67.beta1 + 5.68.alpha1 beta - 5.67 + 5.68 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 08976934ec..c8b27be848 100644 --- a/ext/afform/core/info.xml +++ b/ext/afform/core/info.xml @@ -13,9 +13,9 @@ http://www.gnu.org/licenses/agpl-3.0.html 2020-01-09 - 5.67.beta1 + 5.68.alpha1 - 5.67 + 5.68 stable diff --git a/ext/afform/html/info.xml b/ext/afform/html/info.xml index 923661547d..89566b57df 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.67.beta1 + 5.68.alpha1 alpha - 5.67 + 5.68 org.civicrm.afform diff --git a/ext/afform/mock/info.xml b/ext/afform/mock/info.xml index 0b9a35e8f5..11951dbf7a 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.67.beta1 + 5.68.alpha1 mgmt:hidden alpha - 5.67 + 5.68 org.civicrm.afform diff --git a/ext/authx/info.xml b/ext/authx/info.xml index 42306bd922..9412b4405d 100644 --- a/ext/authx/info.xml +++ b/ext/authx/info.xml @@ -15,13 +15,13 @@ http://www.gnu.org/licenses/agpl-3.0.html 2021-02-11 - 5.67.beta1 + 5.68.alpha1 stable mgmt:required - 5.67 + 5.68 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/civi_campaign/info.xml b/ext/civi_campaign/info.xml index f8ced03576..c965a30661 100644 --- a/ext/civi_campaign/info.xml +++ b/ext/civi_campaign/info.xml @@ -13,13 +13,13 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-04-08 - 5.67.beta1 + 5.68.alpha1 stable component - 5.67 + 5.68 Core Component CRM_Extension_Upgrader_Component diff --git a/ext/civi_case/info.xml b/ext/civi_case/info.xml index 4d4dc74c68..7890b7dd53 100644 --- a/ext/civi_case/info.xml +++ b/ext/civi_case/info.xml @@ -13,13 +13,13 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-04-08 - 5.67.beta1 + 5.68.alpha1 stable component - 5.67 + 5.68 Core Component CRM_Extension_Upgrader_Component diff --git a/ext/civi_contribute/info.xml b/ext/civi_contribute/info.xml index 8a13c7f035..dc12f1431c 100644 --- a/ext/civi_contribute/info.xml +++ b/ext/civi_contribute/info.xml @@ -13,13 +13,13 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-04-08 - 5.67.beta1 + 5.68.alpha1 stable component - 5.67 + 5.68 Core Component CRM_Extension_Upgrader_Component diff --git a/ext/civi_event/info.xml b/ext/civi_event/info.xml index a05a6b557e..855c8bc27e 100644 --- a/ext/civi_event/info.xml +++ b/ext/civi_event/info.xml @@ -13,13 +13,13 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-04-08 - 5.67.beta1 + 5.68.alpha1 stable component - 5.67 + 5.68 Core Component CRM_Extension_Upgrader_Component diff --git a/ext/civi_mail/info.xml b/ext/civi_mail/info.xml index 96dd6795cf..f718531b1f 100644 --- a/ext/civi_mail/info.xml +++ b/ext/civi_mail/info.xml @@ -13,13 +13,13 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-04-08 - 5.67.beta1 + 5.68.alpha1 stable component - 5.67 + 5.68 Core Component CRM_Extension_Upgrader_Component diff --git a/ext/civi_member/info.xml b/ext/civi_member/info.xml index 00cf1ffd34..ad35cbf93d 100644 --- a/ext/civi_member/info.xml +++ b/ext/civi_member/info.xml @@ -13,13 +13,13 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-04-08 - 5.67.beta1 + 5.68.alpha1 stable component - 5.67 + 5.68 Core Component CRM_Extension_Upgrader_Component diff --git a/ext/civi_pledge/info.xml b/ext/civi_pledge/info.xml index 6f4bdb1ef6..380e5ded58 100644 --- a/ext/civi_pledge/info.xml +++ b/ext/civi_pledge/info.xml @@ -13,13 +13,13 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-04-08 - 5.67.beta1 + 5.68.alpha1 stable component - 5.67 + 5.68 Core Component CRM_Extension_Upgrader_Component diff --git a/ext/civi_report/info.xml b/ext/civi_report/info.xml index aab448ebf2..b58133a7ee 100644 --- a/ext/civi_report/info.xml +++ b/ext/civi_report/info.xml @@ -13,13 +13,13 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-04-08 - 5.67.beta1 + 5.68.alpha1 stable component - 5.67 + 5.68 Core Component CRM_Extension_Upgrader_Component diff --git a/ext/civicrm_admin_ui/info.xml b/ext/civicrm_admin_ui/info.xml index f6d200ecfa..0379767398 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.67.beta1 + 5.68.alpha1 beta - 5.67 + 5.68 org.civicrm.search_kit diff --git a/ext/civicrm_search_ui/info.xml b/ext/civicrm_search_ui/info.xml index 5154d835ac..0aa6af2c08 100644 --- a/ext/civicrm_search_ui/info.xml +++ b/ext/civicrm_search_ui/info.xml @@ -15,14 +15,14 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-07-17 - 5.67.beta1 + 5.68.alpha1 alpha org.civicrm.search_kit org.civicrm.afform - 5.67 + 5.68 Replacement SearchKit/FormBuilder pages for core Search pages. diff --git a/ext/civigrant/info.xml b/ext/civigrant/info.xml index 44890de65c..afa152e1a0 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.67.beta1 + 5.68.alpha1 stable - 5.67 + 5.68 CiviGrant was originally a core component before migrating to an extension diff --git a/ext/civiimport/info.xml b/ext/civiimport/info.xml index c2bfbe2060..ce9ced5fe7 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.67.beta1 + 5.68.alpha1 alpha - 5.67 + 5.68 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 417a3a5e24..a922e4846b 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.67.beta1 + 5.68.alpha1 stable - 5.67 + 5.68 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 1f478c837a..4fed5ff1c8 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.67.beta1 + 5.68.alpha1 stable - 5.67 + 5.68 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 e9a934d9cd..caa727f5a0 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.67.beta1 + 5.68.alpha1 stable - 5.67 + 5.68 diff --git a/ext/eventcart/info.xml b/ext/eventcart/info.xml index e4d520afcd..dd4fd35565 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.67.beta1 + 5.68.alpha1 mgmt:hidden stable - 5.67 + 5.68 diff --git a/ext/ewaysingle/info.xml b/ext/ewaysingle/info.xml index c7608d7c4b..33dc82269b 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.67.beta1 + 5.68.alpha1 mgmt:hidden stable - 5.67 + 5.68 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 edcbfc089f..9511b97f3c 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.67.beta1 + 5.68.alpha1 stable - 5.67 + 5.68 mgmt:hidden diff --git a/ext/flexmailer/info.xml b/ext/flexmailer/info.xml index 8643704f7b..1f629c8c54 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.67.beta1 + 5.68.alpha1 stable FlexMailer is an email delivery engine which replaces the internal guts @@ -23,7 +23,7 @@ to provide richer email features. - 5.67 + 5.68 mgmt:required diff --git a/ext/greenwich/info.xml b/ext/greenwich/info.xml index 569aca4f5f..696c0356bc 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.67.beta1 + 5.68.alpha1 mgmt:hidden stable - 5.67 + 5.68 diff --git a/ext/legacycustomsearches/info.xml b/ext/legacycustomsearches/info.xml index d091a1811f..68da476446 100644 --- a/ext/legacycustomsearches/info.xml +++ b/ext/legacycustomsearches/info.xml @@ -15,10 +15,10 @@ http://www.gnu.org/licenses/agpl-3.0.html 2021-07-25 - 5.67.beta1 + 5.68.alpha1 stable - 5.67 + 5.68 This is our old search system which has limited support. All new effort is on SearchKit diff --git a/ext/message_admin/info.xml b/ext/message_admin/info.xml index 4661982619..d7dbe160db 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.67.beta1 + 5.68.alpha1 alpha - 5.67 + 5.68 org.civicrm.afform diff --git a/ext/oauth-client/info.xml b/ext/oauth-client/info.xml index 2b43ec3bd1..5a053ade6b 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.67.beta1 + 5.68.alpha1 stable - 5.67 + 5.68 org.civicrm.afform diff --git a/ext/payflowpro/info.xml b/ext/payflowpro/info.xml index 0c5b02fb2a..035ce3f04f 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.67.beta1 + 5.68.alpha1 stable - 5.67 + 5.68 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 f72557bdb8..73c330502b 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.67.beta1 + 5.68.alpha1 mgmt:hidden stable - 5.67 + 5.68 diff --git a/ext/scheduled_communications/info.xml b/ext/scheduled_communications/info.xml index f6cd119c57..be78bc666c 100644 --- a/ext/scheduled_communications/info.xml +++ b/ext/scheduled_communications/info.xml @@ -13,10 +13,10 @@ http://www.gnu.org/licenses/agpl-3.0.html 2023-09-04 - 5.67.beta1 + 5.68.alpha1 beta - 5.67 + 5.68 Click on the chat link above to discuss development, report problems or ask questions. diff --git a/ext/search_kit/info.xml b/ext/search_kit/info.xml index dad0b6b319..57bf06d853 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.67.beta1 + 5.68.alpha1 stable mgmt:required - 5.67 + 5.68 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 645d685699..d0488d5ab1 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.67.beta1 + 5.68.alpha1 mgmt:hidden stable - 5.67 + 5.68 setting-php@1.0.0 diff --git a/ext/standaloneusers/info.xml b/ext/standaloneusers/info.xml index c20a042af5..dab664f0b8 100644 --- a/ext/standaloneusers/info.xml +++ b/ext/standaloneusers/info.xml @@ -15,10 +15,10 @@ http://www.gnu.org/licenses/agpl-3.0.html 2022-11-11 - 5.67.beta1 + 5.68.alpha1 alpha - 5.67 + 5.68 org.civicrm.search_kit diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql index ba8e5c22f3..22737b0c63 100644 --- a/sql/civicrm_generated.mysql +++ b/sql/civicrm_generated.mysql @@ -2961,7 +2961,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.67.beta1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}'); + (1,'Default Domain Name',NULL,'5.68.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 f9786eb2e5..cb7d8d7f73 100644 --- a/sql/test_data_second_domain.mysql +++ b/sql/test_data_second_domain.mysql @@ -907,4 +907,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.67.beta1'; +UPDATE civicrm_domain SET version = '5.68.alpha1'; diff --git a/xml/version.xml b/xml/version.xml index db860cddda..cf450594ea 100644 --- a/xml/version.xml +++ b/xml/version.xml @@ -1,4 +1,4 @@ - 5.67.beta1 + 5.68.alpha1 -- 2.25.1