Skip to content

Commit

Permalink
Backport My Jetpack Release (#34456)
Browse files Browse the repository at this point in the history
* Release my-jetpack

* Fixup project versions

Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/7104187658
  • Loading branch information
anomiex authored and matticbot committed Dec 5, 2023
1 parent b2c38d5 commit 6099d95
Show file tree
Hide file tree
Showing 7 changed files with 85 additions and 83 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"automattic/jetpack-composer-plugin": "^2.0.0",
"automattic/jetpack-config": "^2.0.0",
"automattic/jetpack-identity-crisis": "^0.14.0-alpha",
"automattic/jetpack-my-jetpack": "^4.1.1-alpha",
"automattic/jetpack-my-jetpack": "^4.1.2-alpha",
"automattic/jetpack-plugins-installer": "^0.3.0",
"automattic/jetpack-sync": "^2.1.1"
},
Expand Down
8 changes: 5 additions & 3 deletions jetpack_vendor/automattic/jetpack-my-jetpack/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,16 @@ 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).

## [4.1.1-alpha] - unreleased
## [4.1.2-alpha] - unreleased

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

### Changed
- Updated package dependencies.

## [4.1.1] - 2023-12-05
### Fixed
- My Jetpack: Fix outdated product cache issue when enabling tiers.
- My Jetpack: Fix outdated product cache issue when enabling tiers. [#34428]

## [4.1.0] - 2023-12-03
### Added
Expand Down Expand Up @@ -1153,7 +1154,8 @@ This is an alpha version! The changes listed here are not final.
### Added
- Created package

[4.1.1-alpha]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.1.0...4.1.1-alpha
[4.1.2-alpha]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.1.1...4.1.2-alpha
[4.1.1]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.1.0...4.1.1
[4.1.0]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.0.3...4.1.0
[4.0.3]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.0.2...4.0.3
[4.0.2]: https://github.com/Automattic/jetpack-my-jetpack/compare/4.0.1...4.0.2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class Initializer {
*
* @var string
*/
const PACKAGE_VERSION = '4.1.1-alpha';
const PACKAGE_VERSION = '4.1.2-alpha';

/**
* HTML container ID for the IDC screen on My Jetpack page.
Expand Down
2 changes: 1 addition & 1 deletion jetpack_vendor/i18n-map.php
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
),
'jetpack-my-jetpack' => array(
'path' => 'jetpack_vendor/automattic/jetpack-my-jetpack',
'ver' => '4.1.1-alpha1701712806',
'ver' => '4.1.2-alpha1701796389',
),
'jetpack-password-checker' => array(
'path' => 'jetpack_vendor/automattic/jetpack-password-checker',
Expand Down
48 changes: 24 additions & 24 deletions vendor/composer/installed.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-a8c-mc-stats",
"reference": "64dccd85167334c9c4165aa1ac95c7aa8f4b2351"
"reference": "5f080b33f79e567e26df9082791a8881fb21d580"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -60,7 +60,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
"reference": "10b50f01c5a73ac57a774420a9a56731e1451e22"
"reference": "46c1a2ec7a5f94f38eefe487dd50b0ae09e69b3f"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -125,7 +125,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-assets",
"reference": "365949b48c4f7746ebafbfb6dad358edf3691ea1"
"reference": "4ea8b4933432a3a0a5f97911c2621dfcd94587a6"
},
"require": {
"automattic/jetpack-constants": "^2.0.0",
Expand Down Expand Up @@ -194,7 +194,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-autoloader",
"reference": "b6c9dcca9c2b60f27df7a346bf3ff6c74920bc1d"
"reference": "aad53dd4d27a469e91197306a63693233e01f817"
},
"require": {
"composer-plugin-api": "^1.1 || ^2.0",
Expand Down Expand Up @@ -260,7 +260,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
"reference": "1a59313e3bb91e411da9e24fc51ab9abd4330ed0"
"reference": "21a26cde785db806a5e70f6c8101a65de5554f18"
},
"require": {
"composer-plugin-api": "^2.1.0",
Expand Down Expand Up @@ -320,7 +320,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-config",
"reference": "b23828aa96f1eebe83eeb3ac67a55f0316c31005"
"reference": "730d5f73670b430527ac3d8c3df7ccf6775999a5"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -365,7 +365,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-connection",
"reference": "c2e69d918936531a7dc5bd2fa065ea0d03f14c8f"
"reference": "3442d70f2e6d0d814185d1c153ec9631e3882863"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^2.0.0",
Expand Down Expand Up @@ -444,7 +444,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-constants",
"reference": "faf2295b998676f6d62f33c8ca46eec9ea109e55"
"reference": "8237ad3c2b1113d05dc431aed5373422c9b5a32e"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -498,7 +498,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
"reference": "d6a8a4b96df939e83cd4a2d8c43a2a7b16110510"
"reference": "ef2966679020e1c4a564792668e3dc394c0892b8"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -551,7 +551,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-identity-crisis",
"reference": "d7788b357c3cdb8f87dff22b34c480dbc7db96ab"
"reference": "5a1451ba0268f6f81ba5157324937f474c2c6e50"
},
"require": {
"automattic/jetpack-assets": "^2.0.2",
Expand Down Expand Up @@ -630,7 +630,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-ip",
"reference": "3cd6e53fdfb05f59c9c5f22b7a5db58b2a76c375"
"reference": "18d4e5155c06ec7f655fee4664f2b1bdbae9c240"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -688,7 +688,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
"reference": "171b4f88c2c60b4fde3da4073771efe3c8de2189"
"reference": "59e0529eaa34fd3c8df28478cf969647be0bb9f7"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^2.0.0",
Expand Down Expand Up @@ -763,7 +763,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-licensing",
"reference": "0d087aae17f198347fc70946bf7f9d99906189f0"
"reference": "5dd81f19125f8bed17d15376ad7fc25e3250a656"
},
"require": {
"automattic/jetpack-connection": "^2.1.0",
Expand Down Expand Up @@ -825,7 +825,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-logo",
"reference": "d2a614cae6791fc5b7a1fdb4c73bddae81002459"
"reference": "b0e2388af01f7527674ba7a6795e58ecfee4c072"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -873,12 +873,12 @@
},
{
"name": "automattic/jetpack-my-jetpack",
"version": "4.1.1-alpha.1701712806",
"version_normalized": "4.1.1.0-alpha1701712806",
"version": "4.1.2-alpha.1701796389",
"version_normalized": "4.1.2.0-alpha1701796389",
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-my-jetpack",
"reference": "fd6b88fb4e1a26004c3ac2d58367d52d806d1bb8"
"reference": "4620b1669fd7031d10b5f526c2c829348e0a9b27"
},
"require": {
"automattic/jetpack-admin-ui": "^0.3.1",
Expand Down Expand Up @@ -970,7 +970,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
"reference": "3380ad63f27158f4ba862392bf1132af47a57300"
"reference": "5dd3d733f3c3dd42d4343062f6df4b50f74e02a7"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -1031,7 +1031,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plans",
"reference": "43248d70efc9260a986e75907cdde6db9a134ad5"
"reference": "2a232899a6655b326f654539316e875e30050e17"
},
"require": {
"automattic/jetpack-connection": "^2.1.0",
Expand Down Expand Up @@ -1099,7 +1099,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-plugins-installer",
"reference": "4afd3c38b27eefa849276def8145adc37ba59747"
"reference": "d47bbb5d048a079fab42a8f9a6bfd3b01cf69823"
},
"require": {
"automattic/jetpack-a8c-mc-stats": "^2.0.0",
Expand Down Expand Up @@ -1154,7 +1154,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
"reference": "085a96ae1cc11b24c351531e52b34c539c50b840"
"reference": "e2c28d997a0f907121baaa15000134b3c75bd07c"
},
"require": {
"automattic/jetpack-status": "^2.0.2",
Expand Down Expand Up @@ -1209,7 +1209,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-roles",
"reference": "5bce8921c201f98daf1c8fe9e597d85d9b2d51c4"
"reference": "c157b58839bc7110cf66a721ac819b1c053ae532"
},
"require": {
"php": ">=7.0"
Expand Down Expand Up @@ -1263,7 +1263,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-status",
"reference": "9c5447d761edf3293c05d96ceb2b813178f110fb"
"reference": "e6ad60541d47d33896549d162420cd7f123546fd"
},
"require": {
"automattic/jetpack-constants": "^2.0.0",
Expand Down Expand Up @@ -1319,7 +1319,7 @@
"dist": {
"type": "path",
"url": "/tmp/jetpack-build/Automattic/jetpack-sync",
"reference": "c9aa5a0589fcef866ea97be1da240be26c3d438b"
"reference": "1c7be77f80942d654d4666651112b2d179d4a424"
},
"require": {
"automattic/jetpack-connection": "^2.1.0",
Expand Down
Loading

0 comments on commit 6099d95

Please sign in to comment.