Update various forms of referring to anti-spam to all use Akismet Ant…

…i-spam (#32908) * Update various forms of referring to anti-spam to all use Akismet Anti-spam Committed via a GitHub action: https://github.com/Automattic/jetpack/actions/runs/6113740254
Automattic · Sep 7, 2023 · 80cabf7 · 80cabf7
1 parent ab9830c
commit 80cabf7
Show file tree

Hide file tree

Showing 8 changed files with 68 additions and 60 deletions.
diff --git a/jetpack_vendor/automattic/jetpack-admin-ui/CHANGELOG.md b/jetpack_vendor/automattic/jetpack-admin-ui/CHANGELOG.md
@@ -5,6 +5,13 @@ 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.2.22-alpha] - unreleased
+
+This is an alpha version! The changes listed here are not final.
+
+### Fixed
+- Akismet: update naming to common form
+
 ## [0.2.21] - 2023-08-23
 ### Changed
 - Updated package dependencies. [#32605]
@@ -112,6 +119,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - Fixing menu visibility issues.
 
+[0.2.22-alpha]: https://github.com/Automattic/jetpack-admin-ui/compare/0.2.21...0.2.22-alpha
 [0.2.21]: https://github.com/Automattic/jetpack-admin-ui/compare/0.2.20...0.2.21
 [0.2.20]: https://github.com/Automattic/jetpack-admin-ui/compare/0.2.19...0.2.20
 [0.2.19]: https://github.com/Automattic/jetpack-admin-ui/compare/0.2.18...0.2.19

diff --git a/jetpack_vendor/automattic/jetpack-admin-ui/src/class-admin-menu.php b/jetpack_vendor/automattic/jetpack-admin-ui/src/class-admin-menu.php
@@ -13,7 +13,7 @@
  */
 class Admin_Menu {
 
-	const PACKAGE_VERSION = '0.2.21';
+	const PACKAGE_VERSION = '0.2.22-alpha';
 
 	/**
 	 * Whether this class has been initialized
@@ -60,7 +60,7 @@ function () {
 			);
 
 			// Add an Anti-spam menu item for Jetpack.
-			self::add_menu( __( 'Anti-Spam', 'jetpack-admin-ui' ), __( 'Anti-Spam', 'jetpack-admin-ui' ), 'manage_options', 'akismet-key-config', array( 'Akismet_Admin', 'display_page' ) );
+			self::add_menu( __( 'Akismet Anti-spam', 'jetpack-admin-ui' ), __( 'Akismet Anti-spam', 'jetpack-admin-ui' ), 'manage_options', 'akismet-key-config', array( 'Akismet_Admin', 'display_page' ) );
 
 		}
 	}

diff --git a/jetpack_vendor/automattic/jetpack-connection/composer.json b/jetpack_vendor/automattic/jetpack-connection/composer.json
@@ -5,7 +5,7 @@
 	"license": "GPL-2.0-or-later",
 	"require": {
 		"automattic/jetpack-a8c-mc-stats": "^1.4.21",
-		"automattic/jetpack-admin-ui": "^0.2.21",
+		"automattic/jetpack-admin-ui": "^0.2.22-alpha",
 		"automattic/jetpack-constants": "^1.6.23",
 		"automattic/jetpack-roles": "^1.4.24",
 		"automattic/jetpack-status": "^1.18.3-alpha",

diff --git a/jetpack_vendor/automattic/jetpack-my-jetpack/composer.json b/jetpack_vendor/automattic/jetpack-my-jetpack/composer.json
@@ -4,7 +4,7 @@
 	"type": "jetpack-library",
 	"license": "GPL-2.0-or-later",
 	"require": {
-		"automattic/jetpack-admin-ui": "^0.2.21",
+		"automattic/jetpack-admin-ui": "^0.2.22-alpha",
 		"automattic/jetpack-assets": "^1.18.10",
 		"automattic/jetpack-connection": "^1.57.3-alpha",
 		"automattic/jetpack-jitm": "^2.3.18",

diff --git a/jetpack_vendor/i18n-map.php b/jetpack_vendor/i18n-map.php
@@ -6,7 +6,7 @@
   'packages' => array(
     'jetpack-admin-ui' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-admin-ui',
-      'ver' => '0.2.21',
+      'ver' => '0.2.22-alpha1694113286',
     ),
     'jetpack-assets' => array(
       'path' => 'jetpack_vendor/automattic/jetpack-assets',

diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -7,7 +7,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-a8c-mc-stats",
-                "reference": "2f171113758735f764a11fcd91c87135d2afb260"
+                "reference": "09bb42e91a8d8fdf17649b923c73e0f36b90b197"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.8",
@@ -52,12 +52,12 @@
         },
         {
             "name": "automattic/jetpack-admin-ui",
-            "version": "0.2.21",
-            "version_normalized": "0.2.21.0",
+            "version": "0.2.22-alpha.1694113286",
+            "version_normalized": "0.2.22.0-alpha1694113286",
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-admin-ui",
-                "reference": "d6e7bf712fe81805ae253df92833d914fd2e17d2"
+                "reference": "77eefffaa9e167260c256e5f743cf1e440301d9e"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.8",
@@ -119,7 +119,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-assets",
-                "reference": "a40d4325f7247e42da23f17ed976ac41371438bf"
+                "reference": "7370cc818e35a683b6934e3807cf9a37b5a6f997"
             },
             "require": {
                 "automattic/jetpack-constants": "^1.6.23"
@@ -187,7 +187,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-autoloader",
-                "reference": "ad09dab9bb67a63d3a10513f923bbb625709d77a"
+                "reference": "bf7f86d8c1036eb1ca856ed1878be7d6bdf91765"
             },
             "require": {
                 "composer-plugin-api": "^1.1 || ^2.0"
@@ -249,7 +249,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-composer-plugin",
-                "reference": "503dd238f3cbe229f78e0a88bda3267d1df62f45"
+                "reference": "f8a609a37e1358c6b378dd3b9c804b3db3ade548"
             },
             "require": {
                 "composer-plugin-api": "^2.1.0"
@@ -308,7 +308,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-config",
-                "reference": "c0508c030b36cc85756ca284f262c0438a9fd9d4"
+                "reference": "1fd35ff572f25a644e815b4de945a298f61356f2"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.8"
@@ -350,11 +350,11 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-connection",
-                "reference": "dab06eecdb663205b999daeffeee4a6dca0bfbf1"
+                "reference": "31a84fbe5c191fe6d1d0506330596393ca2bfa76"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "^1.4.21",
-                "automattic/jetpack-admin-ui": "^0.2.21",
+                "automattic/jetpack-admin-ui": "^0.2.22-alpha",
                 "automattic/jetpack-constants": "^1.6.23",
                 "automattic/jetpack-redirect": "^1.7.26",
                 "automattic/jetpack-roles": "^1.4.24",
@@ -428,7 +428,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-constants",
-                "reference": "ea147e9296f8ec7d03afca36bcf1415ce13c7a38"
+                "reference": "c9a7cd5e4473a6ddea826de1e633c51d7dd387b9"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.8",
@@ -479,7 +479,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-device-detection",
-                "reference": "7a10f71f15348df01d07aaf6458b8b91820330a2"
+                "reference": "f32c5df2f65a751fe464c0149c30679c4871a54f"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.8",
@@ -529,7 +529,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-identity-crisis",
-                "reference": "31db1825afa80c16bd5aa63875c4accc37e4149f"
+                "reference": "ed4e327d078b6b9f035680ff2dc887cbb271571d"
             },
             "require": {
                 "automattic/jetpack-assets": "^1.18.10",
@@ -607,7 +607,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-ip",
-                "reference": "9f4cd00c7a8f38ba8175866485a4a89aa9510c73"
+                "reference": "328e69ff5a08d5db58b7dba702b25c6c54f2e942"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.8",
@@ -662,7 +662,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-jitm",
-                "reference": "94e10bd267a0e838c1ef05eef7c69a28efe10883"
+                "reference": "fbfde805675cdf6728c19ab815c26463a6b871f4"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "^1.4.21",
@@ -737,7 +737,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-licensing",
-                "reference": "290729dbe793cbd2bfe1efda4c36b990e99d11ed"
+                "reference": "540681adb5b3d5a114a7c1898ef3fc50da9b63d1"
             },
             "require": {
                 "automattic/jetpack-connection": "^1.57.3-alpha"
@@ -798,7 +798,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-logo",
-                "reference": "eda6898be6891f25077f9a7cec7dd9be81be1c3f"
+                "reference": "715d5c78d177654eb00a4c089dc9818c3891c100"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.8",
@@ -848,10 +848,10 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-my-jetpack",
-                "reference": "cae694b2c3e070cb0dcb98de7c940d404191fcd4"
+                "reference": "62266c64c3e7d0e28abdc5973703d9fb2c6f0440"
             },
             "require": {
-                "automattic/jetpack-admin-ui": "^0.2.21",
+                "automattic/jetpack-admin-ui": "^0.2.22-alpha",
                 "automattic/jetpack-assets": "^1.18.10",
                 "automattic/jetpack-connection": "^1.57.3-alpha",
                 "automattic/jetpack-constants": "^1.6.23",
@@ -938,7 +938,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-partner",
-                "reference": "539e8e4cc4f4e9234020027df9ef5071df581914"
+                "reference": "f14601613269e82e38121b1707829404c51a9dc2"
             },
             "require": {
                 "automattic/jetpack-connection": "^1.57.3-alpha",
@@ -1000,7 +1000,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-password-checker",
-                "reference": "aab5c0f5d37369d8fd2dd1141520a966e3771b40"
+                "reference": "cded564adcc8cefb3978c07d504f128b083ffc81"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.8",
@@ -1058,7 +1058,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-plugins-installer",
-                "reference": "c853f9f02ccc14a86643d96b9b309107e18780ea"
+                "reference": "777c98228e4249832e18a2575543a91eb36dd9ae"
             },
             "require": {
                 "automattic/jetpack-a8c-mc-stats": "^1.4.21"
@@ -1112,7 +1112,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-redirect",
-                "reference": "2f23807e74f2ef6ef523e0f9e3f1dc2d3aa3939d"
+                "reference": "8bdd8ff7d7f52ec4dd9e8ce627c363a2313059e7"
             },
             "require": {
                 "automattic/jetpack-status": "^1.18.3-alpha"
@@ -1166,7 +1166,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-roles",
-                "reference": "f2339943cb94309cb1a7e0ad044c92c93530584c"
+                "reference": "3be65f6220c749eed6caccdaa9f7dc144f05640b"
             },
             "require-dev": {
                 "automattic/jetpack-changelogger": "^3.3.8",
@@ -1217,7 +1217,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-search",
-                "reference": "92733658178070eee1bbd5297353a5c52bb7fdb8"
+                "reference": "bcd5aa0e87efe4760db5bb90e480d7ffa331fa22"
             },
             "require": {
                 "automattic/jetpack-assets": "^1.18.10",
@@ -1303,7 +1303,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-stats",
-                "reference": "dffea7bc02c225c7bfbc0aae1e764382963b434c"
+                "reference": "096528fb3a8ddaa112d29a915993ffb33293add9"
             },
             "require": {
                 "automattic/jetpack-assets": "^1.18.10",
@@ -1367,7 +1367,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-status",
-                "reference": "79f03ecbbbb7e0a275dee0c0993178957a7a515d"
+                "reference": "2daead569b5967d26b12253f58c85eab4e5a3f45"
             },
             "require": {
                 "automattic/jetpack-constants": "^1.6.23"
@@ -1422,7 +1422,7 @@
             "dist": {
                 "type": "path",
                 "url": "/tmp/jetpack-build/Automattic/jetpack-sync",
-                "reference": "7e4117723db7c4c04f3d563246d1c8ba77e9db8e"
+                "reference": "374154846408fb1d46601e8164c6b6f6aab46031"
             },
             "require": {
                 "automattic/jetpack-connection": "^1.57.3-alpha",