Skip to content

Commit 9857569

Browse files
authored
[6.1] Preparation for Joomla! 6.1 (#46019)
* Preparation for Joomla! 6.1 * Add release managers to readme * Update CONTRIBUTING.md
1 parent 7fc5fdf commit 9857569

File tree

18 files changed

+87
-61
lines changed

18 files changed

+87
-61
lines changed

.github/CONTRIBUTING.md

Lines changed: 36 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,47 @@
11
Contributing to the Joomla! CMS™
2-
===============
3-
You are welcome to submit a contribution for review and possible inclusion in the Joomla! CMS but, before it will be accepted, we ask that you follow these simple guidelines:
2+
================================
43

5-
* If you have a feature request, then please open a discussion to define the feature request and discuss possible solutions. Discussions can be converted into issues when the request is defined sufficiently that a developer can start coding the feature. In this process you will get feedback from the maintainers, if the feature is something for the Joomla core distribution or not.
4+
You are welcome to submit a contribution for review and possible inclusion in the Joomla! CMS but,
5+
before it will be accepted, we ask that you follow these simple guidelines:
66

7-
* If you have found a bug, open an issue on our [Issue Tracker](https://issues.joomla.org/) or here on GitHub. If you can, please provide a fix and create a pull request (PR) instead; this will automatically create an issue for you so you do not have to create an issue, if you are creating a pull request.
7+
* If you have a feature request, then please open a discussion to define the feature request and discuss possible solutions.
8+
Discussions can be converted into issues when the request is defined sufficiently that a developer can start coding the feature.
9+
In this process you will get feedback from the maintainers, if the feature is something for the Joomla core distribution or not.
10+
11+
* If you have found a bug, open an issue on our [Issue Tracker](https://issues.joomla.org/) or here on GitHub.
12+
If you can, please provide a fix and create a pull request (PR) instead; this will automatically create an issue
13+
for you so you do not have to create an issue, if you are creating a pull request.
814

915
* Follow the [Joomla! Coding Standards](https://manual.joomla.org/docs/get-started/codestyle) for code contributions.
1016

11-
* When filing an issue or opening a Pull Request(PR), please include a clear title and description. The title should be a short summary of the issue. For example, `Invalid Query in com_admin`. All issues and PRs should include a description with as much detail as possible. If it is a PR, include what the issue is, what the PR is addressing, testing instructions and environmental information (PHP version, database driver and version, and other data you can retrieve from your site's system information view) in case the issue is specific to certain environments. If additional information is needed, please be prepared to provide it as our community members review your submission.
17+
* When filing an issue or opening a Pull Request(PR), please include a clear title and description.
18+
The title should be a short summary of the issue. For example, `Invalid Query in com_admin`. All issues and PRs
19+
should include a description with as much detail as possible. If it is a PR, include what the issue is, what the
20+
PR is addressing, testing instructions and environmental information (PHP version, database driver and version,
21+
and other data you can retrieve from your site's system information view) in case the issue is specific to certain
22+
environments. If additional information is needed, please be prepared to provide it as our community members
23+
review your submission.
1224

13-
* Report security issues to the Joomla! Security Strike Team (JSST) at [email protected] or use the [JSST contact form](https://developer.joomla.org/contact-security-team.html). Please do not use the public tracker for security issues. Find [here](https://github.com/joomla/joomla-cms?tab=security-ov-file#readme) more information about the [Security Policies and Procedures](https://github.com/joomla/joomla-cms?tab=security-ov-file#readme).
25+
* Report security issues to the Joomla! Security Strike Team (JSST) at [email protected] or use
26+
the [JSST contact form](https://developer.joomla.org/contact-security-team.html). Please do not use the public tracker
27+
for security issues. Find [here](https://github.com/joomla/joomla-cms?tab=security-ov-file#readme) more information
28+
about the [Security Policies and Procedures](https://github.com/joomla/joomla-cms?tab=security-ov-file#readme).
1429

15-
Please be patient as not all items will be viewed or tested immediately (remember, all bug testing for the Joomla! CMS is done by volunteers) and be receptive to feedback about your code.
30+
Please be patient as not all items will be viewed or tested immediately (remember, all bug testing for the Joomla! CMS
31+
is done by volunteers) and be receptive to feedback about your code.
1632

1733
#### Branches
18-
Joomla 4.4 is in security maintenance mode, until 14th October 2025, which means it will only receive security fixes. Bug fixing PRs should be made to the `5.3-dev` branch. Merged bugfixes will be upmerged into the current branches. New features that do not break backwards compatibility should be made to the `5.4-dev` branch otherwise they should be made to the `6.0-dev` branch.
19-
2034

21-
| Branch | Purpose |
22-
| ------ | ------- |
23-
| 4.4-dev | Branch for the current 4.x Joomla version. Currently in security maintenance mode. |
24-
| 5.3-dev | Branch for the current 5.x Joomla version. Bugfix only for 5.x go into this branch. |
25-
| 5.4-dev | Branch for the next minor 5.x Joomla version. New features go into this branch. |
26-
| 6.0-dev | Branch for the next major Joomla version. New features that include a b/c break have to go into this branch. |
35+
Joomla 4.4 is in security maintenance mode, until 14th October 2025, which means it will only receive security fixes.
36+
Bug fixing PRs should be made to the `5.3-dev` branch. Merged bugfixes will be upmerged into the current branches.
37+
New features that do not break backwards compatibility should be made to the `6.1-dev` branch otherwise
38+
they should be made to the `7.0-dev` branch.
39+
40+
| Branch | Purpose |
41+
|---------|--------------------------------------------------------------------------------------------------------------|
42+
| 4.4-dev | Branch for the current 4.x Joomla version. Currently in security maintenance mode. |
43+
| 5.3-dev | Branch for the current 5.x Joomla version. Bugfix only for 5.x go into this branch. |
44+
| 5.4-dev | Branch for the next minor 5.x Joomla version. Bugfix only for 5.x go into this branch. |
45+
| 6.0-dev | Branch for the next major Joomla version. Bugfix only for 5.x go into this branch. |
46+
| 6.1-dev | Branch for the next minor 6.x Joomla version. New features go into this branch. |
47+
| 7.0-dev | Branch for the next major Joomla version. New features that include a b/c break have to go into this branch. |

README.md

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,38 @@
11
Joomla! CMS™
2-
====================
2+
============
33

4-
The Joomla! 6.0 branch is under heavy development and not all links in this document are available yet
5-
------------------------------------------------------------------------------------------------------
4+
## The Joomla! 6.1 branch is under heavy development and not all links in this document are available yet
65

7-
Build Status
8-
------------
6+
## Build Status
97

108
| Actions | PHP | Node | npm |
119
|-------------------------------------------------------------------------------------------------------------------------------------------------|-------------------------------------------------------------------------------|--------------------------------------------------------------------------------------|----------------------------------------------------------------------------------|
12-
| [![Build Status](https://github.com/joomla/joomla-cms/actions/workflows/ci.yml/badge.svg?branch=6.0-dev)](https://github.com/joomla/joomla-cms) | [![PHP](https://img.shields.io/badge/PHP-V8.3.0-green)](https://www.php.net/) | [![node-lts](https://img.shields.io/badge/Node-V20.0-green)](https://nodejs.org/en/) | [![npm](https://img.shields.io/badge/npm-v10.1.0-green)](https://nodejs.org/en/) |
10+
| [![Build Status](https://github.com/joomla/joomla-cms/actions/workflows/ci.yml/badge.svg?branch=6.1-dev)](https://github.com/joomla/joomla-cms) | [![PHP](https://img.shields.io/badge/PHP-V8.3.0-green)](https://www.php.net/) | [![node-lts](https://img.shields.io/badge/Node-V20.0-green)](https://nodejs.org/en/) | [![npm](https://img.shields.io/badge/npm-v10.1.0-green)](https://nodejs.org/en/) |
11+
12+
## Overview
1313

14-
Overview
15-
---------------------
1614
* This is the source of Joomla! 6.x.
1715
* Joomla's [Official website](https://www.joomla.org).
18-
* Joomla! 6.0 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_6.0_version_history).
19-
* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/6.0-dev).
16+
* Joomla! 6.1 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_6.1_version_history).
17+
* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/6.1-dev).
18+
* Release Managers responsible for Joomla! 6.1
19+
* Stefan Wendhausen @tecpromotion
20+
* Harald Leithner @HLeithner
21+
22+
## What is Joomla?
2023

21-
What is Joomla?
22-
---------------------
2324
* [Joomla!](https://www.joomla.org/about-joomla.html) is a **Content Management System** (CMS) which enables you to build websites and powerful online applications.
2425
* It is a simple and powerful web server application which requires a server with PHP and either MySQL, MariaDB or PostgreSQL to run. You can find [full technical requirements here](https://downloads.joomla.org/technical-requirements).
2526
* Joomla! is **free and Open Source software** distributed under the GNU General Public License version 2 or later.
2627

27-
Looking for an installable package?
28-
---------------------
28+
## Looking for an installable package?
29+
2930
Joomla is not installable out of the box from this repository, please use:
3031
- For the latest stable package: https://downloads.joomla.org
3132
- For a nightly package: https://developer.joomla.org/nightly-builds.html
3233

33-
How to get a working installation from the source
34-
---------------------
34+
## How to get a working installation from the source
35+
3536
For detailed instructions please visit https://docs.joomla.org/Special:MyLanguage/J5.x:Setting_Up_Your_Local_Environment
3637

3738
You will need:
@@ -49,9 +50,9 @@ git clone https://github.com/joomla/joomla-cms.git
4950
```bash
5051
cd joomla-cms
5152
```
52-
- Go to the 6.0-dev branch:
53+
- Go to the 6.1-dev branch:
5354
```bash
54-
git checkout 6.0-dev
55+
git checkout 6.1-dev
5556
```
5657
- Install all the needed composer packages:
5758
```bash
@@ -67,8 +68,8 @@ Joomla creates a cache of the namespaces of its extensions in `JOOMLA_ROOT/admin
6768
extensions are created, deleted or removed in git then this file needs to be recreated. You can simply delete the file
6869
and it will be regenerated on the next call to Joomla.
6970

70-
Do you want to improve Joomla?
71-
--------------------
71+
## Do you want to improve Joomla?
72+
7273
* Where to [request a feature](https://issues.joomla.org)?
7374
* How do you [report a bug](https://docs.joomla.org/Special:MyLanguage/Filing_bugs_and_issues) on the [Issue Tracker](https://issues.joomla.org)?
7475
* How to [submit code](https://manual.joomla.org/docs/get-started/git/) to the Joomla CMS using a Pull Request?
@@ -77,8 +78,8 @@ Do you want to improve Joomla?
7778
* Documentation for [Web designers](https://docs.joomla.org/Special:MyLanguage/Web_designers).
7879
* Provide a translation for Joomla: [Joomla Crowdin Project](https://joomla.crowdin.com/cms)
7980

80-
Copyright
81-
---------------------
81+
## Copyright
82+
8283
* (C) 2005 Open Source Matters, Inc. <https://www.joomla.org>
8384
* Distributed under the GNU General Public License version 2 or later
8485
* See [License details](https://docs.joomla.org/Special:MyLanguage/Joomla_Licenses)

README.txt

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
Joomla! CMS™
22

3-
The Joomla! 6.0 branch is under heavy development and not all links in this document are available yet
3+
The Joomla! 6.1 branch is under heavy development and not all links in this document are available yet
44
------------------------------------------------------------------------------------------------------
55

66
1- Overview
77
* This is a Joomla! 6.x installation/upgrade package.
88
* Joomla! Official site: https://www.joomla.org
9-
* Joomla! 6.0 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_6.0_version_history
10-
* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/6.0-dev
9+
* Joomla! 6.1 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_6.1_version_history
10+
* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/6.1-dev
11+
* Release Managers responsible for Joomla! 6.1
12+
* Stefan Wendhausen @tecpromotion
13+
* Harald Leithner @HLeithner
1114

1215
2- What is Joomla?
1316
* Joomla! is a Content Management System (CMS) which enables you to build websites and powerful online applications.
@@ -51,6 +54,7 @@ The Joomla! 6.0 branch is under heavy development and not all links in this docu
5154

5255
10- Where can you get support and help?
5356
* The Joomla! Documentation: https://docs.joomla.org/Special:MyLanguage/Main_Page
57+
* Developer Documentation: https://manual.joomla.org/docs/
5458
* FAQ Frequently Asked Questions: https://docs.joomla.org/Special:MyLanguage/Category:FAQ
5559
* Find the information you need: https://docs.joomla.org/Special:MyLanguage/Start_here
5660
* Find help and other users: https://www.joomla.org/about-joomla/create-and-share.html

administrator/language/en-GB/install.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<extension client="administrator" type="language" method="upgrade">
33
<name>English (en-GB)</name>
44
<tag>en-GB</tag>
5-
<version>6.0.0</version>
5+
<version>6.1.0</version>
66
<creationDate>2025-08</creationDate>
77
<author>Joomla! Project</author>
88
<authorEmail>[email protected]</authorEmail>

administrator/language/en-GB/langmetadata.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<metafile client="administrator">
33
<name>English (en-GB)</name>
4-
<version>6.0.0</version>
4+
<version>6.1.0</version>
55
<creationDate>2025-08</creationDate>
66
<author>Joomla! Project</author>
77
<authorEmail>[email protected]</authorEmail>

administrator/manifests/files/joomla.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<authorUrl>www.joomla.org</authorUrl>
77
<copyright>(C) 2019 Open Source Matters, Inc.</copyright>
88
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
9-
<version>6.0.0-beta2-dev</version>
9+
<version>6.1.0-alpha1-dev</version>
1010
<creationDate>2025-08</creationDate>
1111
<description>FILES_JOOMLA_XML_DESCRIPTION</description>
1212

administrator/manifests/packages/pkg_en-GB.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<extension type="package" method="upgrade">
33
<name>English (en-GB) Language Pack</name>
44
<packagename>en-GB</packagename>
5-
<version>6.0.0.1</version>
5+
<version>6.1.0.1</version>
66
<creationDate>2025-08</creationDate>
77
<author>Joomla! Project</author>
88
<authorEmail>[email protected]</authorEmail>

api/language/en-GB/install.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<extension client="api" type="language" method="upgrade">
33
<name>English (en-GB)</name>
44
<tag>en-GB</tag>
5-
<version>6.0.0</version>
5+
<version>6.1.0</version>
66
<creationDate>2025-08</creationDate>
77
<author>Joomla! Project</author>
88
<authorEmail>[email protected]</authorEmail>

api/language/en-GB/langmetadata.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<metafile client="api">
33
<name>English (en-GB)</name>
4-
<version>6.0.0</version>
4+
<version>6.1.0</version>
55
<creationDate>2025-08</creationDate>
66
<author>Joomla! Project</author>
77
<authorEmail>[email protected]</authorEmail>

build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
<arg value="--template" />
8686
<arg value="joomla" />
8787
<arg value="--title" />
88-
<arg value="Joomla! CMS 6.0 API" />
88+
<arg value="Joomla! CMS 6.1 API" />
8989
</exec>
9090
</target>
9191

0 commit comments

Comments
 (0)