diff --git a/.github/workflows/build-and-deploy-preprod.yml b/.github/workflows/build-and-deploy-preprod.yml index 0dfddbe9..f8dd622a 100644 --- a/.github/workflows/build-and-deploy-preprod.yml +++ b/.github/workflows/build-and-deploy-preprod.yml @@ -36,7 +36,7 @@ jobs: docker_context: . project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }} identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }} - byosbom: target/bom.json + byosbom: target/classes/META-INF/sbom/application.cdx.json outputs: image: ${{ steps.docker-push.outputs.image }} deploy: diff --git a/.github/workflows/build-and-deploy-prod.yml b/.github/workflows/build-and-deploy-prod.yml index 916538c9..12ec8836 100644 --- a/.github/workflows/build-and-deploy-prod.yml +++ b/.github/workflows/build-and-deploy-prod.yml @@ -35,7 +35,7 @@ jobs: docker_context: . project_id: ${{ vars.NAIS_MANAGEMENT_PROJECT_ID }} identity_provider: ${{ secrets.NAIS_WORKLOAD_IDENTITY_PROVIDER }} - byosbom: target/bom.json + byosbom: target/classes/META-INF/sbom/application.cdx.json - name: Post build failures to Slack if: failure() run: | diff --git a/pom.xml b/pom.xml index ed333a44..e5740d43 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.6 + 3.3.2 @@ -21,9 +21,9 @@ 21 2.0.0 no.nav.familie.oppdrag.LauncherKt - 3.20240515152313_9dd5659 - 3.0_20240603143357_2992125 - 4.1.7 + 3.20240624143824_64bf8f2 + 3.0_20240607101709_d35e18c + 5.0.1 + + no.nav.security + token-client-spring + ${token-validation-spring.version} + + + no.nav.security + token-client-core + ${token-validation-spring.version} + no.nav.security token-validation-spring