Skip to content

Commit

Permalink
Backport changes for Jetpack 14.0-a.7 (#39855)
Browse files Browse the repository at this point in the history
* Changelog and readme.txt edits.

* Update changelog entries for clarity

* Update readme.txt

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/11478275744

Upstream-Ref: Automattic/jetpack@2599f56
  • Loading branch information
ice9js authored and matticbot committed Oct 23, 2024
1 parent d0926b4 commit 1eb321d
Show file tree
Hide file tree
Showing 21 changed files with 179 additions and 188 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
"automattic/jetpack-autoloader": "^3.1.2",
"automattic/jetpack-composer-plugin": "^2.0.3",
"automattic/jetpack-config": "^2.0.4",
"automattic/jetpack-connection": "^5.1.4-alpha",
"automattic/jetpack-connection": "^5.1.4",
"automattic/jetpack-my-jetpack": "^4.35.15",
"automattic/jetpack-search": "^0.45.9-alpha",
"automattic/jetpack-search": "^0.45.9",
"automattic/jetpack-stats": "^0.13.3",
"automattic/jetpack-status": "^4.0.2",
"automattic/jetpack-sync": "^3.14.3-alpha"
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-boost-core/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.0",
"automattic/jetpack-connection": "^5.1.4-alpha"
"automattic/jetpack-connection": "^5.1.4"
},
"require-dev": {
"yoast/phpunit-polyfills": "^1.1.1",
Expand Down
9 changes: 3 additions & 6 deletions jetpack_vendor/automattic/jetpack-connection/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,9 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [5.1.4-alpha] - unreleased

This is an alpha version! The changes listed here are not final.

## [5.1.4] - 2024-10-21
### Changed
- SSO: optimize 'admin_notices' action callback.
- SSO: optimize 'admin_notices' action callback. [#39811]

## [5.1.3] - 2024-10-10
### Changed
Expand Down Expand Up @@ -1233,7 +1230,7 @@ This is an alpha version! The changes listed here are not final.

- Separate the connection library into its own package.

[5.1.4-alpha]: https://github.com/Automattic/jetpack-connection/compare/v5.1.3...v5.1.4-alpha
[5.1.4]: https://github.com/Automattic/jetpack-connection/compare/v5.1.3...v5.1.4
[5.1.3]: https://github.com/Automattic/jetpack-connection/compare/v5.1.2...v5.1.3
[5.1.2]: https://github.com/Automattic/jetpack-connection/compare/v5.1.1...v5.1.2
[5.1.1]: https://github.com/Automattic/jetpack-connection/compare/v5.1.0...v5.1.1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
*/
class Package_Version {

const PACKAGE_VERSION = '5.1.4-alpha';
const PACKAGE_VERSION = '5.1.4';

const PACKAGE_SLUG = 'connection';

Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-explat/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.0",
"automattic/jetpack-connection": "^5.1.4-alpha"
"automattic/jetpack-connection": "^5.1.4"
},
"require-dev": {
"yoast/phpunit-polyfills": "^1.1.1",
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-jitm/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"php": ">=7.0",
"automattic/jetpack-a8c-mc-stats": "^2.0.3",
"automattic/jetpack-assets": "^2.3.10",
"automattic/jetpack-connection": "^5.1.4-alpha",
"automattic/jetpack-connection": "^5.1.4",
"automattic/jetpack-device-detection": "^2.1.5",
"automattic/jetpack-logo": "^2.0.4",
"automattic/jetpack-redirect": "^2.0.4",
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-licensing/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.0",
"automattic/jetpack-connection": "^5.1.4-alpha"
"automattic/jetpack-connection": "^5.1.4"
},
"require-dev": {
"automattic/wordbless": "@dev",
Expand Down
4 changes: 2 additions & 2 deletions jetpack_vendor/automattic/jetpack-my-jetpack/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
"automattic/jetpack-admin-ui": "^0.4.5",
"automattic/jetpack-assets": "^2.3.10",
"automattic/jetpack-boost-speed-score": "^0.3.12",
"automattic/jetpack-connection": "^5.1.4-alpha",
"automattic/jetpack-connection": "^5.1.4",
"automattic/jetpack-explat": "^0.1.12",
"automattic/jetpack-jitm": "^3.1.26",
"automattic/jetpack-licensing": "^2.0.10",
"automattic/jetpack-plugins-installer": "^0.4.3",
"automattic/jetpack-redirect": "^2.0.4",
"automattic/jetpack-constants": "^2.0.4",
"automattic/jetpack-plans": "^0.4.12-alpha",
"automattic/jetpack-plans": "^0.4.12",
"automattic/jetpack-status": "^4.0.2",
"automattic/jetpack-sync": "^3.14.3-alpha",
"automattic/jetpack-protect-status": "^0.2.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.0",
"automattic/jetpack-connection": "^5.1.4-alpha",
"automattic/jetpack-connection": "^5.1.4",
"automattic/jetpack-plugins-installer": "^0.4.3",
"automattic/jetpack-sync": "^3.14.3-alpha",
"automattic/jetpack-protect-models": "^0.3.0",
"automattic/jetpack-plans": "^0.4.12-alpha"
"automattic/jetpack-plans": "^0.4.12"
},
"require-dev": {
"yoast/phpunit-polyfills": "^1.1.1",
Expand Down
9 changes: 3 additions & 6 deletions jetpack_vendor/automattic/jetpack-search/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,9 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [0.45.9-alpha] - unreleased

This is an alpha version! The changes listed here are not final.

## [0.45.9] - 2024-10-21
### Changed
- Update dependencies.
- Update dependencies. [#39781]

## [0.45.8] - 2024-10-14
### Changed
Expand Down Expand Up @@ -1074,7 +1071,7 @@ This is an alpha version! The changes listed here are not final.
- Updated package dependencies.
- Update PHPUnit configs to include just what needs coverage rather than include everything then try to exclude stuff that doesn't.

[0.45.9-alpha]: https://github.com/Automattic/jetpack-search/compare/v0.45.8...v0.45.9-alpha
[0.45.9]: https://github.com/Automattic/jetpack-search/compare/v0.45.8...v0.45.9
[0.45.8]: https://github.com/Automattic/jetpack-search/compare/v0.45.7...v0.45.8
[0.45.7]: https://github.com/Automattic/jetpack-search/compare/v0.45.6...v0.45.7
[0.45.6]: https://github.com/Automattic/jetpack-search/compare/v0.45.5...v0.45.6
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-search/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.0",
"automattic/jetpack-connection": "^5.1.4-alpha",
"automattic/jetpack-connection": "^5.1.4",
"automattic/jetpack-assets": "^2.3.10",
"automattic/jetpack-constants": "^2.0.4",
"automattic/jetpack-status": "^4.0.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Search package general information
*/
class Package {
const VERSION = '0.45.9-alpha';
const VERSION = '0.45.9';
const SLUG = 'search';

/**
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-stats/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.0",
"automattic/jetpack-connection": "^5.1.4-alpha",
"automattic/jetpack-connection": "^5.1.4",
"automattic/jetpack-constants": "^2.0.4",
"automattic/jetpack-status": "^4.0.2"
},
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/automattic/jetpack-sync/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.0",
"automattic/jetpack-connection": "^5.1.4-alpha",
"automattic/jetpack-connection": "^5.1.4",
"automattic/jetpack-constants": "^2.0.4",
"automattic/jetpack-password-checker": "^0.3.2",
"automattic/jetpack-ip": "^0.3.0",
Expand Down
4 changes: 2 additions & 2 deletions jetpack_vendor/i18n-map.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
),
'jetpack-connection' => array(
'path' => 'jetpack_vendor/automattic/jetpack-connection',
'ver' => '5.1.4-alpha1729191608',
'ver' => '5.1.4',
),
'jetpack-explat' => array(
'path' => 'jetpack_vendor/automattic/jetpack-explat',
Expand Down Expand Up @@ -66,7 +66,7 @@
),
'jetpack-search-pkg' => array(
'path' => 'jetpack_vendor/automattic/jetpack-search',
'ver' => '0.45.9-alpha1729133444',
'ver' => '0.45.9',
),
'jetpack-stats' => array(
'path' => 'jetpack_vendor/automattic/jetpack-stats',
Expand Down
9 changes: 3 additions & 6 deletions vendor/automattic/jetpack-plans/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,9 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [0.4.12-alpha] - unreleased

This is an alpha version! The changes listed here are not final.

## [0.4.12] - 2024-10-21
### Fixed
- Fixed the site features for Simple sites
- Fixed the site features for Simple sites. [#39817]

## [0.4.11] - 2024-09-23
### Changed
Expand Down Expand Up @@ -161,7 +158,7 @@ This is an alpha version! The changes listed here are not final.
### Deprecated
- Moved the options class into Connection. [#24095]

[0.4.12-alpha]: https://github.com/Automattic/jetpack-plans/compare/v0.4.11...v0.4.12-alpha
[0.4.12]: https://github.com/Automattic/jetpack-plans/compare/v0.4.11...v0.4.12
[0.4.11]: https://github.com/Automattic/jetpack-plans/compare/v0.4.10...v0.4.11
[0.4.10]: https://github.com/Automattic/jetpack-plans/compare/v0.4.9...v0.4.10
[0.4.9]: https://github.com/Automattic/jetpack-plans/compare/v0.4.8...v0.4.9
Expand Down
2 changes: 1 addition & 1 deletion vendor/automattic/jetpack-plans/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"license": "GPL-2.0-or-later",
"require": {
"php": ">=7.0",
"automattic/jetpack-connection": "^5.1.4-alpha"
"automattic/jetpack-connection": "^5.1.4"
},
"require-dev": {
"yoast/phpunit-polyfills": "^1.1.1",
Expand Down
Loading

0 comments on commit 1eb321d

Please sign in to comment.