Oppgrader til Spring 3.3.0 og tokenValidationVersion from 4.1.8 (#485)

* Bump tokenValidationVersion from 4.1.7 to 4.1.8 Bumps `tokenValidationVersion` from 4.1.7 to 4.1.8. Updates `no.nav.security:token-validation-spring` from 4.1.7 to 4.1.8 - [Release notes](https://github.com/navikt/token-support/releases) - [Commits](navikt/token-support@4.1.7...4.1.8) Updates `no.nav.security:token-validation-spring-test` from 4.1.7 to 4.1.8 - [Release notes](https://github.com/navikt/token-support/releases) - [Commits](navikt/token-support@4.1.7...4.1.8) --- updated-dependencies: - dependency-name: no.nav.security:token-validation-spring dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: no.nav.security:token-validation-spring-test dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Oppgrader Spring --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Stig Helge Strøm <[email protected]>
navikt · Jun 4, 2024 · 6012ef2 · 6012ef2
1 parent 0df802a
commit 6012ef2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -37,7 +37,7 @@ jobs:
           docker_context: .
           project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
           identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
-          byosbom: build/reports/bom.json
+          byosbom: build/reports/application.cdx.json
       - name: Deploy to prod-fss
         uses: nais/deploy/actions/deploy@v2
         env:

diff --git a/.github/workflows/pull-requests.yml b/.github/workflows/pull-requests.yml
@@ -34,7 +34,7 @@ jobs:
           docker_context: .
           project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }}
           identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }}
-          byosbom: build/reports/bom.json
+          byosbom: build/reports/application.cdx.json
       - name: Deploy to dev-fss
         uses: nais/deploy/actions/deploy@v2
         if: github.triggering_actor != 'dependabot[bot]'

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -5,7 +5,7 @@ val mainClass = "no.nav.familie.ba.infotrygd.Main"
 
 plugins {
     val kotlinVersion = "2.0.0"
-    val springBootVersion = "3.2.5"
+    val springBootVersion = "3.3.0"
     id("org.springframework.boot") version springBootVersion
     id("io.spring.dependency-management") version "1.1.5"
     kotlin("jvm") version kotlinVersion
@@ -61,7 +61,7 @@ allOpen {
 dependencies {
 
     val mockkVersion = "1.13.11"
-    val tokenValidationVersion = "4.1.7"
+    val tokenValidationVersion = "4.1.8"
     val springdocVersion = "2.5.0"
     val navFoedselsnummerVersion = "1.0-SNAPSHOT.6"
     val skattKontraktVersjon = "2.0_20230214104704_706e9c0"
@@ -83,7 +83,7 @@ dependencies {
 
     // ---------- Kotlin ---------- \\
     implementation("org.jetbrains.kotlin:kotlin-reflect")
-    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion")
 
     // ---------- NAV ---------- \\

diff --git a/src/main/kotlin/no/nav/familie/ba/infotrygd/config/JacksonJsonConfig.kt b/src/main/kotlin/no/nav/familie/ba/infotrygd/config/JacksonJsonConfig.kt
@@ -24,7 +24,7 @@ class JacksonJsonConfig {
             OM.setVisibility(PropertyAccessor.CREATOR, JsonAutoDetect.Visibility.ANY)
             OM.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
             OM.registerModule(JavaTimeModule())
-            OM.registerModule(KotlinModule())
+            OM.registerModule(KotlinModule.Builder().build())
         }
     }