Merge branch 'main' into dependabot/maven/io.mockk-mockk-jvm-1.13.11

navikt · Jul 15, 2024 · b55ad21 · b55ad21
2 parents 9de5ad3 + d8636cd
commit b55ad21
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/log/src/main/java/no/nav/familie/log/filter/RequestTimeFilter.kt b/log/src/main/java/no/nav/familie/log/filter/RequestTimeFilter.kt
@@ -36,7 +36,7 @@ open class RequestTimeFilter : Filter {
         code: Int,
         timer: StopWatch,
     ) {
-        if (HttpStatus.valueOf(code).isError) {
+        if (HttpStatus.valueOf(code).is5xxServerError) {
             LOG.warn("{} - {} - ({}). Dette tok {}ms", request.method, request.requestURI, code, timer.totalTimeMillis)
         } else {
             if (!shouldNotFilter(request.requestURI)) {

diff --git a/pom.xml b/pom.xml
@@ -23,11 +23,11 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
         <kontrakter.version>3.0_20240514121145_5e689cc</kontrakter.version>
-        <kotest.version>5.9.0</kotest.version>
-        <kotlin.version>1.9.24</kotlin.version>
+        <kotest.version>5.9.1</kotest.version>
+        <kotlin.version>2.0.0</kotlin.version>
         <mockk.version>1.13.11</mockk.version>
         <nav.security.token.version>4.1.5</nav.security.token.version>
-        <wiremock.version>3.5.4</wiremock.version>        
+        <wiremock.version>3.8.0</wiremock.version>        
     </properties>
 
     <modules>
@@ -212,7 +212,7 @@
                 <plugin>
                     <groupId>org.sonatype.plugins</groupId>
                     <artifactId>nexus-staging-maven-plugin</artifactId>
-                    <version>1.6.13</version>
+                    <version>1.7.0</version>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -318,7 +318,7 @@
                     <dependency>
                         <groupId>com.pinterest.ktlint</groupId>
                         <artifactId>ktlint-cli</artifactId>
-                        <version>1.2.1</version>
+                        <version>1.3.1</version>
                     </dependency>
                     <!-- additional 3rd party ruleset(s) can be specified here -->
                 </dependencies>