Merge branch 'release/7.3.0' into main

MauroDataMapper · Feb 23, 2023 · 8e9cfac · 8e9cfac
2 parents 4d6f7d4 + b378083
commit 8e9cfac
Show file tree

Hide file tree

Showing 990 changed files with 32,947 additions and 37,638 deletions.
diff --git a/.gitignore b/.gitignore
@@ -42,6 +42,7 @@ build/Release
 # Dependency directories
 node_modules/
 jspm_packages/
+.angular/
 
 # TypeScript v1 declaration files
 typings/

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-14.18.1
+16.10.0
diff --git a/NOTICE b/NOTICE
@@ -1,5 +1,4 @@
-Copyright 2020-2022 University of Oxford
-and Health and Social Care Information Centre, also known as NHS Digital
+Copyright 2020-2023 University of Oxford and NHS England
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/angular.json b/angular.json
@@ -113,19 +113,6 @@
         "test": {
           "builder": "@angular-builders/jest:run"
         },
-        "lint": {
-          "builder": "@angular-devkit/build-angular:tslint",
-          "options": {
-            "tsConfig": [
-              "tsconfig.app.json",
-              "tsconfig.spec.json",
-              "e2e/tsconfig.json"
-            ],
-            "exclude": [
-              "**/node_modules/**"
-            ]
-          }
-        },
         "e2e": {
           "builder": "@angular-devkit/build-angular:protractor",
           "options": {
@@ -141,7 +128,6 @@
       }
     }
   },
-  "defaultProject": "mdm-ui",
   "cli": {
     "analytics": false
   }

diff --git a/jest.config.js b/jest.config.js
@@ -1,6 +1,5 @@
 /*
-Copyright 2020-2022 University of Oxford
-and Health and Social Care Information Centre, also known as NHS Digital
+Copyright 2020-2023 University of Oxford and NHS England
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/license-check-and-add-config.json b/license-check-and-add-config.json
@@ -1,5 +1,6 @@
 {
   "ignore": [
+    ".angular",
     ".git",
     ".github",
     "coverage",
@@ -27,7 +28,8 @@
     "**/*.ttf",
     "**/*.woff",
     "**/*.woff2",
-    "sonar-project.properties"
+    "sonar-project.properties",
+    "src/app/external/**"
   ],
   "license": "NOTICE",