Merge branch 'master' of https://github.com/backstage/backstage into bazaar-workflow-changes

plugins/bazaar-backend/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @backstage/plugin-bazaar-backend
 
+## 0.1.5
+
+### Patch Changes
+
+- 26926bb7a7: made the linkage between a Bazaar project to a catalog Entity optional
+- Updated dependencies
+  - @backstage/backend-common@0.10.0
+  - @backstage/backend-test-utils@0.1.11
+
 ## 0.1.4
 
 ### Patch Changes

plugins/bazaar-backend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@backstage/plugin-bazaar-backend",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "main": "src/index.ts",
   "types": "src/index.ts",
   "license": "Apache-2.0",
@@ -20,8 +20,8 @@
     "clean": "backstage-cli clean"
   },
   "dependencies": {
-    "@backstage/backend-common": "^0.9.13",
-    "@backstage/backend-test-utils": "^0.1.10",
+    "@backstage/backend-common": "^0.10.0",
+    "@backstage/backend-test-utils": "^0.1.11",
     "@backstage/config": "^0.1.5",
     "@types/express": "^4.17.6",
     "express": "^4.17.1",
@@ -31,7 +31,7 @@
     "yn": "^4.0.0"
   },
   "devDependencies": {
-    "@backstage/cli": "^0.10.1"
+    "@backstage/cli": "^0.10.3"
   },
   "files": [
     "dist",

plugins/bazaar-backend/src/service/standaloneServer.ts

@@ -5,7 +5,7 @@
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- * http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,