Skip to content
This repository was archived by the owner on Nov 19, 2024. It is now read-only.

Commit bb9bf86

Browse files
Merge pull request magento-commerce/devdocs#2524 from magento-devdocs/2022-release-schedule
2022 release policy and schedule updates
2 parents bb2b1c7 + f1f7b10 commit bb9bf86

File tree

6 files changed

+88
-67
lines changed

6 files changed

+88
-67
lines changed

src/_data/toc/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ pages:
1414
versionless: true
1515

1616
- label: Lifecycle policy
17-
url: /release/lifecycle-policy.html
17+
url: https://magento.com/sites/default/files/magento-software-lifecycle-policy.pdf
1818
versionless: true
1919

2020
- label: Availability

src/guides/v2.3/extension-dev-guide/versioning/codebase-changes.md

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,18 @@ group: php-developer-guide
33
title: Codebase changes
44
---
55

6-
Every Magento version release includes a change in the codebase.
7-
The scope of the change determines whether the MAJOR, MINOR, or PATCH number increases in the version.
6+
Every release includes a change in the codebase. The scope of the change determines whether the MAJOR, MINOR, or PATCH number increases in the version.
87

98
## Public vs private code changes
109

11-
A Magento module's codebase consists of public and private code.
10+
A module's codebase consists of public and private code.
1211
Public code includes Public [API](https://glossary.magento.com/api)(indicated by the `@api` docblock tag) and Public Customization Points.
1312
All other code is considered private.
1413

1514
Changes in public code always trigger MINOR or MAJOR version increases.
1615

1716
In most cases, modifications to private code will trigger PATCH version increases.
18-
On rare occasions, if the Magento development team made significant modifications to private code, they will increase the MINOR or MAJOR version.
17+
On rare occasions, if the Adobe development team made significant modifications to private code, they will increase the MINOR or MAJOR version.
1918

2019
Third-party modules should not use private code.
2120
If this is unavoidable, you must depend on the PATCH version of the core modules used.
@@ -30,13 +29,13 @@ Modifications that break Customization Points will trigger an increase in a modu
3029

3130
An interface represents either an API or a Customization Point.
3231

33-
This policy allows third-party module developers to declare more granular dependencies depending on their module's interaction with Magento modules.
32+
This policy allows third-party module developers to declare more granular dependencies depending on their module's interaction with core modules.
3433

3534
## Deprecation
3635

37-
Marking public code with `@deprecated` indicates that Magento plans to remove that code in a future MINOR release.
36+
Marking public code with `@deprecated` indicates that Adobe plans to remove that code in a future MINOR release or potentially after a year if no MINOR version is released.
3837

39-
When Magento deprecates the API or a customization point in favor of a new implementation, the `@see` annotation points to the new implementation.
38+
When Adobe deprecates the API or a customization point in favor of a new implementation, the `@see` annotation points to the new implementation.
4039

4140
**Deprecated Code Example:**
4241

@@ -55,7 +54,7 @@ public function save()
5554
## Version increase scenarios
5655

5756
This table lists code change scenarios and which version number it affects.
58-
Use this table to understand what changes Magento can make and which version number gets increased for that change.
57+
Use this table to understand what changes Adobe can make and which version number gets increased for that change.
5958
Any change not listed below is considered a PATCH level change.
6059

6160
| API/Customization Point | Code Change| Version Change |
@@ -162,7 +161,7 @@ Any change not listed below is considered a PATCH level change.
162161

163162
### PHP Classes Intended for Extension
164163

165-
Though inheritance is discouraged in Magento, the following classes are still acceptable for extension at the moment:
164+
Though inheritance is discouraged, the following classes are still acceptable for extensions at the moment:
166165

167166
* \Magento\Framework\Model\AbstractExtensibleModel
168167
* \Magento\Framework\Api\AbstractExtensibleObject
@@ -175,4 +174,11 @@ Though inheritance is discouraged in Magento, the following classes are still ac
175174
* \Magento\Framework\View\Element\AbstractBlock
176175
* \Magento\Framework\View\Element\Template
177176

178-
As Magento framework improves, this list should be reduced and, eventually, eliminated.
177+
As the framework improves, this list should be reduced and, eventually, eliminated.
178+
179+
{:.ref-header}
180+
Related topics
181+
182+
* [Release policy]({{ site.baseurl }}/release/policy/)
183+
* [Upcoming releases]({{ site.baseurl }}/release/)
184+
* [Backward compatibility policy]({{ site.baseurl }}/contributor-guide/backward-compatible-development/)

src/guides/v2.3/extension-dev-guide/versioning/index.md

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
---
22
group: php-developer-guide
3-
title: Magento versioning schema
3+
title: Versioning schema
44
redirect_from:
55
- /guides/v2.3/architecture/versioning.html
66
---
77

8-
Magento software and Magento module releases have their own unique version number.
8+
{{site.data.var.ee}} and {{site.data.var.ce}} application and module releases have their own unique version number.
99

10-
## Software version format
10+
## Application version format
1111

12-
A change in the version for the Magento software indicates a patch or feature release.
12+
A change in the version for the application indicates a patch or feature release.
1313
This version change does not reflect the nature of the changes in the code base.
1414

1515
## Module version format
@@ -24,6 +24,9 @@ The format follows [Semantic Versioning][semantic-versioning] rules for any `@ap
2424
* The MINOR version increments when backward-compatible functionality has been added or if the module's customization points have changed.
2525
* The PATCH version increments when backward-compatible bug fixes occur.
2626

27+
{:.bs-callout-info}
28+
On an exceptional basis, breaking changes or additional patches or hotfixes may be released on a PATCH version to address security or compliance issues and high-impact quality issues.
29+
2730
### Pre-release versions
2831

2932
For pre-release versions, the format is:
@@ -33,15 +36,15 @@ For pre-release versions, the format is:
3336
| `alpha`, `beta` or `rc` | Stability indicators, as described in the [`version_compare()`][php-version-compare]{:target="_blank"} specification|
3437
| `n` | An increment number to distinguish releases of the non-stable versions |
3538

36-
Magento's module versioning policy complies with the following specifications:
39+
Adobe's module versioning policy complies with the following specifications:
3740

3841
* [Semantic Versioning][semantic-versioning]{:target="_blank"}
3942
* [Composer version specification][composer-versioning]{:target="_blank"}
4043
* [PHP `version_compare()` specification][php-version-compare]{:target="_blank"}
4144

4245
## Where versioning is used
4346

44-
The software version can be found in the source code of any [Magento component](https://glossary.magento.com/magento-component) or bundle, inside the `composer.json` file.
47+
The application version can be found in the source code of any [component](https://glossary.magento.com/magento-component) or bundle inside the `composer.json` file.
4548

4649
It can be declared as the version of the component:
4750

@@ -59,16 +62,15 @@ Or it can be used to declare a dependency on a particular version of a component
5962
}
6063
```
6164

62-
{:.bs-callout-info}
63-
If Magento is installed from GitHub without using Composer, the `version` is not included. Admin displays the version as `Magento ver. dev-<GitHub-branch-name>`. In addition, Magento modules inside the `require` declaration list a version of `*`. For example, `"magento/framework": "*"`
64-
65-
## Related Topics
66-
67-
[Module version dependencies][version-dependencies] - Information about how your module can depend on the version of other modules.
65+
{:.bs-callout-info}
66+
If you installed the application from GitHub without using Composer, the `version` is not included. The Admin displays the version as `Magento ver. dev-<GitHub-branch-name>`. In addition, modules inside the `require` declaration list a version of `*`. For example, `"magento/framework": "*"`.
6867

69-
[Codebase changes][codebase-changes] - Information on how changes in a Magento module's codebase affect versions.
68+
{:.ref-header}
69+
Related Topics
7070

71-
[Backward compatible development]({{ site.baseurl }}/contributor-guide/backward-compatible-development/index.html) - Information about MAJOR and MINOR changes and how they impact extension developers.
71+
* [Module version dependencies][version-dependencies] - Information about how your module can depend on the version of other modules.
72+
* [Codebase changes][codebase-changes] - Information on how changes in a module's codebase affect versions.
73+
* [Backward compatible development]({{ site.baseurl }}/contributor-guide/backward-compatible-development/index.html) - Information about MAJOR and MINOR changes and how they impact extension developers.
7274

7375
[version-dependencies]: {{ page.baseurl }}/extension-dev-guide/versioning/dependencies.html
7476
[codebase-changes]: {{ page.baseurl }}/extension-dev-guide/versioning/codebase-changes.html

src/release/index.md

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,30 @@ title: Upcoming releases
33
group: release
44
---
55

6-
Magento continually strives to find the right balance between making product upgrades simple and predictable and delivering improvements and new features to early adopters faster. Over the last year, we have refined how we deliver software to support this balance. For additional information, refer to our [release policy]({{site.baseurl}}/release/policy/).
6+
Adobe continually strives to find the right balance between making product upgrades simple and predictable and delivering improvements and new features to early adopters faster. Over the last year, we have refined how we deliver software to support this balance. For additional information, refer to our [release policy]({{site.baseurl}}/release/policy/).
77

88
## Release schedule
99

10-
Magento releases security and functional patches for each supported release line of {{site.data.var.ee}} every quarter.
10+
Adobe releases security and functional patches for each supported release line of {{site.data.var.ee}} and {{site.data.var.ce}}.
1111

12-
The following table provides the dates for scheduled releases in 2021 (dates are subject to change):
12+
The following table provides the dates for scheduled releases (dates are subject to change):
1313

14-
| Quarter | Versions | Beta | Pre-release | General Availability |
15-
|---------------------|-------------------------------|-------------------------------------------|--------------------|----------------------|
16-
| 2021 Q1 | 2.4.2<br>2.4.1-p1<br>2.3.6-p1 | December 17, 2020 | January 26, 2021 | February 9, 2021 |
17-
| 2021 Q2<sup>1</sup> | 2.4.2-p1<br>2.3.7 | March 30, 2021 | April 27, 2021 | May 11, 2021 |
18-
| 2021 Q3<sup>2</sup> | 2.4.3<br>2.4.2-p2<br>2.3.7-p1 | June 7, 2021 | July 27, 2021 | August 10, 2021 |
19-
| 2021 Q4<sup>3</sup> | 2.4.3-p1<br>2.3.7-p2 | None | September 28, 2021 | October 12, 2021 |
14+
| Release | Versions | {{site.data.var.ee}} Beta | {{site.data.var.ee}} Pre-release | {{site.data.var.ee}} & {{site.data.var.ce}}<br>General Availability |
15+
|--------------------------------------------------|-------------------------------------------|---------------------------|----------------------------------|---------------------------------------------------------------------|
16+
| October 2021<br>Security patch release | 2.4.3-p1<br>2.3.7-p2 | \-\- | September 28, 2021 | October 12, 2021 |
17+
| January 2022<br>Feature release | \-\- | \-\- | \-\- | January 18, 2022 |
18+
| March 2022<br>Feature + patch release | 2.4.4<br>2.4.3-p2<br>2.3.7-p3<sup>1</sup> | October 2021 and ongoing | February 22, 2022 | March 8, 2022 |
19+
| April 2022<br>Feature release | \-\- | \-\- | \-\- | April 26, 2022 |
20+
| June 2022<br>Feature release | \-\- | \-\- | \-\- | June 21, 2022 |
21+
| August 2022<br>Feature + patch release | 2.4.5<br>2.4.4-p1 | \-\- | July 26, 2022 | August 9, 2022 |
22+
| October 2022<br>Feature + security patch release | 2.4.5-p1<sup>2</sup> | \-\- | September 27, 2022 | October 11, 2022 |
2023

21-
_<sup>1</sup>If you take the 2021 Q2 2.3.x release line, you must [update to PHP 7.4](https://community.magento.com/t5/Magento-DevBlog/PHP-7-4-support-for-Magento-2-3-x-release-line/ba-p/458946) since PHP 7.3 reaches end-of-life in December 2021. There will not be a 2.4.3 release in 2021 Q2._
22-
23-
_<sup>2</sup>The 2021 Q3 release will return to normal with a security-only release for the 2.3.x release line using PHP 7.4._
24-
25-
_<sup>3</sup>There will not be a 2.4.4 release in 2021 Q4._
24+
<sup>\-\- Indicates items that are not applicable to this release.</sup><br>
25+
<sup>1 This is the last patch release for the 2.3.x release line. The 2.3.x release line reaches End of Life (EOL) in April 2022.</sup><br>
26+
<sup>2 There is no full patch release in October 2022.</sup><br>
2627

2728
{:.bs-callout-info}
28-
We have introduced a [new policy](https://magento.com/updated-lifecycle-policy-magento-releases) that applies to a previous, supported Magento release line.
29+
We have introduced a [new policy](https://magento.com/sites/default/files/magento-software-lifecycle-policy.pdf) that applies to our supported release lines. To learn more about the new strategy behind our 2022 release calendar and lifecycle policy, visit our [blog](https://magento.com/blog/magento-news/accelerating-innovation-through-simplified-release-strategy).
2930

3031
## Early access
3132

@@ -34,3 +35,9 @@ Pre-release is General Availability code that is available to {{site.data.var.ee
3435
Beta is non-General Availability code that is available to all partners. It allows for extra time to review code and affected components.
3536

3637
For information about our Beta program, go to our [GitHub wiki page](https://github.com/magento/magento2/wiki/Magento-Beta-Program).
38+
39+
## Release types
40+
41+
- **Patch releases**—Updates to the core {{site.data.var.ee}} and {{site.data.var.ce}} application that include security, compliance, performance, and high-priority quality fixes.
42+
- **Security patch releases**—Security-only updates to the {{site.data.var.ee}} and {{site.data.var.ce}} application released to keep merchants secure and compliant.
43+
- **Feature releases**—New features and feature updates that are delivered as independent services, separate from the patch releases. Examples include services like Product Recommendations and Live Search, independent modules like PWA Studio and Inventory Management (MSI), and updates to our cloud services and infrastructure.

src/release/lifecycle-policy.md

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,29 @@
11
---
22
title: Lifecycle policy
33
group: release
4+
redirect_to: https://magento.com/sites/default/files/magento-software-lifecycle-policy.pdf
45
---
56

6-
For {{site.data.var.ece}} 2.3 and subsequent releases:
7+
For {{site.data.var.ee}} 2.3 and subsequent releases:
78

8-
- Magento will provide quality fixes for a minor release for a minimum of 12 months from the general availability announcement date of the next minor software release.
9+
- {{site.data.var.ee}} will provide quality fixes for a minor release for a minimum of 12 months from the general availability announcement date of the next minor software release.
910

10-
- Magento will provide security fixes for a minor release for a minimum of 18 months from the general availability announcement date of the next minor software release.
11+
- {{site.data.var.ee}} will provide security fixes for a minor release for a minimum of 18 months from the general availability announcement date of the next minor software release.
1112

12-
- Magento will provide security fixes through patch releases for currently supported minor release versions only. Security fixes will not be backported to previous minor releases, nor to previous patch releases within supported minor releases.
13+
- {{site.data.var.ee}} will provide security fixes through patch releases for currently supported minor release versions only. Security fixes will not be backported to previous minor releases, nor to previous patch releases within supported minor releases.
1314

14-
For example, while 2.3 and 2.4 are currently supported minor releases, security fixes will be released as 2.3.X and 2.4.Y, where X and Y represent the next incremental patch release cumulative of all prior patches. Patch releases will not be released for prior minor releases that have reached end of support (for example, 2.2.Z), or as patches to prior patch releases (for example, 2.3.1.X).
15+
For example, while Adobe will provide security releases to its 2.3 release line until April 2022, customers must upgrade to the latest patch or security patch to access security fixes. When 2.3.7-p1 is released, customers must upgrade to 2.3.7-p1 to adopt the security fixes. The security fixes will not be backported to previous patch releases of the 2.3 release line (2.3.0-2.3.6-p1).
1516

16-
- Magento will provide quality fixes through patch release for the latest supported minor release version only. Quality fixes will be available as individual patches for all other currently supported minor release versions. Quality fixes will not be backported to other previous minor releases, nor to previous patch releases within supported minor releases.
17+
- To better streamline our lifecycle policy, {{site.data.var.ee}} will provide quality fixes to its 2.4 release line until the end of support date of the PHP version upon which it is based. Refer to the table below for the End of Software Support dates for {{site.data.var.ee}} release lines:
1718

18-
For example, while 2.3 and 2.4 are currently supported minor releases, individual patches will be released as 2.3.X and release patches will be released as 2.4.Y, where X and Y represent the next incremental patch release cumulative of all prior patches. Neither patch releases nor individual patches will be released for prior minor releases that have reached end of support (e.g. 2.2.2).
19+
| Release | Release Date | End of Software Support<sup>1</sup> | Dependent PHP Version |
20+
|----------------------------------|---------------|-------------------------------------|-----------------------|
21+
| {{site.data.var.ee}} 2.3 | November 2018 | April 2022<sup>2</sup> | PHP 7.3 and 7.4<sup>3</sup> |
22+
| {{site.data.var.ee}} 2.4.0-2.4.3 | July 2020 | November 2022 | PHP 7.4 |
23+
| {{site.data.var.ee}} 2.4.4-2.4.6 | TBA | November 2024 | PHP 8.1 |
1924

20-
| Release | Release Date | End of Quality Fixes | End of Security Fixes/<br>End of Software Support |
21-
|---------------------------|---------------|----------------------|---------------------------------------------------|
22-
| {{site.data.var.ece}} 2.3 | November 2018 | July 2021 | April 2022<sup>*</sup> |
23-
| {{site.data.var.ece}} 2.4 | July 2020 | | |
25+
<sup>1 End of Software Support includes both end of quality fixes and end of security fixes.</sup><br>
26+
<sup>2 The End of Software Support date for 2.3 has been extended to April 2022 due to impacts from COVID-19.</sup>
27+
<sup>3 2.3.0-2.3.6 are dependent on PHP 7.3; 2.3.7 is dependent on PHP 7.4.</sup>
2428

25-
*<sup>*</sup> The End of Software Support date for {{site.data.vr.ece}} 2.3 has been extended to April 2022 due to impacts from COVID-19.*
26-
27-
See [Magento Software Lifecycle Policy](https://magento.com/sites/default/files/magento-software-lifecycle-policy.pdf).
29+
See [Software Lifecycle Policy](https://magento.com/sites/default/files/magento-software-lifecycle-policy.pdf).

0 commit comments

Comments
 (0)