From 062c69ac8b75578f7ceb06469b144b40569b40d1 Mon Sep 17 00:00:00 2001 From: stigus Date: Wed, 10 Jan 2024 13:51:40 +0100 Subject: [PATCH 01/18] Oppdatert spring boot til 3.2 og samtidig oppgradert en del dependencies. Fikset utdatert bootstrap.yml oppsett og fjernet den avhengigheten #deploy-brreg-stub #deploy-test-dolly-backend --- apps/adresse-service/build.gradle | 8 ++++---- apps/amelding-service/build.gradle | 10 +++++----- apps/app-tilgang-analyse-service/build.gradle | 8 ++++---- apps/arbeidsforhold-service/build.gradle | 8 ++++---- apps/batch-bestilling-service/build.gradle | 8 ++++---- apps/brreg-stub/build.gradle | 8 ++++---- .../src/main/resources/application.yaml | 19 ++++++++++++++++++ .../src/main/resources/bootstrap.yaml | 19 ------------------ .../src/test/resources/bootstrap.yml | 6 ------ apps/bruker-service/build.gradle | 8 ++++---- apps/budpro-service/build.gradle | 2 +- apps/dolly-backend/build.gradle | 20 +++++++++---------- apps/dolly-frontend/build.gradle | 6 +++--- apps/dollystatus/build.gradle | 2 +- apps/endringsmelding-frontend/build.gradle | 4 ++-- apps/endringsmelding-service/build.gradle | 8 ++++---- apps/ereg-batch-status-service/build.gradle | 8 ++++---- apps/faste-data-frontend/build.gradle | 4 ++-- .../build.gradle | 8 ++++---- apps/generer-navn-service/build.gradle | 8 ++++---- .../build.gradle | 8 ++++---- .../build.gradle | 8 ++++---- .../geografiske-kodeverk-service/build.gradle | 8 ++++---- apps/helsepersonell-service/build.gradle | 8 ++++---- .../build.gradle | 8 ++++---- apps/inntektsmelding-service/build.gradle | 8 ++++---- .../jenkins-batch-status-service/build.gradle | 8 ++++---- apps/joark-dokument-service/build.gradle | 8 ++++---- apps/miljoer-service/build.gradle | 8 ++++---- .../build.gradle | 8 ++++---- .../build.gradle | 8 ++++---- .../build.gradle | 8 ++++---- apps/organisasjon-forvalter/build.gradle | 6 +++--- apps/organisasjon-mottak-service/build.gradle | 6 +++--- apps/organisasjon-service/build.gradle | 6 +++--- .../build.gradle | 4 ++-- .../organisasjon-tilgang-service/build.gradle | 8 ++++---- apps/orgnummer-service/build.gradle | 8 ++++---- apps/oversikt-frontend/build.gradle | 6 +++--- apps/pdl-forvalter/build.gradle | 8 ++++---- apps/person-faste-data-service/build.gradle | 8 ++++---- .../build.gradle | 6 +++--- apps/person-search-service/build.gradle | 6 +++--- apps/person-service/build.gradle | 6 +++--- apps/profil-api/build.gradle | 6 +++--- apps/sykemelding-api/build.gradle | 8 ++++---- apps/synt-sykemelding-api/build.gradle | 6 +++--- .../build.gradle | 6 +++--- apps/testnav-ident-pool/build.gradle | 6 +++--- .../build.gradle | 8 ++++---- apps/tilbakemelding-api/build.gradle | 6 +++--- apps/tps-messaging-service/build.gradle | 6 +++--- apps/udi-stub/build.gradle | 6 +++--- apps/varslinger-service/build.gradle | 6 +++--- examples/reactive-rest-example/build.gradle | 6 +++--- libs/data-transfer-objects/build.gradle | 2 +- .../data-transfer-search-objects/build.gradle | 2 +- libs/database/build.gradle | 2 +- libs/reactive-frontend/build.gradle | 2 +- libs/reactive-proxy/build.gradle | 2 +- libs/servlet-core/build.gradle | 2 +- libs/testing/build.gradle | 2 +- mocks/maskinporten-mock/build.gradle | 6 +++--- mocks/tokendings-mock/build.gradle | 6 +++--- proxies/aareg-proxy/build.gradle | 4 ++-- .../aareg-synt-services-proxy/build.gradle | 4 ++-- proxies/arbeidsplassencv-proxy/build.gradle | 4 ++-- proxies/arena-forvalteren-proxy/build.gradle | 4 ++-- proxies/batch-adeo-proxy/build.gradle | 4 ++-- proxies/brregstub-proxy/build.gradle | 4 ++-- proxies/dokarkiv-proxy/build.gradle | 4 ++-- proxies/ereg-proxy/build.gradle | 4 ++-- proxies/histark-proxy/build.gradle | 4 ++-- proxies/inntektstub-proxy/build.gradle | 4 ++-- proxies/inst-proxy/build.gradle | 4 ++-- proxies/kodeverk-proxy/build.gradle | 4 ++-- .../kontoregister-person-proxy/build.gradle | 4 ++-- proxies/krrstub-proxy/build.gradle | 4 ++-- proxies/medl-proxy/build.gradle | 4 ++-- proxies/norg2-proxy/build.gradle | 4 ++-- proxies/pdl-proxy/build.gradle | 4 ++-- .../build.gradle | 4 ++-- proxies/saf-proxy/build.gradle | 4 ++-- proxies/sigrunstub-proxy/build.gradle | 4 ++-- proxies/skjermingsregister-proxy/build.gradle | 4 ++-- .../synthdata-meldekort-proxy/build.gradle | 4 ++-- proxies/tps-forvalteren-proxy/build.gradle | 4 ++-- proxies/udistub-proxy/build.gradle | 4 ++-- 88 files changed, 266 insertions(+), 272 deletions(-) delete mode 100644 apps/brreg-stub/src/main/resources/bootstrap.yaml delete mode 100644 apps/brreg-stub/src/test/resources/bootstrap.yml diff --git a/apps/adresse-service/build.gradle b/apps/adresse-service/build.gradle index ff7439fd68e..4c013c10e78 100644 --- a/apps/adresse-service/build.gradle +++ b/apps/adresse-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" 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.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -68,8 +68,8 @@ dependencies { implementation 'org.aspectj:aspectjweaver:1.9.7' 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' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' testImplementation 'org.springframework.boot:spring-boot-starter-test' diff --git a/apps/amelding-service/build.gradle b/apps/amelding-service/build.gradle index 9ee08fb9224..20234060d36 100644 --- a/apps/amelding-service/build.gradle +++ b/apps/amelding-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" 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.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -64,15 +64,15 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - + implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'org.hibernate.validator:hibernate-validator' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' + implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' testImplementation 'org.springframework.boot:spring-boot-starter-test' diff --git a/apps/app-tilgang-analyse-service/build.gradle b/apps/app-tilgang-analyse-service/build.gradle index 562d0a2d3f6..6f933938c32 100644 --- a/apps/app-tilgang-analyse-service/build.gradle +++ b/apps/app-tilgang-analyse-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -69,8 +69,8 @@ dependencies { implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' + implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' diff --git a/apps/arbeidsforhold-service/build.gradle b/apps/arbeidsforhold-service/build.gradle index 15f4cf7f78c..aacbd7bdef9 100644 --- a/apps/arbeidsforhold-service/build.gradle +++ b/apps/arbeidsforhold-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" 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.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -75,8 +75,8 @@ dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'javax.annotation:javax.annotation-api:1.3.2' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' diff --git a/apps/batch-bestilling-service/build.gradle b/apps/batch-bestilling-service/build.gradle index bceca753034..583eeb33d1b 100644 --- a/apps/batch-bestilling-service/build.gradle +++ b/apps/batch-bestilling-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -67,8 +67,8 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' diff --git a/apps/brreg-stub/build.gradle b/apps/brreg-stub/build.gradle index f00997f210d..8b2dd005bed 100644 --- a/apps/brreg-stub/build.gradle +++ b/apps/brreg-stub/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id "uk.co.boothen.gradle.wsimport" version "0.21" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -37,7 +37,7 @@ sonarqube { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -76,7 +76,6 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' implementation 'org.springframework.cloud:spring-cloud-vault-config-databases' - implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'org.springframework.boot:spring-boot-starter-validation' @@ -99,7 +98,8 @@ dependencies { implementation 'wsdl4j:wsdl4j' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.springdoc:springdoc-openapi-ui:1.6.15' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' implementation 'no.nav.common:auth' implementation 'no.nav.common:util' diff --git a/apps/brreg-stub/src/main/resources/application.yaml b/apps/brreg-stub/src/main/resources/application.yaml index c9bf38e4653..a2817bbdaab 100644 --- a/apps/brreg-stub/src/main/resources/application.yaml +++ b/apps/brreg-stub/src/main/resources/application.yaml @@ -1,4 +1,23 @@ spring: + cloud: + vault: + host: vault.adeo.no + port: 443 + connection-timeout: 15000 + read-timeout: 30000 + application-name: preprod/fss/brreg-stub + authentication: TOKEN + kv: + enabled: false + backend: kv + application-name: preprod/fss/brreg-stub/default + default-context: preprod/fss/brreg-stub/default + database: + enabled: true + role: brreg-stub-admin + backend: postgresql/preprod-fss + username-property: spring.datasource.username + password-property: spring.datasource.password application: name: brreg-stub diff --git a/apps/brreg-stub/src/main/resources/bootstrap.yaml b/apps/brreg-stub/src/main/resources/bootstrap.yaml deleted file mode 100644 index 3d95812827b..00000000000 --- a/apps/brreg-stub/src/main/resources/bootstrap.yaml +++ /dev/null @@ -1,19 +0,0 @@ -spring.cloud.vault: - host: vault.adeo.no - port: 443 - connection-timeout: 15000 - read-timeout: 30000 - application-name: preprod/fss/brreg-stub - authentication: TOKEN - - kv: - enabled: false - backend: kv - application-name: preprod/fss/brreg-stub/default - default-context: preprod/fss/brreg-stub/default - database: - enabled: true - role: brreg-stub-admin - backend: postgresql/preprod-fss - username-property: spring.datasource.username - password-property: spring.datasource.password \ No newline at end of file diff --git a/apps/brreg-stub/src/test/resources/bootstrap.yml b/apps/brreg-stub/src/test/resources/bootstrap.yml deleted file mode 100644 index 805ec8009eb..00000000000 --- a/apps/brreg-stub/src/test/resources/bootstrap.yml +++ /dev/null @@ -1,6 +0,0 @@ -spring: - cloud: - vault: - enabled: false - database: - enabled: false \ No newline at end of file diff --git a/apps/bruker-service/build.gradle b/apps/bruker-service/build.gradle index 0171386fb3b..5181a5e856b 100644 --- a/apps/bruker-service/build.gradle +++ b/apps/bruker-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -48,7 +48,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -75,8 +75,8 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' + implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' diff --git a/apps/budpro-service/build.gradle b/apps/budpro-service/build.gradle index 80da396b83b..543bf1f3c11 100644 --- a/apps/budpro-service/build.gradle +++ b/apps/budpro-service/build.gradle @@ -60,7 +60,7 @@ dependencies { implementation 'no.nav.testnav.libs:servlet-insecure-security' implementation 'no.nav.testnav.libs:servlet-security' implementation 'org.projectlombok:lombok' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' diff --git a/apps/dolly-backend/build.gradle b/apps/dolly-backend/build.gradle index 2895086f8e7..267a8dec020 100644 --- a/apps/dolly-backend/build.gradle +++ b/apps/dolly-backend/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -41,7 +41,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -78,8 +78,8 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-vault-config-databases' 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' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-webflux' @@ -88,12 +88,12 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-validation' - implementation 'org.springframework.retry:spring-retry:2.0.0' + implementation 'org.springframework.retry:spring-retry:2.0.5' implementation 'org.springframework.boot:spring-boot-starter-data-elasticsearch' - implementation 'org.opensearch.client:spring-data-opensearch:1.2.0' + implementation 'org.opensearch.client:spring-data-opensearch:1.3.0' - implementation 'org.apache.commons:commons-lang3:3.12.0' + implementation 'org.apache.commons:commons-lang3:3.14.0' implementation 'org.springframework.boot:spring-boot-starter-cache' implementation 'com.github.ben-manes.caffeine:caffeine' @@ -104,8 +104,8 @@ dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'ma.glasnost.orika:orika-core:1.5.4' implementation 'org.codehaus.jettison:jettison:1.5.4' - implementation 'org.apache.poi:poi:5.2.3' - implementation 'org.apache.poi:poi-ooxml:5.2.3' + implementation 'org.apache.poi:poi:5.2.5' + implementation 'org.apache.poi:poi-ooxml:5.2.5' testImplementation "org.springframework.boot:spring-boot-starter-test" testImplementation 'org.opensearch:opensearch-testcontainers:2.0.0' @@ -113,7 +113,7 @@ dependencies { testImplementation 'org.springframework.security:spring-security-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' testImplementation 'com.h2database:h2' - testImplementation 'io.projectreactor:reactor-test:3.5.3' + testImplementation 'io.projectreactor:reactor-test:3.5.4' testImplementation 'org.testcontainers:junit-jupiter' testImplementation 'org.testcontainers:postgresql' testImplementation 'org.bitbucket.b_c:jose4j:0.9.3' diff --git a/apps/dolly-frontend/build.gradle b/apps/dolly-frontend/build.gradle index c4ba6e9f53f..226b6da3e36 100644 --- a/apps/dolly-frontend/build.gradle +++ b/apps/dolly-frontend/build.gradle @@ -1,7 +1,7 @@ plugins { id "org.sonarqube" version "4.0.0.2929" id 'java' - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' mavenBom 'org.springframework.session:spring-session-bom:2021.2.3' } @@ -72,7 +72,7 @@ dependencies { implementation 'no.nav.testnav.libs:data-transfer-objects' // Session - implementation 'redis.clients:jedis:4.4.0-m2' + implementation 'redis.clients:jedis:5.1.0' implementation 'org.springframework.session:spring-session-core' implementation 'org.springframework.session:spring-session-data-redis' diff --git a/apps/dollystatus/build.gradle b/apps/dollystatus/build.gradle index f4ce7b69aa9..5c2ba97a1e8 100644 --- a/apps/dollystatus/build.gradle +++ b/apps/dollystatus/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } diff --git a/apps/endringsmelding-frontend/build.gradle b/apps/endringsmelding-frontend/build.gradle index 99ae52f135d..b97c13ab246 100644 --- a/apps/endringsmelding-frontend/build.gradle +++ b/apps/endringsmelding-frontend/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" 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.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } diff --git a/apps/endringsmelding-service/build.gradle b/apps/endringsmelding-service/build.gradle index 210652ba98e..a05be8186e0 100644 --- a/apps/endringsmelding-service/build.gradle +++ b/apps/endringsmelding-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -32,7 +32,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -58,8 +58,8 @@ dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'org.hibernate.validator:hibernate-validator' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' + implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' testImplementation 'org.springframework.boot:spring-boot-starter-test' diff --git a/apps/ereg-batch-status-service/build.gradle b/apps/ereg-batch-status-service/build.gradle index 3e7fff65598..a91a601c08a 100644 --- a/apps/ereg-batch-status-service/build.gradle +++ b/apps/ereg-batch-status-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -65,8 +65,8 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' diff --git a/apps/faste-data-frontend/build.gradle b/apps/faste-data-frontend/build.gradle index 0e76f343985..3ceb9772811 100644 --- a/apps/faste-data-frontend/build.gradle +++ b/apps/faste-data-frontend/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" 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.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } diff --git a/apps/generer-arbeidsforhold-populasjon-service/build.gradle b/apps/generer-arbeidsforhold-populasjon-service/build.gradle index acff03c789e..ed985448f1a 100644 --- a/apps/generer-arbeidsforhold-populasjon-service/build.gradle +++ b/apps/generer-arbeidsforhold-populasjon-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -66,8 +66,8 @@ dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' 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' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' diff --git a/apps/generer-navn-service/build.gradle b/apps/generer-navn-service/build.gradle index c1efbd5e8ac..544559e56b6 100644 --- a/apps/generer-navn-service/build.gradle +++ b/apps/generer-navn-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -63,8 +63,8 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' diff --git a/apps/generer-organisasjon-populasjon-service/build.gradle b/apps/generer-organisasjon-populasjon-service/build.gradle index 1743ca07cb2..dbdad5df3a7 100644 --- a/apps/generer-organisasjon-populasjon-service/build.gradle +++ b/apps/generer-organisasjon-populasjon-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -84,8 +84,8 @@ dependencies { implementation 'com.zaxxer:HikariCP' 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' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' implementation 'org.projectreactor:reactor-spring:1.0.1.RELEASE' implementation 'org.hibernate.validator:hibernate-validator' implementation 'org.postgresql:postgresql' diff --git a/apps/generer-synt-amelding-service/build.gradle b/apps/generer-synt-amelding-service/build.gradle index 96535cbf724..2577e9e0ef5 100644 --- a/apps/generer-synt-amelding-service/build.gradle +++ b/apps/generer-synt-amelding-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -32,7 +32,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -59,8 +59,8 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' diff --git a/apps/geografiske-kodeverk-service/build.gradle b/apps/geografiske-kodeverk-service/build.gradle index f60b47b5d26..a483f0a7315 100644 --- a/apps/geografiske-kodeverk-service/build.gradle +++ b/apps/geografiske-kodeverk-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -64,8 +64,8 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' diff --git a/apps/helsepersonell-service/build.gradle b/apps/helsepersonell-service/build.gradle index fbafef94927..5e2ce6cf631 100644 --- a/apps/helsepersonell-service/build.gradle +++ b/apps/helsepersonell-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -63,8 +63,8 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' diff --git a/apps/inntektsmelding-generator-service/build.gradle b/apps/inntektsmelding-generator-service/build.gradle index 4313ba82af5..399038fc0f9 100644 --- a/apps/inntektsmelding-generator-service/build.gradle +++ b/apps/inntektsmelding-generator-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -59,8 +59,8 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' implementation 'org.hibernate.validator:hibernate-validator' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' implementation 'org.aspectj:aspectjweaver:1.9.7' diff --git a/apps/inntektsmelding-service/build.gradle b/apps/inntektsmelding-service/build.gradle index 661fe50f7aa..720fd8b30dd 100644 --- a/apps/inntektsmelding-service/build.gradle +++ b/apps/inntektsmelding-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -64,8 +64,8 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' implementation 'org.hibernate.validator:hibernate-validator' implementation 'org.aspectj:aspectjweaver:1.9.7' diff --git a/apps/jenkins-batch-status-service/build.gradle b/apps/jenkins-batch-status-service/build.gradle index edd717a67cf..c00e3e90316 100644 --- a/apps/jenkins-batch-status-service/build.gradle +++ b/apps/jenkins-batch-status-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -67,8 +67,8 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' diff --git a/apps/joark-dokument-service/build.gradle b/apps/joark-dokument-service/build.gradle index d6b89056646..fbc8bc7aa4c 100644 --- a/apps/joark-dokument-service/build.gradle +++ b/apps/joark-dokument-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -64,8 +64,8 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' diff --git a/apps/miljoer-service/build.gradle b/apps/miljoer-service/build.gradle index 3ffded68927..29b323e0e46 100644 --- a/apps/miljoer-service/build.gradle +++ b/apps/miljoer-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -65,8 +65,8 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' diff --git a/apps/oppsummeringsdokument-service/build.gradle b/apps/oppsummeringsdokument-service/build.gradle index 2b4340fdf8d..c67b7b8d841 100644 --- a/apps/oppsummeringsdokument-service/build.gradle +++ b/apps/oppsummeringsdokument-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -89,8 +89,8 @@ dependencies { implementation 'org.apache.kafka:kafka-clients:3.6.1' implementation 'io.confluent:kafka-avro-serializer:7.5.1' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' implementation 'org.hibernate.validator:hibernate-validator' implementation 'no.nav.freg:freg-security-oidc:2c24d35d' diff --git a/apps/organisasjon-bestilling-service/build.gradle b/apps/organisasjon-bestilling-service/build.gradle index 88fab1f912d..7dc872ddcb4 100644 --- a/apps/organisasjon-bestilling-service/build.gradle +++ b/apps/organisasjon-bestilling-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -75,8 +75,8 @@ dependencies { implementation 'org.hibernate.validator:hibernate-validator' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' testImplementation 'org.springframework.boot:spring-boot-starter-test' diff --git a/apps/organisasjon-faste-data-service/build.gradle b/apps/organisasjon-faste-data-service/build.gradle index 6210f5e3856..835b93bc1a5 100644 --- a/apps/organisasjon-faste-data-service/build.gradle +++ b/apps/organisasjon-faste-data-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -83,8 +83,8 @@ dependencies { implementation 'org.postgresql:postgresql' 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' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' implementation 'org.projectreactor:reactor-spring:1.0.1.RELEASE' implementation 'org.hibernate.validator:hibernate-validator' diff --git a/apps/organisasjon-forvalter/build.gradle b/apps/organisasjon-forvalter/build.gradle index b8ca81d542c..2113fad7a77 100644 --- a/apps/organisasjon-forvalter/build.gradle +++ b/apps/organisasjon-forvalter/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" 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.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -90,7 +90,7 @@ dependencies { implementation 'org.postgresql:postgresql' implementation 'org.hibernate.validator:hibernate-validator' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'ma.glasnost.orika:orika-core:1.5.4' diff --git a/apps/organisasjon-mottak-service/build.gradle b/apps/organisasjon-mottak-service/build.gradle index 92d0e4e4ae3..a66bbfb73b6 100644 --- a/apps/organisasjon-mottak-service/build.gradle +++ b/apps/organisasjon-mottak-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -79,7 +79,7 @@ dependencies { implementation 'org.apache.kafka:kafka-clients:3.6.1' implementation 'io.confluent:kafka-avro-serializer:7.5.1' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' testImplementation 'org.springframework.boot:spring-boot-starter-test' diff --git a/apps/organisasjon-service/build.gradle b/apps/organisasjon-service/build.gradle index e6282160c18..c5e712b8679 100644 --- a/apps/organisasjon-service/build.gradle +++ b/apps/organisasjon-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -67,7 +67,7 @@ dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'org.hibernate.validator:hibernate-validator' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' testImplementation 'junit:junit:4.13.2' //TODO upgrade to JUnit5 diff --git a/apps/organisasjon-tilgang-frontend/build.gradle b/apps/organisasjon-tilgang-frontend/build.gradle index b6f0936ab52..740e63821e6 100644 --- a/apps/organisasjon-tilgang-frontend/build.gradle +++ b/apps/organisasjon-tilgang-frontend/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" 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.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } diff --git a/apps/organisasjon-tilgang-service/build.gradle b/apps/organisasjon-tilgang-service/build.gradle index 26d56417738..048855a6d6b 100644 --- a/apps/organisasjon-tilgang-service/build.gradle +++ b/apps/organisasjon-tilgang-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -44,7 +44,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -72,8 +72,8 @@ dependencies { implementation 'ma.glasnost.orika:orika-core:1.5.4' implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' + implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' testImplementation 'org.springframework.boot:spring-boot-starter-test' diff --git a/apps/orgnummer-service/build.gradle b/apps/orgnummer-service/build.gradle index f9ce74141ed..6a90359c7eb 100644 --- a/apps/orgnummer-service/build.gradle +++ b/apps/orgnummer-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -76,8 +76,8 @@ dependencies { implementation 'com.zaxxer:HikariCP' 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' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' implementation 'org.hibernate.validator:hibernate-validator' implementation 'org.postgresql:postgresql' diff --git a/apps/oversikt-frontend/build.gradle b/apps/oversikt-frontend/build.gradle index 56f05744c9a..93f923439dd 100644 --- a/apps/oversikt-frontend/build.gradle +++ b/apps/oversikt-frontend/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' mavenBom 'org.springframework.session:spring-session-bom:2021.2.0' } } @@ -70,7 +70,7 @@ dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4' + implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' diff --git a/apps/pdl-forvalter/build.gradle b/apps/pdl-forvalter/build.gradle index e65a5293da6..a3d5acc45d1 100644 --- a/apps/pdl-forvalter/build.gradle +++ b/apps/pdl-forvalter/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" 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.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -84,8 +84,8 @@ dependencies { implementation 'ma.glasnost.orika:orika-core:1.5.4' 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' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' implementation 'org.postgresql:postgresql' implementation 'org.flywaydb:flyway-core' diff --git a/apps/person-faste-data-service/build.gradle b/apps/person-faste-data-service/build.gradle index 5973026c17e..0d5701e1204 100644 --- a/apps/person-faste-data-service/build.gradle +++ b/apps/person-faste-data-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -69,9 +69,9 @@ dependencies { implementation 'com.zaxxer:HikariCP' implementation 'org.postgresql:postgresql' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4' + implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' diff --git a/apps/person-organisasjon-tilgang-service/build.gradle b/apps/person-organisasjon-tilgang-service/build.gradle index 9c53fedc230..e0c5798193d 100644 --- a/apps/person-organisasjon-tilgang-service/build.gradle +++ b/apps/person-organisasjon-tilgang-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -55,7 +55,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -76,7 +76,7 @@ dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4' + implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.2' diff --git a/apps/person-search-service/build.gradle b/apps/person-search-service/build.gradle index d0d305b3ea6..1e080a89fb9 100644 --- a/apps/person-search-service/build.gradle +++ b/apps/person-search-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" 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.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -81,7 +81,7 @@ dependencies { implementation 'org.hibernate.validator:hibernate-validator' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' diff --git a/apps/person-service/build.gradle b/apps/person-service/build.gradle index 44b1f6f19c8..959e97b1b57 100644 --- a/apps/person-service/build.gradle +++ b/apps/person-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -75,7 +75,7 @@ dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'ma.glasnost.orika:orika-core:1.5.4' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' implementation 'org.hibernate.validator:hibernate-validator' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' diff --git a/apps/profil-api/build.gradle b/apps/profil-api/build.gradle index 8dfa7e3a4b2..fabb4f79721 100644 --- a/apps/profil-api/build.gradle +++ b/apps/profil-api/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -68,7 +68,7 @@ dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' diff --git a/apps/sykemelding-api/build.gradle b/apps/sykemelding-api/build.gradle index 375526e10a6..781630596f9 100644 --- a/apps/sykemelding-api/build.gradle +++ b/apps/sykemelding-api/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -75,8 +75,8 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' + implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'com.ibm.mq:mq-jms-spring-boot-starter:3.0.3' diff --git a/apps/synt-sykemelding-api/build.gradle b/apps/synt-sykemelding-api/build.gradle index d815abbe06f..5e1fa9c73c7 100644 --- a/apps/synt-sykemelding-api/build.gradle +++ b/apps/synt-sykemelding-api/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -68,7 +68,7 @@ dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'org.hibernate.validator:hibernate-validator' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' testImplementation 'no.nav.testnav.libs:testing' diff --git a/apps/synt-vedtakshistorikk-service/build.gradle b/apps/synt-vedtakshistorikk-service/build.gradle index 743cdcb7409..71717bc45ec 100644 --- a/apps/synt-vedtakshistorikk-service/build.gradle +++ b/apps/synt-vedtakshistorikk-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -71,7 +71,7 @@ dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' diff --git a/apps/testnav-ident-pool/build.gradle b/apps/testnav-ident-pool/build.gradle index f7a80aba2bd..7a063d4aaef 100644 --- a/apps/testnav-ident-pool/build.gradle +++ b/apps/testnav-ident-pool/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" 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.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -101,7 +101,7 @@ dependencies { implementation 'org.postgresql:postgresql' implementation 'ma.glasnost.orika:orika-core:1.5.4' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' diff --git a/apps/testnorge-statisk-data-forvalter/build.gradle b/apps/testnorge-statisk-data-forvalter/build.gradle index 66b242897e8..a3bb67f0e2c 100644 --- a/apps/testnorge-statisk-data-forvalter/build.gradle +++ b/apps/testnorge-statisk-data-forvalter/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -35,7 +35,7 @@ sonarqube { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -91,8 +91,8 @@ dependencies { implementation 'org.hibernate.validator:hibernate-validator' implementation 'org.apache.httpcomponents.client5:httpclient5:5.2.1' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' implementation 'com.squareup.okhttp3:okhttp:4.9.3' implementation 'org.projectlombok:lombok' diff --git a/apps/tilbakemelding-api/build.gradle b/apps/tilbakemelding-api/build.gradle index 8b94d1455ae..9d07da4c440 100644 --- a/apps/tilbakemelding-api/build.gradle +++ b/apps/tilbakemelding-api/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -61,7 +61,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-security' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' implementation 'org.hibernate.validator:hibernate-validator' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' diff --git a/apps/tps-messaging-service/build.gradle b/apps/tps-messaging-service/build.gradle index 56993ecbac9..bd6149159ae 100644 --- a/apps/tps-messaging-service/build.gradle +++ b/apps/tps-messaging-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" 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.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -105,7 +105,7 @@ dependencies { implementation 'org.aspectj:aspectjweaver:1.9.7' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' testImplementation 'org.springframework.boot:spring-boot-starter-test' diff --git a/apps/udi-stub/build.gradle b/apps/udi-stub/build.gradle index 0e96a301760..b8d9ed62251 100644 --- a/apps/udi-stub/build.gradle +++ b/apps/udi-stub/build.gradle @@ -2,7 +2,7 @@ plugins { id "org.sonarqube" version "4.0.0.2929" id 'java' id "uk.co.boothen.gradle.wsimport" version "0.18" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -37,7 +37,7 @@ sonarqube { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -100,7 +100,7 @@ dependencies { implementation 'ma.glasnost.orika:orika-core:1.5.4' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' diff --git a/apps/varslinger-service/build.gradle b/apps/varslinger-service/build.gradle index b5d7fb05948..d63a7bfcc02 100644 --- a/apps/varslinger-service/build.gradle +++ b/apps/varslinger-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -73,7 +73,7 @@ dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' diff --git a/examples/reactive-rest-example/build.gradle b/examples/reactive-rest-example/build.gradle index 7690696c88d..30a6a655d6a 100644 --- a/examples/reactive-rest-example/build.gradle +++ b/examples/reactive-rest-example/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -66,7 +66,7 @@ dependencies { runtimeOnly 'org.postgresql:postgresql' runtimeOnly 'com.h2database:h2' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4' + implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' diff --git a/libs/data-transfer-objects/build.gradle b/libs/data-transfer-objects/build.gradle index c951fe168e5..3f16dc567f0 100644 --- a/libs/data-transfer-objects/build.gradle +++ b/libs/data-transfer-objects/build.gradle @@ -54,7 +54,7 @@ dependencies { implementation 'com.fasterxml.jackson.core:jackson-annotations' implementation 'com.fasterxml.jackson.core:jackson-databind' implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' implementation 'jakarta.validation:jakarta.validation-api' implementation 'jakarta.xml.bind:jakarta.xml.bind-api' implementation 'javax.xml.bind:jaxb-api:2.3.1' diff --git a/libs/data-transfer-search-objects/build.gradle b/libs/data-transfer-search-objects/build.gradle index 9810aaba515..a5bc3efea3e 100644 --- a/libs/data-transfer-search-objects/build.gradle +++ b/libs/data-transfer-search-objects/build.gradle @@ -54,7 +54,7 @@ dependencies { implementation 'com.fasterxml.jackson.core:jackson-annotations' implementation 'com.fasterxml.jackson.core:jackson-databind' implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' implementation 'jakarta.validation:jakarta.validation-api' implementation 'jakarta.xml.bind:jakarta.xml.bind-api' implementation 'javax.xml.bind:jaxb-api:2.3.1' diff --git a/libs/database/build.gradle b/libs/database/build.gradle index 1183d6d9700..220fae44a31 100644 --- a/libs/database/build.gradle +++ b/libs/database/build.gradle @@ -30,7 +30,7 @@ dependencyManagement { applyMavenExclusions = false imports { mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } diff --git a/libs/reactive-frontend/build.gradle b/libs/reactive-frontend/build.gradle index 2797d91860c..9af7cb5258a 100644 --- a/libs/reactive-frontend/build.gradle +++ b/libs/reactive-frontend/build.gradle @@ -39,7 +39,7 @@ repositories { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' } } diff --git a/libs/reactive-proxy/build.gradle b/libs/reactive-proxy/build.gradle index 449a20ba5c8..6eea4dda7a0 100644 --- a/libs/reactive-proxy/build.gradle +++ b/libs/reactive-proxy/build.gradle @@ -38,7 +38,7 @@ repositories { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' } } diff --git a/libs/servlet-core/build.gradle b/libs/servlet-core/build.gradle index 6c48d7c5b2e..1e2c4d3a711 100644 --- a/libs/servlet-core/build.gradle +++ b/libs/servlet-core/build.gradle @@ -53,7 +53,7 @@ java { dependencies { - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-actuator' diff --git a/libs/testing/build.gradle b/libs/testing/build.gradle index 0291fd18bc1..7c52af21d96 100644 --- a/libs/testing/build.gradle +++ b/libs/testing/build.gradle @@ -37,7 +37,7 @@ repositories { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' } } diff --git a/mocks/maskinporten-mock/build.gradle b/mocks/maskinporten-mock/build.gradle index 59b4e7ffcd9..ce4d51080c5 100644 --- a/mocks/maskinporten-mock/build.gradle +++ b/mocks/maskinporten-mock/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" } @@ -11,7 +11,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -33,7 +33,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4' + implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0' compileOnly 'jakarta.servlet:jakarta.servlet-api:6.0.0' diff --git a/mocks/tokendings-mock/build.gradle b/mocks/tokendings-mock/build.gradle index 2cc6860008a..83c970af6dc 100644 --- a/mocks/tokendings-mock/build.gradle +++ b/mocks/tokendings-mock/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" } @@ -11,7 +11,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } @@ -34,7 +34,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4' + implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0' compileOnly 'jakarta.servlet:jakarta.servlet-api:6.0.0' implementation 'org.projectlombok:lombok' diff --git a/proxies/aareg-proxy/build.gradle b/proxies/aareg-proxy/build.gradle index 562ead1f4be..abdc197fab1 100644 --- a/proxies/aareg-proxy/build.gradle +++ b/proxies/aareg-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'io.spring.dependency-management' version "1.1.3" id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } diff --git a/proxies/aareg-synt-services-proxy/build.gradle b/proxies/aareg-synt-services-proxy/build.gradle index d5bc875f65a..4d7964317a5 100644 --- a/proxies/aareg-synt-services-proxy/build.gradle +++ b/proxies/aareg-synt-services-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } diff --git a/proxies/arbeidsplassencv-proxy/build.gradle b/proxies/arbeidsplassencv-proxy/build.gradle index a65de00fba6..4bab78192fe 100644 --- a/proxies/arbeidsplassencv-proxy/build.gradle +++ b/proxies/arbeidsplassencv-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } diff --git a/proxies/arena-forvalteren-proxy/build.gradle b/proxies/arena-forvalteren-proxy/build.gradle index 4a6df72441c..2e147710847 100644 --- a/proxies/arena-forvalteren-proxy/build.gradle +++ b/proxies/arena-forvalteren-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } diff --git a/proxies/batch-adeo-proxy/build.gradle b/proxies/batch-adeo-proxy/build.gradle index 19cfcbd172a..60e80505d0f 100644 --- a/proxies/batch-adeo-proxy/build.gradle +++ b/proxies/batch-adeo-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } diff --git a/proxies/brregstub-proxy/build.gradle b/proxies/brregstub-proxy/build.gradle index f5fc098e409..dbfa6f64633 100644 --- a/proxies/brregstub-proxy/build.gradle +++ b/proxies/brregstub-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } diff --git a/proxies/dokarkiv-proxy/build.gradle b/proxies/dokarkiv-proxy/build.gradle index 7ff998bb680..a6140997c13 100644 --- a/proxies/dokarkiv-proxy/build.gradle +++ b/proxies/dokarkiv-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version '1.0.11.RELEASE' id "jacoco" } @@ -33,7 +33,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } diff --git a/proxies/ereg-proxy/build.gradle b/proxies/ereg-proxy/build.gradle index 758415a786b..e2a699700d5 100644 --- a/proxies/ereg-proxy/build.gradle +++ b/proxies/ereg-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } diff --git a/proxies/histark-proxy/build.gradle b/proxies/histark-proxy/build.gradle index f092aeb2e13..ef29911008f 100644 --- a/proxies/histark-proxy/build.gradle +++ b/proxies/histark-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } diff --git a/proxies/inntektstub-proxy/build.gradle b/proxies/inntektstub-proxy/build.gradle index 787c19d21e6..31353471807 100644 --- a/proxies/inntektstub-proxy/build.gradle +++ b/proxies/inntektstub-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } diff --git a/proxies/inst-proxy/build.gradle b/proxies/inst-proxy/build.gradle index ff5c166e8c1..398fa77e2a2 100644 --- a/proxies/inst-proxy/build.gradle +++ b/proxies/inst-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } diff --git a/proxies/kodeverk-proxy/build.gradle b/proxies/kodeverk-proxy/build.gradle index a4a936e3fb4..a2bf01a0efc 100644 --- a/proxies/kodeverk-proxy/build.gradle +++ b/proxies/kodeverk-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } diff --git a/proxies/kontoregister-person-proxy/build.gradle b/proxies/kontoregister-person-proxy/build.gradle index 23d60690e26..d8ba5672766 100644 --- a/proxies/kontoregister-person-proxy/build.gradle +++ b/proxies/kontoregister-person-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } diff --git a/proxies/krrstub-proxy/build.gradle b/proxies/krrstub-proxy/build.gradle index 26793591028..a20e76ac6df 100644 --- a/proxies/krrstub-proxy/build.gradle +++ b/proxies/krrstub-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } diff --git a/proxies/medl-proxy/build.gradle b/proxies/medl-proxy/build.gradle index 98f419a895e..6b72a81cfd7 100644 --- a/proxies/medl-proxy/build.gradle +++ b/proxies/medl-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } diff --git a/proxies/norg2-proxy/build.gradle b/proxies/norg2-proxy/build.gradle index e46b9090715..57a88438eb2 100644 --- a/proxies/norg2-proxy/build.gradle +++ b/proxies/norg2-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -32,7 +32,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } diff --git a/proxies/pdl-proxy/build.gradle b/proxies/pdl-proxy/build.gradle index fb5edf6f87e..a7a55026e6e 100644 --- a/proxies/pdl-proxy/build.gradle +++ b/proxies/pdl-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } diff --git a/proxies/pensjon-testdata-facade-proxy/build.gradle b/proxies/pensjon-testdata-facade-proxy/build.gradle index aba01e473d2..a31ff694a05 100644 --- a/proxies/pensjon-testdata-facade-proxy/build.gradle +++ b/proxies/pensjon-testdata-facade-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } diff --git a/proxies/saf-proxy/build.gradle b/proxies/saf-proxy/build.gradle index b429e7fe74f..84840c6057b 100644 --- a/proxies/saf-proxy/build.gradle +++ b/proxies/saf-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } diff --git a/proxies/sigrunstub-proxy/build.gradle b/proxies/sigrunstub-proxy/build.gradle index b5b93f70080..87f18078b09 100644 --- a/proxies/sigrunstub-proxy/build.gradle +++ b/proxies/sigrunstub-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } diff --git a/proxies/skjermingsregister-proxy/build.gradle b/proxies/skjermingsregister-proxy/build.gradle index a711ce5a38a..ecdbae792b1 100644 --- a/proxies/skjermingsregister-proxy/build.gradle +++ b/proxies/skjermingsregister-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } diff --git a/proxies/synthdata-meldekort-proxy/build.gradle b/proxies/synthdata-meldekort-proxy/build.gradle index ecbc8796587..0b161b2c3e1 100644 --- a/proxies/synthdata-meldekort-proxy/build.gradle +++ b/proxies/synthdata-meldekort-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -38,7 +38,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } diff --git a/proxies/tps-forvalteren-proxy/build.gradle b/proxies/tps-forvalteren-proxy/build.gradle index 711e8077cf6..faabed8c22e 100644 --- a/proxies/tps-forvalteren-proxy/build.gradle +++ b/proxies/tps-forvalteren-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } diff --git a/proxies/udistub-proxy/build.gradle b/proxies/udistub-proxy/build.gradle index 670fcab1e6a..62f5a3ee3cb 100644 --- a/proxies/udistub-proxy/build.gradle +++ b/proxies/udistub-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" - id 'org.springframework.boot' version "3.1.4" + id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.3" id "jacoco" } @@ -39,7 +39,7 @@ bootJar { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } From 852a36570271e22d9ba8be89e6a13575dc44768d Mon Sep 17 00:00:00 2001 From: stigus Date: Wed, 10 Jan 2024 14:13:16 +0100 Subject: [PATCH 02/18] Brreg stub Postgres dialect #deploy-brreg-stub --- apps/brreg-stub/src/main/resources/application.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/apps/brreg-stub/src/main/resources/application.yaml b/apps/brreg-stub/src/main/resources/application.yaml index a2817bbdaab..bc45907ceaf 100644 --- a/apps/brreg-stub/src/main/resources/application.yaml +++ b/apps/brreg-stub/src/main/resources/application.yaml @@ -1,4 +1,8 @@ spring: + jpa: + properties: + hibernate: + dialect: org.hibernate.dialect.PostgreSQLDialect cloud: vault: host: vault.adeo.no From 62d724decea6274ffbd74c7ea6cf3e45edf0bcf0 Mon Sep 17 00:00:00 2001 From: stigus Date: Wed, 10 Jan 2024 14:43:08 +0100 Subject: [PATCH 03/18] Brreg stub Postgres dialect #deploy-brreg-stub --- .../src/main/resources/application.yaml | 19 ------------------- .../no/nav/dolly/config/CachingConfig.java | 4 ++-- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/apps/brreg-stub/src/main/resources/application.yaml b/apps/brreg-stub/src/main/resources/application.yaml index bc45907ceaf..1ee72bc46e8 100644 --- a/apps/brreg-stub/src/main/resources/application.yaml +++ b/apps/brreg-stub/src/main/resources/application.yaml @@ -3,25 +3,6 @@ spring: properties: hibernate: dialect: org.hibernate.dialect.PostgreSQLDialect - cloud: - vault: - host: vault.adeo.no - port: 443 - connection-timeout: 15000 - read-timeout: 30000 - application-name: preprod/fss/brreg-stub - authentication: TOKEN - kv: - enabled: false - backend: kv - application-name: preprod/fss/brreg-stub/default - default-context: preprod/fss/brreg-stub/default - database: - enabled: true - role: brreg-stub-admin - backend: postgresql/preprod-fss - username-property: spring.datasource.username - password-property: spring.datasource.password application: name: brreg-stub diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/config/CachingConfig.java b/apps/dolly-backend/src/main/java/no/nav/dolly/config/CachingConfig.java index 56ef766ba0b..f28c3b344c7 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/config/CachingConfig.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/config/CachingConfig.java @@ -24,7 +24,7 @@ public class CachingConfig { public static final String CACHE_KODEVERK_2 = "kodeverk2"; @Bean - @Profile({"dev", "prod"}) + @Profile({ "dev", "prod" }) public CacheManager cacheManager(Caffeine caffeine) { var caffeineCacheManager = new CaffeineCacheManager(CACHE_BESTILLING, CACHE_BRUKER, @@ -44,7 +44,7 @@ public CacheManager cacheManager() { } @Bean - public Caffeine caffeineConfig() { + public Caffeine caffeineConfig() { return Caffeine.newBuilder().expireAfterWrite(8, TimeUnit.HOURS); } } \ No newline at end of file From beed7419a6372a825c30d00c596f13c88a893d35 Mon Sep 17 00:00:00 2001 From: stigus Date: Wed, 10 Jan 2024 14:47:11 +0100 Subject: [PATCH 04/18] Async cache mode Caffeine #deploy-test-dolly-backend --- .../src/main/java/no/nav/dolly/config/CachingConfig.java | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/config/CachingConfig.java b/apps/dolly-backend/src/main/java/no/nav/dolly/config/CachingConfig.java index f28c3b344c7..67c4e88d522 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/config/CachingConfig.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/config/CachingConfig.java @@ -34,6 +34,7 @@ public CacheManager cacheManager(Caffeine caffeine) { CACHE_KODEVERK_2 ); caffeineCacheManager.setCaffeine(caffeine); + caffeineCacheManager.setAsyncCacheMode(true); return caffeineCacheManager; } From 198b261be8e4043e8716d4360543eeaad178ce0e Mon Sep 17 00:00:00 2001 From: stigus Date: Wed, 10 Jan 2024 15:16:50 +0100 Subject: [PATCH 05/18] Deploy AmeldingService #deploy-amelding-service --- .../testnav/ameldingservice/service/AMeldingService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/amelding-service/src/main/java/no/nav/registre/testnav/ameldingservice/service/AMeldingService.java b/apps/amelding-service/src/main/java/no/nav/registre/testnav/ameldingservice/service/AMeldingService.java index 117a241c0fe..e780ceb060f 100644 --- a/apps/amelding-service/src/main/java/no/nav/registre/testnav/ameldingservice/service/AMeldingService.java +++ b/apps/amelding-service/src/main/java/no/nav/registre/testnav/ameldingservice/service/AMeldingService.java @@ -32,4 +32,4 @@ public Mono get(String id) { Mono accessToken = tokenExchange.exchange(consumers.getOppsummeringsdokumentService()).map(AccessToken::getTokenValue); return oppsummeringsdokumentConsumer.get(id, accessToken).map(AMelding::new); } -} +} \ No newline at end of file From ceec5e9f3ef97c7c9c594f17150bf03e54b3cb58 Mon Sep 17 00:00:00 2001 From: stigus Date: Wed, 10 Jan 2024 16:32:43 +0100 Subject: [PATCH 06/18] Brreg stub Vault #deploy-brreg-stub --- apps/brreg-stub/src/main/resources/application-prod.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/apps/brreg-stub/src/main/resources/application-prod.yaml b/apps/brreg-stub/src/main/resources/application-prod.yaml index 6856ba2e0fb..5b85954312a 100644 --- a/apps/brreg-stub/src/main/resources/application-prod.yaml +++ b/apps/brreg-stub/src/main/resources/application-prod.yaml @@ -29,7 +29,10 @@ spring: application-name: preprod/fss/brreg-stub database: enabled: true + role: brreg-stub-admin backend: postgresql/preprod-fss + username-property: spring.datasource.username + password-property: spring.datasource.password server: servlet: From ae53caf4656e1e9a3614c5bf9b4b2f581e842738 Mon Sep 17 00:00:00 2001 From: stigus Date: Wed, 10 Jan 2024 17:12:51 +0100 Subject: [PATCH 07/18] En del flere oppdateringer i libs #deploy-brreg-stub --- apps/brreg-stub/build.gradle | 2 +- .../main/java/no/nav/brregstub/BrregApplicationLauncher.java | 2 +- apps/budpro-service/build.gradle | 2 +- libs/commands/build.gradle | 2 +- libs/csv-converter/build.gradle | 2 +- libs/data-transfer-objects/build.gradle | 2 +- libs/data-transfer-search-objects/build.gradle | 2 +- libs/database/build.gradle | 2 +- libs/domain/build.gradle | 2 +- libs/integration-test/build.gradle | 2 +- libs/kafka-config/build.gradle | 2 +- libs/kafka-producers/build.gradle | 2 +- libs/reactive-core/build.gradle | 2 +- libs/reactive-frontend/build.gradle | 2 +- libs/reactive-proxy/build.gradle | 2 +- libs/reactive-security/build.gradle | 4 ++-- libs/reactive-session-security/build.gradle | 2 +- libs/security-core/build.gradle | 2 +- libs/security-token-service/build.gradle | 2 +- libs/servlet-core/build.gradle | 2 +- libs/servlet-insecure-security/build.gradle | 2 +- libs/servlet-security/build.gradle | 2 +- libs/slack/build.gradle | 2 +- libs/testing/build.gradle | 2 +- 24 files changed, 25 insertions(+), 25 deletions(-) diff --git a/apps/brreg-stub/build.gradle b/apps/brreg-stub/build.gradle index 8b2dd005bed..bc54fc5bd10 100644 --- a/apps/brreg-stub/build.gradle +++ b/apps/brreg-stub/build.gradle @@ -89,7 +89,7 @@ dependencies { implementation 'org.apache.cxf:cxf-rt-transports-http' implementation 'org.apache.cxf:cxf-rt-ws-security' implementation 'jakarta.servlet:jakarta.servlet-api' - + implementation 'org.postgresql:postgresql' implementation 'com.zaxxer:HikariCP' diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/BrregApplicationLauncher.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/BrregApplicationLauncher.java index afbd371a308..6678bcbb749 100644 --- a/apps/brreg-stub/src/main/java/no/nav/brregstub/BrregApplicationLauncher.java +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/BrregApplicationLauncher.java @@ -16,4 +16,4 @@ public static void main(String[] args) { } SpringApplication.run(BrregApplicationLauncher.class, args); } -} \ No newline at end of file +} diff --git a/apps/budpro-service/build.gradle b/apps/budpro-service/build.gradle index 543bf1f3c11..2c9b2b47751 100644 --- a/apps/budpro-service/build.gradle +++ b/apps/budpro-service/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id 'org.springframework.boot' version '3.1.4' + id 'org.springframework.boot' version '3.2.1' id 'io.spring.dependency-management' version '1.1.3' id "jacoco" id "org.sonarqube" version "4.0.0.2929" diff --git a/libs/commands/build.gradle b/libs/commands/build.gradle index 146c350740c..db5c41633c7 100644 --- a/libs/commands/build.gradle +++ b/libs/commands/build.gradle @@ -30,7 +30,7 @@ sonarqube { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' } } diff --git a/libs/csv-converter/build.gradle b/libs/csv-converter/build.gradle index b3bf815ce1d..905798dd496 100644 --- a/libs/csv-converter/build.gradle +++ b/libs/csv-converter/build.gradle @@ -30,7 +30,7 @@ sonarqube { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' } } diff --git a/libs/data-transfer-objects/build.gradle b/libs/data-transfer-objects/build.gradle index 3f16dc567f0..6e0665b8548 100644 --- a/libs/data-transfer-objects/build.gradle +++ b/libs/data-transfer-objects/build.gradle @@ -31,7 +31,7 @@ sonarqube { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' } } diff --git a/libs/data-transfer-search-objects/build.gradle b/libs/data-transfer-search-objects/build.gradle index a5bc3efea3e..3bdf100cd3c 100644 --- a/libs/data-transfer-search-objects/build.gradle +++ b/libs/data-transfer-search-objects/build.gradle @@ -31,7 +31,7 @@ sonarqube { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' } } diff --git a/libs/database/build.gradle b/libs/database/build.gradle index 220fae44a31..d96a8ec5bb0 100644 --- a/libs/database/build.gradle +++ b/libs/database/build.gradle @@ -29,7 +29,7 @@ sonarqube { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } diff --git a/libs/domain/build.gradle b/libs/domain/build.gradle index c5cf6dd5e00..ef7f7973bdb 100644 --- a/libs/domain/build.gradle +++ b/libs/domain/build.gradle @@ -30,7 +30,7 @@ sonarqube { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' } } diff --git a/libs/integration-test/build.gradle b/libs/integration-test/build.gradle index fb6b34bd21b..096d7d1a7e4 100644 --- a/libs/integration-test/build.gradle +++ b/libs/integration-test/build.gradle @@ -34,7 +34,7 @@ sonarqube { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' } } diff --git a/libs/kafka-config/build.gradle b/libs/kafka-config/build.gradle index 317acb22b43..302ee2c8c23 100644 --- a/libs/kafka-config/build.gradle +++ b/libs/kafka-config/build.gradle @@ -30,7 +30,7 @@ sonarqube { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' } } diff --git a/libs/kafka-producers/build.gradle b/libs/kafka-producers/build.gradle index 777db157abc..2dba6b8658a 100644 --- a/libs/kafka-producers/build.gradle +++ b/libs/kafka-producers/build.gradle @@ -30,7 +30,7 @@ sonarqube { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' } } group = 'no.nav.testnav.libs' diff --git a/libs/reactive-core/build.gradle b/libs/reactive-core/build.gradle index 61415c833b4..e6a7360dacc 100644 --- a/libs/reactive-core/build.gradle +++ b/libs/reactive-core/build.gradle @@ -35,7 +35,7 @@ sonarqube { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' } } diff --git a/libs/reactive-frontend/build.gradle b/libs/reactive-frontend/build.gradle index 9af7cb5258a..de05a4095a4 100644 --- a/libs/reactive-frontend/build.gradle +++ b/libs/reactive-frontend/build.gradle @@ -40,7 +40,7 @@ dependencyManagement { applyMavenExclusions = false imports { mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' } } diff --git a/libs/reactive-proxy/build.gradle b/libs/reactive-proxy/build.gradle index 6eea4dda7a0..41cf13774f0 100644 --- a/libs/reactive-proxy/build.gradle +++ b/libs/reactive-proxy/build.gradle @@ -39,7 +39,7 @@ dependencyManagement { applyMavenExclusions = false imports { mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' } } diff --git a/libs/reactive-security/build.gradle b/libs/reactive-security/build.gradle index a4005a8861b..60564e67cae 100644 --- a/libs/reactive-security/build.gradle +++ b/libs/reactive-security/build.gradle @@ -79,14 +79,14 @@ publishing { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' } } dependencies { implementation 'no.nav.testnav.libs:security-core' - implementation 'com.auth0:java-jwt:4.3.0' + implementation 'com.auth0:java-jwt:4.4.0' implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' implementation 'org.springframework.boot:spring-boot-starter-webflux' diff --git a/libs/reactive-session-security/build.gradle b/libs/reactive-session-security/build.gradle index a1c8f0a023f..520b41ebd03 100644 --- a/libs/reactive-session-security/build.gradle +++ b/libs/reactive-session-security/build.gradle @@ -30,7 +30,7 @@ sonarqube { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' mavenBom 'org.springframework.session:spring-session-bom:2021.0.3' } } diff --git a/libs/security-core/build.gradle b/libs/security-core/build.gradle index be95e8dd1ca..3b88645b1f0 100644 --- a/libs/security-core/build.gradle +++ b/libs/security-core/build.gradle @@ -30,7 +30,7 @@ sonarqube { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' } } diff --git a/libs/security-token-service/build.gradle b/libs/security-token-service/build.gradle index 2ec98ef8949..c41b19c658b 100644 --- a/libs/security-token-service/build.gradle +++ b/libs/security-token-service/build.gradle @@ -30,7 +30,7 @@ sonarqube { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' } } diff --git a/libs/servlet-core/build.gradle b/libs/servlet-core/build.gradle index 1e2c4d3a711..5c2fd128cc6 100644 --- a/libs/servlet-core/build.gradle +++ b/libs/servlet-core/build.gradle @@ -34,7 +34,7 @@ sonarqube { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' } } diff --git a/libs/servlet-insecure-security/build.gradle b/libs/servlet-insecure-security/build.gradle index 14015ae5f5b..9a36b06ebaf 100644 --- a/libs/servlet-insecure-security/build.gradle +++ b/libs/servlet-insecure-security/build.gradle @@ -32,7 +32,7 @@ group = 'no.nav.testnav.libs' dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' } } diff --git a/libs/servlet-security/build.gradle b/libs/servlet-security/build.gradle index 8abd3e1b81c..5d22b676d73 100644 --- a/libs/servlet-security/build.gradle +++ b/libs/servlet-security/build.gradle @@ -30,7 +30,7 @@ sonarqube { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' } } diff --git a/libs/slack/build.gradle b/libs/slack/build.gradle index e18e9f283a4..101425a462e 100644 --- a/libs/slack/build.gradle +++ b/libs/slack/build.gradle @@ -29,7 +29,7 @@ sonarqube { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' } } diff --git a/libs/testing/build.gradle b/libs/testing/build.gradle index 7c52af21d96..7000e4b9667 100644 --- a/libs/testing/build.gradle +++ b/libs/testing/build.gradle @@ -38,7 +38,7 @@ dependencyManagement { applyMavenExclusions = false imports { mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.1.4' + mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' } } From ebb9fb98f8c42236fd8354618ed7db816b3e459b Mon Sep 17 00:00:00 2001 From: stigus Date: Wed, 10 Jan 2024 20:09:13 +0100 Subject: [PATCH 08/18] Brreg vault implemenet #deploy-brreg-stub --- apps/brreg-stub/build.gradle | 1 + .../main/java/no/nav/brregstub/BrregApplicationLauncher.java | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/brreg-stub/build.gradle b/apps/brreg-stub/build.gradle index bc54fc5bd10..a8c44eacd6d 100644 --- a/apps/brreg-stub/build.gradle +++ b/apps/brreg-stub/build.gradle @@ -75,6 +75,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' + implementation 'org.springframework.vault:spring-vault-core:3.1.0' implementation 'org.springframework.cloud:spring-cloud-vault-config-databases' implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'org.springframework.boot:spring-boot-starter-validation' diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/BrregApplicationLauncher.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/BrregApplicationLauncher.java index 6678bcbb749..12faa239d78 100644 --- a/apps/brreg-stub/src/main/java/no/nav/brregstub/BrregApplicationLauncher.java +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/BrregApplicationLauncher.java @@ -1,10 +1,9 @@ package no.nav.brregstub; +import no.nav.testnav.libs.servletcore.util.VaultUtil; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import no.nav.testnav.libs.servletcore.util.VaultUtil; - @SpringBootApplication public class BrregApplicationLauncher { From 6a9d9cfd053595240b220bcb0afa772ccedb0aa5 Mon Sep 17 00:00:00 2001 From: stigus Date: Thu, 11 Jan 2024 08:55:08 +0100 Subject: [PATCH 09/18] Oppgradert gradle wrapper og spring dependency management Endret en del av oppsettet for Brreg #deploy-brreg-stub --- apps/adresse-service/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- apps/amelding-service/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- apps/app-tilgang-analyse-service/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- apps/arbeidsforhold-service/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- apps/batch-bestilling-service/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- apps/brreg-stub/build.gradle | 20 +++++++++++++------ .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../nav/brregstub/config/DevVaultConfig.java | 2 +- .../brregstub/rs/v1/HentRolleController.java | 4 ++-- .../rs/v1/HentRolleoversiktController.java | 4 ++-- .../rs/v2/RolleoversiktController.java | 2 +- .../no/nav/brregstub/ws/BrregEndpoint.java | 2 -- .../v1/HentRolleoversiktControllerTest.java | 3 --- .../rs/v1/HentRollerControllerTest.java | 13 +++++------- .../endpoint/rs/v1/KodeControllerTest.java | 3 --- .../rs/v2/RolleoversiktControllerTest.java | 3 --- .../brregstub/service/BrregServiceTest.java | 2 +- apps/bruker-service/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- apps/dolly-backend/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- apps/dolly-frontend/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- apps/dollystatus/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- apps/endringsmelding-frontend/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- apps/endringsmelding-service/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- apps/ereg-batch-status-service/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- apps/faste-data-frontend/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- apps/generer-navn-service/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../geografiske-kodeverk-service/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- apps/helsepersonell-service/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- apps/inntektsmelding-service/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../jenkins-batch-status-service/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- apps/joark-dokument-service/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- apps/miljoer-service/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- apps/organisasjon-forvalter/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- apps/organisasjon-mottak-service/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- apps/organisasjon-service/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../organisasjon-tilgang-service/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- apps/orgnummer-service/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- apps/oversikt-frontend/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- apps/pdl-forvalter/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- apps/person-faste-data-service/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- apps/person-search-service/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- apps/person-service/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- apps/profil-api/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- apps/sykemelding-api/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- apps/synt-sykemelding-api/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- apps/testnav-ident-pool/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- apps/tilbakemelding-api/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- apps/tps-messaging-service/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- apps/udi-stub/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- apps/varslinger-service/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- examples/reactive-rest-example/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- libs/commands/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- libs/csv-converter/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- libs/data-transfer-objects/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../data-transfer-search-objects/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- libs/database/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- libs/domain/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- libs/integration-test/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- libs/kafka-config/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- libs/kafka-producers/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- libs/reactive-core/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- libs/reactive-frontend/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- libs/reactive-proxy/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- libs/reactive-security/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- libs/reactive-session-security/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- libs/security-core/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- libs/security-token-service/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- libs/servlet-core/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- libs/servlet-insecure-security/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- libs/servlet-security/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- libs/slack/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- libs/testing/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- mocks/maskinporten-mock/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- mocks/tokendings-mock/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- proxies/aareg-proxy/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../aareg-synt-services-proxy/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- proxies/arbeidsplassencv-proxy/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- proxies/arena-forvalteren-proxy/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- proxies/batch-adeo-proxy/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- proxies/brregstub-proxy/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- proxies/ereg-proxy/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- proxies/histark-proxy/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- proxies/inntektstub-proxy/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- proxies/inst-proxy/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- proxies/kodeverk-proxy/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../kontoregister-person-proxy/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- proxies/krrstub-proxy/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- proxies/medl-proxy/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- proxies/norg2-proxy/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- proxies/pdl-proxy/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- proxies/saf-proxy/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- proxies/sigrunstub-proxy/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- proxies/skjermingsregister-proxy/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../synthdata-meldekort-proxy/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- proxies/tps-forvalteren-proxy/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- proxies/udistub-proxy/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- 209 files changed, 225 insertions(+), 231 deletions(-) diff --git a/apps/adresse-service/build.gradle b/apps/adresse-service/build.gradle index 4c013c10e78..a8929e82212 100644 --- a/apps/adresse-service/build.gradle +++ b/apps/adresse-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/adresse-service/gradle/wrapper/gradle-wrapper.properties b/apps/adresse-service/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/adresse-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/adresse-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/amelding-service/build.gradle b/apps/amelding-service/build.gradle index 20234060d36..c6a6333888f 100644 --- a/apps/amelding-service/build.gradle +++ b/apps/amelding-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/amelding-service/gradle/wrapper/gradle-wrapper.properties b/apps/amelding-service/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/amelding-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/amelding-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/app-tilgang-analyse-service/build.gradle b/apps/app-tilgang-analyse-service/build.gradle index 6f933938c32..4cc1ae3ea0a 100644 --- a/apps/app-tilgang-analyse-service/build.gradle +++ b/apps/app-tilgang-analyse-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/app-tilgang-analyse-service/gradle/wrapper/gradle-wrapper.properties b/apps/app-tilgang-analyse-service/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/app-tilgang-analyse-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/app-tilgang-analyse-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/arbeidsforhold-service/build.gradle b/apps/arbeidsforhold-service/build.gradle index aacbd7bdef9..3c492d415c2 100644 --- a/apps/arbeidsforhold-service/build.gradle +++ b/apps/arbeidsforhold-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/arbeidsforhold-service/gradle/wrapper/gradle-wrapper.properties b/apps/arbeidsforhold-service/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/arbeidsforhold-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/arbeidsforhold-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/batch-bestilling-service/build.gradle b/apps/batch-bestilling-service/build.gradle index 583eeb33d1b..f233aaa7e5f 100644 --- a/apps/batch-bestilling-service/build.gradle +++ b/apps/batch-bestilling-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/batch-bestilling-service/gradle/wrapper/gradle-wrapper.properties b/apps/batch-bestilling-service/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/batch-bestilling-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/batch-bestilling-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/brreg-stub/build.gradle b/apps/brreg-stub/build.gradle index a8c44eacd6d..a70faa2fc13 100644 --- a/apps/brreg-stub/build.gradle +++ b/apps/brreg-stub/build.gradle @@ -3,8 +3,9 @@ plugins { id "org.sonarqube" version "4.0.0.2929" id "uk.co.boothen.gradle.wsimport" version "0.21" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" + id("org.openrewrite.rewrite") version("6.6.4") } test { @@ -33,6 +34,10 @@ sonarqube { } } +rewrite { + activeRecipe("org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_2") +} + dependencyManagement { applyMavenExclusions = false @@ -62,6 +67,8 @@ repositories { dependencies { + rewrite("org.openrewrite.recipe:rewrite-spring:5.2.0") + implementation("io.dropwizard:dropwizard-jackson:4.0.2") { exclude group: "com.google.code.findbugs" } @@ -75,7 +82,6 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.vault:spring-vault-core:3.1.0' implementation 'org.springframework.cloud:spring-cloud-vault-config-databases' implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'org.springframework.boot:spring-boot-starter-validation' @@ -98,6 +104,7 @@ dependencies { implementation 'com.h2database:h2' implementation 'wsdl4j:wsdl4j' + jaxWsTools "com.sun.xml.ws:jaxws-rt:2.3.7" implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' @@ -107,20 +114,21 @@ dependencies { implementation 'no.nav.common:cxf:3.2023.10.17_06.55-4e30d96bba05' implementation 'com.h2database:h2' + implementation "com.sun.xml.ws:jaxws-rt:4.0.2" testImplementation 'org.testcontainers:junit-jupiter' testImplementation 'org.testcontainers:postgresql' - implementation 'jakarta.jws:jakarta.jws-api:3.0.0' - - testImplementation 'junit:junit:4.13.2' //TODO upgrade to JUnit5 + implementation 'jakarta.jws:jakarta.jws-api:3.0.0' //TODO upgrade to JUnit5 testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' testImplementation 'org.springframework.boot:spring-boot-starter-test' implementation 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' + + testImplementation "org.junit.jupiter:junit-jupiter:5.10.1" } java { toolchain { - languageVersion = JavaLanguageVersion.of(21) + languageVersion = JavaLanguageVersion.of(17) } } diff --git a/apps/brreg-stub/gradle/wrapper/gradle-wrapper.properties b/apps/brreg-stub/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/brreg-stub/gradle/wrapper/gradle-wrapper.properties +++ b/apps/brreg-stub/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/config/DevVaultConfig.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/config/DevVaultConfig.java index 0ce402687dd..2b42e25f307 100644 --- a/apps/brreg-stub/src/main/java/no/nav/brregstub/config/DevVaultConfig.java +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/config/DevVaultConfig.java @@ -26,7 +26,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(TOKEN); if (StringUtils.isBlank(token)) { - throw new IllegalArgumentException(String.format("Påkrevet property '%s' er ikke satt.", TOKEN)); + throw new IllegalArgumentException("Påkrevet property '%s' er ikke satt.".formatted(TOKEN)); } return new TokenAuthentication(System.getProperty(TOKEN)); } diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v1/HentRolleController.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v1/HentRolleController.java index df6374f0463..9735cf9aeba 100644 --- a/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v1/HentRolleController.java +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v1/HentRolleController.java @@ -42,8 +42,8 @@ public ResponseEntity lagreEllerOppdaterHentRolleStub(@Valid @RequestBody R @GetMapping("/{orgnr}") public ResponseEntity hentGrunndata(@NotNull @PathVariable Integer orgnr) { var grunndata = service.hentRolle(orgnr) - .orElseThrow(() -> new NotFoundException(String.format("Kunne ikke finne roller for :%s", - orgnr))); + .orElseThrow(() -> new NotFoundException("Kunne ikke finne roller for :%s".formatted( + orgnr))); return ResponseEntity.status(HttpStatus.OK).body(grunndata); } diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v1/HentRolleoversiktController.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v1/HentRolleoversiktController.java index 60e45271cb9..5820cc73683 100644 --- a/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v1/HentRolleoversiktController.java +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v1/HentRolleoversiktController.java @@ -39,8 +39,8 @@ public ResponseEntity lagreEllerOppdaterRolleoversikt(@Valid @R @GetMapping public ResponseEntity hentRolleoversikt(@NotNull @RequestHeader(name = "Nav-Personident") String ident) { var grunndata = service.hentRolleoversiktV1(ident) - .orElseThrow(() -> new NotFoundException(String.format("Kunne ikke finne person med fnr:%s", - ident))); + .orElseThrow(() -> new NotFoundException("Kunne ikke finne person med fnr:%s".formatted( + ident))); return ResponseEntity.status(HttpStatus.OK).body(grunndata); } diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v2/RolleoversiktController.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v2/RolleoversiktController.java index 8a506d3132f..35a1e35ed67 100644 --- a/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v2/RolleoversiktController.java +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/rs/v2/RolleoversiktController.java @@ -40,7 +40,7 @@ public ResponseEntity lagreEllerOppdaterRolleoversikt(@Valid @R @GetMapping public ResponseEntity hentRolleoversikt(@NotNull @RequestHeader(name = "Nav-Personident") String ident) { var grunndata = service.hentRolleoversiktV2(ident) - .orElseThrow(() -> new NotFoundException(String.format("Kunne ikke finne person med fnr:%s", ident))); + .orElseThrow(() -> new NotFoundException("Kunne ikke finne person med fnr:%s".formatted(ident))); return ResponseEntity.status(HttpStatus.OK).body(grunndata); } diff --git a/apps/brreg-stub/src/main/java/no/nav/brregstub/ws/BrregEndpoint.java b/apps/brreg-stub/src/main/java/no/nav/brregstub/ws/BrregEndpoint.java index b414591e5d4..f31256e9dc2 100644 --- a/apps/brreg-stub/src/main/java/no/nav/brregstub/ws/BrregEndpoint.java +++ b/apps/brreg-stub/src/main/java/no/nav/brregstub/ws/BrregEndpoint.java @@ -9,7 +9,6 @@ import no.nav.brregstub.tjenestekontrakter.ws.HentRolleutskriftResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.ws.server.endpoint.annotation.Endpoint; import org.springframework.ws.server.endpoint.annotation.PayloadRoot; import org.springframework.ws.server.endpoint.annotation.RequestPayload; @@ -28,7 +27,6 @@ public class BrregEndpoint { private final BrregService brregService; - @Autowired public BrregEndpoint(BrregService brregService) { this.brregService = brregService; } diff --git a/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v1/HentRolleoversiktControllerTest.java b/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v1/HentRolleoversiktControllerTest.java index 5bf4f32d655..5f54d245bd6 100644 --- a/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v1/HentRolleoversiktControllerTest.java +++ b/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v1/HentRolleoversiktControllerTest.java @@ -9,7 +9,6 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; -import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mockito; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -20,7 +19,6 @@ import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.test.context.ActiveProfiles; -import org.springframework.test.context.junit.jupiter.SpringExtension; import java.time.LocalDate; import java.util.Map; @@ -30,7 +28,6 @@ @ActiveProfiles("test") @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -@ExtendWith(SpringExtension.class) @TestInstance(TestInstance.Lifecycle.PER_CLASS) public class HentRolleoversiktControllerTest { diff --git a/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v1/HentRollerControllerTest.java b/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v1/HentRollerControllerTest.java index 52e688bc232..0369854c39c 100644 --- a/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v1/HentRollerControllerTest.java +++ b/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v1/HentRollerControllerTest.java @@ -6,7 +6,6 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; -import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mockito; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -16,7 +15,6 @@ import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.test.context.ActiveProfiles; -import org.springframework.test.context.junit.jupiter.SpringExtension; import java.time.LocalDate; import java.util.Map; @@ -26,7 +24,6 @@ @ActiveProfiles("test") @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -@ExtendWith(SpringExtension.class) @TestInstance(TestInstance.Lifecycle.PER_CLASS) public class HentRollerControllerTest { @@ -39,7 +36,7 @@ public class HentRollerControllerTest { @Test @DisplayName("GET rolle returnerer 404 hvis ikke eksisterer") - public void skalKasteNotFoundHvisRolleIkkeEksister() { + void skalKasteNotFoundHvisRolleIkkeEksister() { var response = restTemplate.getForEntity(API_V_1_ROLLER + "0", String.class); assertThat(response.getStatusCode()).isEqualTo(HttpStatus.NOT_FOUND); @@ -47,7 +44,7 @@ public void skalKasteNotFoundHvisRolleIkkeEksister() { @Test @DisplayName("GET rolle returnerer 200 hvis ikke eksisterer") - public void skalHenteRolleutskriftFraDatabase() { + void skalHenteRolleutskriftFraDatabase() { var nyRolle = new HentRolle(); nyRolle.setOrgnr(1); nyRolle.setJson("{\"orgnr\": 1}"); @@ -62,7 +59,7 @@ public void skalHenteRolleutskriftFraDatabase() { @Test @DisplayName("DELETE rolle skal slettes fra database") - public void skalSletteRolleutskrift() { + void skalSletteRolleutskrift() { var rolleSomSkalSlettes = new HentRolle(); rolleSomSkalSlettes.setOrgnr(3); rolleSomSkalSlettes.setJson("{}"); @@ -81,7 +78,7 @@ public void skalSletteRolleutskrift() { @Test @DisplayName("POST rolle skal opprette ny databaseinnslag") - public void skalLagreRequestIDatabase() { + void skalLagreRequestIDatabase() { var to = new RsOrganisasjon(); to.setOrgnr(4); to.setRegistreringsdato(LocalDate.now()); @@ -96,7 +93,7 @@ public void skalLagreRequestIDatabase() { @Test @DisplayName("POST rolle returnere bad request ved manglende feilt") - public void skalReturnereBadRequestVedValideringsFeil() { + void skalReturnereBadRequestVedValideringsFeil() { var to = new RsOrganisasjon(); var response = diff --git a/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v1/KodeControllerTest.java b/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v1/KodeControllerTest.java index 01237f092ea..29dfdd8c260 100644 --- a/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v1/KodeControllerTest.java +++ b/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v1/KodeControllerTest.java @@ -5,13 +5,11 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; -import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.http.HttpStatus; import org.springframework.test.context.ActiveProfiles; -import org.springframework.test.context.junit.jupiter.SpringExtension; import java.util.Map; @@ -19,7 +17,6 @@ @ActiveProfiles("test") @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -@ExtendWith(SpringExtension.class) @TestInstance(TestInstance.Lifecycle.PER_CLASS) class KodeControllerTest { diff --git a/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v2/RolleoversiktControllerTest.java b/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v2/RolleoversiktControllerTest.java index ae496d1f49c..85123f3268f 100644 --- a/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v2/RolleoversiktControllerTest.java +++ b/apps/brreg-stub/src/test/java/no/nav/brregstub/endpoint/rs/v2/RolleoversiktControllerTest.java @@ -13,7 +13,6 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.TestInstance; -import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.Mockito; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -24,7 +23,6 @@ import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.test.context.ActiveProfiles; -import org.springframework.test.context.junit.jupiter.SpringExtension; import java.time.LocalDate; import java.util.Collections; @@ -35,7 +33,6 @@ @ActiveProfiles("test") @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -@ExtendWith(SpringExtension.class) @TestInstance(TestInstance.Lifecycle.PER_CLASS) public class RolleoversiktControllerTest { diff --git a/apps/brreg-stub/src/test/java/no/nav/brregstub/service/BrregServiceTest.java b/apps/brreg-stub/src/test/java/no/nav/brregstub/service/BrregServiceTest.java index 1dab0054d39..74b4936c736 100644 --- a/apps/brreg-stub/src/test/java/no/nav/brregstub/service/BrregServiceTest.java +++ b/apps/brreg-stub/src/test/java/no/nav/brregstub/service/BrregServiceTest.java @@ -49,7 +49,7 @@ class BrregServiceTest { private BrregService brregService; @BeforeEach - public void onSetup() { + void onSetup() { rolleoversiktRepositoryMock.deleteAll(); hentRolleRepositoryMock.deleteAll(); brregService = new BrregService(rolleoversiktRepositoryMock, hentRolleRepositoryMock, objectMapper); diff --git a/apps/bruker-service/build.gradle b/apps/bruker-service/build.gradle index 5181a5e856b..fc669b6cd52 100644 --- a/apps/bruker-service/build.gradle +++ b/apps/bruker-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/bruker-service/gradle/wrapper/gradle-wrapper.properties b/apps/bruker-service/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/bruker-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/bruker-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/budpro-service/gradle/wrapper/gradle-wrapper.properties b/apps/budpro-service/gradle/wrapper/gradle-wrapper.properties index 744c64d1277..3499ded5c11 100644 --- a/apps/budpro-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/budpro-service/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/dolly-backend/build.gradle b/apps/dolly-backend/build.gradle index 267a8dec020..db7c67814de 100644 --- a/apps/dolly-backend/build.gradle +++ b/apps/dolly-backend/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/dolly-backend/gradle/wrapper/gradle-wrapper.properties b/apps/dolly-backend/gradle/wrapper/gradle-wrapper.properties index 744c64d1277..3499ded5c11 100644 --- a/apps/dolly-backend/gradle/wrapper/gradle-wrapper.properties +++ b/apps/dolly-backend/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/dolly-frontend/build.gradle b/apps/dolly-frontend/build.gradle index 226b6da3e36..e01bf2e59bd 100644 --- a/apps/dolly-frontend/build.gradle +++ b/apps/dolly-frontend/build.gradle @@ -2,7 +2,7 @@ plugins { id "org.sonarqube" version "4.0.0.2929" id 'java' id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/dolly-frontend/gradle/wrapper/gradle-wrapper.properties b/apps/dolly-frontend/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/dolly-frontend/gradle/wrapper/gradle-wrapper.properties +++ b/apps/dolly-frontend/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/dollystatus/build.gradle b/apps/dollystatus/build.gradle index 5c2ba97a1e8..ebdfddbda27 100644 --- a/apps/dollystatus/build.gradle +++ b/apps/dollystatus/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/dollystatus/gradle/wrapper/gradle-wrapper.properties b/apps/dollystatus/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/dollystatus/gradle/wrapper/gradle-wrapper.properties +++ b/apps/dollystatus/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/endringsmelding-frontend/build.gradle b/apps/endringsmelding-frontend/build.gradle index b97c13ab246..c9a0bc7b1cc 100644 --- a/apps/endringsmelding-frontend/build.gradle +++ b/apps/endringsmelding-frontend/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/endringsmelding-frontend/gradle/wrapper/gradle-wrapper.properties b/apps/endringsmelding-frontend/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/endringsmelding-frontend/gradle/wrapper/gradle-wrapper.properties +++ b/apps/endringsmelding-frontend/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/endringsmelding-service/build.gradle b/apps/endringsmelding-service/build.gradle index a05be8186e0..d59d86f100b 100644 --- a/apps/endringsmelding-service/build.gradle +++ b/apps/endringsmelding-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/endringsmelding-service/gradle/wrapper/gradle-wrapper.properties b/apps/endringsmelding-service/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/endringsmelding-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/endringsmelding-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/ereg-batch-status-service/build.gradle b/apps/ereg-batch-status-service/build.gradle index a91a601c08a..4f06619d738 100644 --- a/apps/ereg-batch-status-service/build.gradle +++ b/apps/ereg-batch-status-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/ereg-batch-status-service/gradle/wrapper/gradle-wrapper.properties b/apps/ereg-batch-status-service/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/ereg-batch-status-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/ereg-batch-status-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/faste-data-frontend/build.gradle b/apps/faste-data-frontend/build.gradle index 3ceb9772811..2cd58e65b88 100644 --- a/apps/faste-data-frontend/build.gradle +++ b/apps/faste-data-frontend/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/faste-data-frontend/gradle/wrapper/gradle-wrapper.properties b/apps/faste-data-frontend/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/faste-data-frontend/gradle/wrapper/gradle-wrapper.properties +++ b/apps/faste-data-frontend/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/generer-arbeidsforhold-populasjon-service/build.gradle b/apps/generer-arbeidsforhold-populasjon-service/build.gradle index ed985448f1a..49e279bf82f 100644 --- a/apps/generer-arbeidsforhold-populasjon-service/build.gradle +++ b/apps/generer-arbeidsforhold-populasjon-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/generer-arbeidsforhold-populasjon-service/gradle/wrapper/gradle-wrapper.properties b/apps/generer-arbeidsforhold-populasjon-service/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/generer-arbeidsforhold-populasjon-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/generer-arbeidsforhold-populasjon-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/generer-navn-service/build.gradle b/apps/generer-navn-service/build.gradle index 544559e56b6..8c007fa4620 100644 --- a/apps/generer-navn-service/build.gradle +++ b/apps/generer-navn-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/generer-navn-service/gradle/wrapper/gradle-wrapper.properties b/apps/generer-navn-service/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/generer-navn-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/generer-navn-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/generer-organisasjon-populasjon-service/build.gradle b/apps/generer-organisasjon-populasjon-service/build.gradle index dbdad5df3a7..1aa54a4db33 100644 --- a/apps/generer-organisasjon-populasjon-service/build.gradle +++ b/apps/generer-organisasjon-populasjon-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/generer-organisasjon-populasjon-service/gradle/wrapper/gradle-wrapper.properties b/apps/generer-organisasjon-populasjon-service/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/generer-organisasjon-populasjon-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/generer-organisasjon-populasjon-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/generer-synt-amelding-service/build.gradle b/apps/generer-synt-amelding-service/build.gradle index 2577e9e0ef5..cae306a5195 100644 --- a/apps/generer-synt-amelding-service/build.gradle +++ b/apps/generer-synt-amelding-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/generer-synt-amelding-service/gradle/wrapper/gradle-wrapper.properties b/apps/generer-synt-amelding-service/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/generer-synt-amelding-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/generer-synt-amelding-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/geografiske-kodeverk-service/build.gradle b/apps/geografiske-kodeverk-service/build.gradle index a483f0a7315..5b3a58e9043 100644 --- a/apps/geografiske-kodeverk-service/build.gradle +++ b/apps/geografiske-kodeverk-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/geografiske-kodeverk-service/gradle/wrapper/gradle-wrapper.properties b/apps/geografiske-kodeverk-service/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/geografiske-kodeverk-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/geografiske-kodeverk-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/helsepersonell-service/build.gradle b/apps/helsepersonell-service/build.gradle index 5e2ce6cf631..560d0faacb9 100644 --- a/apps/helsepersonell-service/build.gradle +++ b/apps/helsepersonell-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/helsepersonell-service/gradle/wrapper/gradle-wrapper.properties b/apps/helsepersonell-service/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/helsepersonell-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/helsepersonell-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/inntektsmelding-generator-service/build.gradle b/apps/inntektsmelding-generator-service/build.gradle index 399038fc0f9..ff4a81d1e6f 100644 --- a/apps/inntektsmelding-generator-service/build.gradle +++ b/apps/inntektsmelding-generator-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/inntektsmelding-generator-service/gradle/wrapper/gradle-wrapper.properties b/apps/inntektsmelding-generator-service/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/inntektsmelding-generator-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/inntektsmelding-generator-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/inntektsmelding-service/build.gradle b/apps/inntektsmelding-service/build.gradle index 720fd8b30dd..014cac7910d 100644 --- a/apps/inntektsmelding-service/build.gradle +++ b/apps/inntektsmelding-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/inntektsmelding-service/gradle/wrapper/gradle-wrapper.properties b/apps/inntektsmelding-service/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/inntektsmelding-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/inntektsmelding-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/jenkins-batch-status-service/build.gradle b/apps/jenkins-batch-status-service/build.gradle index c00e3e90316..2ef827a8666 100644 --- a/apps/jenkins-batch-status-service/build.gradle +++ b/apps/jenkins-batch-status-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/jenkins-batch-status-service/gradle/wrapper/gradle-wrapper.properties b/apps/jenkins-batch-status-service/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/jenkins-batch-status-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/jenkins-batch-status-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/joark-dokument-service/build.gradle b/apps/joark-dokument-service/build.gradle index fbc8bc7aa4c..a5d649d94e2 100644 --- a/apps/joark-dokument-service/build.gradle +++ b/apps/joark-dokument-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/joark-dokument-service/gradle/wrapper/gradle-wrapper.properties b/apps/joark-dokument-service/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/joark-dokument-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/joark-dokument-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/miljoer-service/build.gradle b/apps/miljoer-service/build.gradle index 29b323e0e46..38127a0fa35 100644 --- a/apps/miljoer-service/build.gradle +++ b/apps/miljoer-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/miljoer-service/gradle/wrapper/gradle-wrapper.properties b/apps/miljoer-service/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/miljoer-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/miljoer-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/oppsummeringsdokument-service/build.gradle b/apps/oppsummeringsdokument-service/build.gradle index c67b7b8d841..ec2cf58289b 100644 --- a/apps/oppsummeringsdokument-service/build.gradle +++ b/apps/oppsummeringsdokument-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/oppsummeringsdokument-service/gradle/wrapper/gradle-wrapper.properties b/apps/oppsummeringsdokument-service/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/oppsummeringsdokument-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/oppsummeringsdokument-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/organisasjon-bestilling-service/build.gradle b/apps/organisasjon-bestilling-service/build.gradle index 7dc872ddcb4..f14b547f1c0 100644 --- a/apps/organisasjon-bestilling-service/build.gradle +++ b/apps/organisasjon-bestilling-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/organisasjon-bestilling-service/gradle/wrapper/gradle-wrapper.properties b/apps/organisasjon-bestilling-service/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/organisasjon-bestilling-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/organisasjon-bestilling-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/organisasjon-faste-data-service/build.gradle b/apps/organisasjon-faste-data-service/build.gradle index 835b93bc1a5..f77e37fa54f 100644 --- a/apps/organisasjon-faste-data-service/build.gradle +++ b/apps/organisasjon-faste-data-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/organisasjon-faste-data-service/gradle/wrapper/gradle-wrapper.properties b/apps/organisasjon-faste-data-service/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/organisasjon-faste-data-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/organisasjon-faste-data-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/organisasjon-forvalter/build.gradle b/apps/organisasjon-forvalter/build.gradle index 2113fad7a77..1c3683435b6 100644 --- a/apps/organisasjon-forvalter/build.gradle +++ b/apps/organisasjon-forvalter/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/organisasjon-forvalter/gradle/wrapper/gradle-wrapper.properties b/apps/organisasjon-forvalter/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/organisasjon-forvalter/gradle/wrapper/gradle-wrapper.properties +++ b/apps/organisasjon-forvalter/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/organisasjon-mottak-service/build.gradle b/apps/organisasjon-mottak-service/build.gradle index a66bbfb73b6..1d790581f2c 100644 --- a/apps/organisasjon-mottak-service/build.gradle +++ b/apps/organisasjon-mottak-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/organisasjon-mottak-service/gradle/wrapper/gradle-wrapper.properties b/apps/organisasjon-mottak-service/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/organisasjon-mottak-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/organisasjon-mottak-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/organisasjon-service/build.gradle b/apps/organisasjon-service/build.gradle index c5e712b8679..5664b67bbe3 100644 --- a/apps/organisasjon-service/build.gradle +++ b/apps/organisasjon-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/organisasjon-service/gradle/wrapper/gradle-wrapper.properties b/apps/organisasjon-service/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/organisasjon-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/organisasjon-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/organisasjon-tilgang-frontend/build.gradle b/apps/organisasjon-tilgang-frontend/build.gradle index 740e63821e6..4acac9fb5ed 100644 --- a/apps/organisasjon-tilgang-frontend/build.gradle +++ b/apps/organisasjon-tilgang-frontend/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/organisasjon-tilgang-frontend/gradle/wrapper/gradle-wrapper.properties b/apps/organisasjon-tilgang-frontend/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/organisasjon-tilgang-frontend/gradle/wrapper/gradle-wrapper.properties +++ b/apps/organisasjon-tilgang-frontend/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/organisasjon-tilgang-service/build.gradle b/apps/organisasjon-tilgang-service/build.gradle index 048855a6d6b..363f15c34cc 100644 --- a/apps/organisasjon-tilgang-service/build.gradle +++ b/apps/organisasjon-tilgang-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/organisasjon-tilgang-service/gradle/wrapper/gradle-wrapper.properties b/apps/organisasjon-tilgang-service/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/organisasjon-tilgang-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/organisasjon-tilgang-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/orgnummer-service/build.gradle b/apps/orgnummer-service/build.gradle index 6a90359c7eb..0ca8ccf19aa 100644 --- a/apps/orgnummer-service/build.gradle +++ b/apps/orgnummer-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/orgnummer-service/gradle/wrapper/gradle-wrapper.properties b/apps/orgnummer-service/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/orgnummer-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/orgnummer-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/oversikt-frontend/build.gradle b/apps/oversikt-frontend/build.gradle index 93f923439dd..5600c7a24df 100644 --- a/apps/oversikt-frontend/build.gradle +++ b/apps/oversikt-frontend/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/oversikt-frontend/gradle/wrapper/gradle-wrapper.properties b/apps/oversikt-frontend/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/oversikt-frontend/gradle/wrapper/gradle-wrapper.properties +++ b/apps/oversikt-frontend/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/pdl-forvalter/build.gradle b/apps/pdl-forvalter/build.gradle index a3d5acc45d1..a18ece55d5d 100644 --- a/apps/pdl-forvalter/build.gradle +++ b/apps/pdl-forvalter/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/pdl-forvalter/gradle/wrapper/gradle-wrapper.properties b/apps/pdl-forvalter/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/pdl-forvalter/gradle/wrapper/gradle-wrapper.properties +++ b/apps/pdl-forvalter/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/person-faste-data-service/build.gradle b/apps/person-faste-data-service/build.gradle index 0d5701e1204..e111c6541a1 100644 --- a/apps/person-faste-data-service/build.gradle +++ b/apps/person-faste-data-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/person-faste-data-service/gradle/wrapper/gradle-wrapper.properties b/apps/person-faste-data-service/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/person-faste-data-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/person-faste-data-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/person-organisasjon-tilgang-service/build.gradle b/apps/person-organisasjon-tilgang-service/build.gradle index e0c5798193d..fc0f8c48b91 100644 --- a/apps/person-organisasjon-tilgang-service/build.gradle +++ b/apps/person-organisasjon-tilgang-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/person-organisasjon-tilgang-service/gradle/wrapper/gradle-wrapper.properties b/apps/person-organisasjon-tilgang-service/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/person-organisasjon-tilgang-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/person-organisasjon-tilgang-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/person-search-service/build.gradle b/apps/person-search-service/build.gradle index 1e080a89fb9..0c648749123 100644 --- a/apps/person-search-service/build.gradle +++ b/apps/person-search-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/person-search-service/gradle/wrapper/gradle-wrapper.properties b/apps/person-search-service/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/person-search-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/person-search-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/person-service/build.gradle b/apps/person-service/build.gradle index 959e97b1b57..9dca0dc1e16 100644 --- a/apps/person-service/build.gradle +++ b/apps/person-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/person-service/gradle/wrapper/gradle-wrapper.properties b/apps/person-service/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/person-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/person-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/profil-api/build.gradle b/apps/profil-api/build.gradle index fabb4f79721..0a0acfc9442 100644 --- a/apps/profil-api/build.gradle +++ b/apps/profil-api/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/profil-api/gradle/wrapper/gradle-wrapper.properties b/apps/profil-api/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/profil-api/gradle/wrapper/gradle-wrapper.properties +++ b/apps/profil-api/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/sykemelding-api/build.gradle b/apps/sykemelding-api/build.gradle index 781630596f9..fa5e3822483 100644 --- a/apps/sykemelding-api/build.gradle +++ b/apps/sykemelding-api/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/sykemelding-api/gradle/wrapper/gradle-wrapper.properties b/apps/sykemelding-api/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/sykemelding-api/gradle/wrapper/gradle-wrapper.properties +++ b/apps/sykemelding-api/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/synt-sykemelding-api/build.gradle b/apps/synt-sykemelding-api/build.gradle index 5e1fa9c73c7..b79e402d8b1 100644 --- a/apps/synt-sykemelding-api/build.gradle +++ b/apps/synt-sykemelding-api/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/synt-sykemelding-api/gradle/wrapper/gradle-wrapper.properties b/apps/synt-sykemelding-api/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/synt-sykemelding-api/gradle/wrapper/gradle-wrapper.properties +++ b/apps/synt-sykemelding-api/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/synt-vedtakshistorikk-service/build.gradle b/apps/synt-vedtakshistorikk-service/build.gradle index 71717bc45ec..d043a0b6f48 100644 --- a/apps/synt-vedtakshistorikk-service/build.gradle +++ b/apps/synt-vedtakshistorikk-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/synt-vedtakshistorikk-service/gradle/wrapper/gradle-wrapper.properties b/apps/synt-vedtakshistorikk-service/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/synt-vedtakshistorikk-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/synt-vedtakshistorikk-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/testnav-ident-pool/build.gradle b/apps/testnav-ident-pool/build.gradle index 7a063d4aaef..ad2da904b29 100644 --- a/apps/testnav-ident-pool/build.gradle +++ b/apps/testnav-ident-pool/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/testnav-ident-pool/gradle/wrapper/gradle-wrapper.properties b/apps/testnav-ident-pool/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/testnav-ident-pool/gradle/wrapper/gradle-wrapper.properties +++ b/apps/testnav-ident-pool/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/testnorge-statisk-data-forvalter/build.gradle b/apps/testnorge-statisk-data-forvalter/build.gradle index a3bb67f0e2c..e53c4ac8e8b 100644 --- a/apps/testnorge-statisk-data-forvalter/build.gradle +++ b/apps/testnorge-statisk-data-forvalter/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/testnorge-statisk-data-forvalter/gradle/wrapper/gradle-wrapper.properties b/apps/testnorge-statisk-data-forvalter/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/testnorge-statisk-data-forvalter/gradle/wrapper/gradle-wrapper.properties +++ b/apps/testnorge-statisk-data-forvalter/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/tilbakemelding-api/build.gradle b/apps/tilbakemelding-api/build.gradle index 9d07da4c440..cf3fed405f8 100644 --- a/apps/tilbakemelding-api/build.gradle +++ b/apps/tilbakemelding-api/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/tilbakemelding-api/gradle/wrapper/gradle-wrapper.properties b/apps/tilbakemelding-api/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/tilbakemelding-api/gradle/wrapper/gradle-wrapper.properties +++ b/apps/tilbakemelding-api/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/tps-messaging-service/build.gradle b/apps/tps-messaging-service/build.gradle index bd6149159ae..cef8f7ef43a 100644 --- a/apps/tps-messaging-service/build.gradle +++ b/apps/tps-messaging-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/tps-messaging-service/gradle/wrapper/gradle-wrapper.properties b/apps/tps-messaging-service/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/tps-messaging-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/tps-messaging-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/udi-stub/build.gradle b/apps/udi-stub/build.gradle index b8d9ed62251..f22b8655ff3 100644 --- a/apps/udi-stub/build.gradle +++ b/apps/udi-stub/build.gradle @@ -3,7 +3,7 @@ plugins { id 'java' id "uk.co.boothen.gradle.wsimport" version "0.18" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/udi-stub/gradle/wrapper/gradle-wrapper.properties b/apps/udi-stub/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/udi-stub/gradle/wrapper/gradle-wrapper.properties +++ b/apps/udi-stub/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/varslinger-service/build.gradle b/apps/varslinger-service/build.gradle index d63a7bfcc02..11d21292fda 100644 --- a/apps/varslinger-service/build.gradle +++ b/apps/varslinger-service/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/apps/varslinger-service/gradle/wrapper/gradle-wrapper.properties b/apps/varslinger-service/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/apps/varslinger-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/varslinger-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/examples/reactive-rest-example/build.gradle b/examples/reactive-rest-example/build.gradle index 30a6a655d6a..203fdca4846 100644 --- a/examples/reactive-rest-example/build.gradle +++ b/examples/reactive-rest-example/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/examples/reactive-rest-example/gradle/wrapper/gradle-wrapper.properties b/examples/reactive-rest-example/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/examples/reactive-rest-example/gradle/wrapper/gradle-wrapper.properties +++ b/examples/reactive-rest-example/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cf58316ee06..3499ded5c11 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists \ No newline at end of file +zipStorePath=wrapper/dists diff --git a/libs/avro-schema/gradle/wrapper/gradle-wrapper.properties b/libs/avro-schema/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/libs/avro-schema/gradle/wrapper/gradle-wrapper.properties +++ b/libs/avro-schema/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/commands/build.gradle b/libs/commands/build.gradle index db5c41633c7..852e2cc0991 100644 --- a/libs/commands/build.gradle +++ b/libs/commands/build.gradle @@ -1,7 +1,7 @@ plugins { id "org.sonarqube" version "4.0.0.2929" id 'java-library' - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/libs/commands/gradle/wrapper/gradle-wrapper.properties b/libs/commands/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/libs/commands/gradle/wrapper/gradle-wrapper.properties +++ b/libs/commands/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/csv-converter/build.gradle b/libs/csv-converter/build.gradle index 905798dd496..901ec37084d 100644 --- a/libs/csv-converter/build.gradle +++ b/libs/csv-converter/build.gradle @@ -1,7 +1,7 @@ plugins { id "org.sonarqube" version "4.0.0.2929" id 'java-library' - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/libs/csv-converter/gradle/wrapper/gradle-wrapper.properties b/libs/csv-converter/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/libs/csv-converter/gradle/wrapper/gradle-wrapper.properties +++ b/libs/csv-converter/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/data-transfer-objects/build.gradle b/libs/data-transfer-objects/build.gradle index 6e0665b8548..a8da8b09246 100644 --- a/libs/data-transfer-objects/build.gradle +++ b/libs/data-transfer-objects/build.gradle @@ -2,7 +2,7 @@ plugins { id "org.sonarqube" version "4.0.0.2929" id 'java-library' id 'maven-publish' - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/libs/data-transfer-objects/gradle/wrapper/gradle-wrapper.properties b/libs/data-transfer-objects/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/libs/data-transfer-objects/gradle/wrapper/gradle-wrapper.properties +++ b/libs/data-transfer-objects/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/data-transfer-search-objects/build.gradle b/libs/data-transfer-search-objects/build.gradle index 3bdf100cd3c..86feabb9e79 100644 --- a/libs/data-transfer-search-objects/build.gradle +++ b/libs/data-transfer-search-objects/build.gradle @@ -2,7 +2,7 @@ plugins { id "org.sonarqube" version "4.0.0.2929" id 'java-library' id 'maven-publish' - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/libs/data-transfer-search-objects/gradle/wrapper/gradle-wrapper.properties b/libs/data-transfer-search-objects/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/libs/data-transfer-search-objects/gradle/wrapper/gradle-wrapper.properties +++ b/libs/data-transfer-search-objects/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/database/build.gradle b/libs/database/build.gradle index d96a8ec5bb0..64459ea99b8 100644 --- a/libs/database/build.gradle +++ b/libs/database/build.gradle @@ -1,7 +1,7 @@ plugins { id "org.sonarqube" version "4.0.0.2929" id 'java-library' - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/libs/database/gradle/wrapper/gradle-wrapper.properties b/libs/database/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/libs/database/gradle/wrapper/gradle-wrapper.properties +++ b/libs/database/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/domain/build.gradle b/libs/domain/build.gradle index ef7f7973bdb..4f426e9e5bc 100644 --- a/libs/domain/build.gradle +++ b/libs/domain/build.gradle @@ -1,7 +1,7 @@ plugins { id "org.sonarqube" version "4.0.0.2929" id 'java-library' - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/libs/domain/gradle/wrapper/gradle-wrapper.properties b/libs/domain/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/libs/domain/gradle/wrapper/gradle-wrapper.properties +++ b/libs/domain/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/integration-test/build.gradle b/libs/integration-test/build.gradle index 096d7d1a7e4..831d79debb9 100644 --- a/libs/integration-test/build.gradle +++ b/libs/integration-test/build.gradle @@ -1,7 +1,7 @@ plugins { id "org.sonarqube" version "4.0.0.2929" id 'java-library' - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/libs/integration-test/gradle/wrapper/gradle-wrapper.properties b/libs/integration-test/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/libs/integration-test/gradle/wrapper/gradle-wrapper.properties +++ b/libs/integration-test/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/kafka-config/build.gradle b/libs/kafka-config/build.gradle index 302ee2c8c23..55cd1b05ae4 100644 --- a/libs/kafka-config/build.gradle +++ b/libs/kafka-config/build.gradle @@ -1,7 +1,7 @@ plugins { id "org.sonarqube" version "4.0.0.2929" id 'java-library' - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/libs/kafka-config/gradle/wrapper/gradle-wrapper.properties b/libs/kafka-config/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/libs/kafka-config/gradle/wrapper/gradle-wrapper.properties +++ b/libs/kafka-config/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/kafka-producers/build.gradle b/libs/kafka-producers/build.gradle index 2dba6b8658a..628615e5635 100644 --- a/libs/kafka-producers/build.gradle +++ b/libs/kafka-producers/build.gradle @@ -1,7 +1,7 @@ plugins { id "org.sonarqube" version "4.0.0.2929" id 'java-library' - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/libs/kafka-producers/gradle/wrapper/gradle-wrapper.properties b/libs/kafka-producers/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/libs/kafka-producers/gradle/wrapper/gradle-wrapper.properties +++ b/libs/kafka-producers/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/reactive-core/build.gradle b/libs/reactive-core/build.gradle index e6a7360dacc..9eed16348f2 100644 --- a/libs/reactive-core/build.gradle +++ b/libs/reactive-core/build.gradle @@ -2,7 +2,7 @@ plugins { id "org.sonarqube" version "4.0.0.2929" id 'java-library' id 'maven-publish' - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/libs/reactive-core/gradle/wrapper/gradle-wrapper.properties b/libs/reactive-core/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/libs/reactive-core/gradle/wrapper/gradle-wrapper.properties +++ b/libs/reactive-core/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/reactive-frontend/build.gradle b/libs/reactive-frontend/build.gradle index de05a4095a4..d609c54295d 100644 --- a/libs/reactive-frontend/build.gradle +++ b/libs/reactive-frontend/build.gradle @@ -2,7 +2,7 @@ plugins { id "org.sonarqube" version "4.0.0.2929" id 'java-library' id 'maven-publish' - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/libs/reactive-frontend/gradle/wrapper/gradle-wrapper.properties b/libs/reactive-frontend/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/libs/reactive-frontend/gradle/wrapper/gradle-wrapper.properties +++ b/libs/reactive-frontend/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/reactive-proxy/build.gradle b/libs/reactive-proxy/build.gradle index 41cf13774f0..90162b61359 100644 --- a/libs/reactive-proxy/build.gradle +++ b/libs/reactive-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id "org.sonarqube" version "4.0.0.2929" id 'java-library' id 'maven-publish' - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/libs/reactive-proxy/gradle/wrapper/gradle-wrapper.properties b/libs/reactive-proxy/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/libs/reactive-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/libs/reactive-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/reactive-security/build.gradle b/libs/reactive-security/build.gradle index 60564e67cae..1de3a85a582 100644 --- a/libs/reactive-security/build.gradle +++ b/libs/reactive-security/build.gradle @@ -2,7 +2,7 @@ plugins { id "org.sonarqube" version "4.0.0.2929" id 'java-library' id 'maven-publish' - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/libs/reactive-security/gradle/wrapper/gradle-wrapper.properties b/libs/reactive-security/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/libs/reactive-security/gradle/wrapper/gradle-wrapper.properties +++ b/libs/reactive-security/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/reactive-session-security/build.gradle b/libs/reactive-session-security/build.gradle index 520b41ebd03..7390efc0eb9 100644 --- a/libs/reactive-session-security/build.gradle +++ b/libs/reactive-session-security/build.gradle @@ -1,7 +1,7 @@ plugins { id "org.sonarqube" version "4.0.0.2929" id 'java-library' - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/libs/reactive-session-security/gradle/wrapper/gradle-wrapper.properties b/libs/reactive-session-security/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/libs/reactive-session-security/gradle/wrapper/gradle-wrapper.properties +++ b/libs/reactive-session-security/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/security-core/build.gradle b/libs/security-core/build.gradle index 3b88645b1f0..12858881851 100644 --- a/libs/security-core/build.gradle +++ b/libs/security-core/build.gradle @@ -1,7 +1,7 @@ plugins { id "org.sonarqube" version "4.0.0.2929" id 'java-library' - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/libs/security-core/gradle/wrapper/gradle-wrapper.properties b/libs/security-core/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/libs/security-core/gradle/wrapper/gradle-wrapper.properties +++ b/libs/security-core/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/security-token-service/build.gradle b/libs/security-token-service/build.gradle index c41b19c658b..6dfa10c4bd8 100644 --- a/libs/security-token-service/build.gradle +++ b/libs/security-token-service/build.gradle @@ -1,7 +1,7 @@ plugins { id "org.sonarqube" version "4.0.0.2929" id 'java-library' - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/libs/security-token-service/gradle/wrapper/gradle-wrapper.properties b/libs/security-token-service/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/libs/security-token-service/gradle/wrapper/gradle-wrapper.properties +++ b/libs/security-token-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/servlet-core/build.gradle b/libs/servlet-core/build.gradle index 5c2fd128cc6..c39716fb442 100644 --- a/libs/servlet-core/build.gradle +++ b/libs/servlet-core/build.gradle @@ -1,7 +1,7 @@ plugins { id "org.sonarqube" version "4.0.0.2929" id 'java-library' - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/libs/servlet-core/gradle/wrapper/gradle-wrapper.properties b/libs/servlet-core/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/libs/servlet-core/gradle/wrapper/gradle-wrapper.properties +++ b/libs/servlet-core/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/servlet-insecure-security/build.gradle b/libs/servlet-insecure-security/build.gradle index 9a36b06ebaf..d5b0cbb577e 100644 --- a/libs/servlet-insecure-security/build.gradle +++ b/libs/servlet-insecure-security/build.gradle @@ -1,7 +1,7 @@ plugins { id "org.sonarqube" version "4.0.0.2929" id 'java-library' - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/libs/servlet-insecure-security/gradle/wrapper/gradle-wrapper.properties b/libs/servlet-insecure-security/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/libs/servlet-insecure-security/gradle/wrapper/gradle-wrapper.properties +++ b/libs/servlet-insecure-security/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/servlet-security/build.gradle b/libs/servlet-security/build.gradle index 5d22b676d73..cb78579d86a 100644 --- a/libs/servlet-security/build.gradle +++ b/libs/servlet-security/build.gradle @@ -1,7 +1,7 @@ plugins { id "org.sonarqube" version "4.0.0.2929" id 'java-library' - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/libs/servlet-security/gradle/wrapper/gradle-wrapper.properties b/libs/servlet-security/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/libs/servlet-security/gradle/wrapper/gradle-wrapper.properties +++ b/libs/servlet-security/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/slack/build.gradle b/libs/slack/build.gradle index 101425a462e..88ed8d1bdb1 100644 --- a/libs/slack/build.gradle +++ b/libs/slack/build.gradle @@ -1,7 +1,7 @@ plugins { id "org.sonarqube" version "4.0.0.2929" id 'java-library' - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/libs/slack/gradle/wrapper/gradle-wrapper.properties b/libs/slack/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/libs/slack/gradle/wrapper/gradle-wrapper.properties +++ b/libs/slack/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/testing/build.gradle b/libs/testing/build.gradle index 7000e4b9667..cb69862ba03 100644 --- a/libs/testing/build.gradle +++ b/libs/testing/build.gradle @@ -1,7 +1,7 @@ plugins { id "org.sonarqube" version "4.0.0.2929" id 'java-library' - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/libs/testing/gradle/wrapper/gradle-wrapper.properties b/libs/testing/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/libs/testing/gradle/wrapper/gradle-wrapper.properties +++ b/libs/testing/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/mocks/maskinporten-mock/build.gradle b/mocks/maskinporten-mock/build.gradle index ce4d51080c5..7487f6dab72 100644 --- a/mocks/maskinporten-mock/build.gradle +++ b/mocks/maskinporten-mock/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" } bootJar { diff --git a/mocks/maskinporten-mock/gradle/wrapper/gradle-wrapper.properties b/mocks/maskinporten-mock/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/mocks/maskinporten-mock/gradle/wrapper/gradle-wrapper.properties +++ b/mocks/maskinporten-mock/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/mocks/tokendings-mock/build.gradle b/mocks/tokendings-mock/build.gradle index 83c970af6dc..ac535e04b82 100644 --- a/mocks/tokendings-mock/build.gradle +++ b/mocks/tokendings-mock/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" } bootJar { diff --git a/mocks/tokendings-mock/gradle/wrapper/gradle-wrapper.properties b/mocks/tokendings-mock/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/mocks/tokendings-mock/gradle/wrapper/gradle-wrapper.properties +++ b/mocks/tokendings-mock/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/aareg-proxy/build.gradle b/proxies/aareg-proxy/build.gradle index abdc197fab1..55cc4c4e065 100644 --- a/proxies/aareg-proxy/build.gradle +++ b/proxies/aareg-proxy/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" diff --git a/proxies/aareg-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/aareg-proxy/gradle/wrapper/gradle-wrapper.properties index 744c64d1277..3499ded5c11 100644 --- a/proxies/aareg-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/aareg-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/aareg-synt-services-proxy/build.gradle b/proxies/aareg-synt-services-proxy/build.gradle index 4d7964317a5..18d47c3266e 100644 --- a/proxies/aareg-synt-services-proxy/build.gradle +++ b/proxies/aareg-synt-services-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/proxies/aareg-synt-services-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/aareg-synt-services-proxy/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/proxies/aareg-synt-services-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/aareg-synt-services-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/arbeidsplassencv-proxy/build.gradle b/proxies/arbeidsplassencv-proxy/build.gradle index 4bab78192fe..988016700f8 100644 --- a/proxies/arbeidsplassencv-proxy/build.gradle +++ b/proxies/arbeidsplassencv-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/proxies/arbeidsplassencv-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/arbeidsplassencv-proxy/gradle/wrapper/gradle-wrapper.properties index 15bc9344b74..c64ee91b762 100644 --- a/proxies/arbeidsplassencv-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/arbeidsplassencv-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/arena-forvalteren-proxy/build.gradle b/proxies/arena-forvalteren-proxy/build.gradle index 2e147710847..91b495d668e 100644 --- a/proxies/arena-forvalteren-proxy/build.gradle +++ b/proxies/arena-forvalteren-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/proxies/arena-forvalteren-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/arena-forvalteren-proxy/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/proxies/arena-forvalteren-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/arena-forvalteren-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/batch-adeo-proxy/build.gradle b/proxies/batch-adeo-proxy/build.gradle index 60e80505d0f..d10d1ccb3ff 100644 --- a/proxies/batch-adeo-proxy/build.gradle +++ b/proxies/batch-adeo-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/proxies/batch-adeo-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/batch-adeo-proxy/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/proxies/batch-adeo-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/batch-adeo-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/brregstub-proxy/build.gradle b/proxies/brregstub-proxy/build.gradle index dbfa6f64633..53e31e2d6b5 100644 --- a/proxies/brregstub-proxy/build.gradle +++ b/proxies/brregstub-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/proxies/brregstub-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/brregstub-proxy/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/proxies/brregstub-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/brregstub-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/dokarkiv-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/dokarkiv-proxy/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/proxies/dokarkiv-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/dokarkiv-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/ereg-proxy/build.gradle b/proxies/ereg-proxy/build.gradle index e2a699700d5..c0d5e2e8f40 100644 --- a/proxies/ereg-proxy/build.gradle +++ b/proxies/ereg-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/proxies/ereg-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/ereg-proxy/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/proxies/ereg-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/ereg-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/histark-proxy/build.gradle b/proxies/histark-proxy/build.gradle index ef29911008f..8e9b32e226f 100644 --- a/proxies/histark-proxy/build.gradle +++ b/proxies/histark-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/proxies/histark-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/histark-proxy/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/proxies/histark-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/histark-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/inntektstub-proxy/build.gradle b/proxies/inntektstub-proxy/build.gradle index 31353471807..e99c6db6ab1 100644 --- a/proxies/inntektstub-proxy/build.gradle +++ b/proxies/inntektstub-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/proxies/inntektstub-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/inntektstub-proxy/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/proxies/inntektstub-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/inntektstub-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/inst-proxy/build.gradle b/proxies/inst-proxy/build.gradle index 398fa77e2a2..749177e34f2 100644 --- a/proxies/inst-proxy/build.gradle +++ b/proxies/inst-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/proxies/inst-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/inst-proxy/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/proxies/inst-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/inst-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/kodeverk-proxy/build.gradle b/proxies/kodeverk-proxy/build.gradle index a2bf01a0efc..a1f05af0c5f 100644 --- a/proxies/kodeverk-proxy/build.gradle +++ b/proxies/kodeverk-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/proxies/kodeverk-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/kodeverk-proxy/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/proxies/kodeverk-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/kodeverk-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/kontoregister-person-proxy/build.gradle b/proxies/kontoregister-person-proxy/build.gradle index d8ba5672766..50e5417494b 100644 --- a/proxies/kontoregister-person-proxy/build.gradle +++ b/proxies/kontoregister-person-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/proxies/kontoregister-person-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/kontoregister-person-proxy/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/proxies/kontoregister-person-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/kontoregister-person-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/krrstub-proxy/build.gradle b/proxies/krrstub-proxy/build.gradle index a20e76ac6df..99a39e1684b 100644 --- a/proxies/krrstub-proxy/build.gradle +++ b/proxies/krrstub-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/proxies/krrstub-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/krrstub-proxy/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/proxies/krrstub-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/krrstub-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/medl-proxy/build.gradle b/proxies/medl-proxy/build.gradle index 6b72a81cfd7..9a0346a5c03 100644 --- a/proxies/medl-proxy/build.gradle +++ b/proxies/medl-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/proxies/medl-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/medl-proxy/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/proxies/medl-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/medl-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/norg2-proxy/build.gradle b/proxies/norg2-proxy/build.gradle index 57a88438eb2..9b5f50620a1 100644 --- a/proxies/norg2-proxy/build.gradle +++ b/proxies/norg2-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/proxies/norg2-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/norg2-proxy/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/proxies/norg2-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/norg2-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/pdl-proxy/build.gradle b/proxies/pdl-proxy/build.gradle index a7a55026e6e..0be0d98eac6 100644 --- a/proxies/pdl-proxy/build.gradle +++ b/proxies/pdl-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/proxies/pdl-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/pdl-proxy/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/proxies/pdl-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/pdl-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/pensjon-testdata-facade-proxy/build.gradle b/proxies/pensjon-testdata-facade-proxy/build.gradle index a31ff694a05..b0b0bf1e70b 100644 --- a/proxies/pensjon-testdata-facade-proxy/build.gradle +++ b/proxies/pensjon-testdata-facade-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/proxies/pensjon-testdata-facade-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/pensjon-testdata-facade-proxy/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/proxies/pensjon-testdata-facade-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/pensjon-testdata-facade-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/saf-proxy/build.gradle b/proxies/saf-proxy/build.gradle index 84840c6057b..beb143e1f1d 100644 --- a/proxies/saf-proxy/build.gradle +++ b/proxies/saf-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/proxies/saf-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/saf-proxy/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/proxies/saf-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/saf-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/sigrunstub-proxy/build.gradle b/proxies/sigrunstub-proxy/build.gradle index 87f18078b09..f0229179a1f 100644 --- a/proxies/sigrunstub-proxy/build.gradle +++ b/proxies/sigrunstub-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/proxies/sigrunstub-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/sigrunstub-proxy/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/proxies/sigrunstub-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/sigrunstub-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/skjermingsregister-proxy/build.gradle b/proxies/skjermingsregister-proxy/build.gradle index ecdbae792b1..6d8d76766db 100644 --- a/proxies/skjermingsregister-proxy/build.gradle +++ b/proxies/skjermingsregister-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/proxies/skjermingsregister-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/skjermingsregister-proxy/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/proxies/skjermingsregister-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/skjermingsregister-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/synthdata-meldekort-proxy/build.gradle b/proxies/synthdata-meldekort-proxy/build.gradle index 0b161b2c3e1..aaa44c74964 100644 --- a/proxies/synthdata-meldekort-proxy/build.gradle +++ b/proxies/synthdata-meldekort-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/proxies/synthdata-meldekort-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/synthdata-meldekort-proxy/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/proxies/synthdata-meldekort-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/synthdata-meldekort-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/tps-forvalteren-proxy/build.gradle b/proxies/tps-forvalteren-proxy/build.gradle index faabed8c22e..7e850f548b6 100644 --- a/proxies/tps-forvalteren-proxy/build.gradle +++ b/proxies/tps-forvalteren-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/proxies/tps-forvalteren-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/tps-forvalteren-proxy/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/proxies/tps-forvalteren-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/tps-forvalteren-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/udistub-proxy/build.gradle b/proxies/udistub-proxy/build.gradle index 62f5a3ee3cb..bd66f906918 100644 --- a/proxies/udistub-proxy/build.gradle +++ b/proxies/udistub-proxy/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id "org.sonarqube" version "4.0.0.2929" id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.3" + id 'io.spring.dependency-management' version "1.1.4" id "jacoco" } diff --git a/proxies/udistub-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/udistub-proxy/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/proxies/udistub-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/udistub-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/xsd/arbeidsforhold-xsd/gradle/wrapper/gradle-wrapper.properties b/xsd/arbeidsforhold-xsd/gradle/wrapper/gradle-wrapper.properties index e411586a54a..a5952066425 100644 --- a/xsd/arbeidsforhold-xsd/gradle/wrapper/gradle-wrapper.properties +++ b/xsd/arbeidsforhold-xsd/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 0a70c290349c74d93a50aef91337824e411ea97f Mon Sep 17 00:00:00 2001 From: stigus Date: Thu, 11 Jan 2024 09:04:43 +0100 Subject: [PATCH 10/18] Brregstub java 21 #deploy-brreg-stub --- apps/brreg-stub/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/brreg-stub/build.gradle b/apps/brreg-stub/build.gradle index a70faa2fc13..6fa0e7df0c4 100644 --- a/apps/brreg-stub/build.gradle +++ b/apps/brreg-stub/build.gradle @@ -129,6 +129,6 @@ dependencies { } java { toolchain { - languageVersion = JavaLanguageVersion.of(17) + languageVersion = JavaLanguageVersion.of(21) } } From 61eade274e4f4091bc7f4367f93b68d866719161 Mon Sep 17 00:00:00 2001 From: stigus Date: Thu, 11 Jan 2024 09:48:58 +0100 Subject: [PATCH 11/18] Brregstub fix wsimport #deploy-brreg-stub --- apps/brreg-stub/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/brreg-stub/build.gradle b/apps/brreg-stub/build.gradle index 6fa0e7df0c4..ab9ad66e61b 100644 --- a/apps/brreg-stub/build.gradle +++ b/apps/brreg-stub/build.gradle @@ -104,7 +104,6 @@ dependencies { implementation 'com.h2database:h2' implementation 'wsdl4j:wsdl4j' - jaxWsTools "com.sun.xml.ws:jaxws-rt:2.3.7" implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' From 998e784cf2586b0ad77c5877f4e2361cfc776cd3 Mon Sep 17 00:00:00 2001 From: stigus Date: Thu, 11 Jan 2024 10:05:01 +0100 Subject: [PATCH 12/18] Brregstub fix duplicateStrategy #deploy-brreg-stub --- apps/brreg-stub/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/brreg-stub/build.gradle b/apps/brreg-stub/build.gradle index ab9ad66e61b..6d1875ebc4e 100644 --- a/apps/brreg-stub/build.gradle +++ b/apps/brreg-stub/build.gradle @@ -48,6 +48,7 @@ dependencyManagement { } bootJar { + duplicatesStrategy(DuplicatesStrategy.INCLUDE) archiveFileName = "app.jar" } From d3ede7bb12f6a0040721f3c06255f30a0c4289de Mon Sep 17 00:00:00 2001 From: stigus Date: Thu, 11 Jan 2024 10:19:31 +0100 Subject: [PATCH 13/18] Brregstub fix Hikari #deploy-brreg-stub --- apps/brreg-stub/src/main/resources/application-prod.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/brreg-stub/src/main/resources/application-prod.yaml b/apps/brreg-stub/src/main/resources/application-prod.yaml index 5b85954312a..95a75127330 100644 --- a/apps/brreg-stub/src/main/resources/application-prod.yaml +++ b/apps/brreg-stub/src/main/resources/application-prod.yaml @@ -6,12 +6,13 @@ spring: locations: "classpath:db/migration/postgresql" main.banner-mode: "off" datasource: - url: "jdbc:postgresql://b27dbvl013.preprod.local:5432/brreg-stub" + url: "jdbc:postgresql://b27dbvl013.preprod.local:5432/brreg-stub?autoReconnect=true&useSSL=false" hikari: maximum-pool-size: 2 connection-test-query: "select 1" max-lifetime: 30000 minimum-idle: 1 + jdbc-url: "jdbc:postgresql://b27dbvl013.preprod.local:5432/brreg-stub?autoReconnect=true&useSSL=false" jpa: hibernate: ddl-auto: none @@ -27,12 +28,12 @@ spring: connection-timeout: 15000 read-timeout: 30000 application-name: preprod/fss/brreg-stub + kv: + enabled: false database: enabled: true role: brreg-stub-admin backend: postgresql/preprod-fss - username-property: spring.datasource.username - password-property: spring.datasource.password server: servlet: From 7303f38104771778db0e42035354dd432330c364 Mon Sep 17 00:00:00 2001 From: stigus Date: Thu, 11 Jan 2024 10:30:58 +0100 Subject: [PATCH 14/18] Brregstub fix Hikari #deploy-brreg-stub --- apps/brreg-stub/src/main/resources/application-prod.yaml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/brreg-stub/src/main/resources/application-prod.yaml b/apps/brreg-stub/src/main/resources/application-prod.yaml index 95a75127330..aa34ab14e55 100644 --- a/apps/brreg-stub/src/main/resources/application-prod.yaml +++ b/apps/brreg-stub/src/main/resources/application-prod.yaml @@ -10,7 +10,8 @@ spring: hikari: maximum-pool-size: 2 connection-test-query: "select 1" - max-lifetime: 30000 + connection-timeout: 30000 + initialization-fail-timeout: 10000 minimum-idle: 1 jdbc-url: "jdbc:postgresql://b27dbvl013.preprod.local:5432/brreg-stub?autoReconnect=true&useSSL=false" jpa: @@ -27,13 +28,15 @@ spring: port: 443 connection-timeout: 15000 read-timeout: 30000 - application-name: preprod/fss/brreg-stub kv: enabled: false database: enabled: true role: brreg-stub-admin backend: postgresql/preprod-fss + fail-fast: true + config: + import: vault:// server: servlet: From 8a181baccc9302c4aa5a3557f7f972877205f47b Mon Sep 17 00:00:00 2001 From: stigus Date: Thu, 11 Jan 2024 11:08:24 +0100 Subject: [PATCH 15/18] Deploy pdlforvalter dev #deploy-test-pdl-forvalter --- .../no/nav/pdl/forvalter/PdlForvalterApplicationStarter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/PdlForvalterApplicationStarter.java b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/PdlForvalterApplicationStarter.java index d4f60c563e8..45f34416ff3 100644 --- a/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/PdlForvalterApplicationStarter.java +++ b/apps/pdl-forvalter/src/main/java/no/nav/pdl/forvalter/PdlForvalterApplicationStarter.java @@ -10,4 +10,4 @@ public static void main(String[] args) { SpringApplication.run(PdlForvalterApplicationStarter.class, args); } -} \ No newline at end of file +} From 86941bcfa19f1abae1e031635dbba51fcbaaddd7 Mon Sep 17 00:00:00 2001 From: stigus Date: Thu, 11 Jan 2024 11:10:24 +0100 Subject: [PATCH 16/18] Deploy udistub #deploy-udi-stub --- .../src/main/java/no/nav/udistub/UdiStubApplicationStarter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/udi-stub/src/main/java/no/nav/udistub/UdiStubApplicationStarter.java b/apps/udi-stub/src/main/java/no/nav/udistub/UdiStubApplicationStarter.java index b6eb3a1b723..d8870907b9a 100644 --- a/apps/udi-stub/src/main/java/no/nav/udistub/UdiStubApplicationStarter.java +++ b/apps/udi-stub/src/main/java/no/nav/udistub/UdiStubApplicationStarter.java @@ -15,4 +15,4 @@ public static void main(String[] args) { SpringApplication.run(UdiStubApplicationStarter.class, args); } -} +} \ No newline at end of file From a32027cdf44eafb8c278cb09e6f1c418474c6827 Mon Sep 17 00:00:00 2001 From: stigus Date: Thu, 11 Jan 2024 13:26:54 +0100 Subject: [PATCH 17/18] Udistub refaktor for spring 3.2 #deploy-udi-stub --- apps/udi-stub/build.gradle | 16 ++- .../java/no/nav/udistub/config/DevConfig.java | 2 +- .../nav/udistub/service/KodeverkService.java | 2 +- .../no/nav/udistub/service/PersonService.java | 4 +- .../wsdl/schema/Common_Headers_v2.xsd | 100 +++++++++--------- .../ArbeidsadgangPersonConverterTest.java | 8 +- ...dsPaSammeVilkarIkkeVisumConverterTest.java | 7 +- .../udistub/converter/itest/UdiStubITest.java | 2 +- 8 files changed, 76 insertions(+), 65 deletions(-) diff --git a/apps/udi-stub/build.gradle b/apps/udi-stub/build.gradle index f22b8655ff3..4a372d58b91 100644 --- a/apps/udi-stub/build.gradle +++ b/apps/udi-stub/build.gradle @@ -1,9 +1,10 @@ plugins { id "org.sonarqube" version "4.0.0.2929" id 'java' - id "uk.co.boothen.gradle.wsimport" version "0.18" + id "uk.co.boothen.gradle.wsimport" version "0.21" id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.4" + id("org.openrewrite.rewrite") version("6.6.4") id "jacoco" } @@ -18,6 +19,10 @@ jacocoTestReport { } } +rewrite { + activeRecipe("org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_2") +} + sonarqube { properties { property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" @@ -51,6 +56,7 @@ configurations { } bootJar { + duplicatesStrategy(DuplicatesStrategy.INCLUDE) archiveFileName = "app.jar" } @@ -74,8 +80,11 @@ repositories { } dependencies { + rewrite("org.openrewrite.recipe:rewrite-spring:5.2.0") + implementation platform('org.testcontainers:testcontainers-bom:1.19.1') + implementation "com.sun.xml.ws:jaxws-rt:4.0.2" implementation 'no.nav.testnav.libs:servlet-core' implementation 'no.nav.testnav.libs:servlet-security' implementation 'no.nav.testnav.libs:database' @@ -105,12 +114,13 @@ dependencies { implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'com.h2database:h2' + testImplementation "org.junit.jupiter:junit-jupiter:5.10.1" testImplementation 'org.testcontainers:junit-jupiter' testImplementation 'org.testcontainers:postgresql' testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - testImplementation 'junit:junit:4.13.2' //TODO upgrade to JUnit5 + testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' //TODO upgrade to JUnit5 + testImplementation "org.mockito:mockito-junit-jupiter:4.11.0" implementation 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' diff --git a/apps/udi-stub/src/main/java/no/nav/udistub/config/DevConfig.java b/apps/udi-stub/src/main/java/no/nav/udistub/config/DevConfig.java index 3cd1c00c271..8668160175a 100644 --- a/apps/udi-stub/src/main/java/no/nav/udistub/config/DevConfig.java +++ b/apps/udi-stub/src/main/java/no/nav/udistub/config/DevConfig.java @@ -30,7 +30,7 @@ public ClientAuthentication clientAuthentication() { } var token = System.getProperty(VAULT_PROPERTY); if (isBlank(token)) { - throw new IllegalArgumentException(String.format("Påkrevet property '%s' er ikke satt.", VAULT_PROPERTY)); + throw new IllegalArgumentException("Påkrevet property '%s' er ikke satt.".formatted(VAULT_PROPERTY)); } return new TokenAuthentication(System.getProperty(VAULT_PROPERTY)); } diff --git a/apps/udi-stub/src/main/java/no/nav/udistub/service/KodeverkService.java b/apps/udi-stub/src/main/java/no/nav/udistub/service/KodeverkService.java index 0d1ba54a8de..7b4060542a7 100644 --- a/apps/udi-stub/src/main/java/no/nav/udistub/service/KodeverkService.java +++ b/apps/udi-stub/src/main/java/no/nav/udistub/service/KodeverkService.java @@ -30,7 +30,7 @@ public List finnAlleMedType(String type) { public Kodeverk finnMedKode(String kode) { return kodeverkRepository.findByKode(kode).orElseThrow(() -> new HttpClientErrorException(HttpStatus.NOT_FOUND, - String.format("Kunne ikke finne kode: %s i kodeverket", kode)) + "Kunne ikke finne kode: %s i kodeverket".formatted(kode)) ); } diff --git a/apps/udi-stub/src/main/java/no/nav/udistub/service/PersonService.java b/apps/udi-stub/src/main/java/no/nav/udistub/service/PersonService.java index b58dfc9eb62..f9e00975643 100644 --- a/apps/udi-stub/src/main/java/no/nav/udistub/service/PersonService.java +++ b/apps/udi-stub/src/main/java/no/nav/udistub/service/PersonService.java @@ -45,14 +45,14 @@ public UdiPerson finnPerson(String ident) { return personRepository.findByIdent(ident) .map(person -> mapperFacade.map(person, UdiPerson.class)) - .orElseThrow(() -> new NotFoundException(String.format(IKKE_FUNNET, ident))); + .orElseThrow(() -> new NotFoundException(IKKE_FUNNET.formatted(ident))); } @Transactional public void deletePerson(String ident) { var slettePerson = personRepository.findByIdent(ident) - .orElseThrow(() -> new NotFoundException(String.format(IKKE_FUNNET, ident))); + .orElseThrow(() -> new NotFoundException(IKKE_FUNNET.formatted(ident))); personRepository.deleteById(slettePerson.getId()); } } diff --git a/apps/udi-stub/src/main/resources/wsdl/schema/Common_Headers_v2.xsd b/apps/udi-stub/src/main/resources/wsdl/schema/Common_Headers_v2.xsd index 36a3145f8b5..1e5d9306ab4 100755 --- a/apps/udi-stub/src/main/resources/wsdl/schema/Common_Headers_v2.xsd +++ b/apps/udi-stub/src/main/resources/wsdl/schema/Common_Headers_v2.xsd @@ -1,58 +1,60 @@  - - - - - Headeren som blir brukt av alle tjenester - - - - - - - - - Unit of Work. Benyttes i headers - - - + + + - Id til den logiske transaksjonen. + Headeren som blir brukt av alle tjenester - - + + + + + + - Id til meldingen. + Unit of Work. Benyttes i headers - - - - - - Informasjon om kallets opphav. Benyttes i headers - - - + + + + Id til den logiske transaksjonen. + + + + + Id til meldingen. + + + + + - Active Directory brukernavn på formatet domain\user + Informasjon om kallets opphav. Benyttes i headers - - - - Navn på systemtjenesten som utførte det opprinnelige kallet - - - - - IP eller DNS -navn til maskinen som utførte det opprinnelige kallet - - - - - Tidspunktet for det opprinnelige kallet - - - - + + + + Active Directory brukernavn på formatet domain user + + + + + Navn på systemtjenesten som utførte det opprinnelige kallet + + + + + IP eller DNS -navn til maskinen som utførte det opprinnelige kallet + + + + + + Tidspunktet for det opprinnelige kallet + + + + \ No newline at end of file diff --git a/apps/udi-stub/src/test/java/no/nav/udistub/converter/ArbeidsadgangPersonConverterTest.java b/apps/udi-stub/src/test/java/no/nav/udistub/converter/ArbeidsadgangPersonConverterTest.java index 921fa3c9636..3ba545f12ae 100644 --- a/apps/udi-stub/src/test/java/no/nav/udistub/converter/ArbeidsadgangPersonConverterTest.java +++ b/apps/udi-stub/src/test/java/no/nav/udistub/converter/ArbeidsadgangPersonConverterTest.java @@ -1,7 +1,6 @@ package no.nav.udistub.converter; import no.nav.udistub.converter.ws.ArbeidsadgangWsConverter; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; @@ -10,6 +9,7 @@ import static no.nav.udistub.converter.DefaultTestData.TEST_ARBEIDOMGANGKATEGORI; import static no.nav.udistub.converter.DefaultTestData.TEST_ARBEIDSADGANG; import static no.nav.udistub.converter.DefaultTestData.TEST_ARBEIDSADGANG_TYPE; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; @@ -23,9 +23,9 @@ class ArbeidsadgangPersonConverterTest extends ConverterTestBase { void convertFromPersonToArbeidsadgangIfPresent() { no.udi.mt_1067_nav_data.v1.Arbeidsadgang result = arbeidsadgangConverter.convert(defaultTestPerson.getArbeidsadgang()); assertNotNull(result); - Assertions.assertEquals(TEST_ARBEIDSADGANG, result.getHarArbeidsadgang()); - Assertions.assertEquals(TEST_ARBEIDOMGANGKATEGORI, result.getArbeidsOmfang()); - Assertions.assertEquals(TEST_ARBEIDSADGANG_TYPE, result.getTypeArbeidsadgang()); + assertEquals(TEST_ARBEIDSADGANG, result.getHarArbeidsadgang()); + assertEquals(TEST_ARBEIDOMGANGKATEGORI, result.getArbeidsOmfang()); + assertEquals(TEST_ARBEIDSADGANG_TYPE, result.getTypeArbeidsadgang()); } @Test diff --git a/apps/udi-stub/src/test/java/no/nav/udistub/converter/IkkeOppholdstillatelseIkkeOppholdsPaSammeVilkarIkkeVisumConverterTest.java b/apps/udi-stub/src/test/java/no/nav/udistub/converter/IkkeOppholdstillatelseIkkeOppholdsPaSammeVilkarIkkeVisumConverterTest.java index bb42fb13e75..89502df793f 100644 --- a/apps/udi-stub/src/test/java/no/nav/udistub/converter/IkkeOppholdstillatelseIkkeOppholdsPaSammeVilkarIkkeVisumConverterTest.java +++ b/apps/udi-stub/src/test/java/no/nav/udistub/converter/IkkeOppholdstillatelseIkkeOppholdsPaSammeVilkarIkkeVisumConverterTest.java @@ -6,7 +6,6 @@ import no.udi.mt_1067_nav_data.v1.EOSellerEFTAGrunnlagskategoriOppholdstillatelse; import no.udi.mt_1067_nav_data.v1.IkkeOppholdstillatelseIkkeOppholdsPaSammeVilkarIkkeVisum; import no.udi.mt_1067_nav_data.v1.OppholdsgrunnlagKategori; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.InjectMocks; @@ -28,10 +27,10 @@ void convertFromPersonToIkkeOppholdstillatelseIkkeOppholdsPaSammeVilkarIkkeVisum defaultTestPerson.getOppholdStatus().getIkkeOppholdstilatelseIkkeVilkaarIkkeVisum()); assertNotNull(result); - Assertions.assertEquals(DefaultTestData.TEST_ovrigIkkeOppholdsKategori, result.getOvrigIkkeOpphold().getArsak()); + assertEquals(DefaultTestData.TEST_ovrigIkkeOppholdsKategori, result.getOvrigIkkeOpphold().getArsak()); - Assertions.assertEquals(DefaultTestData.TEST_INNREISEFORBUD, result.getUtvistMedInnreiseForbud().getInnreiseForbud()); - Assertions.assertEquals(DefaultTestData.TEST_VARIGHET_UDI, result.getUtvistMedInnreiseForbud().getVarighet()); + assertEquals(DefaultTestData.TEST_INNREISEFORBUD, result.getUtvistMedInnreiseForbud().getInnreiseForbud()); + assertEquals(DefaultTestData.TEST_VARIGHET_UDI, result.getUtvistMedInnreiseForbud().getVarighet()); AvslagEllerBortfallAvPOBOSellerTilbakekallEllerFormeltVedtak avslagEllerBortfall = result.getAvslagEllerBortfallAvPOBOSellerTilbakekallEllerFormeltVedtak(); assertEquals(EOSellerEFTAGrunnlagskategoriOppholdsrett.FAMILIE, avslagEllerBortfall.getAvslagPaSoknadOmOppholdsrettRealitetsBehandlet().getAvslagsGrunnlagEOS()); diff --git a/apps/udi-stub/src/test/java/no/nav/udistub/converter/itest/UdiStubITest.java b/apps/udi-stub/src/test/java/no/nav/udistub/converter/itest/UdiStubITest.java index 7f93be643d8..54170daf2a5 100644 --- a/apps/udi-stub/src/test/java/no/nav/udistub/converter/itest/UdiStubITest.java +++ b/apps/udi-stub/src/test/java/no/nav/udistub/converter/itest/UdiStubITest.java @@ -67,7 +67,7 @@ class UdiStubITest { private Flyway flyway; @BeforeEach - public void setUp() throws IOException { + void setUp() throws IOException { flyway.migrate(); From 8b23e17c538b3909569fb6628731ee915658879e Mon Sep 17 00:00:00 2001 From: stigus Date: Thu, 11 Jan 2024 17:02:26 +0100 Subject: [PATCH 18/18] Update tps-messaging-service til spring 3.2 #deploy-tps-messaging-service --- apps/budpro-service/build.gradle | 12 +++++- .../ResourceNumberGenerator.java | 2 +- .../budpro/generate/BudproControllerTest.java | 10 ++--- .../config/SecurityConfig.java | 38 +++++++++---------- .../config/SecurityConfig.java | 11 +++--- apps/tps-messaging-service/build.gradle | 25 +++++++----- .../config/XmlMapperConfig.java | 26 ------------- .../consumer/EndringsmeldingConsumer.java | 6 +-- .../consumer/ServicerutineConsumer.java | 6 +-- .../consumer/TpsConsumer.java | 2 +- .../consumer/command/TpsMeldingCommand.java | 4 +- .../dto/BankkontoNorskRequest.java | 4 +- .../dto/BankkontoNorskResponse.java | 2 +- .../dto/BankkontoUtlandRequest.java | 4 +- .../dto/BankkontoUtlandResponse.java | 2 +- .../dto/EgenansattRequest.java | 4 +- .../dto/EgenansattResponse.java | 2 +- .../dto/KontaktopplysningerRequest.java | 4 +- .../dto/KontaktopplysningerResponse.java | 2 +- .../dto/SfePersonDataErrorResponse.java | 2 +- .../dto/SikkerhetstiltakRequest.java | 4 +- .../dto/SikkerhetstiltakResponse.java | 2 +- .../dto/SpraakRequest.java | 4 +- .../dto/SpraakResponse.java | 2 +- .../dto/TpsEndringsopplysninger.java | 2 +- .../dto/TpsPersonDataErrorResponse.java | 2 +- .../dto/TpsServiceRutine.java | 2 +- .../dto/TpsServicerutineM201Response.java | 4 +- .../dto/TpsServicerutineRequest.java | 2 +- .../dto/TpsSystemInfo.java | 2 +- .../CachedConnectionFactoryFactory.java | 2 +- .../mapper/AdresseMappingStrategy.java | 3 +- .../BankkontonrNorskMappingStrategy.java | 3 +- .../service/BankkontoNorskService.java | 4 +- .../service/BankkontoUtlandService.java | 4 +- .../service/EgenansattService.java | 4 +- .../service/IdentService.java | 14 +++---- .../service/PersonService.java | 4 +- .../service/SikkerhetstiltakService.java | 4 +- .../service/SpraakService.java | 4 +- .../utils/EndringsmeldingUtil.java | 4 +- .../utils/ServiceRutineUtil.java | 2 +- .../utils/TranslittereringUtil.java | 6 +-- ...lientRequestObservationConventionTest.java | 8 +--- 44 files changed, 121 insertions(+), 139 deletions(-) delete mode 100644 apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/config/XmlMapperConfig.java diff --git a/apps/budpro-service/build.gradle b/apps/budpro-service/build.gradle index 2c9b2b47751..db7d862a3d2 100644 --- a/apps/budpro-service/build.gradle +++ b/apps/budpro-service/build.gradle @@ -1,9 +1,10 @@ plugins { id 'java' id 'org.springframework.boot' version '3.2.1' - id 'io.spring.dependency-management' version '1.1.3' + id 'io.spring.dependency-management' version '1.1.4' id "jacoco" id "org.sonarqube" version "4.0.0.2929" + id("org.openrewrite.rewrite") version("6.6.4") } bootJar { @@ -11,6 +12,10 @@ bootJar { mainClass = 'no.nav.dolly.budpro.BudproServiceApplication' } +rewrite { + activeRecipe("org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_2") +} + configurations { compileOnly { extendsFrom annotationProcessor @@ -39,11 +44,13 @@ repositories { dependencyManagement { applyMavenExclusions = false imports { - mavenBom "org.springframework.cloud:spring-cloud-dependencies:2022.0.4" + mavenBom "org.springframework.cloud:spring-cloud-dependencies:2023.0.0" } } dependencies { + rewrite("org.openrewrite.recipe:rewrite-spring:5.2.0") + annotationProcessor 'org.projectlombok:lombok' annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor' @@ -73,6 +80,7 @@ dependencies { testAnnotationProcessor 'org.projectlombok:lombok' + testImplementation "org.junit.jupiter:junit-jupiter:5.10.1" testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.testcontainers:junit-jupiter' } diff --git a/apps/budpro-service/src/main/java/no/nav/dolly/budpro/ressursnummer/ResourceNumberGenerator.java b/apps/budpro-service/src/main/java/no/nav/dolly/budpro/ressursnummer/ResourceNumberGenerator.java index 4111fc3c6df..105dd393cd1 100644 --- a/apps/budpro-service/src/main/java/no/nav/dolly/budpro/ressursnummer/ResourceNumberGenerator.java +++ b/apps/budpro-service/src/main/java/no/nav/dolly/budpro/ressursnummer/ResourceNumberGenerator.java @@ -20,7 +20,7 @@ public String next() { var a = random.nextInt(99); var b = random.nextInt(99); var c = random.nextInt(99); - generated = String.format("%02d%02d%02d", a, b, c); + generated = "%02d%02d%02d".formatted(a, b, c); } while (assigned.contains(generated)); assigned.add(generated); return generated; diff --git a/apps/budpro-service/src/test/java/no/nav/dolly/budpro/generate/BudproControllerTest.java b/apps/budpro-service/src/test/java/no/nav/dolly/budpro/generate/BudproControllerTest.java index 84e14433dae..2c50833c75d 100644 --- a/apps/budpro-service/src/test/java/no/nav/dolly/budpro/generate/BudproControllerTest.java +++ b/apps/budpro-service/src/test/java/no/nav/dolly/budpro/generate/BudproControllerTest.java @@ -43,7 +43,7 @@ class BudproControllerTest { private AutoCloseable closeable; @BeforeEach - public void before() { + void before() { closeable = MockitoAnnotations.openMocks(this); var names = new ArrayList(100); @@ -56,12 +56,12 @@ public void before() { } @AfterEach - public void after() throws Exception { + void after() throws Exception { closeable.close(); } @Test - void testThatNoSeedGivesDifferentResults() + void thatNoSeedGivesDifferentResults() throws Exception { var result1 = mockMvc .perform(get("/api/random?limit={limit}", 50)) @@ -80,7 +80,7 @@ void testThatNoSeedGivesDifferentResults() } @Test - void testThatSameSeedGivesSameResults() + void thatSameSeedGivesSameResults() throws Exception { var result1 = mockMvc .perform(get("/api/random?seed={seed}&limit={limit}", 123L, 50)) @@ -99,7 +99,7 @@ void testThatSameSeedGivesSameResults() } @Test - void testThatOverrideWorksAsIntended() + void thatOverrideWorksAsIntended() throws Exception { var override = new BudproRecord( "OVERRIDE", diff --git a/apps/inntektsmelding-service/src/main/java/no/nav/registre/testnav/inntektsmeldingservice/config/SecurityConfig.java b/apps/inntektsmelding-service/src/main/java/no/nav/registre/testnav/inntektsmeldingservice/config/SecurityConfig.java index cdd6afb30bd..7b1b9e89e5b 100644 --- a/apps/inntektsmelding-service/src/main/java/no/nav/registre/testnav/inntektsmeldingservice/config/SecurityConfig.java +++ b/apps/inntektsmelding-service/src/main/java/no/nav/registre/testnav/inntektsmeldingservice/config/SecurityConfig.java @@ -3,8 +3,10 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Profile; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.web.SecurityFilterChain; @@ -16,25 +18,23 @@ public class SecurityConfig { @Bean public SecurityFilterChain filterChain(HttpSecurity httpSecurity) throws Exception { - httpSecurity.sessionManagement() - .sessionCreationPolicy(SessionCreationPolicy.STATELESS) - .and().csrf().disable() - .authorizeHttpRequests() - .requestMatchers( - "/internal/**", - "/webjars/**", - "/h2/**", - "/swagger-resources/**", - "/v3/api-docs/**", - "/swagger-ui/**", - "/swagger", - "/error", - "/swagger-ui.html" - ).permitAll() - .requestMatchers("/api/**").fullyAuthenticated() - .and() - .oauth2ResourceServer() - .jwt(); + httpSecurity.sessionManagement(managementConfigurer -> + managementConfigurer.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) + .csrf(AbstractHttpConfigurer::disable) + .authorizeHttpRequests(matcherRegistry -> matcherRegistry.requestMatchers( + "/internal/**", + "/webjars/**", + "/h2/**", + "/swagger-resources/**", + "/v3/api-docs/**", + "/swagger-ui/**", + "/swagger", + "/error", + "/swagger-ui.html") + .permitAll() + .requestMatchers("/api/**").fullyAuthenticated()) + .oauth2ResourceServer(httpSecurityOAuth2ResourceServerConfigurer -> httpSecurityOAuth2ResourceServerConfigurer + .jwt(Customizer.withDefaults())); return httpSecurity.build(); } diff --git a/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/config/SecurityConfig.java b/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/config/SecurityConfig.java index a49293de860..b6101336dae 100644 --- a/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/config/SecurityConfig.java +++ b/apps/oversikt-frontend/src/main/java/no/nav/testnav/apps/oversiktfrontend/config/SecurityConfig.java @@ -4,6 +4,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.web.reactive.EnableWebFluxSecurity; import org.springframework.security.config.web.server.ServerHttpSecurity; import org.springframework.security.oauth2.jwt.ReactiveJwtDecoder; @@ -21,12 +22,10 @@ public class SecurityConfig { @Bean public SecurityWebFilterChain configure(ServerHttpSecurity http) { - http.cors() - .and().csrf().disable() - .authorizeExchange() - .anyExchange() - .permitAll() - .and().oauth2ResourceServer().jwt(jwt -> jwtDecoder()); + http.cors(Customizer.withDefaults()) + .csrf(ServerHttpSecurity.CsrfSpec::disable) + .authorizeExchange(authorizeExchangeSpec -> authorizeExchangeSpec.anyExchange().permitAll()) + .oauth2ResourceServer(oAuth2ResourceServerSpec -> oAuth2ResourceServerSpec.jwt(jwtSpec -> jwtDecoder())); return http.build(); } diff --git a/apps/tps-messaging-service/build.gradle b/apps/tps-messaging-service/build.gradle index cef8f7ef43a..a9751899f54 100644 --- a/apps/tps-messaging-service/build.gradle +++ b/apps/tps-messaging-service/build.gradle @@ -4,6 +4,7 @@ plugins { id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.4" id "jacoco" + id("org.openrewrite.rewrite") version("6.6.4") } test { @@ -11,6 +12,10 @@ test { jvmArgs '--add-opens', 'java.base/java.lang=ALL-UNNAMED' } +rewrite { + activeRecipe("org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_2") +} + jacocoTestReport { reports { xml.required = true @@ -34,6 +39,7 @@ sonarqube { } bootJar { + duplicatesStrategy(DuplicatesStrategy.INCLUDE) archiveFileName = "app.jar" } @@ -69,6 +75,7 @@ configurations.implementation { } dependencies { + rewrite("org.openrewrite.recipe:rewrite-spring:5.2.0") implementation 'no.nav.testnav.libs:security-core' implementation 'no.nav.testnav.libs:servlet-core' implementation 'no.nav.testnav.libs:servlet-security' @@ -81,16 +88,14 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' + implementation 'com.fasterxml.jackson.core:jackson-annotations' implementation 'com.fasterxml.jackson.core:jackson-databind' - implementation 'com.ibm.mq:mq-jms-spring-boot-starter:3.0.3' - implementation 'com.ibm.icu:icu4j:72.1' - - implementation 'javax.xml.bind:jaxb-api:2.3.1' - implementation 'javax.json.bind:javax.json.bind-api:1.0' - implementation 'javax.activation:activation:1.1.1' - implementation 'org.glassfish.jaxb:jaxb-runtime:2.3.0' - implementation 'com.sun.xml.bind:jaxb-core:2.3.0.1' + implementation 'com.ibm.mq:mq-jms-spring-boot-starter:3.2.1' + implementation 'com.ibm.icu:icu4j:74.2' + + implementation 'jakarta.xml.bind:jakarta.xml.bind-api' + implementation 'com.sun.xml.bind:jaxb-core' implementation 'org.glassfish.jaxb:jaxb-runtime' implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml' @@ -102,7 +107,7 @@ dependencies { 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 'org.aspectj:aspectjweaver:1.9.19' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' @@ -112,4 +117,6 @@ dependencies { implementation 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' + + testImplementation "org.junit.jupiter:junit-jupiter:5.10.1" } \ No newline at end of file diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/config/XmlMapperConfig.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/config/XmlMapperConfig.java deleted file mode 100644 index 7d460b03a45..00000000000 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/config/XmlMapperConfig.java +++ /dev/null @@ -1,26 +0,0 @@ -package no.nav.testnav.apps.tpsmessagingservice.config; - -import com.fasterxml.jackson.databind.DeserializationFeature; -import com.fasterxml.jackson.databind.MapperFeature; -import com.fasterxml.jackson.databind.SerializationFeature; -import com.fasterxml.jackson.dataformat.xml.XmlMapper; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class XmlMapperConfig { - - @Bean - public XmlMapper xmlMapper() { - return XmlMapper - .builder() - .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) - .configure(DeserializationFeature.ACCEPT_EMPTY_STRING_AS_NULL_OBJECT, true) - .configure(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL, true) - .enable(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY) - .configure(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES, true) - .disable(SerializationFeature.FAIL_ON_EMPTY_BEANS) - .build(); - } - -} diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/consumer/EndringsmeldingConsumer.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/consumer/EndringsmeldingConsumer.java index 2daa6bfeff5..7ee998ff96a 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/consumer/EndringsmeldingConsumer.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/consumer/EndringsmeldingConsumer.java @@ -7,8 +7,8 @@ import no.nav.testnav.apps.tpsmessagingservice.factory.ConnectionFactoryFactory; import org.springframework.stereotype.Service; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; import java.io.StringWriter; import static org.apache.commons.lang3.StringUtils.isBlank; @@ -29,7 +29,7 @@ public EndringsmeldingConsumer(ConnectionFactoryFactory connectionFactoryFactory protected String getQueueName(String queue, String miljoe) { return isBlank(queue) ? - String.format("%s%s_%s", PREFIX_MQ_QUEUES, miljoe.toUpperCase(), + "%s%s_%s".formatted(PREFIX_MQ_QUEUES, miljoe.toUpperCase(), XML_REQUEST_QUEUE_ENDRINGSMELDING_ALIAS) : queue; } diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/consumer/ServicerutineConsumer.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/consumer/ServicerutineConsumer.java index e103af7f94e..18d8c4df27e 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/consumer/ServicerutineConsumer.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/consumer/ServicerutineConsumer.java @@ -6,8 +6,8 @@ import no.nav.testnav.apps.tpsmessagingservice.factory.ConnectionFactoryFactory; import org.springframework.stereotype.Service; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; import java.io.StringWriter; import static org.apache.commons.lang3.StringUtils.isBlank; @@ -28,7 +28,7 @@ public ServicerutineConsumer(ConnectionFactoryFactory connectionFactoryFactory) protected String getQueueName(String queue, String miljoe) { return isBlank(queue) ? - String.format("%s%s_%s", PREFIX_MQ_QUEUES, miljoe.toUpperCase(), + "%s%s_%s".formatted(PREFIX_MQ_QUEUES, miljoe.toUpperCase(), XML_REQUEST_QUEUE_SERVICE_RUTINE_ALIAS) : queue; } diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/consumer/TpsConsumer.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/consumer/TpsConsumer.java index 77436bca314..c72482156b9 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/consumer/TpsConsumer.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/consumer/TpsConsumer.java @@ -11,7 +11,7 @@ import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBException; import java.util.List; import java.util.Map; import java.util.Objects; diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/consumer/command/TpsMeldingCommand.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/consumer/command/TpsMeldingCommand.java index 184dbd9f56f..4a3544ce01c 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/consumer/command/TpsMeldingCommand.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/consumer/command/TpsMeldingCommand.java @@ -63,14 +63,14 @@ public String call() throws JMSException, JmqiException { producer.send(requestMessage); } } catch (JMSException e) { - log.warn(String.format("%s: %s", FEIL_KOENAVN, e.getMessage()), e); + log.warn("%s: %s".formatted(FEIL_KOENAVN, e.getMessage()), e); return e.getMessage(); } TextMessage responseMessage; /* Wait for response */ - String attributes = String.format("JMSCorrelationID='%s'", requestMessage.getJMSMessageID()); + String attributes = "JMSCorrelationID='%s'".formatted(requestMessage.getJMSMessageID()); try (MessageConsumer consumer = session.createConsumer(responseDestination, attributes)) { diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/BankkontoNorskRequest.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/BankkontoNorskRequest.java index 7f20c5ba373..625ca635bfa 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/BankkontoNorskRequest.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/BankkontoNorskRequest.java @@ -5,8 +5,8 @@ import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; @Data @SuperBuilder diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/BankkontoNorskResponse.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/BankkontoNorskResponse.java index e89d3d659b3..5257989293b 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/BankkontoNorskResponse.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/BankkontoNorskResponse.java @@ -5,7 +5,7 @@ import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @Data @SuperBuilder diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/BankkontoUtlandRequest.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/BankkontoUtlandRequest.java index 44ec5360fc0..f001d0bea9b 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/BankkontoUtlandRequest.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/BankkontoUtlandRequest.java @@ -5,8 +5,8 @@ import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; @Data @SuperBuilder diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/BankkontoUtlandResponse.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/BankkontoUtlandResponse.java index 48c2da1de5e..df3d5fda5c8 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/BankkontoUtlandResponse.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/BankkontoUtlandResponse.java @@ -5,7 +5,7 @@ import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @Data @SuperBuilder diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/EgenansattRequest.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/EgenansattRequest.java index fa76006c75b..eb2ae56008e 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/EgenansattRequest.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/EgenansattRequest.java @@ -8,8 +8,8 @@ import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; @Data @SuperBuilder diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/EgenansattResponse.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/EgenansattResponse.java index 0b00c236c02..36692c2e025 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/EgenansattResponse.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/EgenansattResponse.java @@ -6,7 +6,7 @@ import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @Data @SuperBuilder diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/KontaktopplysningerRequest.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/KontaktopplysningerRequest.java index 7b1242956d0..da30f78b05c 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/KontaktopplysningerRequest.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/KontaktopplysningerRequest.java @@ -9,8 +9,8 @@ import lombok.experimental.SuperBuilder; import no.nav.testnav.libs.data.tpsmessagingservice.v1.TelefonTypeNummerDTO; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.List; @Data diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/KontaktopplysningerResponse.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/KontaktopplysningerResponse.java index 95ae53feec1..56560c6fa47 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/KontaktopplysningerResponse.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/KontaktopplysningerResponse.java @@ -6,7 +6,7 @@ import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @Data @SuperBuilder diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/SfePersonDataErrorResponse.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/SfePersonDataErrorResponse.java index 39cc3575ac6..f73b95052f5 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/SfePersonDataErrorResponse.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/SfePersonDataErrorResponse.java @@ -3,7 +3,7 @@ import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @SuperBuilder @NoArgsConstructor diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/SikkerhetstiltakRequest.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/SikkerhetstiltakRequest.java index 77773276e19..9f78c0345a9 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/SikkerhetstiltakRequest.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/SikkerhetstiltakRequest.java @@ -8,8 +8,8 @@ import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; @Data @SuperBuilder diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/SikkerhetstiltakResponse.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/SikkerhetstiltakResponse.java index c8f81bcf8f5..d05bfa0d0a6 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/SikkerhetstiltakResponse.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/SikkerhetstiltakResponse.java @@ -6,7 +6,7 @@ import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @Data @SuperBuilder diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/SpraakRequest.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/SpraakRequest.java index 19d1d4ce522..3690473446c 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/SpraakRequest.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/SpraakRequest.java @@ -5,8 +5,8 @@ import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; @Data @SuperBuilder diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/SpraakResponse.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/SpraakResponse.java index 5802c76f163..9767b645e7c 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/SpraakResponse.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/SpraakResponse.java @@ -5,7 +5,7 @@ import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @Data @SuperBuilder diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsEndringsopplysninger.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsEndringsopplysninger.java index 2f35e528205..845e026accd 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsEndringsopplysninger.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsEndringsopplysninger.java @@ -6,7 +6,7 @@ import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlType; @Data @SuperBuilder diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsPersonDataErrorResponse.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsPersonDataErrorResponse.java index bc301ea802e..2715f3a8fbb 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsPersonDataErrorResponse.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsPersonDataErrorResponse.java @@ -5,7 +5,7 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @Builder @NoArgsConstructor diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsServiceRutine.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsServiceRutine.java index 24f0a28ccb8..c6901b839c5 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsServiceRutine.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsServiceRutine.java @@ -5,7 +5,7 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlType; @Data @Builder diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsServicerutineM201Response.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsServicerutineM201Response.java index 4edca47fde4..e0d4bf2febb 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsServicerutineM201Response.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsServicerutineM201Response.java @@ -10,8 +10,8 @@ import lombok.NoArgsConstructor; import no.nav.tps.ctg.m201.domain.TpsServiceRutineType; -import javax.xml.bind.annotation.XmlRootElement; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlType; import java.util.ArrayList; import java.util.List; import java.util.Objects; diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsServicerutineRequest.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsServicerutineRequest.java index 22f7ce43e54..4a9f69f5fe5 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsServicerutineRequest.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsServicerutineRequest.java @@ -6,7 +6,7 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.xml.bind.annotation.XmlRootElement; +import jakarta.xml.bind.annotation.XmlRootElement; @Data @Builder diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsSystemInfo.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsSystemInfo.java index d94489562fe..fa2e3dc3c6c 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsSystemInfo.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/dto/TpsSystemInfo.java @@ -5,7 +5,7 @@ import lombok.Data; import lombok.NoArgsConstructor; -import javax.xml.bind.annotation.XmlType; +import jakarta.xml.bind.annotation.XmlType; @Data @Builder diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/factory/CachedConnectionFactoryFactory.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/factory/CachedConnectionFactoryFactory.java index 03bc6870493..7d26e78d43c 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/factory/CachedConnectionFactoryFactory.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/factory/CachedConnectionFactoryFactory.java @@ -34,7 +34,7 @@ public ConnectionFactory createConnectionFactory(QueueManager queueManager) thro factory.setChannel(queueManager.channel()); if (log.isInfoEnabled()) { - log.info(String.format("Creating connection factory '%s@%s:%d' on channel '%s' using transport type '%d'", + log.info("Creating connection factory '%s@%s:%d' on channel '%s' using transport type '%d'".formatted( factory.getQueueManager(), factory.getHostName(), factory.getPort(), diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/AdresseMappingStrategy.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/AdresseMappingStrategy.java index abeb720d1bd..dcd08fd69ec 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/AdresseMappingStrategy.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/AdresseMappingStrategy.java @@ -16,7 +16,6 @@ import java.time.LocalDate; import java.time.LocalDateTime; -import static java.lang.String.format; import static java.util.Objects.nonNull; import static no.nav.testnav.libs.data.tpsmessagingservice.v1.AdresseDTO.Adressetype.GATE; import static no.nav.testnav.libs.data.tpsmessagingservice.v1.AdresseDTO.Adressetype.MATR; @@ -52,7 +51,7 @@ public void mapAtoB(PostAdresseType source, PostadresseDTO target, MappingContex if (POST_NORGE.equals(source.getAdresseType())) { - target.setPostLinje3(format("%s %s", source.getPostnr(), source.getPoststed())); + target.setPostLinje3("%s %s".formatted(source.getPostnr(), source.getPoststed())); target.setPostLand(NORGE); } else { diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/BankkontonrNorskMappingStrategy.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/BankkontonrNorskMappingStrategy.java index 9f541362384..3e98c52cb54 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/BankkontonrNorskMappingStrategy.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/mapper/BankkontonrNorskMappingStrategy.java @@ -11,7 +11,6 @@ import java.time.LocalDate; -import static java.lang.String.format; import static java.util.Objects.isNull; import static org.apache.commons.lang3.StringUtils.isBlank; import static org.apache.commons.lang3.StringUtils.isNotBlank; @@ -70,7 +69,7 @@ public void mapAtoB(BankkontonrNorskDTO source, BankkontoNorskRequest.BrukerIden public void mapAtoB(BankkontoNorgeType source, BankkontonrNorskDTO target, MappingContext context) { target.setKontonummer(isBlank(source.getKontoNummer()) ? null : - format("%s.%s.%s", source.getKontoNummer().substring(0, 4), + "%s.%s.%s".formatted(source.getKontoNummer().substring(0, 4), source.getKontoNummer().substring(4, 6), source.getKontoNummer().substring(6))); target.setKontoRegdato(isBlank(source.getRegTidspunkt()) ? null : diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/BankkontoNorskService.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/BankkontoNorskService.java index 05c38a36872..d06c15fb25b 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/BankkontoNorskService.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/BankkontoNorskService.java @@ -12,8 +12,8 @@ import no.nav.testnav.libs.data.kontoregister.v1.BankkontonrNorskDTO; import org.springframework.stereotype.Service; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; import java.util.List; import java.util.Map; import java.util.stream.Collectors; diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/BankkontoUtlandService.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/BankkontoUtlandService.java index 26b6ca28743..2c4b34fdb11 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/BankkontoUtlandService.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/BankkontoUtlandService.java @@ -12,8 +12,8 @@ import no.nav.testnav.libs.data.kontoregister.v1.BankkontonrUtlandDTO; import org.springframework.stereotype.Service; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; import java.util.List; import java.util.Map; import java.util.stream.Collectors; diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/EgenansattService.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/EgenansattService.java index e1a30666c4b..c802a804804 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/EgenansattService.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/EgenansattService.java @@ -12,8 +12,8 @@ import no.nav.testnav.apps.tpsmessagingservice.dto.TpsMeldingResponse; import org.springframework.stereotype.Service; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; import java.time.LocalDate; import java.util.List; import java.util.Map; diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/IdentService.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/IdentService.java index 73c6c471d7b..460e6f249f9 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/IdentService.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/IdentService.java @@ -1,6 +1,8 @@ package no.nav.testnav.apps.tpsmessagingservice.service; -import com.fasterxml.jackson.dataformat.xml.XmlMapper; +import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; import lombok.SneakyThrows; import lombok.extern.slf4j.Slf4j; import no.nav.testnav.apps.tpsmessagingservice.consumer.ServicerutineConsumer; @@ -15,8 +17,6 @@ import no.nav.tps.ctg.m201.domain.TpsServiceRutineType; import org.springframework.stereotype.Service; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; import java.io.StringWriter; import java.util.HashMap; import java.util.List; @@ -39,15 +39,15 @@ public class IdentService { private final ServicerutineConsumer servicerutineConsumer; private final JAXBContext requestContext; private final TestmiljoerServiceConsumer testmiljoerServiceConsumer; - private final XmlMapper xmlMapper; + private final ObjectMapper objectMapper; public IdentService(ServicerutineConsumer servicerutineConsumer, TestmiljoerServiceConsumer testmiljoerServiceConsumer, - XmlMapper xmlMapper) throws JAXBException { + ObjectMapper objectMapper) throws JAXBException { this.servicerutineConsumer = servicerutineConsumer; this.testmiljoerServiceConsumer = testmiljoerServiceConsumer; this.requestContext = JAXBContext.newInstance(TpsPersonData.class); - this.xmlMapper = xmlMapper; + this.objectMapper = objectMapper; } @SneakyThrows @@ -125,7 +125,7 @@ private TpsServicerutineM201Response unmarshallFromXml(String endringsmeldingRes .build(); } else { - return xmlMapper.readValue(endringsmeldingResponse, TpsServicerutineM201Response.class); + return objectMapper.readValue(endringsmeldingResponse, TpsServicerutineM201Response.class); } } diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/PersonService.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/PersonService.java index 544bb512ede..580f1c9852f 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/PersonService.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/PersonService.java @@ -26,8 +26,8 @@ import org.json.XML; import org.springframework.stereotype.Service; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; import java.util.Collection; import java.util.List; import java.util.Map; diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/SikkerhetstiltakService.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/SikkerhetstiltakService.java index 230e9b6db06..eaa2b56b79b 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/SikkerhetstiltakService.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/SikkerhetstiltakService.java @@ -12,8 +12,8 @@ import no.nav.testnav.libs.data.tpsmessagingservice.v1.SikkerhetTiltakDTO; import org.springframework.stereotype.Service; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; import java.util.List; import java.util.Map; import java.util.Map.Entry; diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/SpraakService.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/SpraakService.java index 5a7fd206873..b53f2dd627d 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/SpraakService.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/service/SpraakService.java @@ -12,8 +12,8 @@ import no.nav.testnav.libs.data.tpsmessagingservice.v1.SpraakDTO; import org.springframework.stereotype.Service; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; import java.util.List; import java.util.Map; import java.util.stream.Collectors; diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/utils/EndringsmeldingUtil.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/utils/EndringsmeldingUtil.java index b3ef9da96f7..a2e85aa1be0 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/utils/EndringsmeldingUtil.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/utils/EndringsmeldingUtil.java @@ -7,8 +7,8 @@ import no.nav.testnav.apps.tpsmessagingservice.dto.EndringsmeldingResponse; import no.nav.testnav.apps.tpsmessagingservice.dto.TpsMeldingResponse; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBException; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBException; import java.io.StringReader; import java.io.StringWriter; diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/utils/ServiceRutineUtil.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/utils/ServiceRutineUtil.java index a1e1238c7a6..5833499e2f0 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/utils/ServiceRutineUtil.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/utils/ServiceRutineUtil.java @@ -4,7 +4,7 @@ import lombok.experimental.UtilityClass; import no.nav.testnav.apps.tpsmessagingservice.dto.TpsServicerutineRequest; -import javax.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBContext; import java.io.StringWriter; @UtilityClass diff --git a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/utils/TranslittereringUtil.java b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/utils/TranslittereringUtil.java index f076ecae919..8e6383d5fbb 100644 --- a/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/utils/TranslittereringUtil.java +++ b/apps/tps-messaging-service/src/main/java/no/nav/testnav/apps/tpsmessagingservice/utils/TranslittereringUtil.java @@ -53,9 +53,9 @@ public String translitterer(String str) { return null; } - val prepared = preprocess(str); - val normalized = pattern.matcher(Normalizer.normalize(prepared, Normalizer.Form.NFD)).replaceAll(""); - val processed = postprocess(normalized); + final var prepared = preprocess(str); + final var normalized = pattern.matcher(Normalizer.normalize(prepared, Normalizer.Form.NFD)).replaceAll(""); + final var processed = postprocess(normalized); String text = convertKnownCharactersNotHandledByNormalization(processed); return cyrillicToLatinTrans.transliterate(text); } diff --git a/libs/reactive-core/src/test/java/no/nav/testnav/libs/reactivecore/metrics/UriStrippingClientRequestObservationConventionTest.java b/libs/reactive-core/src/test/java/no/nav/testnav/libs/reactivecore/metrics/UriStrippingClientRequestObservationConventionTest.java index 0dce08f6c4c..fd9dbea0fab 100644 --- a/libs/reactive-core/src/test/java/no/nav/testnav/libs/reactivecore/metrics/UriStrippingClientRequestObservationConventionTest.java +++ b/libs/reactive-core/src/test/java/no/nav/testnav/libs/reactivecore/metrics/UriStrippingClientRequestObservationConventionTest.java @@ -26,13 +26,9 @@ class UriStrippingClientRequestObservationConventionTest { void testUriStripping() throws URISyntaxException { - var context = new ClientRequestObservationContext(); + var context = new ClientRequestObservationContext(ClientRequest + .create(GET, new URI(BASE_URI + PATH_AND_PARAMETERS))); context.setUriTemplate(BASE_URI + PATH_AND_PARAMETERS_AND_TEMPLATE); - context.setRequest( - ClientRequest - .create(GET, new URI(BASE_URI + PATH_AND_PARAMETERS)) - .build() - ); context.setResponse( ClientResponse .create(HttpStatusCode.valueOf(200))