From aeccb85424ea54e3c521f4ebae69407ec7fa83ed Mon Sep 17 00:00:00 2001 From: Harald Leithner Date: Sun, 23 Jan 2022 12:03:11 +0100 Subject: [PATCH 1/2] Update package branch --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 076b5064f8977..954b3df2b709c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -415,11 +415,11 @@ steps: path: /reference when: branch: - - 4.1-dev + - 4.2-dev --- kind: signature -hmac: daa8e5588cc88058bc57aadf35e3d9dd55eefaa9419c457ce374a0dd19eb7cda +hmac: d9707d261edba35bc6b70f09a1babee119cb0a88cebda40171248e5c0a8b135e ... From 541c99fb229b7502c6fd8baadbf77eaeaaa1d519 Mon Sep 17 00:00:00 2001 From: Harald Leithner Date: Sun, 23 Jan 2022 12:10:17 +0100 Subject: [PATCH 2/2] Update version to 4.2-dev --- README.md | 8 ++++---- README.txt | 4 ++-- administrator/language/en-GB/install.xml | 2 +- administrator/language/en-GB/langmetadata.xml | 2 +- administrator/manifests/files/joomla.xml | 2 +- administrator/manifests/packages/pkg_en-GB.xml | 2 +- api/language/en-GB/install.xml | 2 +- api/language/en-GB/langmetadata.xml | 2 +- build.xml | 2 +- installation/language/en-GB/langmetadata.xml | 2 +- language/en-GB/install.xml | 2 +- language/en-GB/langmetadata.xml | 2 +- libraries/src/Version.php | 6 +++--- 13 files changed, 19 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 54e3d085974dd..6ca05e6ba09cb 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Joomla! CMS™ +Joomla! CMS™ ==================== Build Status @@ -11,8 +11,8 @@ Overview --------------------- * This is the source of Joomla! 4.x. * Joomla's [Official website](https://www.joomla.org). -* Joomla! 4.1 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_4.1_version_history). -* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/4.0-dev). +* Joomla! 4.2 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_4.2_version_history). +* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/4.2-dev). What is Joomla? --------------------- @@ -47,7 +47,7 @@ cd joomla-cms ``` - Go to the 4.0-dev branch: ```bash -git checkout 4.0-dev +git checkout 4.2-dev ``` - Install all the needed composer packages: ```bash diff --git a/README.txt b/README.txt index a4539409f9872..d36d3afafc030 100644 --- a/README.txt +++ b/README.txt @@ -3,8 +3,8 @@ Joomla! CMS™ 1- Overview * This is a Joomla! 4.x installation/upgrade package. * Joomla! Official site: https://www.joomla.org - * Joomla! 4.1 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_4.1_version_history - * Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/4.0-dev + * Joomla! 4.2 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_4.2_version_history + * Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/4.2-dev 2- What is Joomla? * Joomla! is a Content Management System (CMS) which enables you to build websites and powerful online applications. diff --git a/administrator/language/en-GB/install.xml b/administrator/language/en-GB/install.xml index c8659ad484aeb..dacc5f79ed5bd 100644 --- a/administrator/language/en-GB/install.xml +++ b/administrator/language/en-GB/install.xml @@ -2,7 +2,7 @@ English (en-GB) en-GB - 4.1.0 + 4.2.0 January 2022 Joomla! Project admin@joomla.org diff --git a/administrator/language/en-GB/langmetadata.xml b/administrator/language/en-GB/langmetadata.xml index 2e8da753bf0a5..a7be25c6c1d8c 100644 --- a/administrator/language/en-GB/langmetadata.xml +++ b/administrator/language/en-GB/langmetadata.xml @@ -1,7 +1,7 @@ English (en-GB) - 4.1.0 + 4.2.0 January 2022 Joomla! Project admin@joomla.org diff --git a/administrator/manifests/files/joomla.xml b/administrator/manifests/files/joomla.xml index 77e57ae86ed26..84402f72b2c08 100644 --- a/administrator/manifests/files/joomla.xml +++ b/administrator/manifests/files/joomla.xml @@ -6,7 +6,7 @@ www.joomla.org (C) 2019 Open Source Matters, Inc. GNU General Public License version 2 or later; see LICENSE.txt - 4.1.0-dev + 4.2.0-dev January 2022 FILES_JOOMLA_XML_DESCRIPTION diff --git a/administrator/manifests/packages/pkg_en-GB.xml b/administrator/manifests/packages/pkg_en-GB.xml index a2d47e858cbda..5703987769047 100644 --- a/administrator/manifests/packages/pkg_en-GB.xml +++ b/administrator/manifests/packages/pkg_en-GB.xml @@ -2,7 +2,7 @@ English (en-GB) Language Pack en-GB - 4.1.0.1 + 4.2.0.1 January 2022 Joomla! Project admin@joomla.org diff --git a/api/language/en-GB/install.xml b/api/language/en-GB/install.xml index 7a97416e4d1e9..73660740293cf 100644 --- a/api/language/en-GB/install.xml +++ b/api/language/en-GB/install.xml @@ -2,7 +2,7 @@ English (en-GB) en-GB - 4.1.0 + 4.2.0 January 2022 Joomla! Project admin@joomla.org diff --git a/api/language/en-GB/langmetadata.xml b/api/language/en-GB/langmetadata.xml index c71909c412579..cdbc39cfb98d6 100644 --- a/api/language/en-GB/langmetadata.xml +++ b/api/language/en-GB/langmetadata.xml @@ -1,7 +1,7 @@ English (en-GB) - 4.1.0 + 4.2.0 January 2022 Joomla! Project admin@joomla.org diff --git a/build.xml b/build.xml index eca54ed52ef28..02218eaf40946 100644 --- a/build.xml +++ b/build.xml @@ -85,7 +85,7 @@ - + diff --git a/installation/language/en-GB/langmetadata.xml b/installation/language/en-GB/langmetadata.xml index 21e07f4bcc97b..7c4b9ace040ca 100644 --- a/installation/language/en-GB/langmetadata.xml +++ b/installation/language/en-GB/langmetadata.xml @@ -1,7 +1,7 @@ English (United Kingdom) - 4.1.0 + 4.2.0 January 2022 Joomla! Project (C) 2005 Open Source Matters, Inc. diff --git a/language/en-GB/install.xml b/language/en-GB/install.xml index 27af1b35c807d..b5c586eec48ec 100644 --- a/language/en-GB/install.xml +++ b/language/en-GB/install.xml @@ -2,7 +2,7 @@ English (en-GB) en-GB - 4.1.0 + 4.2.0 January 2022 Joomla! Project admin@joomla.org diff --git a/language/en-GB/langmetadata.xml b/language/en-GB/langmetadata.xml index 8e7544db658db..1239b6afccc1a 100644 --- a/language/en-GB/langmetadata.xml +++ b/language/en-GB/langmetadata.xml @@ -1,7 +1,7 @@ English (en-GB) - 4.1.0 + 4.2.0 January 2022 Joomla! Project admin@joomla.org diff --git a/libraries/src/Version.php b/libraries/src/Version.php index e8aef5a029ef4..1564e8a077973 100644 --- a/libraries/src/Version.php +++ b/libraries/src/Version.php @@ -42,7 +42,7 @@ final class Version * @var integer * @since 3.8.0 */ - const MINOR_VERSION = 1; + const MINOR_VERSION = 2; /** * Patch release version. @@ -85,7 +85,7 @@ final class Version * @var string * @since 3.5 */ - const RELDATE = '18-January-2022'; + const RELDATE = '23-January-2022'; /** * Release time. @@ -93,7 +93,7 @@ final class Version * @var string * @since 3.5 */ - const RELTIME = '18:00'; + const RELTIME = '11:04'; /** * Release timezone.