VKT:AKR:OTR:YKI(Frontend & Backend) maven + yarn updates [deploy]

Opetushallitus · Feb 3, 2025 · b64bf4d · b64bf4d
1 parent 65ccd91
commit b64bf4d
Show file tree

Hide file tree

Showing 4 changed files with 234 additions and 108 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 -->
@@ -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>