Merge pull request #3315 from navikt/feature/java-lts-21

Feature/java lts 21

.github/workflows/build.yml

@@ -23,7 +23,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: 17
+          java-version: 21
       - name: "Gradle"
         env:
           NAV_TOKEN: ${{ secrets.NAV_TOKEN }}

.github/workflows/common.integration-test.yml

@@ -23,7 +23,7 @@ jobs:
       - name: "Java"
         uses: actions/setup-java@v3
         with:
-          java-version: '17'
+          java-version: 21
           distribution: 'temurin'
       - name: "Gradle"
         env:

.github/workflows/common.java-build.yml

@@ -20,7 +20,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '17.x'
+          java-version: 21
       - name: "Gradle"
         env:
           GITHUB_USERNAME: token

.github/workflows/common.scan.sonar.yml

@@ -23,7 +23,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
       - name: "Gradle"
         env:
           NAV_TOKEN: ${{ secrets.NAV_TOKEN }}

.github/workflows/common.workflow.backend.yml

@@ -93,7 +93,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: temurin
-          java-version: 17
+          java-version: 21
       - name: "Gradle"
         env:
           GITHUB_USERNAME: token

.github/workflows/common.workflow.frontend.yml

@@ -129,7 +129,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '17.x'
+          java-version: 21
       - name: "Gradle"
         env:
           GITHUB_USERNAME: token

.github/workflows/proxy.aareg-proxy.yml

@@ -16,7 +16,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/aareg-proxy"
-      deploy-tag: "#deploy-aareg-proxy"
+      deploy-tag: "#deploy-proxy"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.aareg-synt-services-proxy.yml

@@ -14,7 +14,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/aareg-synt-services-proxy"
-      deploy-tag: "#deploy-aareg-synt-services-proxy"
+      deploy-tag: "#deploy-proxy"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.arbeidsplassencv-proxy.yml

@@ -16,7 +16,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/arbeidsplassencv-proxy"
-      deploy-tag: "#deploy-arbeidsplassencv-proxy"
+      deploy-tag: "#deploy-proxy"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.arena-forvalteren-proxy.yml

@@ -14,7 +14,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/arena-forvalteren-proxy"
-      deploy-tag: "#deploy-arena-forvalteren-proxy"
+      deploy-tag: "#deploy-proxy"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.batch-adeo-proxy.yml

@@ -14,7 +14,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/batch-adeo-proxy"
-      deploy-tag: "#deploy-batch-adeo-proxy"
+      deploy-tag: "#deploy-proxy"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.brregstub-proxy.yml

@@ -14,7 +14,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/brregstub-proxy"
-      deploy-tag: "#deploy-brregstub-proxy"
+      deploy-tag: "#deploy-proxy"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.dokarkiv-proxy.yml

@@ -16,7 +16,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/dokarkiv-proxy"
-      deploy-tag: "#deploy-dokarkiv-proxy"
+      deploy-tag: "#deploy-proxy"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.ereg-proxy.yml

@@ -14,7 +14,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/ereg-proxy"
-      deploy-tag: "#deploy-ereg-proxy"
+      deploy-tag: "#deploy-proxy"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.histark-proxy.yml

@@ -14,7 +14,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/histark-proxy"
-      deploy-tag: "#deploy-histark-proxy"
+      deploy-tag: "#deploy-proxy"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.hodejegeren-proxy.yml

@@ -16,7 +16,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/hodejegeren-proxy"
-      deploy-tag: "#deploy-hodejegeren-proxy"
+      deploy-tag: "#deploy-proxy"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.inntektstub-proxy.yml

@@ -14,7 +14,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/inntektstub-proxy"
-      deploy-tag: "#deploy-inntektstub-proxy"
+      deploy-tag: "#deploy-proxy"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.inst-proxy.yml

@@ -14,7 +14,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/inst-proxy"
-      deploy-tag: "#deploy-inst-proxy"
+      deploy-tag: "#deploy-proxy"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.kodeverk-proxy.yml

@@ -14,7 +14,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/kodeverk-proxy"
-      deploy-tag: "#deploy-kodeverk-proxy"
+      deploy-tag: "#deploy-proxy"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.kontoregister-person-proxy.yml

@@ -16,7 +16,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/kontoregister-person-proxy"
-      deploy-tag: "#deploy-kontoregister-person-proxy"
+      deploy-tag: "#deploy-proxy"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.krrstub-proxy.yml

@@ -16,7 +16,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/krrstub-proxy"
-      deploy-tag: "#deploy-krrstub-proxy"
+      deploy-tag: "#deploy-proxy"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.medl-proxy.yml

@@ -18,7 +18,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/medl-proxy"
-      deploy-tag: "#deploy-medl-proxy"
+      deploy-tag: "#deploy-proxy"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.norg2-proxy.yml

@@ -14,7 +14,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/norg2-proxy"
-      deploy-tag: "#deploy-norg2-proxy"
+      deploy-tag: "#deploy-proxy"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.pdl-proxy.yml

@@ -16,7 +16,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/pdl-proxy"
-      deploy-tag: "#deploy-pdl-proxy"
+      deploy-tag: "#deploy-proxy"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.pensjon-testdata-facade-proxy.yml

@@ -16,7 +16,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/pensjon-testdata-facade-proxy"
-      deploy-tag: "#deploy-pensjon-testdata-facade-proxy"
+      deploy-tag: "#deploy-proxy"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.saf-proxy.yml

@@ -16,7 +16,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/saf-proxy"
-      deploy-tag: "#deploy-saf-proxy"
+      deploy-tag: "#deploy-proxy"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.sigrunstub-proxy.yml

@@ -14,7 +14,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/sigrunstub-proxy"
-      deploy-tag: "#deploy-sigrunstub-proxy"
+      deploy-tag: "#deploy-proxy"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.skjermingsregister-proxy.yml

@@ -15,7 +15,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/skjermingsregister-proxy"
-      deploy-tag: "#deploy-skjermingsregister-proxy"
+      deploy-tag: "#deploy-proxy"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.statisk-data-forvalter-proxy.yml

@@ -16,7 +16,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/statisk-data-forvalter-proxy"
-      deploy-tag: "#deploy-statisk-data-forvalter-proxy"
+      deploy-tag: "#deploy-proxy"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.synthdata-meldekort-proxy.yml

@@ -15,7 +15,7 @@ jobs:
     uses: ./.github/workflows/common.workflow.backend.yml
     with:
       working-directory: "proxies/synthdata-meldekort-proxy"
-      deploy-tag: "#deploy-synthdata-meldekort-proxy"
+      deploy-tag: "#deploy-proxy"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.tps-forvalteren-proxy.yml

@@ -14,7 +14,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/tps-forvalteren-proxy"
-      deploy-tag: "#deploy-tps-forvalteren-proxy"
+      deploy-tag: "#deploy-proxy"
     permissions:
       contents: read
       id-token: write

.github/workflows/proxy.udistub-proxy.yml

@@ -16,7 +16,7 @@ jobs:
     with:
       cluster: "dev-fss"
       working-directory: "proxies/udistub-proxy"
-      deploy-tag: "#deploy-udistub-proxy"
+      deploy-tag: "#deploy-proxy"
     permissions:
       contents: read
       id-token: write

.github/workflows/release.yml

@@ -20,7 +20,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'temurin'
-          java-version: '17'
+          java-version: 21
       - name: "Setup"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -13,8 +13,6 @@ navikt/*/lib/
 
 *.DS_Store
 
-*apps/testnorge-bisys/c:/
-
 ### Gradle ###
 .gradle
 *build/

.nais/alerting-dolly.yml

@@ -63,4 +63,4 @@ spec:
               Kibana: <https://logs.adeo.no/app/discover#/?_g=(filters:!(),refreshInterval:(pause:!t,value:60000),time:(from:now-30m,to:now))&_a=(columns:!(level,message,envclass,application,pod),filters:!(),grid:(columns:(x_WorkerID:(width:325))),index:'96e648c0-980a-11e9-830a-e17bbd64b4db',interval:auto,query:(language:kuery,query:'namespace:%20%22dolly%22%20AND%20level:%20%22Error%22%20AND%20application:%20%22{{ $labels.app }}%22'),sort:!(!('@timestamp',desc)))|Link>
           labels:
             namespace: 'dolly'
-            severity: 'warning'
+            severity: 'warning'

apps/adresse-service/Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/navikt/baseimages/temurin:17
+FROM ghcr.io/navikt/baseimages/temurin:21
 LABEL maintainer="Team Dolly"
 
 ENV JAVA_OPTS="-Dspring.profiles.active=prod --add-opens java.base/java.lang=ALL-UNNAMED"

apps/adresse-service/build.gradle

@@ -1,8 +1,8 @@
 plugins {
     id 'java'
     id "org.sonarqube" version "4.0.0.2929"
-    id 'org.springframework.boot' version "3.0.4"
-    id 'io.spring.dependency-management' version "1.1.0"
+    id 'org.springframework.boot' version "3.1.4"
+    id 'io.spring.dependency-management' version "1.1.3"
     id "jacoco"
 }
 
@@ -40,7 +40,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.1'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
     }
 }
 
@@ -61,20 +61,24 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
 
     implementation 'org.springframework.cloud:spring-cloud-starter-vault-config'
-    
+
     implementation 'io.micrometer:micrometer-registry-prometheus'
     implementation 'ma.glasnost.orika:orika-core:1.5.4'
     implementation 'org.hibernate.validator:hibernate-validator'
     implementation 'org.aspectj:aspectjweaver:1.9.7'
 
-    implementation 'net.logstash.logback:logstash-logback-encoder:7.3'
-    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.8'
+    implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
+    implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
+    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
 
     implementation 'org.projectlombok:lombok'
     annotationProcessor 'org.projectlombok:lombok'
     testAnnotationProcessor 'org.projectlombok:lombok'
 }
-java.sourceCompatibility = JavaVersion.VERSION_17
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(21)
+    }
+}