From 5157a385e13391034baf8bd417df2acea21b4764 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 08:22:39 +0000 Subject: [PATCH 1/4] Bump no.nav.dagpenger:dp-version-catalog Bumps no.nav.dagpenger:dp-version-catalog from 20240221.68.e8cffb to 20240419.74.d850ed. --- updated-dependencies: - dependency-name: no.nav.dagpenger:dp-version-catalog dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 9745d42..6a22b40 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -6,7 +6,7 @@ dependencyResolutionManagement { } versionCatalogs { create("libs") { - from("no.nav.dagpenger:dp-version-catalog:20240221.68.e8cffb") + from("no.nav.dagpenger:dp-version-catalog:20240419.74.d850ed") } } } From 637bf76e0de5ccafe3071a11097696f97efef2fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Geir=20Andr=C3=A9=20Lund?= Date: Mon, 22 Apr 2024 10:51:53 +0200 Subject: [PATCH 2/4] Vi bruker ikke dagpenger-events her. --- build.gradle.kts | 1 - .../inntekt/rivers/opplysning/InntektBehovl\303\270ser.kt" | 1 - 2 files changed, 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 50c1949..65496aa 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -19,7 +19,6 @@ dependencies { implementation("com.github.navikt.dp-biblioteker:ktor-client-metrics:$dpBibliotekerVersjon") implementation("com.github.navikt:dp-grunnbelop:2023.05.24-15.26.f42064d9fdc8") implementation("com.github.navikt:dp-inntekt-kontrakter:1_20231220.55a8a9") - implementation("com.github.navikt:dagpenger-events:20231222.8a61a7") implementation("io.opentelemetry.instrumentation:opentelemetry-instrumentation-annotations:2.3.0") implementation("io.opentelemetry:opentelemetry-api:1.37.0") diff --git "a/src/main/kotlin/no/nav/dagpenger/oppslag/inntekt/rivers/opplysning/InntektBehovl\303\270ser.kt" "b/src/main/kotlin/no/nav/dagpenger/oppslag/inntekt/rivers/opplysning/InntektBehovl\303\270ser.kt" index 07d9790..4029960 100644 --- "a/src/main/kotlin/no/nav/dagpenger/oppslag/inntekt/rivers/opplysning/InntektBehovl\303\270ser.kt" +++ "b/src/main/kotlin/no/nav/dagpenger/oppslag/inntekt/rivers/opplysning/InntektBehovl\303\270ser.kt" @@ -1,6 +1,5 @@ package no.nav.dagpenger.oppslag.inntekt.rivers.opplysning -import io.opentelemetry.api.trace.Span import io.opentelemetry.instrumentation.annotations.WithSpan import kotlinx.coroutines.runBlocking import mu.KotlinLogging From 305fe222749debbe161b7585f52346c430fe98b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Geir=20Andr=C3=A9=20Lund?= Date: Mon, 22 Apr 2024 10:54:28 +0200 Subject: [PATCH 3/4] Vi bruker java 21 her. --- buildSrc/src/main/kotlin/common.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/common.gradle.kts b/buildSrc/src/main/kotlin/common.gradle.kts index 953906b..8c21fce 100644 --- a/buildSrc/src/main/kotlin/common.gradle.kts +++ b/buildSrc/src/main/kotlin/common.gradle.kts @@ -24,7 +24,7 @@ dependencies { } kotlin { - jvmToolchain(17) + jvmToolchain(21) } tasks.test { From b41f29bcc502118ad582c240251dce1014c96584 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 08:57:14 +0000 Subject: [PATCH 4/4] Bump actions/checkout from 4.1.2 to 4.1.3 (#66) Bumps [actions/checkout](https://github.com/actions/checkout) from 4.1.2 to 4.1.3. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4.1.2...v4.1.3) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/dependabot-build.yml | 2 +- .github/workflows/deploy.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dependabot-build.yml b/.github/workflows/dependabot-build.yml index b42d34d..7e9b950 100644 --- a/.github/workflows/dependabot-build.yml +++ b/.github/workflows/dependabot-build.yml @@ -10,7 +10,7 @@ jobs: name: test runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4.1.2 + - uses: actions/checkout@v4.1.3 - uses: actions/setup-java@v4 with: distribution: temurin diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 59fde2b..f72ee25 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -12,7 +12,7 @@ jobs: contents: write id-token: write steps: - - uses: actions/checkout@v4.1.2 + - uses: actions/checkout@v4.1.3 - uses: actions/setup-java@v4 with: distribution: temurin @@ -49,7 +49,7 @@ jobs: runs-on: ubuntu-latest environment: dev-gcp steps: - - uses: actions/checkout@v4.1.2 + - uses: actions/checkout@v4.1.3 - uses: nais/deploy/actions/deploy@v2 env: APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }} @@ -66,7 +66,7 @@ jobs: runs-on: ubuntu-latest environment: prod-gcp steps: - - uses: actions/checkout@v4.1.2 + - uses: actions/checkout@v4.1.3 - uses: nais/deploy/actions/deploy@v2 env: APIKEY: ${{ secrets.NAIS_DEPLOY_APIKEY }}