Merging main, retaining only AAM plugin

Signed-off-by: James Hunt <[email protected]>

README.md

@@ -1,8 +1,8 @@
-[![Build, deploy and test](https://github.com/linuxfoundation/lfevents/actions/workflows/build_deploy_and_test.yml/badge.svg)](https://github.com/linuxfoundation/lfevents/actions/workflows/build_deploy_and_test.yml)
+[![Build, test and deploy](https://github.com/linuxfoundation/lfevents/actions/workflows/build_test_and_deploy.yml/badge.svg)](https://github.com/linuxfoundation/lfevents/actions/workflows/build_test_and_deploy.yml)
 
 ## This repository powers these sites
 * [LFEvents Main Site](https://events.linuxfoundation.org/)
-* [LFEvents China Site](https://www.lfasiallc.cn/)
+* [LFEvents China Site](https://www.lfasiallc.com/)
 
 ## Documentation
 * [Developer Getting Started Guide](/docs/devguide.md)

composer.json

@@ -26,31 +26,27 @@
     "roots/wp-password-bcrypt": "^1.0.0",
     "rvtraveller/qs-composer-installer": "^1.1",
     "vlucas/phpdotenv": "^5.5.0",
-    "wpackagist-plugin/autodescription": "^5",
-    "wpackagist-plugin/china-video-block": "^0.2.0",
-    "wpackagist-plugin/clone-page-tree": "^0.1.0",
-    "wpackagist-plugin/find-my-blocks": "^4",
-    "wpackagist-plugin/flying-pages": "^2.0.8",
-    "wpackagist-plugin/safe-svg":"2.2.4",
-    "wpackagist-plugin/flying-scripts": "^1.1.7",
-    "wpackagist-plugin/leadin": "*",
-    "wpackagist-plugin/pantheon-advanced-page-cache": "^2",
-    "wpackagist-plugin/photonic": "^3.02",
-    "wpackagist-plugin/post-meta-controls": "^1.2.0",
-    "wpackagist-plugin/post-type-switcher": "^3.1.0",
-    "wpackagist-plugin/publishpress-checklists": "^2.5.3",
-    "wpackagist-plugin/redirection": "^5",
-    "wpackagist-plugin/shortpixel-image-optimiser": "*",
-    "wpackagist-plugin/simple-history": "^4.1.0",
-    "wpackagist-plugin/svg-autocrop": "^0.1.0",
-    "wpackagist-plugin/wp-mail-smtp": "^4",
-    "wpackagist-plugin/advanced-access-manager":"^6.9.30",
-    "wpackagist-plugin/user-role-editor":"^4.64.2",
-    "wpackagist-plugin/capability-manager-enhanced":"^2.13.0",
-    "wpackagist-plugin/members":"^3.2.9",
-
-    "wpackagist-plugin/wp-native-php-sessions": "^1.0.0",
-    "wpackagist-plugin/wp-nested-pages": "^3.2.4"
+    "wpackagist-plugin/autodescription": "^5.0",
+    "wpackagist-plugin/china-video-block": "^0.2.5",
+    "wpackagist-plugin/clone-page-tree": "^0.1.2",
+    "wpackagist-plugin/find-my-blocks": "^4.0",
+    "wpackagist-plugin/flying-pages": "^2.4",
+    "wpackagist-plugin/flying-scripts": "^1.2",
+    "wpackagist-plugin/leadin": "^11.1",
+    "wpackagist-plugin/pantheon-advanced-page-cache": "^2.0",
+    "wpackagist-plugin/photonic": "^3.10",
+    "wpackagist-plugin/post-meta-controls": "^1.4",
+    "wpackagist-plugin/post-type-switcher": "^3.3",
+    "wpackagist-plugin/publishpress-checklists": "^2.10",
+    "wpackagist-plugin/redirection": "^5.4",
+    "wpackagist-plugin/safe-svg": "^2.2",
+    "wpackagist-plugin/shortpixel-image-optimiser": "^5.6",
+    "wpackagist-plugin/simple-history": "^4.15",
+    "wpackagist-plugin/svg-autocrop": "^0.1.2",
+    "wpackagist-plugin/wp-mail-smtp": "^4.0",
+    "wpackagist-plugin/wp-native-php-sessions": "^1.4",
+    "wpackagist-plugin/wp-nested-pages": "^3.2",
+	"wpackagist-plugin/advanced-access-manager":"^6.9.30"
   },
   "require-dev": {
     "roave/security-advisories": "dev-master",