Merge branch 'master' of https://github.com/backstage/backstage into add-additional-scaffolder-permissions

plugins/scaffolder-common/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @backstage/plugin-scaffolder-common
 
+## 1.5.2
+
+### Patch Changes
+
+- 9156654: Capturing more event clicks for scaffolder
+- Updated dependencies
+  - @backstage/catalog-model@1.5.0
+
 ## 1.5.2-next.1
 
 ### Patch Changes
@@ -641,8 +649,7 @@
 
 - e72d371296: Added `TemplateEntityV1beta2` which was moved here from
   `@backstage/plugin-scaffolder-common`. It has also been marked as deprecated in
-  the process - please consider [migrating to `v1beta3`
-  templates](https://backstage.io/docs/features/software-templates/migrating-from-v1beta2-to-v1beta3).
+  the process - please consider [migrating to `v1beta3` templates](https://backstage.io/docs/features/software-templates/migrating-from-v1beta2-to-v1beta3).
 - c77c5c7eb6: Added `backstage.role` to `package.json`
 - Updated dependencies
   - @backstage/catalog-model@0.10.0

plugins/scaffolder-common/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-scaffolder-common",
-  "version": "1.5.2-next.1",
+  "version": "1.5.2",
   "description": "Common functionalities for the scaffolder, to be shared between scaffolder and scaffolder-backend plugin",
   "backstage": {
     "role": "common-library"