From 45ca14d49222dc06f498ae28ea64bd416572e6c4 Mon Sep 17 00:00:00 2001 From: Sam Warren Date: Thu, 24 Oct 2024 09:59:02 -0600 Subject: [PATCH 1/3] ESS-Package-Upgrades: Bump various package versions --- .github/workflows/zap-scans.yml | 14 +++++++------- ess/src/API/EMBC.ESS.Host/EMBC.ESS.Host.csproj | 2 +- .../EMBC.ESS.Utilities.Cas.csproj | 6 +++--- .../EMBC.ESS.Utilities.Dynamics.csproj | 12 ++++++------ .../EMBC.ESS.Utilities.Spatial.csproj | 2 +- .../EMBC.Tests.Integration.ESS.csproj | 10 +++++----- .../EMBC.Tests.Unit.ESS/EMBC.Tests.Unit.ESS.csproj | 6 +++--- load-test/src/package.json | 2 +- .../src/API/OAuthServer/OAuthServer.csproj | 12 ++++++------ .../EMBC.Registrants.API.csproj | 4 ++-- .../EMBC.Tests.Unit.Registrants.API.csproj | 6 +++--- .../EMBC.Responders.API/EMBC.Responders.API.csproj | 4 ++-- .../EMBC.Tests.Unit.Responders.API.csproj | 6 +++--- responders/src/UI/embc-responder/package-lock.json | 2 +- .../EMBC.Utilities.Hosting.csproj | 14 +++++++------- .../EMBC.Utilities.Messaging.csproj | 4 ++-- .../EMBC.Utilities.Telemetry.csproj | 2 +- .../EMBC.Suppliers.API/EMBC.Suppliers.API.csproj | 12 ++++++------ .../EMBC.Tests.Integration.Suppliers.API.csproj | 6 +++--- .../EMBC.Tests.Unit.Suppliers.API.csproj | 6 +++--- suppliers/src/UI/embc-supplier/package-lock.json | 2 +- 21 files changed, 67 insertions(+), 67 deletions(-) diff --git a/.github/workflows/zap-scans.yml b/.github/workflows/zap-scans.yml index 5828df32d..a3624d2e6 100644 --- a/.github/workflows/zap-scans.yml +++ b/.github/workflows/zap-scans.yml @@ -11,14 +11,14 @@ jobs: runs-on: ubuntu-latest steps: - name: UI - uses: zaproxy/action-full-scan@v0.10.0 + uses: zaproxy/action-full-scan@v0.11.0 with: token: ${{ secrets.GITHUB_TOKEN }} target: 'https://dev-prj-era-responders.apps.silver.devops.gov.bc.ca' artifact_name: 'responders_ui_zap_scan' issue_title: 'responders_ui_zap_scan' - name: API - uses: zaproxy/action-api-scan@v0.7.0 + uses: zaproxy/action-api-scan@v0.8.0 with: token: ${{ secrets.GITHUB_TOKEN }} target: 'https://dev-prj-era-responders.apps.silver.devops.gov.bc.ca/api/swagger/v1/swagger.json' @@ -29,14 +29,14 @@ jobs: runs-on: ubuntu-latest steps: - name: UI - uses: zaproxy/action-full-scan@v0.10.0 + uses: zaproxy/action-full-scan@v0.11.0 with: token: ${{ secrets.GITHUB_TOKEN }} target: 'https://dev-prj-era-evacuees.apps.silver.devops.gov.bc.ca' artifact_name: 'registrants_ui_zap_scan' issue_title: 'registrants_ui_zap_scan' - name: API - uses: zaproxy/action-api-scan@v0.7.0 + uses: zaproxy/action-api-scan@v0.8.0 with: token: ${{ secrets.GITHUB_TOKEN }} target: 'https://dev-prj-era-responders.apps.silver.devops.gov.bc.ca/api/swagger/v1/swagger.json' @@ -47,14 +47,14 @@ jobs: runs-on: ubuntu-latest steps: - name: UI - uses: zaproxy/action-full-scan@v0.10.0 + uses: zaproxy/action-full-scan@v0.11.0 with: token: ${{ secrets.GITHUB_TOKEN }} target: 'https://dev-prj-era-suppliers.apps.silver.devops.gov.bc.ca' artifact_name: 'suppliers_ui_zap_scan' issue_title: 'suppliers_ui_zap_scan' - name: API - uses: zaproxy/action-api-scan@v0.7.0 + uses: zaproxy/action-api-scan@v0.8.0 with: token: ${{ secrets.GITHUB_TOKEN }} target: 'https://dev-prj-era-suppliers.apps.silver.devops.gov.bc.ca/api/swagger/v1/swagger.json' @@ -65,7 +65,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Server - uses: zaproxy/action-full-scan@v0.10.0 + uses: zaproxy/action-full-scan@v0.11.0 with: token: ${{ secrets.GITHUB_TOKEN }} target: 'https://dev-prj-era-oauth.apps.silver.devops.gov.bc.ca' diff --git a/ess/src/API/EMBC.ESS.Host/EMBC.ESS.Host.csproj b/ess/src/API/EMBC.ESS.Host/EMBC.ESS.Host.csproj index 19501c707..0650a9d3a 100644 --- a/ess/src/API/EMBC.ESS.Host/EMBC.ESS.Host.csproj +++ b/ess/src/API/EMBC.ESS.Host/EMBC.ESS.Host.csproj @@ -19,7 +19,7 @@ - + diff --git a/ess/src/API/EMBC.ESS.Utilities.Cas/EMBC.ESS.Utilities.Cas.csproj b/ess/src/API/EMBC.ESS.Utilities.Cas/EMBC.ESS.Utilities.Cas.csproj index cff4c0707..89d41e524 100644 --- a/ess/src/API/EMBC.ESS.Utilities.Cas/EMBC.ESS.Utilities.Cas.csproj +++ b/ess/src/API/EMBC.ESS.Utilities.Cas/EMBC.ESS.Utilities.Cas.csproj @@ -18,9 +18,9 @@ - - - + + + diff --git a/ess/src/API/EMBC.ESS.Utilities.Dynamics/EMBC.ESS.Utilities.Dynamics.csproj b/ess/src/API/EMBC.ESS.Utilities.Dynamics/EMBC.ESS.Utilities.Dynamics.csproj index 0285dba8d..b862ad2a2 100644 --- a/ess/src/API/EMBC.ESS.Utilities.Dynamics/EMBC.ESS.Utilities.Dynamics.csproj +++ b/ess/src/API/EMBC.ESS.Utilities.Dynamics/EMBC.ESS.Utilities.Dynamics.csproj @@ -30,15 +30,15 @@ - + - - - + + + - - + + diff --git a/ess/src/API/EMBC.ESS.Utilities.Spatial/EMBC.ESS.Utilities.Spatial.csproj b/ess/src/API/EMBC.ESS.Utilities.Spatial/EMBC.ESS.Utilities.Spatial.csproj index 4914c35f2..8c338d0a1 100644 --- a/ess/src/API/EMBC.ESS.Utilities.Spatial/EMBC.ESS.Utilities.Spatial.csproj +++ b/ess/src/API/EMBC.ESS.Utilities.Spatial/EMBC.ESS.Utilities.Spatial.csproj @@ -18,7 +18,7 @@ - + diff --git a/ess/src/API/EMBC.Tests.Integration.ESS/EMBC.Tests.Integration.ESS.csproj b/ess/src/API/EMBC.Tests.Integration.ESS/EMBC.Tests.Integration.ESS.csproj index 894aeae72..f6d1a113e 100644 --- a/ess/src/API/EMBC.Tests.Integration.ESS/EMBC.Tests.Integration.ESS.csproj +++ b/ess/src/API/EMBC.Tests.Integration.ESS/EMBC.Tests.Integration.ESS.csproj @@ -11,13 +11,13 @@ - + - - - + + + - + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/ess/src/API/EMBC.Tests.Unit.ESS/EMBC.Tests.Unit.ESS.csproj b/ess/src/API/EMBC.Tests.Unit.ESS/EMBC.Tests.Unit.ESS.csproj index 547bf9342..9db5215f3 100644 --- a/ess/src/API/EMBC.Tests.Unit.ESS/EMBC.Tests.Unit.ESS.csproj +++ b/ess/src/API/EMBC.Tests.Unit.ESS/EMBC.Tests.Unit.ESS.csproj @@ -10,13 +10,13 @@ - + - + - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/load-test/src/package.json b/load-test/src/package.json index a32e43cfa..047f65f49 100644 --- a/load-test/src/package.json +++ b/load-test/src/package.json @@ -18,7 +18,7 @@ "faker": "5.5.3", "ng-openapi-gen": "^0.21.2", "typescript": "5.3.3", - "webpack": "5.89.0", + "webpack": "5.94.0", "webpack-cli": "5.1.4", "webpack-glob-entries": "^1.0.1" }, diff --git a/oauth-server/src/API/OAuthServer/OAuthServer.csproj b/oauth-server/src/API/OAuthServer/OAuthServer.csproj index 755c24c71..69854f412 100644 --- a/oauth-server/src/API/OAuthServer/OAuthServer.csproj +++ b/oauth-server/src/API/OAuthServer/OAuthServer.csproj @@ -21,18 +21,18 @@ - - - - - + + + + + - + diff --git a/registrants/src/API/EMBC.Registrants.API/EMBC.Registrants.API.csproj b/registrants/src/API/EMBC.Registrants.API/EMBC.Registrants.API.csproj index beaee5e83..d8b109c3d 100644 --- a/registrants/src/API/EMBC.Registrants.API/EMBC.Registrants.API.csproj +++ b/registrants/src/API/EMBC.Registrants.API/EMBC.Registrants.API.csproj @@ -22,8 +22,8 @@ - - + + diff --git a/registrants/src/API/EMBC.Tests.Unit.Registrants.API/EMBC.Tests.Unit.Registrants.API.csproj b/registrants/src/API/EMBC.Tests.Unit.Registrants.API/EMBC.Tests.Unit.Registrants.API.csproj index 246a17b09..556a2a10a 100644 --- a/registrants/src/API/EMBC.Tests.Unit.Registrants.API/EMBC.Tests.Unit.Registrants.API.csproj +++ b/registrants/src/API/EMBC.Tests.Unit.Registrants.API/EMBC.Tests.Unit.Registrants.API.csproj @@ -8,11 +8,11 @@ - + - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/responders/src/API/EMBC.Responders.API/EMBC.Responders.API.csproj b/responders/src/API/EMBC.Responders.API/EMBC.Responders.API.csproj index 28bb60303..7a3800402 100644 --- a/responders/src/API/EMBC.Responders.API/EMBC.Responders.API.csproj +++ b/responders/src/API/EMBC.Responders.API/EMBC.Responders.API.csproj @@ -21,8 +21,8 @@ - - + + diff --git a/responders/src/API/EMBC.Tests.Unit.Responders.API/EMBC.Tests.Unit.Responders.API.csproj b/responders/src/API/EMBC.Tests.Unit.Responders.API/EMBC.Tests.Unit.Responders.API.csproj index 7c7917ffc..fe4af1428 100644 --- a/responders/src/API/EMBC.Tests.Unit.Responders.API/EMBC.Tests.Unit.Responders.API.csproj +++ b/responders/src/API/EMBC.Tests.Unit.Responders.API/EMBC.Tests.Unit.Responders.API.csproj @@ -9,11 +9,11 @@ - + - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/responders/src/UI/embc-responder/package-lock.json b/responders/src/UI/embc-responder/package-lock.json index 18e9c0e53..2169c71d2 100644 --- a/responders/src/UI/embc-responder/package-lock.json +++ b/responders/src/UI/embc-responder/package-lock.json @@ -22,7 +22,7 @@ "@ng-idle/keepalive": "^14.0.0", "angular-imask": "^7.6.0", "angular-oauth2-oidc": "^17.0.2", - "bootstrap": "~5.1.3", + "bootstrap": "~5.3.3", "moment": "^2.29.4", "ngx-markdown": "^17.2.1", "rxjs": "~7.4.0", diff --git a/shared/src/EMBC.Utilities.Hosting/EMBC.Utilities.Hosting.csproj b/shared/src/EMBC.Utilities.Hosting/EMBC.Utilities.Hosting.csproj index 61cda961f..b4ed05475 100644 --- a/shared/src/EMBC.Utilities.Hosting/EMBC.Utilities.Hosting.csproj +++ b/shared/src/EMBC.Utilities.Hosting/EMBC.Utilities.Hosting.csproj @@ -22,20 +22,20 @@ - + - - - - + + + + - - + + diff --git a/shared/src/EMBC.Utilities.Messaging/EMBC.Utilities.Messaging.csproj b/shared/src/EMBC.Utilities.Messaging/EMBC.Utilities.Messaging.csproj index 8b34f5915..dece9684e 100644 --- a/shared/src/EMBC.Utilities.Messaging/EMBC.Utilities.Messaging.csproj +++ b/shared/src/EMBC.Utilities.Messaging/EMBC.Utilities.Messaging.csproj @@ -21,9 +21,9 @@ - + - + diff --git a/shared/src/EMBC.Utilities.Telemetry/EMBC.Utilities.Telemetry.csproj b/shared/src/EMBC.Utilities.Telemetry/EMBC.Utilities.Telemetry.csproj index 5b306b695..79c9d33ba 100644 --- a/shared/src/EMBC.Utilities.Telemetry/EMBC.Utilities.Telemetry.csproj +++ b/shared/src/EMBC.Utilities.Telemetry/EMBC.Utilities.Telemetry.csproj @@ -18,7 +18,7 @@ - + diff --git a/suppliers/src/API/EMBC.Suppliers.API/EMBC.Suppliers.API.csproj b/suppliers/src/API/EMBC.Suppliers.API/EMBC.Suppliers.API.csproj index fe7c18c0c..b004c8283 100644 --- a/suppliers/src/API/EMBC.Suppliers.API/EMBC.Suppliers.API.csproj +++ b/suppliers/src/API/EMBC.Suppliers.API/EMBC.Suppliers.API.csproj @@ -17,12 +17,12 @@ - - - + + + - - + + @@ -30,7 +30,7 @@ - + diff --git a/suppliers/src/API/EMBC.Tests.Integration.Suppliers.API/EMBC.Tests.Integration.Suppliers.API.csproj b/suppliers/src/API/EMBC.Tests.Integration.Suppliers.API/EMBC.Tests.Integration.Suppliers.API.csproj index d41185b53..ea34db8aa 100644 --- a/suppliers/src/API/EMBC.Tests.Integration.Suppliers.API/EMBC.Tests.Integration.Suppliers.API.csproj +++ b/suppliers/src/API/EMBC.Tests.Integration.Suppliers.API/EMBC.Tests.Integration.Suppliers.API.csproj @@ -7,9 +7,9 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/suppliers/src/API/EMBC.Tests.Unit.Suppliers.API/EMBC.Tests.Unit.Suppliers.API.csproj b/suppliers/src/API/EMBC.Tests.Unit.Suppliers.API/EMBC.Tests.Unit.Suppliers.API.csproj index 0d4d17147..cc32945ba 100644 --- a/suppliers/src/API/EMBC.Tests.Unit.Suppliers.API/EMBC.Tests.Unit.Suppliers.API.csproj +++ b/suppliers/src/API/EMBC.Tests.Unit.Suppliers.API/EMBC.Tests.Unit.Suppliers.API.csproj @@ -7,10 +7,10 @@ - - + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/suppliers/src/UI/embc-supplier/package-lock.json b/suppliers/src/UI/embc-supplier/package-lock.json index 9a11418a4..494b4856a 100644 --- a/suppliers/src/UI/embc-supplier/package-lock.json +++ b/suppliers/src/UI/embc-supplier/package-lock.json @@ -25,7 +25,7 @@ "@fortawesome/free-solid-svg-icons": "^6.6.0", "@ng-bootstrap/ng-bootstrap": "^16.0.0", "angular-oauth2-oidc": "^17.0.2", - "bootstrap": "^4.3.1", + "bootstrap": "^5.0.0", "jquery": "^3.5.0", "ng-recaptcha": "^13.2.1", "popper.js": "^1.14.7", From 0bca700b04df91c60f56ef53018712a3b275c16d Mon Sep 17 00:00:00 2001 From: Sam Warren Date: Thu, 24 Oct 2024 10:07:27 -0600 Subject: [PATCH 2/3] ESS-Package-Upgrades: Update package-lock --- load-test/src/package-lock.json | 69 ++++++++++++--------------------- 1 file changed, 24 insertions(+), 45 deletions(-) diff --git a/load-test/src/package-lock.json b/load-test/src/package-lock.json index 3e322039b..0c21ed909 100644 --- a/load-test/src/package-lock.json +++ b/load-test/src/package-lock.json @@ -23,7 +23,7 @@ "faker": "5.5.3", "ng-openapi-gen": "^0.21.2", "typescript": "5.3.3", - "webpack": "5.89.0", + "webpack": "5.94.0", "webpack-cli": "5.1.4", "webpack-glob-entries": "^1.0.1" } @@ -1942,30 +1942,10 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/@types/eslint": { - "version": "8.56.10", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.10.tgz", - "integrity": "sha512-Shavhk87gCtY2fhXDctcfS3e6FdxWkCx1iUZ9eEUbh7rTqlZT0/IzOkCOVt0fCjcFuZ9FPYfuezTBImfHCDBGQ==", - "dev": true, - "dependencies": { - "@types/estree": "*", - "@types/json-schema": "*" - } - }, - "node_modules/@types/eslint-scope": { - "version": "3.7.7", - "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz", - "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==", - "dev": true, - "dependencies": { - "@types/eslint": "*", - "@types/estree": "*" - } - }, "node_modules/@types/estree": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", - "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz", + "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==", "dev": true }, "node_modules/@types/faker": { @@ -2236,10 +2216,10 @@ "node": ">=0.4.0" } }, - "node_modules/acorn-import-assertions": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz", - "integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==", + "node_modules/acorn-import-attributes": { + "version": "1.9.5", + "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz", + "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==", "dev": true, "peerDependencies": { "acorn": "^8" @@ -2743,9 +2723,9 @@ "dev": true }, "node_modules/enhanced-resolve": { - "version": "5.16.1", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.16.1.tgz", - "integrity": "sha512-4U5pNsuDl0EhuZpq46M5xPslstkviJuhrdobaRDBk2Jy2KO37FDAJl4lb2KlNabxT0m4MTK2UHNrsAcphE8nyw==", + "version": "5.17.1", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz", + "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==", "dev": true, "dependencies": { "graceful-fs": "^4.2.4", @@ -4523,34 +4503,33 @@ } }, "node_modules/webpack": { - "version": "5.89.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.89.0.tgz", - "integrity": "sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw==", + "version": "5.94.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz", + "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==", "dev": true, "dependencies": { - "@types/eslint-scope": "^3.7.3", - "@types/estree": "^1.0.0", - "@webassemblyjs/ast": "^1.11.5", - "@webassemblyjs/wasm-edit": "^1.11.5", - "@webassemblyjs/wasm-parser": "^1.11.5", + "@types/estree": "^1.0.5", + "@webassemblyjs/ast": "^1.12.1", + "@webassemblyjs/wasm-edit": "^1.12.1", + "@webassemblyjs/wasm-parser": "^1.12.1", "acorn": "^8.7.1", - "acorn-import-assertions": "^1.9.0", - "browserslist": "^4.14.5", + "acorn-import-attributes": "^1.9.5", + "browserslist": "^4.21.10", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.15.0", + "enhanced-resolve": "^5.17.1", "es-module-lexer": "^1.2.1", "eslint-scope": "5.1.1", "events": "^3.2.0", "glob-to-regexp": "^0.4.1", - "graceful-fs": "^4.2.9", + "graceful-fs": "^4.2.11", "json-parse-even-better-errors": "^2.3.1", "loader-runner": "^4.2.0", "mime-types": "^2.1.27", "neo-async": "^2.6.2", "schema-utils": "^3.2.0", "tapable": "^2.1.1", - "terser-webpack-plugin": "^5.3.7", - "watchpack": "^2.4.0", + "terser-webpack-plugin": "^5.3.10", + "watchpack": "^2.4.1", "webpack-sources": "^3.2.3" }, "bin": { From 03bbc5ed22b840e4b3549350b55ff9e48b142ba2 Mon Sep 17 00:00:00 2001 From: Sam Warren Date: Thu, 24 Oct 2024 10:16:25 -0600 Subject: [PATCH 3/3] ESS-Package-Upgrades: Revert OData package versions --- .../EMBC.ESS.Utilities.Dynamics.csproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ess/src/API/EMBC.ESS.Utilities.Dynamics/EMBC.ESS.Utilities.Dynamics.csproj b/ess/src/API/EMBC.ESS.Utilities.Dynamics/EMBC.ESS.Utilities.Dynamics.csproj index b862ad2a2..a393ffa10 100644 --- a/ess/src/API/EMBC.ESS.Utilities.Dynamics/EMBC.ESS.Utilities.Dynamics.csproj +++ b/ess/src/API/EMBC.ESS.Utilities.Dynamics/EMBC.ESS.Utilities.Dynamics.csproj @@ -33,11 +33,11 @@ - - - + + + - +