Merge branch 'fix/snyk-2025-01' into combined-security-fixes-02-2025

Opetushallitus · Feb 4, 2025 · 15eaaa0 · 15eaaa0
2 parents e256106 + b64bf4d
commit 15eaaa0
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 31 deletions.
diff --git a/backend/akr/src/main/java/fi/oph/akr/onr/OnrOperationApiImpl.java b/backend/akr/src/main/java/fi/oph/akr/onr/OnrOperationApiImpl.java
@@ -10,6 +10,7 @@
 import fi.oph.akr.onr.model.PersonalData;
 import fi.oph.akr.util.HetuUtils;
 import fi.vm.sade.javautils.nio.cas.CasClient;
+import java.time.Duration;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -214,6 +215,6 @@ private RequestBuilder defaultRequestBuilder() {
       .addHeader("Accept", MediaType.APPLICATION_JSON_VALUE)
       .addHeader("Content-Type", MediaType.APPLICATION_JSON_VALUE)
       .addHeader("Caller-Id", Constants.CALLER_ID)
-      .setRequestTimeout((int) TimeUnit.MINUTES.toMillis(2));
+      .setRequestTimeout(Duration.ofMinutes(2));
   }
 }
diff --git a/backend/otr/src/main/java/fi/oph/otr/onr/OnrOperationApiImpl.java b/backend/otr/src/main/java/fi/oph/otr/onr/OnrOperationApiImpl.java
@@ -8,6 +8,7 @@
 import fi.oph.otr.onr.dto.PersonalDataDTO;
 import fi.oph.otr.onr.model.PersonalData;
 import fi.vm.sade.javautils.nio.cas.CasClient;
+import java.time.Duration;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -204,6 +205,6 @@ private RequestBuilder defaultRequestBuilder() {
       .addHeader("Accept", MediaType.APPLICATION_JSON_VALUE)
       .addHeader("Content-Type", MediaType.APPLICATION_JSON_VALUE)
       .addHeader("Caller-Id", Constants.CALLER_ID)
-      .setRequestTimeout((int) TimeUnit.MINUTES.toMillis(2));
+      .setRequestTimeout(Duration.ofMinutes(2));
   }
 }
diff --git a/backend/pom.xml b/backend/pom.xml
@@ -7,7 +7,7 @@
   <parent>
     <groupId>org.springframework.boot</groupId>
     <artifactId>spring-boot-starter-parent</artifactId>
-    <version>3.4.0</version>
+    <version>3.4.2</version>
     <relativePath/>
   </parent>
   <!-- lookup parent from repository -->
@@ -35,7 +35,7 @@
     <!-- latest version for Java 17 https://github.com/lukas-krecan/ShedLock#versions -->
     <shedlock.version>5.16.0</shedlock.version>
     <poi.version>5.3.0</poi.version>
-    <liquibase.version>4.29.2</liquibase.version>
+    <liquibase.version>4.30.0</liquibase.version>
     <spring-framework.version>6.2.1</spring-framework.version>
   </properties>
 
@@ -148,7 +148,7 @@
     <dependency>
       <groupId>fi.vm.sade.java-utils</groupId>
       <artifactId>opintopolku-cas-servlet-filter</artifactId>
-      <version>0.1.2-SNAPSHOT</version>
+      <version>1.0.1-SNAPSHOT</version>
       <exclusions>
         <exclusion>
           <groupId>commons-logging</groupId>
@@ -159,7 +159,7 @@
     <dependency>
       <groupId>fi.vm.sade.java-utils</groupId>
       <artifactId>java-cas</artifactId>
-      <version>1.1.1-SNAPSHOT</version>
+      <version>1.2.2-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>fi.vm.sade.java-utils</groupId>

diff --git a/backend/vkt/pom.xml b/backend/vkt/pom.xml
@@ -41,7 +41,7 @@
     <dependency>
       <groupId>com.fasterxml.jackson.dataformat</groupId>
       <artifactId>jackson-dataformat-xml</artifactId>
-      <version>2.17.2</version>
+      <version>2.18.1</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.woodstox</groupId>
@@ -58,7 +58,7 @@
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>
-      <version>2.16.1</version>
+      <version>2.18.0</version>
     </dependency>
     <dependency>
       <groupId>software.amazon.awssdk</groupId>

diff --git a/frontend/package.json b/frontend/package.json
@@ -38,15 +38,15 @@
     "dayjs": "^1.11.13",
     "finnish-personal-identity-code-validator": "kimmotaskinen/finnish-personal-identity-code-validator#support-new-delimiters",
     "history": "^5.3.0",
-    "i18next": "^23.16.0",
+    "i18next": "^23.16.8",
     "i18next-browser-languagedetector": "^7.2.1",
     "js-cookie": "^3.0.5",
     "normalize.css": "^8.0.1",
     "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-router-dom": "6.28.0",
     "redux-saga": "^1.3.0"
   },
   "devDependencies": {

diff --git a/frontend/yarn.lock b/frontend/yarn.lock
@@ -2656,7 +2656,7 @@ __metadata:
     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: "npm:^23.16.8"
     i18next-browser-languagedetector: "npm:^7.2.1"
     jest: "npm:^29.7.0"
     jest-environment-jsdom: "npm:^29.7.0"
@@ -2670,7 +2670,7 @@ __metadata:
     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-router-dom: "npm:6.28.0"
     react-test-renderer: "npm:^18.2.0"
     redux-saga: "npm:^1.3.0"
     sass: "npm:^1.69.5"
@@ -2816,10 +2816,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@remix-run/router@npm:1.20.0":
-  version: 1.20.0
-  resolution: "@remix-run/router@npm:1.20.0"
-  checksum: e1d2420db94a1855b97f1784898d0ae389cf3b77129b8f419e51d4833b77ca2c92ac09e2cb558015324d64580a138fd6faa31e52fcc3ba90e3cc382a1a324d4a
+"@remix-run/router@npm:1.21.0":
+  version: 1.21.0
+  resolution: "@remix-run/router@npm:1.21.0"
+  checksum: cf0fb69d19c1b79095ff67c59cea89086f3982a9a54c8a993818a60fc76e0ebab5a8db647c1a96a662729fad8e806ddd0a96622adf473f5a9f0b99998b2dbad4
   languageName: node
   linkType: hard
 
@@ -7838,12 +7838,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"i18next@npm:^23.16.0":
-  version: 23.16.4
-  resolution: "i18next@npm:23.16.4"
+"i18next@npm:^23.16.8":
+  version: 23.16.8
+  resolution: "i18next@npm:23.16.8"
   dependencies:
     "@babel/runtime": "npm:^7.23.2"
-  checksum: a3aa6189aa4bf3022c372a03c88a2216d420b70f01369bd1017f7e51d0ed012dcda8b5f6476021835ab9574ee0ac5d056049fe4b720b5458b42bcc6ae66bd38d
+  checksum: d5c38011de4d3b4aa466fac6773520eb28007b9d6138e03432bfbfc0d041c04df45e15c67d96f22cd660088cc9b24d3eda32cddc9fb4c6508c5afada6c2e6290
   languageName: node
   linkType: hard
 
@@ -11076,27 +11076,27 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-router-dom@npm:6.27.0":
-  version: 6.27.0
-  resolution: "react-router-dom@npm:6.27.0"
+"react-router-dom@npm:6.28.0":
+  version: 6.28.0
+  resolution: "react-router-dom@npm:6.28.0"
   dependencies:
-    "@remix-run/router": "npm:1.20.0"
-    react-router: "npm:6.27.0"
+    "@remix-run/router": "npm:1.21.0"
+    react-router: "npm:6.28.0"
   peerDependencies:
     react: ">=16.8"
     react-dom: ">=16.8"
-  checksum: cfbcbc1d387d3341a335e3a075e487cc09dcbb62f1b83bc827fc3eec937523d5647a2c4488c804dc61581e65561823d0166d17b5dbc8579998c25b5a0bcabad6
+  checksum: e637825132ea96c3514ef7b8322f9bf0b752a942d6b4ffc4c20e389b5911726adf3dba8208ed4b97bf5b9c3bd465d9d1a1db1a58a610a8d528f18d890e0b143f
   languageName: node
   linkType: hard
 
-"react-router@npm:6.27.0":
-  version: 6.27.0
-  resolution: "react-router@npm:6.27.0"
+"react-router@npm:6.28.0":
+  version: 6.28.0
+  resolution: "react-router@npm:6.28.0"
   dependencies:
-    "@remix-run/router": "npm:1.20.0"
+    "@remix-run/router": "npm:1.21.0"
   peerDependencies:
     react: ">=16.8"
-  checksum: 352e3af2075cdccf9d114b7e06d94a1b46a2147ba9d6e8643787a92464f5fd9ead950252a98d551f99f21860288bcf3a4f088cb5f46b28d1274a4e2ba24cc0f9
+  checksum: f021a644513144884a567d9c2dcc432e8e3233f931378c219c5a3b5b842340f0faca86225a708bafca1e9010965afe1a7dada28aef5b7b6138c885c0552d9a7d
   languageName: node
   linkType: hard