From 495bc7c4187e0eab056d208617dc1f7e46ec1fdb Mon Sep 17 00:00:00 2001
From: "snyk-io[bot]" <141718529+snyk-io[bot]@users.noreply.github.com>
Date: Tue, 5 Nov 2024 03:29:14 +0000
Subject: [PATCH 01/15] fix: upgrade
net.javacrumbs.shedlock:shedlock-provider-jdbc-template from 5.13.0 to 5.16.0
Snyk has created this PR to upgrade net.javacrumbs.shedlock:shedlock-provider-jdbc-template from 5.13.0 to 5.16.0.
See this package in maven:
net.javacrumbs.shedlock:shedlock-provider-jdbc-template
See this project in Snyk:
https://app.snyk.io/org/oph-snyk/project/d824f7ed-bf61-4724-becd-c480f7e7c8ea?utm_source=github-cloud-app&utm_medium=referral&page=upgrade-pr
---
backend/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/backend/pom.xml b/backend/pom.xml
index 098e28a7b..bf4d340eb 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -33,7 +33,7 @@
2.6.0
- 5.13.0
+ 5.16.0
5.3.0
4.29.2
From fc013a0e7614f4bb287b6920a6a427619bccb81a Mon Sep 17 00:00:00 2001
From: "snyk-io[bot]" <141718529+snyk-io[bot]@users.noreply.github.com>
Date: Tue, 5 Nov 2024 03:29:18 +0000
Subject: [PATCH 02/15] fix: upgrade commons-io:commons-io from 2.16.1 to
2.17.0
Snyk has created this PR to upgrade commons-io:commons-io from 2.16.1 to 2.17.0.
See this package in maven:
commons-io:commons-io
See this project in Snyk:
https://app.snyk.io/org/oph-snyk/project/d824f7ed-bf61-4724-becd-c480f7e7c8ea?utm_source=github-cloud-app&utm_medium=referral&page=upgrade-pr
---
backend/akr/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/backend/akr/pom.xml b/backend/akr/pom.xml
index 40e1ba002..411d6ed6c 100644
--- a/backend/akr/pom.xml
+++ b/backend/akr/pom.xml
@@ -21,7 +21,7 @@
commons-io
commons-io
- 2.16.1
+ 2.17.0
From d19c134565ec8e9fdc535584ecc7a855b26ca505 Mon Sep 17 00:00:00 2001
From: "snyk-io[bot]" <141718529+snyk-io[bot]@users.noreply.github.com>
Date: Fri, 8 Nov 2024 02:47:37 +0000
Subject: [PATCH 03/15] fix: upgrade react-router-dom from 6.26.2 to 6.27.0
Snyk has created this PR to upgrade react-router-dom from 6.26.2 to 6.27.0.
See this package in yarn:
react-router-dom
See this project in Snyk:
https://app.snyk.io/org/oph-snyk/project/84abdeeb-9d9e-4376-92f5-0d0983809ad7?utm_source=github-cloud-app&utm_medium=referral&page=upgrade-pr
---
frontend/package.json | 2 +-
frontend/yarn.lock | 344 ++++++++++++++----------------------------
2 files changed, 111 insertions(+), 235 deletions(-)
diff --git a/frontend/package.json b/frontend/package.json
index eb7c5442b..f79649515 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -46,7 +46,7 @@
"react-dom": "^18.3.1",
"react-i18next": "^13.5.0",
"react-redux": "^8.1.3",
- "react-router-dom": "6.26.2",
+ "react-router-dom": "6.27.0",
"redux-saga": "^1.3.0"
},
"devDependencies": {
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index 19c8a2aed..be2d6c137 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -2,7 +2,7 @@
# Manual changes might be lost - proceed with caution!
__metadata:
- version: 8
+ version: 6
cacheKey: 10
"@aashutoshrathi/word-wrap@npm:^1.2.3":
@@ -2584,132 +2584,92 @@ __metadata:
languageName: node
linkType: hard
-"@opetushallitus/kieli-ja-kaantajatutkinnot.akr@workspace:packages/akr":
- version: 0.0.0-use.local
- resolution: "@opetushallitus/kieli-ja-kaantajatutkinnot.akr@workspace:packages/akr"
- dependencies:
- shared: "npm:@opetushallitus/kieli-ja-kaantajatutkinnot.shared@1.11.4"
- languageName: unknown
- linkType: soft
-
-"@opetushallitus/kieli-ja-kaantajatutkinnot.otr@workspace:packages/otr":
- version: 0.0.0-use.local
- resolution: "@opetushallitus/kieli-ja-kaantajatutkinnot.otr@workspace:packages/otr"
- dependencies:
- shared: "npm:@opetushallitus/kieli-ja-kaantajatutkinnot.shared@1.11.4"
- languageName: unknown
- linkType: soft
-
"@opetushallitus/kieli-ja-kaantajatutkinnot.root@workspace:.":
version: 0.0.0-use.local
resolution: "@opetushallitus/kieli-ja-kaantajatutkinnot.root@workspace:."
dependencies:
- "@babel/core": "npm:^7.23.2"
- "@babel/plugin-transform-runtime": "npm:^7.23.2"
- "@babel/preset-env": "npm:^7.23.2"
- "@babel/preset-react": "npm:^7.22.15"
- "@babel/preset-typescript": "npm:^7.23.2"
- "@babel/runtime": "npm:^7.23.2"
- "@cypress/webpack-preprocessor": "npm:^6.0.0"
- "@emotion/react": "npm:^11.13.0"
- "@emotion/styled": "npm:^11.13.0"
- "@fontsource/roboto": "npm:^5.0.14"
- "@mui/icons-material": "npm:^5.16.7"
- "@mui/material": "npm:^5.16.7"
- "@mui/system": "npm:^5.16.7"
- "@mui/x-date-pickers": "npm:^5.0.20"
- "@reduxjs/toolkit": "npm:^1.9.7"
- "@testing-library/cypress": "npm:^10.0.1"
- "@testing-library/dom": "npm:^9.3.3"
- "@testing-library/jest-dom": "npm:^6.1.4"
- "@testing-library/react": "npm:^14.0.0"
- "@testing-library/user-event": "npm:^14.5.1"
- "@types/jest": "npm:^29.5.7"
- "@types/js-cookie": "npm:^3.0.6"
- "@types/node": "npm:^20.8.10"
- "@types/react": "npm:^18.2.36"
- "@types/react-dom": "npm:^18.2.14"
- "@types/react-redux": "npm:^7.1.29"
- "@types/react-test-renderer": "npm:^18.0.5"
- "@typescript-eslint/eslint-plugin": "npm:^6.10.0"
- "@typescript-eslint/parser": "npm:^6.10.0"
- axios: "npm:^1.7.7"
- babel-jest: "npm:^29.7.0"
- babel-loader: "npm:^9.1.3"
- compression-webpack-plugin: "npm:^10.0.0"
- copy-webpack-plugin: "npm:^11.0.0"
- css-loader: "npm:^6.8.1"
- cypress: "npm:^13.13.3"
- dayjs: "npm:^1.11.13"
- eslint: "npm:^8.53.0"
- eslint-config-prettier: "npm:^9.0.0"
- eslint-import-resolver-webpack: "npm:^0.13.8"
- eslint-plugin-eslint-comments: "npm:^3.2.0"
- eslint-plugin-import: "npm:^2.29.0"
- eslint-plugin-jsx-a11y: "npm:^6.8.0"
- eslint-plugin-no-only-tests: "npm:^3.1.0"
- eslint-plugin-prettier: "npm:^5.0.1"
- eslint-plugin-react: "npm:^7.33.2"
- eslint-plugin-react-hooks: "npm:^4.6.0"
- eslint-webpack-plugin: "npm:^4.0.1"
+ "@babel/core": ^7.23.2
+ "@babel/plugin-transform-runtime": ^7.23.2
+ "@babel/preset-env": ^7.23.2
+ "@babel/preset-react": ^7.22.15
+ "@babel/preset-typescript": ^7.23.2
+ "@babel/runtime": ^7.23.2
+ "@cypress/webpack-preprocessor": ^6.0.0
+ "@emotion/react": ^11.13.0
+ "@emotion/styled": ^11.13.0
+ "@fontsource/roboto": ^5.0.14
+ "@mui/icons-material": ^5.16.7
+ "@mui/material": ^5.16.7
+ "@mui/system": ^5.16.7
+ "@mui/x-date-pickers": ^5.0.20
+ "@reduxjs/toolkit": ^1.9.7
+ "@testing-library/cypress": ^10.0.1
+ "@testing-library/dom": ^9.3.3
+ "@testing-library/jest-dom": ^6.1.4
+ "@testing-library/react": ^14.0.0
+ "@testing-library/user-event": ^14.5.1
+ "@types/jest": ^29.5.7
+ "@types/js-cookie": ^3.0.6
+ "@types/node": ^20.8.10
+ "@types/react": ^18.2.36
+ "@types/react-dom": ^18.2.14
+ "@types/react-redux": ^7.1.29
+ "@types/react-test-renderer": ^18.0.5
+ "@typescript-eslint/eslint-plugin": ^6.10.0
+ "@typescript-eslint/parser": ^6.10.0
+ axios: ^1.7.7
+ babel-jest: ^29.7.0
+ babel-loader: ^9.1.3
+ compression-webpack-plugin: ^10.0.0
+ copy-webpack-plugin: ^11.0.0
+ css-loader: ^6.8.1
+ cypress: ^13.13.3
+ dayjs: ^1.11.13
+ eslint: ^8.53.0
+ eslint-config-prettier: ^9.0.0
+ eslint-import-resolver-webpack: ^0.13.8
+ eslint-plugin-eslint-comments: ^3.2.0
+ eslint-plugin-import: ^2.29.0
+ eslint-plugin-jsx-a11y: ^6.8.0
+ eslint-plugin-no-only-tests: ^3.1.0
+ eslint-plugin-prettier: ^5.0.1
+ eslint-plugin-react: ^7.33.2
+ eslint-plugin-react-hooks: ^4.6.0
+ eslint-webpack-plugin: ^4.0.1
finnish-personal-identity-code-validator: "kimmotaskinen/finnish-personal-identity-code-validator#support-new-delimiters"
- git-revision-webpack-plugin: "npm:^5.0.0"
- history: "npm:^5.3.0"
- html-webpack-plugin: "npm:^5.5.3"
- i18next: "npm:^23.14.0"
- i18next-browser-languagedetector: "npm:^7.2.1"
- jest: "npm:^29.7.0"
- jest-environment-jsdom: "npm:^29.7.0"
- js-cookie: "npm:^3.0.5"
- mini-css-extract-plugin: "npm:^2.7.6"
- msw: "npm:^2.0.4"
- normalize.css: "npm:^8.0.1"
- postcss: "npm:^8.4.31"
- prettier: "npm:^3.0.3"
- react: "npm:^18.3.1"
- react-dom: "npm:^18.3.1"
- react-i18next: "npm:^13.5.0"
- react-redux: "npm:^8.1.3"
- react-router-dom: "npm:6.26.2"
- react-test-renderer: "npm:^18.2.0"
- redux-saga: "npm:^1.3.0"
- sass: "npm:^1.69.5"
- sass-loader: "npm:^13.3.2"
- style-loader: "npm:^3.3.3"
- stylelint: "npm:^15.11.0"
- stylelint-config-prettier: "npm:^9.0.5"
- stylelint-config-sass-guidelines: "npm:^10.0.0"
- stylelint-prettier: "npm:^4.0.2"
- stylelint-webpack-plugin: "npm:^4.1.1"
- ts-unused-exports: "npm:^10.0.1"
- typescript: "npm:^5.2.2"
- webpack: "npm:^5.94.0"
- webpack-cli: "npm:^5.1.4"
- webpack-dev-server: "npm:^4.15.1"
- languageName: unknown
- linkType: soft
-
-"@opetushallitus/kieli-ja-kaantajatutkinnot.shared@workspace:packages/shared, shared@npm:@opetushallitus/kieli-ja-kaantajatutkinnot.shared@1.11.4":
- version: 0.0.0-use.local
- resolution: "@opetushallitus/kieli-ja-kaantajatutkinnot.shared@workspace:packages/shared"
- languageName: unknown
- linkType: soft
-
-"@opetushallitus/kieli-ja-kaantajatutkinnot.vkt@workspace:packages/vkt":
- version: 0.0.0-use.local
- resolution: "@opetushallitus/kieli-ja-kaantajatutkinnot.vkt@workspace:packages/vkt"
- dependencies:
- reduxjs-toolkit-persist: "npm:^7.2.1"
- shared: "npm:@opetushallitus/kieli-ja-kaantajatutkinnot.shared@1.11.4"
- languageName: unknown
- linkType: soft
-
-"@opetushallitus/kieli-ja-kaantajatutkinnot.yki@workspace:packages/yki":
- version: 0.0.0-use.local
- resolution: "@opetushallitus/kieli-ja-kaantajatutkinnot.yki@workspace:packages/yki"
- dependencies:
- multer: "npm:^1.4.5-lts.1"
- shared: "npm:@opetushallitus/kieli-ja-kaantajatutkinnot.shared@1.11.4"
+ git-revision-webpack-plugin: ^5.0.0
+ history: ^5.3.0
+ html-webpack-plugin: ^5.5.3
+ i18next: ^23.14.0
+ i18next-browser-languagedetector: ^7.2.1
+ jest: ^29.7.0
+ jest-environment-jsdom: ^29.7.0
+ js-cookie: ^3.0.5
+ mini-css-extract-plugin: ^2.7.6
+ msw: ^2.0.4
+ normalize.css: ^8.0.1
+ postcss: ^8.4.31
+ prettier: ^3.0.3
+ react: ^18.3.1
+ react-dom: ^18.3.1
+ react-i18next: ^13.5.0
+ react-redux: ^8.1.3
+ react-router-dom: 6.27.0
+ react-test-renderer: ^18.2.0
+ redux-saga: ^1.3.0
+ sass: ^1.69.5
+ sass-loader: ^13.3.2
+ style-loader: ^3.3.3
+ stylelint: ^15.11.0
+ stylelint-config-prettier: ^9.0.5
+ stylelint-config-sass-guidelines: ^10.0.0
+ stylelint-prettier: ^4.0.2
+ stylelint-webpack-plugin: ^4.1.1
+ ts-unused-exports: ^10.0.1
+ typescript: ^5.2.2
+ webpack: ^5.94.0
+ webpack-cli: ^5.1.4
+ webpack-dev-server: ^4.15.1
languageName: unknown
linkType: soft
@@ -2816,10 +2776,10 @@ __metadata:
languageName: node
linkType: hard
-"@remix-run/router@npm:1.19.2":
- version: 1.19.2
- resolution: "@remix-run/router@npm:1.19.2"
- checksum: 31b62b66ea68bd62018189047de7b262700113438f62407df019f81a9856a08a705b2b77454be9293518e2f5f3bbf3f8b858ac19f48cb7d89f8ab56b7b630c19
+"@remix-run/router@npm:1.20.0":
+ version: 1.20.0
+ resolution: "@remix-run/router@npm:1.20.0"
+ checksum: 8/6bff41117eabb867b17c89baa727580f0a431368b309cd9a1f69767aafa68ea9cac95ff0eeb86d37c2c8655f5cd7c6283d37ae5e6d93e94f648c6112ddb24ede
languageName: node
linkType: hard
@@ -4067,13 +4027,6 @@ __metadata:
languageName: node
linkType: hard
-"append-field@npm:^1.0.0":
- version: 1.0.0
- resolution: "append-field@npm:1.0.0"
- checksum: afb50f5ff668af1cb66bc5cfebb55ed9a1d99e24901782ee83d00aed1a499835f9375a149cf27b17f79595ecfcc3d1de0cd5b020b210a5359c43eaf607c217de
- languageName: node
- linkType: hard
-
"arch@npm:^2.2.0":
version: 2.2.0
resolution: "arch@npm:2.2.0"
@@ -4716,15 +4669,6 @@ __metadata:
languageName: node
linkType: hard
-"busboy@npm:^1.0.0":
- version: 1.6.0
- resolution: "busboy@npm:1.6.0"
- dependencies:
- streamsearch: "npm:^1.1.0"
- checksum: bee10fa10ea58e7e3e7489ffe4bda6eacd540a17de9f9cd21cc37e297b2dd9fe52b2715a5841afaec82900750d810d01d7edb4b2d456427f449b92b417579763
- languageName: node
- linkType: hard
-
"bytes@npm:3.0.0":
version: 3.0.0
resolution: "bytes@npm:3.0.0"
@@ -5199,18 +5143,6 @@ __metadata:
languageName: node
linkType: hard
-"concat-stream@npm:^1.5.2":
- version: 1.6.2
- resolution: "concat-stream@npm:1.6.2"
- dependencies:
- buffer-from: "npm:^1.0.0"
- inherits: "npm:^2.0.3"
- readable-stream: "npm:^2.2.2"
- typedarray: "npm:^0.0.6"
- checksum: 71db903c84fc073ca35a274074e8d26c4330713d299f8623e993c448c1f6bf8b967806dd1d1a7b0f8add6f15ab1af7435df21fe79b4fe7efd78420c89e054e28
- languageName: node
- linkType: hard
-
"connect-history-api-fallback@npm:^2.0.0":
version: 2.0.0
resolution: "connect-history-api-fallback@npm:2.0.0"
@@ -7174,9 +7106,9 @@ __metadata:
languageName: node
linkType: hard
-"fsevents@patch:fsevents@npm%3A^2.3.2#optional!builtin, fsevents@patch:fsevents@npm%3A~2.3.2#optional!builtin":
+"fsevents@patch:fsevents@npm%3A^2.3.2#~builtin, fsevents@patch:fsevents@npm%3A~2.3.2#~builtin":
version: 2.3.3
- resolution: "fsevents@patch:fsevents@npm%3A2.3.3#optional!builtin::version=2.3.3&hash=df0bf1"
+ resolution: "fsevents@patch:fsevents@npm%3A2.3.3#~builtin::version=2.3.3&hash=df0bf1"
dependencies:
node-gyp: "npm:latest"
conditions: os=darwin
@@ -9859,17 +9791,6 @@ __metadata:
languageName: node
linkType: hard
-"mkdirp@npm:^0.5.4":
- version: 0.5.6
- resolution: "mkdirp@npm:0.5.6"
- dependencies:
- minimist: "npm:^1.2.6"
- bin:
- mkdirp: bin/cmd.js
- checksum: 0c91b721bb12c3f9af4b77ebf73604baf350e64d80df91754dc509491ae93bf238581e59c7188360cec7cb62fc4100959245a42cfe01834efedc5e9d068376c2
- languageName: node
- linkType: hard
-
"mkdirp@npm:^1.0.3":
version: 1.0.4
resolution: "mkdirp@npm:1.0.4"
@@ -9937,21 +9858,6 @@ __metadata:
languageName: node
linkType: hard
-"multer@npm:^1.4.5-lts.1":
- version: 1.4.5-lts.1
- resolution: "multer@npm:1.4.5-lts.1"
- dependencies:
- append-field: "npm:^1.0.0"
- busboy: "npm:^1.0.0"
- concat-stream: "npm:^1.5.2"
- mkdirp: "npm:^0.5.4"
- object-assign: "npm:^4.1.1"
- type-is: "npm:^1.6.4"
- xtend: "npm:^4.0.0"
- checksum: 957c09956f3b7f79d8586cac5e2a50e9a5c3011eb841667b5e4590c5f31d9464f5b46aecd399c83e183a15b88b019cccf0e4fa5620db40bf16b9e3af7fab3ac6
- languageName: node
- linkType: hard
-
"multicast-dns@npm:^7.2.5":
version: 7.2.5
resolution: "multicast-dns@npm:7.2.5"
@@ -11076,27 +10982,27 @@ __metadata:
languageName: node
linkType: hard
-"react-router-dom@npm:6.26.2":
- version: 6.26.2
- resolution: "react-router-dom@npm:6.26.2"
+"react-router-dom@npm:6.27.0":
+ version: 6.27.0
+ resolution: "react-router-dom@npm:6.27.0"
dependencies:
- "@remix-run/router": "npm:1.19.2"
- react-router: "npm:6.26.2"
+ "@remix-run/router": 1.20.0
+ react-router: 6.27.0
peerDependencies:
react: ">=16.8"
react-dom: ">=16.8"
- checksum: 4eee37839bd1a660807c090b4d272e4aa9b95d8a9a932cdcdf7c5b10735f39b6db73bad79b08a3012386a7e225ff6bf60435e2741fb7c68e137ac5a6295d4308
+ checksum: 8/de3dcc56297a2879a0e3997fa34ba0f3e1b9986a2ad3ef7991f913902ecf38da0282c98f7834f344ce2d881dbab0a382201a57e9f9ef5e9816febdb26dc038b7
languageName: node
linkType: hard
-"react-router@npm:6.26.2":
- version: 6.26.2
- resolution: "react-router@npm:6.26.2"
+"react-router@npm:6.27.0":
+ version: 6.27.0
+ resolution: "react-router@npm:6.27.0"
dependencies:
- "@remix-run/router": "npm:1.19.2"
+ "@remix-run/router": 1.20.0
peerDependencies:
react: ">=16.8"
- checksum: 496e855b53e61066c1791e354f5d79eab56a128d9722fdc6486c3ecd3b3a0bf9968e927028f429893b157f3cc10fc09e890a055847723ee242663e7995fedc9d
+ checksum: 8/d22eedc33bcb11891b431655f90eed2d52c2fb3165ad11ca625f62970caf59c4859e6b1a3f92e78902b31ff1a8b2482ebf97ddebb82e9687d1f98730c14e04e6
languageName: node
linkType: hard
@@ -11172,7 +11078,7 @@ __metadata:
languageName: node
linkType: hard
-"readable-stream@npm:^2.0.1, readable-stream@npm:^2.2.2":
+"readable-stream@npm:^2.0.1":
version: 2.3.8
resolution: "readable-stream@npm:2.3.8"
dependencies:
@@ -11263,15 +11169,6 @@ __metadata:
languageName: node
linkType: hard
-"reduxjs-toolkit-persist@npm:^7.2.1":
- version: 7.2.1
- resolution: "reduxjs-toolkit-persist@npm:7.2.1"
- peerDependencies:
- "@reduxjs/toolkit": ^1.6.1
- checksum: 94c75dff10c8442e69feda9c2a647df23c43c99a74fe175f2623acd8518ae7f47ad48f636d7b8ae26ee1b7b7927ad6c93e6c2b8150bb1a77274f8135eddce8b9
- languageName: node
- linkType: hard
-
"reflect.getprototypeof@npm:^1.0.4":
version: 1.0.4
resolution: "reflect.getprototypeof@npm:1.0.4"
@@ -11467,29 +11364,29 @@ __metadata:
languageName: node
linkType: hard
-"resolve@patch:resolve@npm%3A^1.14.2#optional!builtin, resolve@patch:resolve@npm%3A^1.19.0#optional!builtin, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin, resolve@patch:resolve@npm%3A^1.22.4#optional!builtin":
+"resolve@patch:resolve@npm%3A^1.14.2#~builtin, resolve@patch:resolve@npm%3A^1.19.0#~builtin, resolve@patch:resolve@npm%3A^1.20.0#~builtin, resolve@patch:resolve@npm%3A^1.22.4#~builtin":
version: 1.22.8
- resolution: "resolve@patch:resolve@npm%3A1.22.8#optional!builtin::version=1.22.8&hash=c3c19d"
+ resolution: "resolve@patch:resolve@npm%3A1.22.8#~builtin::version=1.22.8&hash=c3c19d"
dependencies:
is-core-module: "npm:^2.13.0"
path-parse: "npm:^1.0.7"
supports-preserve-symlinks-flag: "npm:^1.0.0"
bin:
resolve: bin/resolve
- checksum: f345cd37f56a2c0275e3fe062517c650bb673815d885e7507566df589375d165bbbf4bdb6aa95600a9bc55f4744b81f452b5a63f95b9f10a72787dba3c90890a
+ checksum: 8/5479b7d431cacd5185f8db64bfcb7286ae5e31eb299f4c4f404ad8aa6098b77599563ac4257cb2c37a42f59dfc06a1bec2bcf283bb448f319e37f0feb9a09847
languageName: node
linkType: hard
-"resolve@patch:resolve@npm%3A^2.0.0-next.4#optional!builtin, resolve@patch:resolve@npm%3A^2.0.0-next.5#optional!builtin":
+"resolve@patch:resolve@npm%3A^2.0.0-next.4#~builtin, resolve@patch:resolve@npm%3A^2.0.0-next.5#~builtin":
version: 2.0.0-next.5
- resolution: "resolve@patch:resolve@npm%3A2.0.0-next.5#optional!builtin::version=2.0.0-next.5&hash=c3c19d"
+ resolution: "resolve@patch:resolve@npm%3A2.0.0-next.5#~builtin::version=2.0.0-next.5&hash=c3c19d"
dependencies:
is-core-module: "npm:^2.13.0"
path-parse: "npm:^1.0.7"
supports-preserve-symlinks-flag: "npm:^1.0.0"
bin:
resolve: bin/resolve
- checksum: 05fa778de9d0347c8b889eb7a18f1f06bf0f801b0eb4610b4871a4b2f22e220900cf0ad525e94f990bb8d8921c07754ab2122c0c225ab4cdcea98f36e64fa4c2
+ checksum: 8/064d09c1808d0c51b3d90b5d27e198e6d0c5dad0eb57065fd40803d6a20553e5398b07f76739d69cbabc12547058bec6b32106ea66622375fb0d7e8fca6a846c
languageName: node
linkType: hard
@@ -12166,13 +12063,6 @@ __metadata:
languageName: node
linkType: hard
-"streamsearch@npm:^1.1.0":
- version: 1.1.0
- resolution: "streamsearch@npm:1.1.0"
- checksum: 612c2b2a7dbcc859f74597112f80a42cbe4d448d03da790d5b7b39673c1197dd3789e91cd67210353e58857395d32c1e955a9041c4e6d5bae723436b3ed9ed14
- languageName: node
- linkType: hard
-
"strict-event-emitter@npm:^0.5.0, strict-event-emitter@npm:^0.5.1":
version: 0.5.1
resolution: "strict-event-emitter@npm:0.5.1"
@@ -12868,7 +12758,7 @@ __metadata:
languageName: node
linkType: hard
-"type-is@npm:^1.6.4, type-is@npm:~1.6.18":
+"type-is@npm:~1.6.18":
version: 1.6.18
resolution: "type-is@npm:1.6.18"
dependencies:
@@ -12925,13 +12815,6 @@ __metadata:
languageName: node
linkType: hard
-"typedarray@npm:^0.0.6":
- version: 0.0.6
- resolution: "typedarray@npm:0.0.6"
- checksum: 2cc1bcf7d8c1237f6a16c04efc06637b2c5f2d74e58e84665445cf87668b85a21ab18dd751fa49eee6ae024b70326635d7b79ad37b1c370ed2fec6aeeeb52714
- languageName: node
- linkType: hard
-
"typescript-compare@npm:^0.0.2":
version: 0.0.2
resolution: "typescript-compare@npm:0.0.2"
@@ -12967,13 +12850,13 @@ __metadata:
languageName: node
linkType: hard
-"typescript@patch:typescript@npm%3A^5.2.2#optional!builtin":
+"typescript@patch:typescript@^5.2.2#~builtin":
version: 5.2.2
- resolution: "typescript@patch:typescript@npm%3A5.2.2#optional!builtin::version=5.2.2&hash=f3b441"
+ resolution: "typescript@patch:typescript@npm%3A5.2.2#~builtin::version=5.2.2&hash=d73830"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
- checksum: f79cc2ba802c94c2b78dbb00d767a10adb67368ae764709737dc277273ec148aa4558033a03ce901406b35fddf4eac46dabc94a1e1d12d2587e2b9cfe5707b4a
+ checksum: 8/07106822b4305de3f22835cbba949a2b35451cad50888759b6818421290ff95d522b38ef7919e70fb381c5fe9c1c643d7dea22c8b31652a717ddbd57b7f4d554
languageName: node
linkType: hard
@@ -13654,13 +13537,6 @@ __metadata:
languageName: node
linkType: hard
-"xtend@npm:^4.0.0":
- version: 4.0.2
- resolution: "xtend@npm:4.0.2"
- checksum: ac5dfa738b21f6e7f0dd6e65e1b3155036d68104e67e5d5d1bde74892e327d7e5636a076f625599dc394330a731861e87343ff184b0047fef1360a7ec0a5a36a
- languageName: node
- linkType: hard
-
"y18n@npm:^5.0.5":
version: 5.0.8
resolution: "y18n@npm:5.0.8"
From bba4a58d0311c8cf52a22108b9c4e3b405b93037 Mon Sep 17 00:00:00 2001
From: "snyk-io[bot]" <141718529+snyk-io[bot]@users.noreply.github.com>
Date: Fri, 8 Nov 2024 02:47:40 +0000
Subject: [PATCH 04/15] fix: upgrade i18next from 23.15.1 to 23.16.0
Snyk has created this PR to upgrade i18next from 23.15.1 to 23.16.0.
See this package in yarn:
i18next
See this project in Snyk:
https://app.snyk.io/org/oph-snyk/project/84abdeeb-9d9e-4376-92f5-0d0983809ad7?utm_source=github-cloud-app&utm_medium=referral&page=upgrade-pr
---
frontend/package.json | 2 +-
frontend/yarn.lock | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/frontend/package.json b/frontend/package.json
index f79649515..3d50908f6 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -38,7 +38,7 @@
"dayjs": "^1.11.13",
"finnish-personal-identity-code-validator": "kimmotaskinen/finnish-personal-identity-code-validator#support-new-delimiters",
"history": "^5.3.0",
- "i18next": "^23.14.0",
+ "i18next": "^23.16.0",
"i18next-browser-languagedetector": "^7.2.1",
"js-cookie": "^3.0.5",
"normalize.css": "^8.0.1",
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index be2d6c137..d193ff6ec 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -2640,7 +2640,7 @@ __metadata:
git-revision-webpack-plugin: ^5.0.0
history: ^5.3.0
html-webpack-plugin: ^5.5.3
- i18next: ^23.14.0
+ i18next: ^23.16.0
i18next-browser-languagedetector: ^7.2.1
jest: ^29.7.0
jest-environment-jsdom: ^29.7.0
@@ -7770,12 +7770,12 @@ __metadata:
languageName: node
linkType: hard
-"i18next@npm:^23.14.0":
- version: 23.15.1
- resolution: "i18next@npm:23.15.1"
+"i18next@npm:^23.16.0":
+ version: 23.16.4
+ resolution: "i18next@npm:23.16.4"
dependencies:
- "@babel/runtime": "npm:^7.23.2"
- checksum: bfd4935517ddd68bd12ccc0b7bd454f1a19403b627d79a2fe81c9059380674f085804f8d7475dd248a887f90d9e2da0f9be64179ddf32e9eebac47e4b9f92889
+ "@babel/runtime": ^7.23.2
+ checksum: 8/a753a23faf87b5028c9b136645b3d6287dd13c6e5ffadcc652edce8c321da2403f57c513aa7168f7ba664e85853aa83acbd291839d622addd701fc85bc991438
languageName: node
linkType: hard
From 626b17b6bf70b7754cea5307562ae357c3ca3c3a Mon Sep 17 00:00:00 2001
From: "snyk-io[bot]" <141718529+snyk-io[bot]@users.noreply.github.com>
Date: Fri, 8 Nov 2024 02:47:44 +0000
Subject: [PATCH 05/15] fix: upgrade @fontsource/roboto from 5.0.15 to 5.1.0
Snyk has created this PR to upgrade @fontsource/roboto from 5.0.15 to 5.1.0.
See this package in yarn:
@fontsource/roboto
See this project in Snyk:
https://app.snyk.io/org/oph-snyk/project/84abdeeb-9d9e-4376-92f5-0d0983809ad7?utm_source=github-cloud-app&utm_medium=referral&page=upgrade-pr
---
frontend/package.json | 2 +-
frontend/yarn.lock | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/frontend/package.json b/frontend/package.json
index 3d50908f6..8c8a15e7f 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -27,7 +27,7 @@
"dependencies": {
"@emotion/react": "^11.13.0",
"@emotion/styled": "^11.13.0",
- "@fontsource/roboto": "^5.0.14",
+ "@fontsource/roboto": "^5.1.0",
"@mui/icons-material": "^5.16.7",
"@mui/material": "^5.16.7",
"@mui/system": "^5.16.7",
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index d193ff6ec..d6faaa878 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -1909,10 +1909,10 @@ __metadata:
languageName: node
linkType: hard
-"@fontsource/roboto@npm:^5.0.14":
- version: 5.0.15
- resolution: "@fontsource/roboto@npm:5.0.15"
- checksum: 99e1aaf6b1d7cda566c3eb03b44f5b6250d27d2e49ba5364beae3295eaa422983bc0e799aad71ba81958cf7ce0eb0c237d50f266166e930d04d9178a8d9c7295
+"@fontsource/roboto@npm:^5.1.0":
+ version: 5.1.0
+ resolution: "@fontsource/roboto@npm:5.1.0"
+ checksum: 8/6431d9230e56ce3246e6339ece2ccae68053dda5e54aa0a85bdf929418f6deaa7ec7c4e964adb66a50a8521c3522644babc7099086d486ba240c4869f4fce8b8
languageName: node
linkType: hard
@@ -2597,7 +2597,7 @@ __metadata:
"@cypress/webpack-preprocessor": ^6.0.0
"@emotion/react": ^11.13.0
"@emotion/styled": ^11.13.0
- "@fontsource/roboto": ^5.0.14
+ "@fontsource/roboto": ^5.1.0
"@mui/icons-material": ^5.16.7
"@mui/material": ^5.16.7
"@mui/system": ^5.16.7
From 3255d359ac299f3d1cd2a1b8268dedebb0e2288b Mon Sep 17 00:00:00 2001
From: "snyk-io[bot]" <141718529+snyk-io[bot]@users.noreply.github.com>
Date: Thu, 14 Nov 2024 23:32:48 +0000
Subject: [PATCH 06/15] fix: backend/vkt/pom.xml to reduce vulnerabilities
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-IONETTY-8367012
---
backend/vkt/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/backend/vkt/pom.xml b/backend/vkt/pom.xml
index b9bebd1ec..9ab736f74 100644
--- a/backend/vkt/pom.xml
+++ b/backend/vkt/pom.xml
@@ -51,7 +51,7 @@
io.netty
netty-resolver-dns-native-macos
- 4.1.113.Final
+ 4.1.115.Final
osx-aarch_64
runtime
From 60a4b40fb276b1c2815ed90f10d5a6a7b12a0c9b Mon Sep 17 00:00:00 2001
From: "snyk-io[bot]" <141718529+snyk-io[bot]@users.noreply.github.com>
Date: Thu, 21 Nov 2024 20:42:21 +0000
Subject: [PATCH 07/15] fix: backend/pom.xml to reduce vulnerabilities
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-ORGAPACHETOMCATEMBED-8383920
- https://snyk.io/vuln/SNYK-JAVA-ORGSPRINGFRAMEWORKSECURITY-8399269
- https://snyk.io/vuln/SNYK-JAVA-ORGSPRINGFRAMEWORKSECURITY-8399272
- https://snyk.io/vuln/SNYK-JAVA-ORGSPRINGFRAMEWORKSECURITY-8399273
- https://snyk.io/vuln/SNYK-JAVA-ORGSPRINGFRAMEWORKSECURITY-8399278
- https://snyk.io/vuln/SNYK-JAVA-ORGSPRINGFRAMEWORK-8384234
---
backend/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/backend/pom.xml b/backend/pom.xml
index bf4d340eb..2894a350c 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -55,13 +55,13 @@
org.springframework.security
spring-security-config
- 6.3.4
+ 6.3.5
org.springframework.security
spring-security-web
- 6.3.4
+ 6.3.5
org.springframework.boot
From 7d7471cc9877066020fdcf93e02bb2f026df081a Mon Sep 17 00:00:00 2001
From: "snyk-io[bot]" <141718529+snyk-io[bot]@users.noreply.github.com>
Date: Tue, 26 Nov 2024 00:46:23 +0000
Subject: [PATCH 08/15] fix: backend/pom.xml to reduce vulnerabilities
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-ORGAPACHETOMCATEMBED-8383920
- https://snyk.io/vuln/SNYK-JAVA-ORGSPRINGFRAMEWORK-7945490
- https://snyk.io/vuln/SNYK-JAVA-ORGSPRINGFRAMEWORK-8230373
- https://snyk.io/vuln/SNYK-JAVA-ORGSPRINGFRAMEWORKSECURITY-8399269
- https://snyk.io/vuln/SNYK-JAVA-ORGSPRINGFRAMEWORKSECURITY-8399272
- https://snyk.io/vuln/SNYK-JAVA-ORGSPRINGFRAMEWORKSECURITY-8399273
- https://snyk.io/vuln/SNYK-JAVA-ORGSPRINGFRAMEWORKSECURITY-8399278
- https://snyk.io/vuln/SNYK-JAVA-ORGSPRINGFRAMEWORK-8230368
---
backend/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/backend/pom.xml b/backend/pom.xml
index 2894a350c..cf7915e43 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -31,7 +31,7 @@
write
- 2.6.0
+ 2.7.0
5.16.0
5.3.0
From fe684a73a3eaaa9492b58b470fc83017b3b780b9 Mon Sep 17 00:00:00 2001
From: "snyk-io[bot]" <141718529+snyk-io[bot]@users.noreply.github.com>
Date: Thu, 28 Nov 2024 23:48:18 +0000
Subject: [PATCH 09/15] fix: frontend/package.json & frontend/yarn.lock to
reduce vulnerabilities
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JS-AXIOS-6671926
---
frontend/package.json | 2 +-
frontend/yarn.lock | 16 ++++++++--------
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/frontend/package.json b/frontend/package.json
index 8c8a15e7f..4dccbc0c0 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -34,7 +34,7 @@
"@mui/x-date-pickers": "^5.0.20",
"@reduxjs/toolkit": "^1.9.7",
"@types/js-cookie": "^3.0.6",
- "axios": "^1.7.7",
+ "axios": "^1.7.8",
"dayjs": "^1.11.13",
"finnish-personal-identity-code-validator": "kimmotaskinen/finnish-personal-identity-code-validator#support-new-delimiters",
"history": "^5.3.0",
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index d6faaa878..b96f6fea7 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -2617,7 +2617,7 @@ __metadata:
"@types/react-test-renderer": ^18.0.5
"@typescript-eslint/eslint-plugin": ^6.10.0
"@typescript-eslint/parser": ^6.10.0
- axios: ^1.7.7
+ axios: ^1.7.8
babel-jest: ^29.7.0
babel-loader: ^9.1.3
compression-webpack-plugin: ^10.0.0
@@ -4284,14 +4284,14 @@ __metadata:
languageName: node
linkType: hard
-"axios@npm:^1.7.7":
- version: 1.7.7
- resolution: "axios@npm:1.7.7"
+"axios@npm:^1.7.8":
+ version: 1.7.8
+ resolution: "axios@npm:1.7.8"
dependencies:
- follow-redirects: "npm:^1.15.6"
- form-data: "npm:^4.0.0"
- proxy-from-env: "npm:^1.1.0"
- checksum: 7f875ea13b9298cd7b40fd09985209f7a38d38321f1118c701520939de2f113c4ba137832fe8e3f811f99a38e12c8225481011023209a77b0c0641270e20cde1
+ follow-redirects: ^1.15.6
+ form-data: ^4.0.0
+ proxy-from-env: ^1.1.0
+ checksum: 8/3d21652faf8e29fb36c47517d2872bb5e2285127a24f5c53ce23082c4eac7f5a88de84dd49d4a1a83068e5301dcfd9067b41e5fbd00b0d20ab7b0a843559273d
languageName: node
linkType: hard
From 68c25b26007bfd367c2021e2b94ae8efe528ae9d Mon Sep 17 00:00:00 2001
From: Laura Ketola
Date: Tue, 10 Dec 2024 10:15:06 +0200
Subject: [PATCH 10/15] run workflows also when only global pom.xml is modified
---
.github/workflows/akr.yml | 1 +
.github/workflows/common-backend.yml | 2 +-
.github/workflows/otr.yml | 1 +
.github/workflows/vkt.yml | 1 +
.github/workflows/yki.yml | 1 +
5 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/akr.yml b/.github/workflows/akr.yml
index 2f7715833..b3e19c0a4 100644
--- a/.github/workflows/akr.yml
+++ b/.github/workflows/akr.yml
@@ -5,6 +5,7 @@ on:
push:
paths:
- "backend/akr/**"
+ - "backend/pom.xml"
- "frontend/packages/akr/**"
- "frontend/yarn.lock"
- "!**/*.md"
diff --git a/.github/workflows/common-backend.yml b/.github/workflows/common-backend.yml
index f303ae23e..964b2d325 100644
--- a/.github/workflows/common-backend.yml
+++ b/.github/workflows/common-backend.yml
@@ -18,7 +18,7 @@ env:
jobs:
common-backend:
- if: ${{ contains(github.event.head_commit.message, inputs.app-name) }}
+ if: ${{ contains(github.event.head_commit.message, inputs.app-name) || contains(github.ref, 'dependabot') }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
diff --git a/.github/workflows/otr.yml b/.github/workflows/otr.yml
index f9550d7cc..4590afba1 100644
--- a/.github/workflows/otr.yml
+++ b/.github/workflows/otr.yml
@@ -5,6 +5,7 @@ on:
push:
paths:
- "backend/otr/**"
+ - "backend/pom.xml"
- "frontend/packages/otr/**"
- "frontend/yarn.lock"
- "!**/*.md"
diff --git a/.github/workflows/vkt.yml b/.github/workflows/vkt.yml
index 952905bc4..2b2983ba3 100644
--- a/.github/workflows/vkt.yml
+++ b/.github/workflows/vkt.yml
@@ -5,6 +5,7 @@ on:
push:
paths:
- "backend/vkt/**"
+ - "backend/pom.xml"
- "frontend/packages/vkt/**"
- "frontend/yarn.lock"
- "!**/*.md"
diff --git a/.github/workflows/yki.yml b/.github/workflows/yki.yml
index 14dc0de3e..5d152cc49 100644
--- a/.github/workflows/yki.yml
+++ b/.github/workflows/yki.yml
@@ -5,6 +5,7 @@ on:
push:
paths:
- "backend/yki/**"
+ - "backend/pom.xml"
- "frontend/packages/yki/**"
- "frontend/yarn.lock"
- "!**/*.md"
From 2f67e2253e27f13f28c86be6eea549ae8aa653ac Mon Sep 17 00:00:00 2001
From: Laura Ketola
Date: Thu, 5 Dec 2024 14:04:54 +0200
Subject: [PATCH 11/15] AKR:OTR:VKT:YKI(Frontend): run yarn install
---
frontend/yarn.lock | 340 +++++++++++++++++++++++++++++++--------------
1 file changed, 232 insertions(+), 108 deletions(-)
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index b96f6fea7..7ff5ea64d 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -2,7 +2,7 @@
# Manual changes might be lost - proceed with caution!
__metadata:
- version: 6
+ version: 8
cacheKey: 10
"@aashutoshrathi/word-wrap@npm:^1.2.3":
@@ -1912,7 +1912,7 @@ __metadata:
"@fontsource/roboto@npm:^5.1.0":
version: 5.1.0
resolution: "@fontsource/roboto@npm:5.1.0"
- checksum: 8/6431d9230e56ce3246e6339ece2ccae68053dda5e54aa0a85bdf929418f6deaa7ec7c4e964adb66a50a8521c3522644babc7099086d486ba240c4869f4fce8b8
+ checksum: a6fb7d4a4605bead714b7e9151912bc7a7577ce8c2cd7e4e725d1ab38d6c5e654f61f38c62cb122504c20f63114a76081fedd532520a4d769e1271d432b61636
languageName: node
linkType: hard
@@ -2584,92 +2584,132 @@ __metadata:
languageName: node
linkType: hard
+"@opetushallitus/kieli-ja-kaantajatutkinnot.akr@workspace:packages/akr":
+ version: 0.0.0-use.local
+ resolution: "@opetushallitus/kieli-ja-kaantajatutkinnot.akr@workspace:packages/akr"
+ dependencies:
+ shared: "npm:@opetushallitus/kieli-ja-kaantajatutkinnot.shared@1.11.4"
+ languageName: unknown
+ linkType: soft
+
+"@opetushallitus/kieli-ja-kaantajatutkinnot.otr@workspace:packages/otr":
+ version: 0.0.0-use.local
+ resolution: "@opetushallitus/kieli-ja-kaantajatutkinnot.otr@workspace:packages/otr"
+ dependencies:
+ shared: "npm:@opetushallitus/kieli-ja-kaantajatutkinnot.shared@1.11.4"
+ languageName: unknown
+ linkType: soft
+
"@opetushallitus/kieli-ja-kaantajatutkinnot.root@workspace:.":
version: 0.0.0-use.local
resolution: "@opetushallitus/kieli-ja-kaantajatutkinnot.root@workspace:."
dependencies:
- "@babel/core": ^7.23.2
- "@babel/plugin-transform-runtime": ^7.23.2
- "@babel/preset-env": ^7.23.2
- "@babel/preset-react": ^7.22.15
- "@babel/preset-typescript": ^7.23.2
- "@babel/runtime": ^7.23.2
- "@cypress/webpack-preprocessor": ^6.0.0
- "@emotion/react": ^11.13.0
- "@emotion/styled": ^11.13.0
- "@fontsource/roboto": ^5.1.0
- "@mui/icons-material": ^5.16.7
- "@mui/material": ^5.16.7
- "@mui/system": ^5.16.7
- "@mui/x-date-pickers": ^5.0.20
- "@reduxjs/toolkit": ^1.9.7
- "@testing-library/cypress": ^10.0.1
- "@testing-library/dom": ^9.3.3
- "@testing-library/jest-dom": ^6.1.4
- "@testing-library/react": ^14.0.0
- "@testing-library/user-event": ^14.5.1
- "@types/jest": ^29.5.7
- "@types/js-cookie": ^3.0.6
- "@types/node": ^20.8.10
- "@types/react": ^18.2.36
- "@types/react-dom": ^18.2.14
- "@types/react-redux": ^7.1.29
- "@types/react-test-renderer": ^18.0.5
- "@typescript-eslint/eslint-plugin": ^6.10.0
- "@typescript-eslint/parser": ^6.10.0
- axios: ^1.7.8
- babel-jest: ^29.7.0
- babel-loader: ^9.1.3
- compression-webpack-plugin: ^10.0.0
- copy-webpack-plugin: ^11.0.0
- css-loader: ^6.8.1
- cypress: ^13.13.3
- dayjs: ^1.11.13
- eslint: ^8.53.0
- eslint-config-prettier: ^9.0.0
- eslint-import-resolver-webpack: ^0.13.8
- eslint-plugin-eslint-comments: ^3.2.0
- eslint-plugin-import: ^2.29.0
- eslint-plugin-jsx-a11y: ^6.8.0
- eslint-plugin-no-only-tests: ^3.1.0
- eslint-plugin-prettier: ^5.0.1
- eslint-plugin-react: ^7.33.2
- eslint-plugin-react-hooks: ^4.6.0
- eslint-webpack-plugin: ^4.0.1
+ "@babel/core": "npm:^7.23.2"
+ "@babel/plugin-transform-runtime": "npm:^7.23.2"
+ "@babel/preset-env": "npm:^7.23.2"
+ "@babel/preset-react": "npm:^7.22.15"
+ "@babel/preset-typescript": "npm:^7.23.2"
+ "@babel/runtime": "npm:^7.23.2"
+ "@cypress/webpack-preprocessor": "npm:^6.0.0"
+ "@emotion/react": "npm:^11.13.0"
+ "@emotion/styled": "npm:^11.13.0"
+ "@fontsource/roboto": "npm:^5.1.0"
+ "@mui/icons-material": "npm:^5.16.7"
+ "@mui/material": "npm:^5.16.7"
+ "@mui/system": "npm:^5.16.7"
+ "@mui/x-date-pickers": "npm:^5.0.20"
+ "@reduxjs/toolkit": "npm:^1.9.7"
+ "@testing-library/cypress": "npm:^10.0.1"
+ "@testing-library/dom": "npm:^9.3.3"
+ "@testing-library/jest-dom": "npm:^6.1.4"
+ "@testing-library/react": "npm:^14.0.0"
+ "@testing-library/user-event": "npm:^14.5.1"
+ "@types/jest": "npm:^29.5.7"
+ "@types/js-cookie": "npm:^3.0.6"
+ "@types/node": "npm:^20.8.10"
+ "@types/react": "npm:^18.2.36"
+ "@types/react-dom": "npm:^18.2.14"
+ "@types/react-redux": "npm:^7.1.29"
+ "@types/react-test-renderer": "npm:^18.0.5"
+ "@typescript-eslint/eslint-plugin": "npm:^6.10.0"
+ "@typescript-eslint/parser": "npm:^6.10.0"
+ axios: "npm:^1.7.8"
+ babel-jest: "npm:^29.7.0"
+ babel-loader: "npm:^9.1.3"
+ compression-webpack-plugin: "npm:^10.0.0"
+ copy-webpack-plugin: "npm:^11.0.0"
+ css-loader: "npm:^6.8.1"
+ cypress: "npm:^13.13.3"
+ dayjs: "npm:^1.11.13"
+ eslint: "npm:^8.53.0"
+ eslint-config-prettier: "npm:^9.0.0"
+ eslint-import-resolver-webpack: "npm:^0.13.8"
+ eslint-plugin-eslint-comments: "npm:^3.2.0"
+ eslint-plugin-import: "npm:^2.29.0"
+ eslint-plugin-jsx-a11y: "npm:^6.8.0"
+ eslint-plugin-no-only-tests: "npm:^3.1.0"
+ eslint-plugin-prettier: "npm:^5.0.1"
+ eslint-plugin-react: "npm:^7.33.2"
+ eslint-plugin-react-hooks: "npm:^4.6.0"
+ eslint-webpack-plugin: "npm:^4.0.1"
finnish-personal-identity-code-validator: "kimmotaskinen/finnish-personal-identity-code-validator#support-new-delimiters"
- git-revision-webpack-plugin: ^5.0.0
- history: ^5.3.0
- html-webpack-plugin: ^5.5.3
- i18next: ^23.16.0
- i18next-browser-languagedetector: ^7.2.1
- jest: ^29.7.0
- jest-environment-jsdom: ^29.7.0
- js-cookie: ^3.0.5
- mini-css-extract-plugin: ^2.7.6
- msw: ^2.0.4
- normalize.css: ^8.0.1
- postcss: ^8.4.31
- prettier: ^3.0.3
- react: ^18.3.1
- react-dom: ^18.3.1
- react-i18next: ^13.5.0
- react-redux: ^8.1.3
- react-router-dom: 6.27.0
- react-test-renderer: ^18.2.0
- redux-saga: ^1.3.0
- sass: ^1.69.5
- sass-loader: ^13.3.2
- style-loader: ^3.3.3
- stylelint: ^15.11.0
- stylelint-config-prettier: ^9.0.5
- stylelint-config-sass-guidelines: ^10.0.0
- stylelint-prettier: ^4.0.2
- stylelint-webpack-plugin: ^4.1.1
- ts-unused-exports: ^10.0.1
- typescript: ^5.2.2
- webpack: ^5.94.0
- webpack-cli: ^5.1.4
- webpack-dev-server: ^4.15.1
+ git-revision-webpack-plugin: "npm:^5.0.0"
+ history: "npm:^5.3.0"
+ html-webpack-plugin: "npm:^5.5.3"
+ i18next: "npm:^23.16.0"
+ i18next-browser-languagedetector: "npm:^7.2.1"
+ jest: "npm:^29.7.0"
+ jest-environment-jsdom: "npm:^29.7.0"
+ js-cookie: "npm:^3.0.5"
+ mini-css-extract-plugin: "npm:^2.7.6"
+ msw: "npm:^2.0.4"
+ normalize.css: "npm:^8.0.1"
+ postcss: "npm:^8.4.31"
+ prettier: "npm:^3.0.3"
+ react: "npm:^18.3.1"
+ react-dom: "npm:^18.3.1"
+ react-i18next: "npm:^13.5.0"
+ react-redux: "npm:^8.1.3"
+ react-router-dom: "npm:6.27.0"
+ react-test-renderer: "npm:^18.2.0"
+ redux-saga: "npm:^1.3.0"
+ sass: "npm:^1.69.5"
+ sass-loader: "npm:^13.3.2"
+ style-loader: "npm:^3.3.3"
+ stylelint: "npm:^15.11.0"
+ stylelint-config-prettier: "npm:^9.0.5"
+ stylelint-config-sass-guidelines: "npm:^10.0.0"
+ stylelint-prettier: "npm:^4.0.2"
+ stylelint-webpack-plugin: "npm:^4.1.1"
+ ts-unused-exports: "npm:^10.0.1"
+ typescript: "npm:^5.2.2"
+ webpack: "npm:^5.94.0"
+ webpack-cli: "npm:^5.1.4"
+ webpack-dev-server: "npm:^4.15.1"
+ languageName: unknown
+ linkType: soft
+
+"@opetushallitus/kieli-ja-kaantajatutkinnot.shared@workspace:packages/shared, shared@npm:@opetushallitus/kieli-ja-kaantajatutkinnot.shared@1.11.4":
+ version: 0.0.0-use.local
+ resolution: "@opetushallitus/kieli-ja-kaantajatutkinnot.shared@workspace:packages/shared"
+ languageName: unknown
+ linkType: soft
+
+"@opetushallitus/kieli-ja-kaantajatutkinnot.vkt@workspace:packages/vkt":
+ version: 0.0.0-use.local
+ resolution: "@opetushallitus/kieli-ja-kaantajatutkinnot.vkt@workspace:packages/vkt"
+ dependencies:
+ reduxjs-toolkit-persist: "npm:^7.2.1"
+ shared: "npm:@opetushallitus/kieli-ja-kaantajatutkinnot.shared@1.11.4"
+ languageName: unknown
+ linkType: soft
+
+"@opetushallitus/kieli-ja-kaantajatutkinnot.yki@workspace:packages/yki":
+ version: 0.0.0-use.local
+ resolution: "@opetushallitus/kieli-ja-kaantajatutkinnot.yki@workspace:packages/yki"
+ dependencies:
+ multer: "npm:^1.4.5-lts.1"
+ shared: "npm:@opetushallitus/kieli-ja-kaantajatutkinnot.shared@1.11.4"
languageName: unknown
linkType: soft
@@ -2779,7 +2819,7 @@ __metadata:
"@remix-run/router@npm:1.20.0":
version: 1.20.0
resolution: "@remix-run/router@npm:1.20.0"
- checksum: 8/6bff41117eabb867b17c89baa727580f0a431368b309cd9a1f69767aafa68ea9cac95ff0eeb86d37c2c8655f5cd7c6283d37ae5e6d93e94f648c6112ddb24ede
+ checksum: e1d2420db94a1855b97f1784898d0ae389cf3b77129b8f419e51d4833b77ca2c92ac09e2cb558015324d64580a138fd6faa31e52fcc3ba90e3cc382a1a324d4a
languageName: node
linkType: hard
@@ -4027,6 +4067,13 @@ __metadata:
languageName: node
linkType: hard
+"append-field@npm:^1.0.0":
+ version: 1.0.0
+ resolution: "append-field@npm:1.0.0"
+ checksum: afb50f5ff668af1cb66bc5cfebb55ed9a1d99e24901782ee83d00aed1a499835f9375a149cf27b17f79595ecfcc3d1de0cd5b020b210a5359c43eaf607c217de
+ languageName: node
+ linkType: hard
+
"arch@npm:^2.2.0":
version: 2.2.0
resolution: "arch@npm:2.2.0"
@@ -4288,10 +4335,10 @@ __metadata:
version: 1.7.8
resolution: "axios@npm:1.7.8"
dependencies:
- follow-redirects: ^1.15.6
- form-data: ^4.0.0
- proxy-from-env: ^1.1.0
- checksum: 8/3d21652faf8e29fb36c47517d2872bb5e2285127a24f5c53ce23082c4eac7f5a88de84dd49d4a1a83068e5301dcfd9067b41e5fbd00b0d20ab7b0a843559273d
+ follow-redirects: "npm:^1.15.6"
+ form-data: "npm:^4.0.0"
+ proxy-from-env: "npm:^1.1.0"
+ checksum: 7ddcde188041ac55090186254b4025eb2af842be3cf615ce45393fd7f543c1eab0ad2fdd2017a5f6190695e3ecea73ee5e9c37f204854aec2698f9579046efdf
languageName: node
linkType: hard
@@ -4669,6 +4716,15 @@ __metadata:
languageName: node
linkType: hard
+"busboy@npm:^1.0.0":
+ version: 1.6.0
+ resolution: "busboy@npm:1.6.0"
+ dependencies:
+ streamsearch: "npm:^1.1.0"
+ checksum: bee10fa10ea58e7e3e7489ffe4bda6eacd540a17de9f9cd21cc37e297b2dd9fe52b2715a5841afaec82900750d810d01d7edb4b2d456427f449b92b417579763
+ languageName: node
+ linkType: hard
+
"bytes@npm:3.0.0":
version: 3.0.0
resolution: "bytes@npm:3.0.0"
@@ -5143,6 +5199,18 @@ __metadata:
languageName: node
linkType: hard
+"concat-stream@npm:^1.5.2":
+ version: 1.6.2
+ resolution: "concat-stream@npm:1.6.2"
+ dependencies:
+ buffer-from: "npm:^1.0.0"
+ inherits: "npm:^2.0.3"
+ readable-stream: "npm:^2.2.2"
+ typedarray: "npm:^0.0.6"
+ checksum: 71db903c84fc073ca35a274074e8d26c4330713d299f8623e993c448c1f6bf8b967806dd1d1a7b0f8add6f15ab1af7435df21fe79b4fe7efd78420c89e054e28
+ languageName: node
+ linkType: hard
+
"connect-history-api-fallback@npm:^2.0.0":
version: 2.0.0
resolution: "connect-history-api-fallback@npm:2.0.0"
@@ -7106,9 +7174,9 @@ __metadata:
languageName: node
linkType: hard
-"fsevents@patch:fsevents@npm%3A^2.3.2#~builtin, fsevents@patch:fsevents@npm%3A~2.3.2#~builtin":
+"fsevents@patch:fsevents@npm%3A^2.3.2#optional!builtin, fsevents@patch:fsevents@npm%3A~2.3.2#optional!builtin":
version: 2.3.3
- resolution: "fsevents@patch:fsevents@npm%3A2.3.3#~builtin::version=2.3.3&hash=df0bf1"
+ resolution: "fsevents@patch:fsevents@npm%3A2.3.3#optional!builtin::version=2.3.3&hash=df0bf1"
dependencies:
node-gyp: "npm:latest"
conditions: os=darwin
@@ -7774,8 +7842,8 @@ __metadata:
version: 23.16.4
resolution: "i18next@npm:23.16.4"
dependencies:
- "@babel/runtime": ^7.23.2
- checksum: 8/a753a23faf87b5028c9b136645b3d6287dd13c6e5ffadcc652edce8c321da2403f57c513aa7168f7ba664e85853aa83acbd291839d622addd701fc85bc991438
+ "@babel/runtime": "npm:^7.23.2"
+ checksum: a3aa6189aa4bf3022c372a03c88a2216d420b70f01369bd1017f7e51d0ed012dcda8b5f6476021835ab9574ee0ac5d056049fe4b720b5458b42bcc6ae66bd38d
languageName: node
linkType: hard
@@ -9791,6 +9859,17 @@ __metadata:
languageName: node
linkType: hard
+"mkdirp@npm:^0.5.4":
+ version: 0.5.6
+ resolution: "mkdirp@npm:0.5.6"
+ dependencies:
+ minimist: "npm:^1.2.6"
+ bin:
+ mkdirp: bin/cmd.js
+ checksum: 0c91b721bb12c3f9af4b77ebf73604baf350e64d80df91754dc509491ae93bf238581e59c7188360cec7cb62fc4100959245a42cfe01834efedc5e9d068376c2
+ languageName: node
+ linkType: hard
+
"mkdirp@npm:^1.0.3":
version: 1.0.4
resolution: "mkdirp@npm:1.0.4"
@@ -9858,6 +9937,21 @@ __metadata:
languageName: node
linkType: hard
+"multer@npm:^1.4.5-lts.1":
+ version: 1.4.5-lts.1
+ resolution: "multer@npm:1.4.5-lts.1"
+ dependencies:
+ append-field: "npm:^1.0.0"
+ busboy: "npm:^1.0.0"
+ concat-stream: "npm:^1.5.2"
+ mkdirp: "npm:^0.5.4"
+ object-assign: "npm:^4.1.1"
+ type-is: "npm:^1.6.4"
+ xtend: "npm:^4.0.0"
+ checksum: 957c09956f3b7f79d8586cac5e2a50e9a5c3011eb841667b5e4590c5f31d9464f5b46aecd399c83e183a15b88b019cccf0e4fa5620db40bf16b9e3af7fab3ac6
+ languageName: node
+ linkType: hard
+
"multicast-dns@npm:^7.2.5":
version: 7.2.5
resolution: "multicast-dns@npm:7.2.5"
@@ -10986,12 +11080,12 @@ __metadata:
version: 6.27.0
resolution: "react-router-dom@npm:6.27.0"
dependencies:
- "@remix-run/router": 1.20.0
- react-router: 6.27.0
+ "@remix-run/router": "npm:1.20.0"
+ react-router: "npm:6.27.0"
peerDependencies:
react: ">=16.8"
react-dom: ">=16.8"
- checksum: 8/de3dcc56297a2879a0e3997fa34ba0f3e1b9986a2ad3ef7991f913902ecf38da0282c98f7834f344ce2d881dbab0a382201a57e9f9ef5e9816febdb26dc038b7
+ checksum: cfbcbc1d387d3341a335e3a075e487cc09dcbb62f1b83bc827fc3eec937523d5647a2c4488c804dc61581e65561823d0166d17b5dbc8579998c25b5a0bcabad6
languageName: node
linkType: hard
@@ -10999,10 +11093,10 @@ __metadata:
version: 6.27.0
resolution: "react-router@npm:6.27.0"
dependencies:
- "@remix-run/router": 1.20.0
+ "@remix-run/router": "npm:1.20.0"
peerDependencies:
react: ">=16.8"
- checksum: 8/d22eedc33bcb11891b431655f90eed2d52c2fb3165ad11ca625f62970caf59c4859e6b1a3f92e78902b31ff1a8b2482ebf97ddebb82e9687d1f98730c14e04e6
+ checksum: 352e3af2075cdccf9d114b7e06d94a1b46a2147ba9d6e8643787a92464f5fd9ead950252a98d551f99f21860288bcf3a4f088cb5f46b28d1274a4e2ba24cc0f9
languageName: node
linkType: hard
@@ -11078,7 +11172,7 @@ __metadata:
languageName: node
linkType: hard
-"readable-stream@npm:^2.0.1":
+"readable-stream@npm:^2.0.1, readable-stream@npm:^2.2.2":
version: 2.3.8
resolution: "readable-stream@npm:2.3.8"
dependencies:
@@ -11169,6 +11263,15 @@ __metadata:
languageName: node
linkType: hard
+"reduxjs-toolkit-persist@npm:^7.2.1":
+ version: 7.2.1
+ resolution: "reduxjs-toolkit-persist@npm:7.2.1"
+ peerDependencies:
+ "@reduxjs/toolkit": ^1.6.1
+ checksum: 94c75dff10c8442e69feda9c2a647df23c43c99a74fe175f2623acd8518ae7f47ad48f636d7b8ae26ee1b7b7927ad6c93e6c2b8150bb1a77274f8135eddce8b9
+ languageName: node
+ linkType: hard
+
"reflect.getprototypeof@npm:^1.0.4":
version: 1.0.4
resolution: "reflect.getprototypeof@npm:1.0.4"
@@ -11364,29 +11467,29 @@ __metadata:
languageName: node
linkType: hard
-"resolve@patch:resolve@npm%3A^1.14.2#~builtin, resolve@patch:resolve@npm%3A^1.19.0#~builtin, resolve@patch:resolve@npm%3A^1.20.0#~builtin, resolve@patch:resolve@npm%3A^1.22.4#~builtin":
+"resolve@patch:resolve@npm%3A^1.14.2#optional!builtin, resolve@patch:resolve@npm%3A^1.19.0#optional!builtin, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin, resolve@patch:resolve@npm%3A^1.22.4#optional!builtin":
version: 1.22.8
- resolution: "resolve@patch:resolve@npm%3A1.22.8#~builtin::version=1.22.8&hash=c3c19d"
+ resolution: "resolve@patch:resolve@npm%3A1.22.8#optional!builtin::version=1.22.8&hash=c3c19d"
dependencies:
is-core-module: "npm:^2.13.0"
path-parse: "npm:^1.0.7"
supports-preserve-symlinks-flag: "npm:^1.0.0"
bin:
resolve: bin/resolve
- checksum: 8/5479b7d431cacd5185f8db64bfcb7286ae5e31eb299f4c4f404ad8aa6098b77599563ac4257cb2c37a42f59dfc06a1bec2bcf283bb448f319e37f0feb9a09847
+ checksum: f345cd37f56a2c0275e3fe062517c650bb673815d885e7507566df589375d165bbbf4bdb6aa95600a9bc55f4744b81f452b5a63f95b9f10a72787dba3c90890a
languageName: node
linkType: hard
-"resolve@patch:resolve@npm%3A^2.0.0-next.4#~builtin, resolve@patch:resolve@npm%3A^2.0.0-next.5#~builtin":
+"resolve@patch:resolve@npm%3A^2.0.0-next.4#optional!builtin, resolve@patch:resolve@npm%3A^2.0.0-next.5#optional!builtin":
version: 2.0.0-next.5
- resolution: "resolve@patch:resolve@npm%3A2.0.0-next.5#~builtin::version=2.0.0-next.5&hash=c3c19d"
+ resolution: "resolve@patch:resolve@npm%3A2.0.0-next.5#optional!builtin::version=2.0.0-next.5&hash=c3c19d"
dependencies:
is-core-module: "npm:^2.13.0"
path-parse: "npm:^1.0.7"
supports-preserve-symlinks-flag: "npm:^1.0.0"
bin:
resolve: bin/resolve
- checksum: 8/064d09c1808d0c51b3d90b5d27e198e6d0c5dad0eb57065fd40803d6a20553e5398b07f76739d69cbabc12547058bec6b32106ea66622375fb0d7e8fca6a846c
+ checksum: 05fa778de9d0347c8b889eb7a18f1f06bf0f801b0eb4610b4871a4b2f22e220900cf0ad525e94f990bb8d8921c07754ab2122c0c225ab4cdcea98f36e64fa4c2
languageName: node
linkType: hard
@@ -12063,6 +12166,13 @@ __metadata:
languageName: node
linkType: hard
+"streamsearch@npm:^1.1.0":
+ version: 1.1.0
+ resolution: "streamsearch@npm:1.1.0"
+ checksum: 612c2b2a7dbcc859f74597112f80a42cbe4d448d03da790d5b7b39673c1197dd3789e91cd67210353e58857395d32c1e955a9041c4e6d5bae723436b3ed9ed14
+ languageName: node
+ linkType: hard
+
"strict-event-emitter@npm:^0.5.0, strict-event-emitter@npm:^0.5.1":
version: 0.5.1
resolution: "strict-event-emitter@npm:0.5.1"
@@ -12758,7 +12868,7 @@ __metadata:
languageName: node
linkType: hard
-"type-is@npm:~1.6.18":
+"type-is@npm:^1.6.4, type-is@npm:~1.6.18":
version: 1.6.18
resolution: "type-is@npm:1.6.18"
dependencies:
@@ -12815,6 +12925,13 @@ __metadata:
languageName: node
linkType: hard
+"typedarray@npm:^0.0.6":
+ version: 0.0.6
+ resolution: "typedarray@npm:0.0.6"
+ checksum: 2cc1bcf7d8c1237f6a16c04efc06637b2c5f2d74e58e84665445cf87668b85a21ab18dd751fa49eee6ae024b70326635d7b79ad37b1c370ed2fec6aeeeb52714
+ languageName: node
+ linkType: hard
+
"typescript-compare@npm:^0.0.2":
version: 0.0.2
resolution: "typescript-compare@npm:0.0.2"
@@ -12850,13 +12967,13 @@ __metadata:
languageName: node
linkType: hard
-"typescript@patch:typescript@^5.2.2#~builtin":
+"typescript@patch:typescript@npm%3A^5.2.2#optional!builtin":
version: 5.2.2
- resolution: "typescript@patch:typescript@npm%3A5.2.2#~builtin::version=5.2.2&hash=d73830"
+ resolution: "typescript@patch:typescript@npm%3A5.2.2#optional!builtin::version=5.2.2&hash=f3b441"
bin:
tsc: bin/tsc
tsserver: bin/tsserver
- checksum: 8/07106822b4305de3f22835cbba949a2b35451cad50888759b6818421290ff95d522b38ef7919e70fb381c5fe9c1c643d7dea22c8b31652a717ddbd57b7f4d554
+ checksum: f79cc2ba802c94c2b78dbb00d767a10adb67368ae764709737dc277273ec148aa4558033a03ce901406b35fddf4eac46dabc94a1e1d12d2587e2b9cfe5707b4a
languageName: node
linkType: hard
@@ -13537,6 +13654,13 @@ __metadata:
languageName: node
linkType: hard
+"xtend@npm:^4.0.0":
+ version: 4.0.2
+ resolution: "xtend@npm:4.0.2"
+ checksum: ac5dfa738b21f6e7f0dd6e65e1b3155036d68104e67e5d5d1bde74892e327d7e5636a076f625599dc394330a731861e87343ff184b0047fef1360a7ec0a5a36a
+ languageName: node
+ linkType: hard
+
"y18n@npm:^5.0.5":
version: 5.0.8
resolution: "y18n@npm:5.0.8"
From 3072fb480a5ee1a71f934d49ea3a881ef40a6802 Mon Sep 17 00:00:00 2001
From: Laura Ketola
Date: Thu, 5 Dec 2024 14:10:17 +0200
Subject: [PATCH 12/15] AKR:OTR:VKT:YKI(Backend): update spring boot to 3.4.0
---
backend/pom.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/backend/pom.xml b/backend/pom.xml
index cf7915e43..72a2b31f8 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -7,7 +7,7 @@
org.springframework.boot
spring-boot-starter-parent
- 3.3.2
+ 3.4.0
@@ -135,6 +135,7 @@
com.squareup.okhttp3
mockwebserver
test
+ 4.12.0
org.jsoup
From 3a6169fa14e69d3d9d213a9fa2a3d602551b5712 Mon Sep 17 00:00:00 2001
From: Laura Ketola
Date: Thu, 12 Dec 2024 15:13:34 +0200
Subject: [PATCH 13/15] AKR:OTR:VKT:YKI(Backend): Force newer spring framework
version
---
backend/pom.xml | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/backend/pom.xml b/backend/pom.xml
index 72a2b31f8..cbf3da9e4 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -36,6 +36,7 @@
5.16.0
5.3.0
4.29.2
+ 6.2.1
@@ -51,17 +52,13 @@
org.springframework.boot
spring-boot-starter-security
-
org.springframework.security
spring-security-config
- 6.3.5
-
org.springframework.security
spring-security-web
- 6.3.5
org.springframework.boot
From 30fbaa80cac74dc20e0b8605acf057468826e494 Mon Sep 17 00:00:00 2001
From: Laura Ketola
Date: Thu, 12 Dec 2024 15:00:49 +0200
Subject: [PATCH 14/15] AKR:OTR:VKT:YKI(Backend): Update actuator endpoint
access config
---
backend/akr/src/main/resources/application.yaml | 7 ++++---
backend/otr/src/main/resources/application.yaml | 7 ++++---
backend/vkt/src/main/resources/application.yaml | 7 ++++---
backend/yki/src/main/resources/application.yaml | 7 ++++---
4 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/backend/akr/src/main/resources/application.yaml b/backend/akr/src/main/resources/application.yaml
index a8ab0cd9f..1bb791730 100644
--- a/backend/akr/src/main/resources/application.yaml
+++ b/backend/akr/src/main/resources/application.yaml
@@ -33,16 +33,17 @@ spring:
templateResolverOrder: 1
management:
endpoints:
- enabled-by-default: false
+ access:
+ default: none
web:
base-path: "/api/actuator"
exposure:
include: "health,info"
endpoint:
info:
- enabled: true
+ access: read_only
health:
- enabled: true
+ access: read_only
springdoc:
swagger-ui:
path: /api/swagger-ui.html
diff --git a/backend/otr/src/main/resources/application.yaml b/backend/otr/src/main/resources/application.yaml
index 965a9dc89..7e190609e 100644
--- a/backend/otr/src/main/resources/application.yaml
+++ b/backend/otr/src/main/resources/application.yaml
@@ -33,16 +33,17 @@ spring:
templateResolverOrder: 1
management:
endpoints:
- enabled-by-default: false
+ access:
+ default: none
web:
base-path: "/api/actuator"
exposure:
include: "health,info"
endpoint:
info:
- enabled: true
+ access: read_only
health:
- enabled: true
+ access: read_only
springdoc:
swagger-ui:
path: /api/swagger-ui.html
diff --git a/backend/vkt/src/main/resources/application.yaml b/backend/vkt/src/main/resources/application.yaml
index 20c4b3b40..495fc1827 100644
--- a/backend/vkt/src/main/resources/application.yaml
+++ b/backend/vkt/src/main/resources/application.yaml
@@ -41,16 +41,17 @@ spring:
templateResolverOrder: 1
management:
endpoints:
- enabled-by-default: false
+ access:
+ default: none
web:
base-path: "/api/actuator"
exposure:
include: "health,info"
endpoint:
info:
- enabled: true
+ access: read_only
health:
- enabled: true
+ access: read_only
springdoc:
swagger-ui:
path: /api/swagger-ui.html
diff --git a/backend/yki/src/main/resources/application.yaml b/backend/yki/src/main/resources/application.yaml
index 1143f4ff1..7c875da86 100644
--- a/backend/yki/src/main/resources/application.yaml
+++ b/backend/yki/src/main/resources/application.yaml
@@ -20,16 +20,17 @@ spring:
templateResolverOrder: 1
management:
endpoints:
- enabled-by-default: false
+ access:
+ default: none
web:
base-path: "/status"
exposure:
include: "health,info"
endpoint:
info:
- enabled: true
+ access: read_only
health:
- enabled: true
+ access: read_only
springdoc:
swagger-ui:
path: /swagger-ui.html
From e9cc8b31ba97be61a6d738b2037f99ce9c758efe Mon Sep 17 00:00:00 2001
From: Laura Ketola
Date: Fri, 13 Dec 2024 11:23:10 +0200
Subject: [PATCH 15/15] workflow: run snyk pull requests instead of dependabot
---
.github/workflows/common-backend.yml | 2 +-
.github/workflows/common-frontend.yml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/common-backend.yml b/.github/workflows/common-backend.yml
index 964b2d325..46f5adfcf 100644
--- a/.github/workflows/common-backend.yml
+++ b/.github/workflows/common-backend.yml
@@ -18,7 +18,7 @@ env:
jobs:
common-backend:
- if: ${{ contains(github.event.head_commit.message, inputs.app-name) || contains(github.ref, 'dependabot') }}
+ if: ${{ contains(github.event.head_commit.message, inputs.app-name) || contains(github.ref, 'snyk-io') }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
diff --git a/.github/workflows/common-frontend.yml b/.github/workflows/common-frontend.yml
index ff0932929..1f843b076 100644
--- a/.github/workflows/common-frontend.yml
+++ b/.github/workflows/common-frontend.yml
@@ -18,7 +18,7 @@ env:
jobs:
common-frontend:
- if: ${{ contains(github.event.head_commit.message, inputs.app-name) || contains(github.ref, 'dependabot') }}
+ if: ${{ contains(github.event.head_commit.message, inputs.app-name) || contains(github.ref, 'snyk-io') }}
runs-on: ubuntu-latest
strategy:
matrix: