Merge branch 'main' into fix/inntekt_oppslag

navikt · Apr 22, 2024 · 25040f9 · 25040f9
2 parents 0fe5e24 + b41f29b
commit 25040f9
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git 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
@@ -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 }}

diff --git 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/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 {

diff --git 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")
         }
     }
 }