diff --git a/_data/compatibility.yml b/_data/compatibility.yml index 19fbaf55fdb..6008fb18371 100644 --- a/_data/compatibility.yml +++ b/_data/compatibility.yml @@ -83,30 +83,6 @@ extension: 2.3.1: general availability 2.3.2: general availability 2.3.3: general availability - - - name: Magento Shipping - versions: - - - name: 1.5.3 - support: - 2.2.4+: not supported - 2.3.0: not supported - 2.3.1: not supported - 2.3.2: general availability - - - name: 1.5.1 - support: - 2.2.4+: not supported - 2.3.0: not supported - 2.3.1: general availability - 2.3.2: not supported - - - name: 1.4.6 - support: - 2.2.4+: not supported - 2.3.0: general availability - 2.3.1: not supported - 2.3.2: not supported - name: Magento Inventory versions: diff --git a/release/index.md b/release/index.md index eabf204e24a..dd7f56263d4 100644 --- a/release/index.md +++ b/release/index.md @@ -9,16 +9,27 @@ Magento continually strives to find the right balance between making product upg The following table describes the status of Magento software availability and where to get it, particularly for software that is available outside the conventional {{site.data.var.ee}} Composer package. -| Product | Availability | How to get it | -|---------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------| -| **{{site.data.var.ee}} 2.3.3** | Available now | [Composer]({{ site.baseurl }}/guides/v2.3/install-gde/composer.html) | -| **{{site.data.var.ee}} 2.3.2-p1** (security only) | Available now | [Composer]({{ site.baseurl }}/guides/v2.3/install-gde/composer.html) | -| **{{site.data.var.ece}} Tools (aka ECE-Tools)** | Available now | [Composer]({{ site.baseurl }}/guides/v2.3/cloud/project/ece-tools-update.html) | -| **PWA Studio** | Available now (including support for {{site.data.var.ece}}) | [Documentation](http://pwastudio.io) and [GitHub](https://github.com/magento-research/pwa-studio) | -| **Magento Shipping** | Available now | | -| **Page Builder** | Available now | Bundled with {{site.data.var.ee}} 2.3.x | -| **Amazon Sales Channel 3.0.0** | Available now for {{site.data.var.ece}} 2.2.4+ and 2.3.x (US, Canada, Mexico, UK)| [Magento Marketplace](https://marketplace.magento.com/magento-module-amazon.html) | -| **Google Shopping ads Channel 3.0.1** | Available now for {{site.data.var.ece}} 2.2.4+ and 2.3.x | [Magento Marketplace](http://marketplace.magento.com/magento-google-shopping-ads.html) | +| Product | Availability | How to get it | +|---------------------------------------------------|-----------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------| +| **{{site.data.var.ee}} 2.3.4** | January 2020 | [Composer]({{ site.baseurl }}/guides/v2.3/install-gde/composer.html) | +| **{{site.data.var.ee}} 2.3.3-p1** (security only) | January 2020 | [Composer]({{ site.baseurl }}/guides/v2.3/install-gde/composer.html) | +| **{{site.data.var.ece}} Tools (aka ECE-Tools)** | Available now | [Composer]({{ site.baseurl }}/guides/v2.3/cloud/project/ece-tools-update.html) | +| **PWA Studio** | Available now | [Documentation](http://pwastudio.io) and [GitHub](https://github.com/magento-research/pwa-studio) | +| **Amazon Sales Channel 3.0.0** | Available now for {{site.data.var.ece}} 2.2.4+ and 2.3.x (US, Canada, Mexico, UK) | [Magento Marketplace](https://marketplace.magento.com/magento-module-amazon.html) | +| **Google Shopping ads Channel 3.0.1** | Available now for {{site.data.var.ece}} 2.2.4+ and 2.3.x | [Magento Marketplace](http://marketplace.magento.com/magento-google-shopping-ads.html) | + +## Patch schedule + +Magento releases security and functional patches for each supported release line of {{site.data.var.ee}} every quarter. The following table provides the dates for each patch scheduled for release in 2020. + +| Version | Pre-release | GA | +|---------|-------------|------------| +| 2.3.4 | January 14 | January 28 | +| 2.3.5 | April 14 | April 28 | +| 2.3.6 | July 14 | July 28 | +| 2.3.7 | October 1 | October 15 | + +_These dates are subject to change._ ## Compatibility diff --git a/release/policy/index.md b/release/policy/index.md index 43a241025e4..ad2acb8499a 100644 --- a/release/policy/index.md +++ b/release/policy/index.md @@ -8,6 +8,7 @@ group: release - **MAJOR**—2 - **MINOR**—2.3 - **PATCH**—2.3.1 +- **SECURITY**—2.3.2-p1 ## MINOR release @@ -32,6 +33,12 @@ The following guidelines apply to patch releases: - On an exceptional basis, breaking changes or additional patches or hotfixes may be released to address security or compliance issues. On the module level, these are mostly PATCH-level changes; sometimes MINOR-level changes. - Patches may include new features as long as they are not expected to break other code. The new feature can be included in the core code or as an extension, such as Page Builder. +## SECURITY release + +Security releases provide fixes for vulnerabilities that have been identified in previous quarterly patch releases. You can install time-sensitive security fixes without applying the hundreds of functional fixes and enhancements that a full quarterly patch release contains. + +For general information about security releases, see [Introducing the New Security-only Patch Release](https://community.magento.com/t5/Magento-DevBlog/Introducing-the-New-Security-only-Patch-Release/ba-p/141287). For instructions on downloading and applying security patches, see [Install Magento using Composer]({{ site.baseurl }}/guides/v2.3/install-gde/composer.html). + ### Related topics - [Planning and Budgeting for Commerce Upgrade Cycles](https://magento.com/sites/default/files8/2019-08/Magento-Release-Cycle-Infosheet_Aug_2019.pdf)