From ea9e995ee954058c5e6945022ff60dae07ce827a Mon Sep 17 00:00:00 2001 From: stigus Date: Tue, 20 Aug 2024 13:57:46 +0200 Subject: [PATCH] * Oppdatert spring til versjon 3.2.2 og backend rammeverk til nyere versjoner #deploy-test-dolly-backend #deploy-test-pdl-forvalter --- apps/app-tilgang-analyse-service/build.gradle | 1 + apps/brreg-stub/build.gradle | 1 + apps/bruker-service/build.gradle | 1 + apps/dolly-backend/build.gradle | 2 ++ .../elastic/BestillingElasticRepository.java | 3 ++- .../elastic/service/OpenSearchService.java | 1 + .../build.gradle | 1 + apps/inntektsmelding-service/build.gradle | 1 + .../build.gradle | 1 + .../build.gradle | 1 + apps/organisasjon-forvalter/build.gradle | 1 + apps/organisasjon-tilgang-service/build.gradle | 1 + apps/orgnummer-service/build.gradle | 1 + apps/pdl-forvalter/build.gradle | 1 + apps/person-faste-data-service/build.gradle | 2 ++ apps/testnav-ident-pool/build.gradle | 1 + .../build.gradle | 1 + apps/udi-stub/build.gradle | 1 + apps/varslinger-service/build.gradle | 1 + examples/reactive-rest-example/build.gradle | 1 + libs/database/build.gradle | 1 + .../java/src/main/groovy/dolly-versions.gradle | 18 +++++++++--------- 22 files changed, 33 insertions(+), 10 deletions(-) diff --git a/apps/app-tilgang-analyse-service/build.gradle b/apps/app-tilgang-analyse-service/build.gradle index 88d3ffe411e..dec83579f53 100644 --- a/apps/app-tilgang-analyse-service/build.gradle +++ b/apps/app-tilgang-analyse-service/build.gradle @@ -23,6 +23,7 @@ dependencies { implementation 'io.r2dbc:r2dbc-h2' implementation 'org.postgresql:r2dbc-postgresql' implementation 'org.flywaydb:flyway-core' + implementation 'org.flywaydb:flyway-database-postgresql' implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml' implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc" diff --git a/apps/brreg-stub/build.gradle b/apps/brreg-stub/build.gradle index 48e8a1d39ae..6b27b6d7857 100644 --- a/apps/brreg-stub/build.gradle +++ b/apps/brreg-stub/build.gradle @@ -44,6 +44,7 @@ dependencies { implementation 'com.zaxxer:HikariCP' implementation 'org.flywaydb:flyway-core' + implementation 'org.flywaydb:flyway-database-postgresql' implementation 'com.h2database:h2' implementation 'wsdl4j:wsdl4j' diff --git a/apps/bruker-service/build.gradle b/apps/bruker-service/build.gradle index d2d3a9c73f0..d4f5e8f8a73 100644 --- a/apps/bruker-service/build.gradle +++ b/apps/bruker-service/build.gradle @@ -41,6 +41,7 @@ dependencies { implementation 'io.r2dbc:r2dbc-h2' implementation 'org.postgresql:r2dbc-postgresql' implementation 'org.flywaydb:flyway-core' + implementation 'org.flywaydb:flyway-database-postgresql' runtimeOnly 'org.postgresql:postgresql' runtimeOnly 'com.h2database:h2' diff --git a/apps/dolly-backend/build.gradle b/apps/dolly-backend/build.gradle index 2adde405cba..27bfb40bc72 100644 --- a/apps/dolly-backend/build.gradle +++ b/apps/dolly-backend/build.gradle @@ -45,6 +45,8 @@ dependencies { implementation 'org.postgresql:postgresql' implementation 'org.flywaydb:flyway-core' + implementation 'org.flywaydb:flyway-database-postgresql' + implementation "ma.glasnost.orika:orika-core:$versions.orika" implementation 'org.codehaus.jettison:jettison:1.5.4' implementation "org.apache.poi:poi:$versions.apachePoi" diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/BestillingElasticRepository.java b/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/BestillingElasticRepository.java index be7b3bafaf1..6f43f867fb2 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/BestillingElasticRepository.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/BestillingElasticRepository.java @@ -2,9 +2,10 @@ import org.springframework.data.elasticsearch.repository.ElasticsearchRepository; +import java.util.Collection; import java.util.List; public interface BestillingElasticRepository extends ElasticsearchRepository { - List getAllByIdenterIn(List ident); + List getAllByIdenterIn(Collection identer); } diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/service/OpenSearchService.java b/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/service/OpenSearchService.java index a051168a81d..9fb08af57f1 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/service/OpenSearchService.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/elastic/service/OpenSearchService.java @@ -22,6 +22,7 @@ import java.io.IOException; import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.List; import static java.util.Objects.nonNull; diff --git a/apps/generer-organisasjon-populasjon-service/build.gradle b/apps/generer-organisasjon-populasjon-service/build.gradle index 9c1768c82f4..a3fccd570c7 100644 --- a/apps/generer-organisasjon-populasjon-service/build.gradle +++ b/apps/generer-organisasjon-populasjon-service/build.gradle @@ -36,6 +36,7 @@ dependencies { implementation "io.confluent:kafka-avro-serializer:$versions.avro" implementation "jakarta.validation:jakarta.validation-api:$versions.jakartaValidation" implementation 'org.flywaydb:flyway-core' + implementation 'org.flywaydb:flyway-database-postgresql' implementation 'com.h2database:h2' implementation 'com.zaxxer:HikariCP' diff --git a/apps/inntektsmelding-service/build.gradle b/apps/inntektsmelding-service/build.gradle index 67622313baa..1f291182f3a 100644 --- a/apps/inntektsmelding-service/build.gradle +++ b/apps/inntektsmelding-service/build.gradle @@ -30,6 +30,7 @@ dependencies { implementation 'org.apache.commons:commons-io:1.3.2' implementation 'org.flywaydb:flyway-core' + implementation 'org.flywaydb:flyway-database-postgresql' implementation 'com.h2database:h2' implementation 'org.postgresql:postgresql' } diff --git a/apps/organisasjon-bestilling-service/build.gradle b/apps/organisasjon-bestilling-service/build.gradle index d0f03b0b23a..7d6eccd8cc8 100644 --- a/apps/organisasjon-bestilling-service/build.gradle +++ b/apps/organisasjon-bestilling-service/build.gradle @@ -28,6 +28,7 @@ dependencies { implementation 'com.h2database:h2' implementation 'com.zaxxer:HikariCP' implementation 'org.flywaydb:flyway-core' + implementation 'org.flywaydb:flyway-database-postgresql' implementation 'org.postgresql:postgresql' implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" diff --git a/apps/organisasjon-faste-data-service/build.gradle b/apps/organisasjon-faste-data-service/build.gradle index adb4ef27310..f7c5315e881 100644 --- a/apps/organisasjon-faste-data-service/build.gradle +++ b/apps/organisasjon-faste-data-service/build.gradle @@ -32,6 +32,7 @@ dependencies { implementation "io.confluent:kafka-avro-serializer:$versions.avro" implementation 'org.flywaydb:flyway-core' + implementation 'org.flywaydb:flyway-database-postgresql' implementation 'com.zaxxer:HikariCP' implementation 'com.h2database:h2' implementation 'org.postgresql:postgresql' diff --git a/apps/organisasjon-forvalter/build.gradle b/apps/organisasjon-forvalter/build.gradle index 03052c5a3ec..50db6abb5e5 100644 --- a/apps/organisasjon-forvalter/build.gradle +++ b/apps/organisasjon-forvalter/build.gradle @@ -36,6 +36,7 @@ dependencies { implementation "org.apache.avro:avro:$versions.apacheAvro" implementation 'org.flywaydb:flyway-core' + implementation 'org.flywaydb:flyway-database-postgresql' implementation 'org.postgresql:postgresql' implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" diff --git a/apps/organisasjon-tilgang-service/build.gradle b/apps/organisasjon-tilgang-service/build.gradle index 3989bbbfd80..6e7f58f08af 100644 --- a/apps/organisasjon-tilgang-service/build.gradle +++ b/apps/organisasjon-tilgang-service/build.gradle @@ -20,6 +20,7 @@ dependencies { implementation 'io.r2dbc:r2dbc-h2' implementation 'org.postgresql:r2dbc-postgresql' implementation 'org.flywaydb:flyway-core' + implementation 'org.flywaydb:flyway-database-postgresql' implementation "ma.glasnost.orika:orika-core:$versions.orika" diff --git a/apps/orgnummer-service/build.gradle b/apps/orgnummer-service/build.gradle index 1a79299b6c6..250446959fa 100644 --- a/apps/orgnummer-service/build.gradle +++ b/apps/orgnummer-service/build.gradle @@ -26,6 +26,7 @@ dependencies { implementation "jakarta.validation:jakarta.validation-api:$versions.jakartaValidation" implementation 'org.flywaydb:flyway-core' + implementation 'org.flywaydb:flyway-database-postgresql' implementation 'com.h2database:h2' implementation 'com.zaxxer:HikariCP' diff --git a/apps/pdl-forvalter/build.gradle b/apps/pdl-forvalter/build.gradle index abdf9719dab..2857450a8eb 100644 --- a/apps/pdl-forvalter/build.gradle +++ b/apps/pdl-forvalter/build.gradle @@ -37,6 +37,7 @@ dependencies { implementation 'org.postgresql:postgresql' implementation 'org.flywaydb:flyway-core' + implementation 'org.flywaydb:flyway-database-postgresql' implementation "com.fasterxml.jackson.core:jackson-core:$versions.jackson" diff --git a/apps/person-faste-data-service/build.gradle b/apps/person-faste-data-service/build.gradle index 745a0854d4d..7051cd1700b 100644 --- a/apps/person-faste-data-service/build.gradle +++ b/apps/person-faste-data-service/build.gradle @@ -21,6 +21,8 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config implementation 'org.flywaydb:flyway-core' + implementation 'org.flywaydb:flyway-database-postgresql' + implementation 'com.h2database:h2' implementation 'com.zaxxer:HikariCP' implementation 'org.postgresql:postgresql' diff --git a/apps/testnav-ident-pool/build.gradle b/apps/testnav-ident-pool/build.gradle index 0bb3e37d932..f1bd50720e7 100644 --- a/apps/testnav-ident-pool/build.gradle +++ b/apps/testnav-ident-pool/build.gradle @@ -35,6 +35,7 @@ dependencies { implementation 'com.h2database:h2' implementation 'org.flywaydb:flyway-core' + implementation 'org.flywaydb:flyway-database-postgresql' implementation 'org.postgresql:postgresql' implementation "ma.glasnost.orika:orika-core:$versions.orika" diff --git a/apps/testnorge-statisk-data-forvalter/build.gradle b/apps/testnorge-statisk-data-forvalter/build.gradle index 6dd8cd066e7..e05f2943d50 100644 --- a/apps/testnorge-statisk-data-forvalter/build.gradle +++ b/apps/testnorge-statisk-data-forvalter/build.gradle @@ -39,6 +39,7 @@ dependencies { implementation 'com.zaxxer:HikariCP' implementation 'org.flywaydb:flyway-core' + implementation 'org.flywaydb:flyway-database-postgresql' implementation 'com.h2database:h2' diff --git a/apps/udi-stub/build.gradle b/apps/udi-stub/build.gradle index b9afdb2c571..0a8aca55b93 100644 --- a/apps/udi-stub/build.gradle +++ b/apps/udi-stub/build.gradle @@ -41,6 +41,7 @@ dependencies { implementation 'org.postgresql:postgresql' implementation 'org.flywaydb:flyway-core' + implementation 'org.flywaydb:flyway-database-postgresql' implementation 'com.zaxxer:HikariCP' implementation "ma.glasnost.orika:orika-core:$versions.orika" diff --git a/apps/varslinger-service/build.gradle b/apps/varslinger-service/build.gradle index 1735ab74ece..1d73768f5a4 100644 --- a/apps/varslinger-service/build.gradle +++ b/apps/varslinger-service/build.gradle @@ -32,6 +32,7 @@ dependencies { implementation 'com.h2database:h2' implementation 'com.zaxxer:HikariCP' implementation 'org.flywaydb:flyway-core' + implementation 'org.flywaydb:flyway-database-postgresql' implementation 'org.postgresql:postgresql' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' diff --git a/examples/reactive-rest-example/build.gradle b/examples/reactive-rest-example/build.gradle index 27ed8451880..ea04abc3846 100644 --- a/examples/reactive-rest-example/build.gradle +++ b/examples/reactive-rest-example/build.gradle @@ -24,6 +24,7 @@ dependencies { implementation 'io.r2dbc:r2dbc-h2' implementation 'org.postgresql:r2dbc-postgresql' implementation 'org.flywaydb:flyway-core' + implementation 'org.flywaydb:flyway-database-postgresql' runtimeOnly 'org.postgresql:postgresql' runtimeOnly 'com.h2database:h2' diff --git a/libs/database/build.gradle b/libs/database/build.gradle index 4c3f4f3d551..a41ac47cec6 100644 --- a/libs/database/build.gradle +++ b/libs/database/build.gradle @@ -16,4 +16,5 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-vault-config-databases' implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' implementation 'org.flywaydb:flyway-core' + implementation 'org.flywaydb:flyway-database-postgresql' } diff --git a/plugins/java/src/main/groovy/dolly-versions.gradle b/plugins/java/src/main/groovy/dolly-versions.gradle index 27445a6f0da..ac8c48bf5e4 100644 --- a/plugins/java/src/main/groovy/dolly-versions.gradle +++ b/plugins/java/src/main/groovy/dolly-versions.gradle @@ -4,17 +4,17 @@ class DollyVersionCatalog { String navAltinnInntektsmelding = "1.2019.08.16-13.46-35cbdfd492d4" String navFellesregister = "2020.08.27-09.53-183ead3d81eb" - String springBoot = "3.2.1" - String springCloud = "2023.0.1" - String springSession = "2021.2.3" + String springBoot = "3.3.2" + String springSession = "3.3.1" + String springCloud = "2023.0.3" String apacheAvro = "1.11.3" String apacheKafka = "3.7.0" - String apachePoi = "5.2.5" + String apachePoi = "5.3.0" String assertj = "3.26.0" String avro = "7.6.1" String guava = "33.2.0-jre" - String jackson = "2.17.1" + String jackson = "2.17.2" String jakartaActivation = "2.1.3" String jakartaValidation = "3.1.0" String jakartaXmlBindApi = "4.0.2" @@ -24,13 +24,13 @@ class DollyVersionCatalog { String jaxws = "4.0.2" String jweaver = "1.9.22" String jwt = "4.4.0" - String logback = "7.4" + String logback = "8.0" String mq = "3.2.3" String okhttp = "4.10.0" - String opensearch = "1.4.0" + String opensearch = "1.5.1" String orika = "1.5.4" String reactorSpring = "1.0.1.RELEASE" - String reactorTest = "3.6.5" + String reactorTest = "3.6.8" String springdoc = "2.5.0" - String swagger = "2.2.21" + String swagger = "2.2.22" } \ No newline at end of file