diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index bb283866..b5ecff8c 100644 --- 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 index ece4ff51..3e7c0832 100644 --- 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 index 89d50bb6..94f9daa2 100644 --- 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 index 23fdf3c3..65ab9309 100644 --- 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()) } }