Merge branch 'master' of https://github.com/spotify/backstage into lintMod

plugins/jenkins/package.json

@@ -33,7 +33,7 @@
   "dependencies": {
     "@backstage/catalog-model": "^0.7.0",
     "@backstage/core": "^0.5.0",
-    "@backstage/plugin-catalog": "^0.2.14",
+    "@backstage/plugin-catalog-react": "^0.0.1",
     "@backstage/theme": "^0.2.2",
     "@material-ui/core": "^4.11.0",
     "@material-ui/icons": "^4.9.1",

plugins/jenkins/src/components/useProjectSlugFromEntity.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { useEntity } from '@backstage/plugin-catalog';
+import { useEntity } from '@backstage/plugin-catalog-react';
 import { JENKINS_ANNOTATION } from '../constants';
 
 export const useProjectSlugFromEntity = () => {