Merge pull request #167 from navikt/manual-dep-updates

update: gradle wrapper. jackson and kotest

Author: ybelMekk

build.gradle.kts

@@ -6,12 +6,12 @@ val kotlinLoggingVersion = "2.1.21"
 val logbackVersion = "1.2.10"
 val nimbusSdkVersion = "9.20.1"
 val mockWebServerVersion = "4.9.3"
-val jacksonVersion = "2.13.0"
+val jacksonVersion = "2.13.1"
 val nettyVersion = "4.1.72.Final"
 val junitJupiterVersion = "5.8.2"
 val kotlinVersion = "1.6.10"
 val freemarkerVersion = "2.3.31"
-val kotestVersion = "4.6.3"
+val kotestVersion = "5.0.3"
 val bouncyCastleVersion = "1.70"
 val springBootVersion = "2.6.2"
 val reactorTestVersion = "3.4.13"
@@ -262,6 +262,6 @@ tasks {
     }
 
     withType<Wrapper> {
-        gradleVersion = "7.1.1"
+        gradleVersion = "7.3.3"
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/test/kotlin/no/nav/security/mock/oauth2/OAuth2ConfigTest.kt

@@ -115,8 +115,10 @@ internal class OAuth2ConfigTest {
             val withSkew = value.toInstant().plus(skew)
             return MatcherResult(
                 withSkew.isAfter(now),
-                "Date $withSkew should be after $now",
-                "Date $withSkew should not be after $now"
+                { "Date $withSkew should be after $now" },
+                {
+                    "Date $withSkew should not be after $now"
+                }
             )
         }
     }

src/test/kotlin/no/nav/security/mock/oauth2/testutils/Token.kt

@@ -94,14 +94,18 @@ fun verifyWith(
             value.verifyWith(server.issuerUrl(issuerId), server.jwksUrl(issuerId), requiredClaims)
             MatcherResult(
                 true,
-                "should not happen, famous last words",
-                "JWT should not verify, expected exception."
+                { "should not happen, famous last words" },
+                {
+                    "JWT should not verify, expected exception."
+                }
             )
         } catch (e: Exception) {
             MatcherResult(
                 false,
-                "${e.message}",
-                "JWT should not verify, expected exception."
+                { "${e.message}" },
+                {
+                    "JWT should not verify, expected exception."
+                }
             )
         }
     }