diff --git a/README.md b/README.md index a5a1d888b6ee9..6e97a270c7f3b 100644 --- a/README.md +++ b/README.md @@ -1,21 +1,21 @@ Joomla! CMS™ ==================== -The Joomla! 5.1 branch is under heavy development and not all links in this document are available yet +The Joomla! 5.2 branch is under heavy development and not all links in this document are available yet ------------------------------------------------------------------------------------------------------ Build Status --------------------- | Drone-CI | AppVeyor | PHP | Node | npm | |------------------------------------------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------|--------------------------------------------------------------------------------------|---------------------------------------------------------------------------------| -| [![Build Status](https://ci.joomla.org/api/badges/joomla/joomla-cms/status.svg?branch=5.1-dev)](https://ci.joomla.org/joomla/joomla-cms) | [![Build status](https://ci.appveyor.com/api/projects/status/ru6sxal8jmfckvjc/branch/5.1-dev?svg=true)](https://ci.appveyor.com/project/release-joomla/joomla-cms) | [![PHP](https://img.shields.io/badge/PHP-V8.1.0-green)](https://www.php.net/) | [![node-lts](https://img.shields.io/badge/Node-V18.0-green)](https://nodejs.org/en/) | [![npm](https://img.shields.io/badge/npm-v9.6.7-green)](https://nodejs.org/en/) | +| [![Build Status](https://ci.joomla.org/api/badges/joomla/joomla-cms/status.svg?branch=5.2-dev)](https://ci.joomla.org/joomla/joomla-cms) | [![Build status](https://ci.appveyor.com/api/projects/status/ru6sxal8jmfckvjc/branch/5.2-dev?svg=true)](https://ci.appveyor.com/project/release-joomla/joomla-cms) | [![PHP](https://img.shields.io/badge/PHP-V8.1.0-green)](https://www.php.net/) | [![node-lts](https://img.shields.io/badge/Node-V18.0-green)](https://nodejs.org/en/) | [![npm](https://img.shields.io/badge/npm-v9.6.7-green)](https://nodejs.org/en/) | Overview --------------------- * This is the source of Joomla! 5.x. * Joomla's [Official website](https://www.joomla.org). -* Joomla! 5.1 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_5.1_version_history). -* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/5.1-dev). +* Joomla! 5.2 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_5.2_version_history). +* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/5.2-dev). What is Joomla? --------------------- @@ -48,9 +48,9 @@ git clone https://github.com/joomla/joomla-cms.git ```bash cd joomla-cms ``` -- Go to the 5.1-dev branch: +- Go to the 5.2-dev branch: ```bash -git checkout 5.1-dev +git checkout 5.2-dev ``` - Install all the needed composer packages: ```bash diff --git a/README.txt b/README.txt index e0fb78d5d9457..df1473dc4d14e 100644 --- a/README.txt +++ b/README.txt @@ -1,13 +1,13 @@ Joomla! CMS™ -The Joomla! 5.1 branch is under heavy development and not all links in this document are available yet +The Joomla! 5.2 branch is under heavy development and not all links in this document are available yet ------------------------------------------------------------------------------------------------------ 1- Overview * This is a Joomla! 5.x installation/upgrade package. * Joomla! Official site: https://www.joomla.org - * Joomla! 5.1 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_5.1_version_history - * Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/5.1-dev + * Joomla! 5.2 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_5.2_version_history + * Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/5.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/package.json b/package.json index 09b42ffac5672..855d078472b13 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "joomla", - "version": "5.1.0", + "version": "5.2.0", "description": "Joomla CMS", "license": "GPL-2.0-or-later", "repository": { @@ -131,4 +131,4 @@ "stylelint-order": "^5.0.0", "stylelint-scss": "^4.7.0" } -} \ No newline at end of file +} diff --git a/renovate.json b/renovate.json index 1105626107a71..4af50ee723422 100644 --- a/renovate.json +++ b/renovate.json @@ -10,11 +10,11 @@ "lockFileMaintenance": { "enabled": true }, "composerIgnorePlatformReqs": ["ext-*", "lib-*"], "rangeStrategy": "update-lockfile", - "baseBranches": ["4.2-dev", "4.3-dev", "5.0-dev"], + "baseBranches": ["4.4-dev", "5.0-dev", "5.1-dev", "5.2-dev", "6.0-dev"], "packageRules": [ { "enabled": false, - "matchBaseBranches": "4.2-dev", + "matchBaseBranches": "5.2-dev", "matchPackagePatterns": ["*"] } ],