Merge pull request #255 from navikt/deps

Deps

Author: bjornhun

Diff for: .github/workflows/deploy-to-dev.yml

@@ -17,7 +17,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
       - name: Setup cache
         uses: actions/cache@v3
         with:

Diff for: .github/workflows/deploy-to-prod.yml

@@ -21,7 +21,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
       - name: Setup cache
         uses: actions/cache@v3
         with:

Diff for: .github/workflows/test-and-build.yml

@@ -14,7 +14,7 @@ jobs:
         uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
       - name: Setup cache
         uses: actions/cache@v3
         with:

Diff for: Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/navikt/baseimages/temurin:17
+FROM ghcr.io/navikt/baseimages/temurin:21
 COPY build/libs/personopplysninger-api-all.jar /app/app.jar
 ENV JAVA_OPTS="-XX:MaxRAMPercentage=75 \
                -XX:+HeapDumpOnOutOfMemoryError \

Diff for: build.gradle.kts

@@ -4,7 +4,7 @@ plugins {
     val versions = object {
         val kotlin = "1.9.22"
         val shadow = "8.1.1"
-        val versions = "0.50.0"
+        val versions = "0.51.0"
     }
 
     kotlin("jvm") version (versions.kotlin)
@@ -17,7 +17,7 @@ plugins {
 }
 
 kotlin {
-    jvmToolchain(17)
+    jvmToolchain(21)
 }
 
 repositories {
@@ -39,9 +39,9 @@ dependencies {
         val ktor = "2.3.7"
         val logback = "1.4.14"
         val logstash = "7.4"
-        val micrometer = "1.12.1"
-        val mockk = "1.13.8"
-        val navSecurity = "3.2.0"
+        val micrometer = "1.12.2"
+        val mockk = "1.13.9"
+        val navSecurity = "4.1.0"
         val kotlin = "1.9.22"
         val tmsKtorTokenSupport = "4.0.0"
         val tmsVarselBuilder = "1.0.1"

Diff for: nais/dev-gcp/personbruker.json

@@ -2,7 +2,6 @@
   "ingresses": [
     "https://www.intern.dev.nav.no/person/personopplysninger-api"
   ],
-  "kodeverk-api-host": "kodeverk.dev-fss-pub.nais.io",
   "norg2-host": "norg2.dev-fss-pub.nais.io",
   "digdir-krr-proxy-host": "digdir-krr-proxy.intern.dev.nav.no",
   "pdl-mottak-host": "pdl-mottak.dev-fss-pub.nais.io",

Diff for: nais/nais.yaml

@@ -32,7 +32,7 @@ spec:
   accessPolicy:
     outbound:
       external:
-        - host: {{ kodeverk-api-host }}
+        - host: kodeverk-api.nav.no
         - host: {{ norg2-host }}
         - host: {{ digdir-krr-proxy-host }}
         - host: {{ pdl-mottak-host }}

Diff for: nais/prod-gcp/personbruker.json

@@ -2,7 +2,6 @@
   "ingresses": [
     "https://www.nav.no/person/personopplysninger-api"
   ],
-  "kodeverk-api-host": "kodeverk.prod-fss-pub.nais.io",
   "norg2-host": "norg2.prod-fss-pub.nais.io",
   "digdir-krr-proxy-host": "digdir-krr-proxy.intern.nav.no",
   "pdl-mottak-host": "pdl-mottak.prod-fss-pub.nais.io",