Merge branch 'backstage:master' into feature/git-wrapper-branch-command

packages/backend-common/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @backstage/backend-common
 
+## 0.15.1-next.3
+
+### Patch Changes
+
+- 96689fbdcb: Workaround for a rare race condition in tests.
+- Updated dependencies
+  - @backstage/config-loader@1.1.4-next.2
+  - @backstage/cli-common@0.1.10-next.0
+  - @backstage/config@1.0.2-next.0
+  - @backstage/errors@1.1.1-next.0
+  - @backstage/integration@1.3.1-next.2
+
 ## 0.15.1-next.2
 
 ### Patch Changes

packages/backend-common/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@backstage/backend-common",
   "description": "Common functionality library for Backstage backends",
-  "version": "0.15.1-next.2",
+  "version": "0.15.1-next.3",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "publishConfig": {
@@ -34,11 +34,11 @@
     "test:kubernetes": "backstage-cli package test -t KubernetesContainerRunner --no-watch"
   },
   "dependencies": {
-    "@backstage/cli-common": "^0.1.9",
-    "@backstage/config": "^1.0.1",
-    "@backstage/config-loader": "^1.1.4-next.1",
-    "@backstage/errors": "^1.1.0",
-    "@backstage/integration": "^1.3.1-next.1",
+    "@backstage/cli-common": "^0.1.10-next.0",
+    "@backstage/config": "^1.0.2-next.0",
+    "@backstage/config-loader": "^1.1.4-next.2",
+    "@backstage/errors": "^1.1.1-next.0",
+    "@backstage/integration": "^1.3.1-next.2",
     "@backstage/types": "^1.0.0",
     "@google-cloud/storage": "^6.0.0",
     "@keyv/redis": "^2.2.3",
@@ -94,8 +94,8 @@
     }
   },
   "devDependencies": {
-    "@backstage/backend-test-utils": "^0.1.28-next.2",
-    "@backstage/cli": "^0.19.0-next.2",
+    "@backstage/backend-test-utils": "^0.1.28-next.3",
+    "@backstage/cli": "^0.19.0-next.3",
     "@types/archiver": "^5.1.0",
     "@types/base64-stream": "^1.0.2",
     "@types/compression": "^1.7.0",