Set version to 5.48.alpha1

diff --git a/CRM/Upgrade/Incremental/php/FiveFortyEight.php b/CRM/Upgrade/Incremental/php/FiveFortyEight.php
new file mode 100644 (file)
index 0000000..2f8b3bf
--- /dev/null
+++ b/CRM/Upgrade/Incremental/php/FiveFortyEight.php
@@ -0,0 +1,34 @@
+<?php
+/*
+ +--------------------------------------------------------------------+
+ | Copyright CiviCRM LLC. All rights reserved.                        |
+ |                                                                    |
+ | This work is published under the GNU AGPLv3 license with some      |
+ | permitted exceptions and without any warranty. For full license    |
+ | and copyright information, see https://civicrm.org/licensing       |
+ +--------------------------------------------------------------------+
+ */
+
+/**
+ * Upgrade logic for the 5.48.x series.
+ *
+ * Each minor version in the series is handled by either a `5.48.x.mysql.tpl` file,
+ * or a function in this class named `upgrade_5_48_x`.
+ * If only a .tpl file exists for a version, it will be run automatically.
+ * If the function exists, it must explicitly add the 'runSql' task if there is a corresponding .mysql.tpl.
+ *
+ * This class may also implement `setPreUpgradeMessage()` and `setPostUpgradeMessage()` functions.
+ */
+class CRM_Upgrade_Incremental_php_FiveFortyEight extends CRM_Upgrade_Incremental_Base {
+
+  /**
+   * Upgrade step; adds tasks including 'runSql'.
+   *
+   * @param string $rev
+   *   The version number matching this function name
+   */
+  public function upgrade_5_48_alpha1($rev): void {
+    $this->addTask(ts('Upgrade DB to %1: SQL', [1 => $rev]), 'runSql', $rev);
+  }
+
+}

diff --git a/CRM/Upgrade/Incremental/sql/5.48.alpha1.mysql.tpl b/CRM/Upgrade/Incremental/sql/5.48.alpha1.mysql.tpl
new file mode 100644 (file)
index 0000000..d6dbb99
--- /dev/null
+++ b/CRM/Upgrade/Incremental/sql/5.48.alpha1.mysql.tpl
@@ -0,0 +1 @@
+{* file to handle db changes in 5.48.alpha1 during upgrade *}

diff --git a/ext/afform/admin/info.xml b/ext/afform/admin/info.xml
index 60ab3285594dcc06374ecd51d20ae3f9f34d3ba6..b957e57d5ca5f6499752334c8b667844e4b5a9ca 100644 (file)
--- a/ext/afform/admin/info.xml
+++ b/ext/afform/admin/info.xml
@@ -13,7 +13,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-01-09</releaseDate>
-  <version>5.47.beta1</version>
+  <version>5.48.alpha1</version>
   <develStage>beta</develStage>
   <compatibility>
     <ver>5.23</ver>

diff --git a/ext/afform/core/info.xml b/ext/afform/core/info.xml
index 1218c706451159b72ca7b4ce758f0734875b3e61..fb9ae8ea025ebae0ebd80077eed126f39626dd76 100644 (file)
--- a/ext/afform/core/info.xml
+++ b/ext/afform/core/info.xml
@@ -13,7 +13,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-01-09</releaseDate>
-  <version>5.47.beta1</version>
+  <version>5.48.alpha1</version>
   <develStage>beta</develStage>
   <compatibility>
     <ver>5.23</ver>

diff --git a/ext/afform/html/info.xml b/ext/afform/html/info.xml
index 8332bd4492d0159bc5129a4a79bb17a47750f208..d9d25042c87986075f186936f40e26cff2d96b65 100644 (file)
--- a/ext/afform/html/info.xml
+++ b/ext/afform/html/info.xml
@@ -13,7 +13,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-01-09</releaseDate>
-  <version>5.47.beta1</version>
+  <version>5.48.alpha1</version>
   <develStage>alpha</develStage>
   <compatibility>
     <ver>5.23</ver>

diff --git a/ext/afform/mock/info.xml b/ext/afform/mock/info.xml
index b05487cdfb59dc114db327fba49dff5dde179d20..4aaf36ff2dca43247142181fb57914b67153bdce 100644 (file)
--- a/ext/afform/mock/info.xml
+++ b/ext/afform/mock/info.xml
@@ -12,7 +12,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-01-09</releaseDate>
-  <version>5.47.beta1</version>
+  <version>5.48.alpha1</version>
   <tags>
     <tag>mgmt:hidden</tag>
   </tags>

diff --git a/ext/authx/info.xml b/ext/authx/info.xml
index f821a46965fafc61afb6788a3481cb4c7e496dc8..c14f8b820ee482707567efc54610da88c8779786 100644 (file)
--- a/ext/authx/info.xml
+++ b/ext/authx/info.xml
@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2021-02-11</releaseDate>
-  <version>5.47.beta1</version>
+  <version>5.48.alpha1</version>
   <develStage>alpha</develStage>
   <compatibility>
     <ver>5.0</ver>

diff --git a/ext/ckeditor4/info.xml b/ext/ckeditor4/info.xml
index ef7508c4a657baf7adb712ec6369ce2a52dd9e32..f19368a4fb28c67264023bede0ae91c68818720b 100644 (file)
--- a/ext/ckeditor4/info.xml
+++ b/ext/ckeditor4/info.xml
@@ -15,7 +15,7 @@
     <url desc="Licensing">https://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2021-05-23</releaseDate>
-  <version>5.47.beta1</version>
+  <version>5.48.alpha1</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>5.39</ver>

diff --git a/ext/contributioncancelactions/info.xml b/ext/contributioncancelactions/info.xml
index 5ac2ba82495eff9c632c1d258d7aacb332e442c1..0cfe20bfe0755e5ebc0399130bd40877e39420be 100644 (file)
--- a/ext/contributioncancelactions/info.xml
+++ b/ext/contributioncancelactions/info.xml
@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-10-12</releaseDate>
-  <version>5.47.beta1</version>
+  <version>5.48.alpha1</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>5.32</ver>

diff --git a/ext/eventcart/info.xml b/ext/eventcart/info.xml
index 416933501ffa6255e2a8857b287679595d38f9c9..09c120f6c85e0caea57c3d199c5f6ffbec7fb4f6 100644 (file)
--- a/ext/eventcart/info.xml
+++ b/ext/eventcart/info.xml
@@ -13,7 +13,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-08-03</releaseDate>
-  <version>5.47.beta1</version>
+  <version>5.48.alpha1</version>
   <tags>
     <tag>mgmt:hidden</tag>
   </tags>

diff --git a/ext/ewaysingle/info.xml b/ext/ewaysingle/info.xml
index db00ab663e6b0e9c45fee89ce8d43dc38f2f9834..2bd54500161b0f459a0196847b2d8756b174dfd2 100644 (file)
--- a/ext/ewaysingle/info.xml
+++ b/ext/ewaysingle/info.xml
@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-10-07</releaseDate>
-  <version>5.47.beta1</version>
+  <version>5.48.alpha1</version>
   <tags>
     <tag>mgmt:hidden</tag>
   </tags>

diff --git a/ext/financialacls/info.xml b/ext/financialacls/info.xml
index 28fb9e7f43de974ef4f16c326d1ea4e145246d22..a41fe3772199180645a516472548e91f0c5d1fad 100644 (file)
--- a/ext/financialacls/info.xml
+++ b/ext/financialacls/info.xml
@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-08-27</releaseDate>
-  <version>5.47.beta1</version>
+  <version>5.48.alpha1</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>5.30</ver>

diff --git a/ext/flexmailer/info.xml b/ext/flexmailer/info.xml
index aff98735a08d27e13df83664aab793d9b4353703..676da3dc8da40215c6edd95e690a62c2236eeac0 100644 (file)
--- a/ext/flexmailer/info.xml
+++ b/ext/flexmailer/info.xml
@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-08-05</releaseDate>
-  <version>5.47.beta1</version>
+  <version>5.48.alpha1</version>
   <develStage>stable</develStage>
   <comments>
     FlexMailer is an email delivery engine which replaces the internal guts

diff --git a/ext/greenwich/info.xml b/ext/greenwich/info.xml
index d41cf17fe569c788e938644c9008b4d2e734a130..9f69dfe502a19df7ca6c078bac7230a4cacf83a8 100644 (file)
--- a/ext/greenwich/info.xml
+++ b/ext/greenwich/info.xml
@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-07-21</releaseDate>
-  <version>5.47.beta1</version>
+  <version>5.48.alpha1</version>
   <tags>
     <tag>mgmt:hidden</tag>
   </tags>

diff --git a/ext/legacycustomsearches/info.xml b/ext/legacycustomsearches/info.xml
index 6bd7bc586c5b0c4be297e87f6a747d83eefc7ee5..51c328e04472b5283f0677fb49e22fc4f8efe6a7 100644 (file)
--- a/ext/legacycustomsearches/info.xml
+++ b/ext/legacycustomsearches/info.xml
@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2021-07-25</releaseDate>
-  <version>5.47.beta1</version>
+  <version>5.48.alpha1</version>
   <develStage>stable</develStage>
   <tags>
     <tag>mgmt:hidden</tag>

diff --git a/ext/message_admin/info.xml b/ext/message_admin/info.xml
index 79ba6f04f63fe9907921161338a296dce9ca7839..9ac47d89e0e543daf3ac14668204ff7da2231425 100644 (file)
--- a/ext/message_admin/info.xml
+++ b/ext/message_admin/info.xml
@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2021-06-12</releaseDate>
-  <version>5.47.beta1</version>
+  <version>5.48.alpha1</version>
   <tags>
     <tag>mgmt:hidden</tag>
   </tags>

diff --git a/ext/oauth-client/info.xml b/ext/oauth-client/info.xml
index e8fcc584c2bab31283b042f71bd25b891f13325e..27cf41d2f191c00dad8e757b4da6bdf53bfd2df2 100644 (file)
--- a/ext/oauth-client/info.xml
+++ b/ext/oauth-client/info.xml
@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-10-23</releaseDate>
-  <version>5.47.beta1</version>
+  <version>5.48.alpha1</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>5.38</ver>

diff --git a/ext/payflowpro/info.xml b/ext/payflowpro/info.xml
index c9694b9a39bcef281122a685c14c54693c54c879..bd005684f52bcb2baf81e01dea6f5ad67a61e9b7 100644 (file)
--- a/ext/payflowpro/info.xml
+++ b/ext/payflowpro/info.xml
@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2021-04-13</releaseDate>
-  <version>5.47.beta1</version>
+  <version>5.48.alpha1</version>
   <develStage>stable</develStage>
   <compatibility>
     <ver>5.0</ver>

diff --git a/ext/recaptcha/info.xml b/ext/recaptcha/info.xml
index bd7f4764679abc425d4877834982ac47a521e248..2c4b8078709e320b1e3d16e040695c629caf6e53 100644 (file)
--- a/ext/recaptcha/info.xml
+++ b/ext/recaptcha/info.xml
@@ -13,7 +13,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2021-04-03</releaseDate>
-  <version>5.47.beta1</version>
+  <version>5.48.alpha1</version>
   <tags>
     <tag>mgmt:hidden</tag>
   </tags>

diff --git a/ext/search_kit/info.xml b/ext/search_kit/info.xml
index ef2ac331993c938a81c8029909a40ba2d890162c..c9ef1e57dc2d51be0b07b265ee0958e99e767539 100644 (file)
--- a/ext/search_kit/info.xml
+++ b/ext/search_kit/info.xml
@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2021-01-06</releaseDate>
-  <version>5.47.beta1</version>
+  <version>5.48.alpha1</version>
   <develStage>beta</develStage>
   <compatibility>
     <ver>5.38</ver>

diff --git a/ext/sequentialcreditnotes/info.xml b/ext/sequentialcreditnotes/info.xml
index 30de9a6b152e692460abce5385db08ec85d5eecf..3620334322f21e6c8947a428f54cfdd0b2b83560 100644 (file)
--- a/ext/sequentialcreditnotes/info.xml
+++ b/ext/sequentialcreditnotes/info.xml
@@ -15,7 +15,7 @@
     <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url>
   </urls>
   <releaseDate>2020-01-28</releaseDate>
-  <version>5.47.beta1</version>
+  <version>5.48.alpha1</version>
   <tags>
     <tag>mgmt:hidden</tag>
   </tags>

diff --git a/sql/civicrm_generated.mysql b/sql/civicrm_generated.mysql
index 7e67c4572e2a424cb21ab3bc585791022a53721d..8267a3e465202eb726278dabe9a8b70c427a29a5 100644 (file)
--- a/sql/civicrm_generated.mysql
+++ b/sql/civicrm_generated.mysql
@@ -2940,7 +2940,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.47.beta1',1,NULL,'a:1:{s:5:\"en_US\";a:0:{}}');
+ (1,'Default Domain Name',NULL,'5.48.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 1c5026ca895d922953f94028431f744d1225c9b7..97801570b809a902f31ae7f646943721ee82b56f 100644 (file)
--- a/sql/test_data_second_domain.mysql
+++ b/sql/test_data_second_domain.mysql
@@ -909,4 +909,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.47.beta1';
+UPDATE civicrm_domain SET version = '5.48.alpha1';

diff --git a/xml/version.xml b/xml/version.xml
index b7c8855e597558bd874db0708c6a61d6730fc083..27da522f528ef1fb4406ce3e8f451d751fa9ccbe 100644 (file)
--- a/xml/version.xml
+++ b/xml/version.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="iso-8859-1" ?>
 <version>
-  <version_no>5.47.beta1</version_no>
+  <version_no>5.48.alpha1</version_no>
 </version>