From 62e514fa26e44ca5511532908cdff8e367d106b3 Mon Sep 17 00:00:00 2001 From: Cato Olsen Date: Wed, 31 Jul 2024 16:09:49 +0200 Subject: [PATCH] feature/java-conventions-plugin-3 (#3549) Ny plugin som definerer ofte brukte felles versjoner. --- .github/workflows/app.skattekort-service.yml | 1 + apps/adresse-service/build.gradle | 8 +-- apps/amelding-service/build.gradle | 4 +- apps/app-tilgang-analyse-service/build.gradle | 4 +- apps/arbeidsforhold-service/build.gradle | 14 ++-- apps/batch-bestilling-service/build.gradle | 4 +- apps/brreg-stub/build.gradle | 6 +- apps/bruker-service/build.gradle | 14 ++-- apps/budpro-service/build.gradle | 2 +- apps/dolly-backend/build.gradle | 20 +++--- apps/endringsmelding-service/build.gradle | 4 +- apps/ereg-batch-status-service/build.gradle | 4 +- .../build.gradle | 4 +- apps/generer-navn-service/build.gradle | 4 +- .../build.gradle | 10 +-- .../build.gradle | 4 +- apps/helsepersonell-service/build.gradle | 4 +- .../build.gradle | 16 ++--- apps/inntektsmelding-service/build.gradle | 6 +- .../jenkins-batch-status-service/build.gradle | 4 +- apps/joark-dokument-service/build.gradle | 4 +- apps/kodeverk-service/build.gradle | 4 +- apps/miljoer-service/build.gradle | 4 +- .../build.gradle | 18 ++--- .../build.gradle | 4 +- .../build.gradle | 10 +-- apps/organisasjon-forvalter/build.gradle | 6 +- apps/organisasjon-mottak-service/build.gradle | 6 +- apps/organisasjon-service/build.gradle | 4 +- .../organisasjon-tilgang-service/build.gradle | 6 +- apps/orgnummer-service/build.gradle | 6 +- apps/oversikt-frontend/build.gradle | 2 +- apps/pdl-forvalter/build.gradle | 8 +-- apps/person-faste-data-service/build.gradle | 4 +- .../build.gradle | 8 +-- apps/person-search-service/build.gradle | 8 +-- apps/person-service/build.gradle | 4 +- apps/profil-api/build.gradle | 2 +- apps/skattekort-service/build.gradle | 69 ++----------------- apps/skattekort-service/settings.gradle | 2 + apps/sykemelding-api/build.gradle | 16 ++--- apps/synt-sykemelding-api/build.gradle | 2 +- .../build.gradle | 4 +- apps/tenor-search-service/build.gradle | 2 +- apps/testnav-ident-pool/build.gradle | 6 +- .../build.gradle | 14 ++-- apps/tilbakemelding-api/build.gradle | 4 +- apps/tps-messaging-service/build.gradle | 20 +++--- apps/udi-stub/build.gradle | 6 +- apps/varslinger-service/build.gradle | 4 +- examples/reactive-rest-example/build.gradle | 4 +- libs/avro-schema/build.gradle | 4 +- libs/data-transfer-objects/build.gradle | 8 +-- .../data-transfer-search-objects/build.gradle | 6 +- libs/domain/build.gradle | 4 +- libs/kafka-producers/build.gradle | 2 +- libs/reactive-core/build.gradle | 4 +- libs/reactive-security/build.gradle | 2 +- libs/reactive-session-security/build.gradle | 2 +- libs/security-core/build.gradle | 2 +- libs/servlet-core/build.gradle | 4 +- libs/servlet-security/build.gradle | 2 +- libs/testing/build.gradle | 2 +- mocks/maskinporten-mock/build.gradle | 6 +- mocks/tokendings-mock/build.gradle | 6 +- .../java/src/main/groovy/dolly-apps.gradle | 9 +-- .../java/src/main/groovy/dolly-libs.gradle | 5 +- .../java/src/main/groovy/dolly-proxies.gradle | 9 +-- .../src/main/groovy/dolly-versions.gradle | 36 ++++++++++ xsd/arbeidsforhold-xsd/build.gradle | 8 +-- 70 files changed, 253 insertions(+), 266 deletions(-) create mode 100644 plugins/java/src/main/groovy/dolly-versions.gradle diff --git a/.github/workflows/app.skattekort-service.yml b/.github/workflows/app.skattekort-service.yml index f6b081daeb4..62d3b5ea777 100644 --- a/.github/workflows/app.skattekort-service.yml +++ b/.github/workflows/app.skattekort-service.yml @@ -3,6 +3,7 @@ name: skattekort-service on: push: paths: + - "plugins/**" - "libs/reactive-core/**" - "libs/reactive-security/**" - "libs/security-core/**" diff --git a/apps/adresse-service/build.gradle b/apps/adresse-service/build.gradle index 56d33d74b09..a7c60fde2e8 100644 --- a/apps/adresse-service/build.gradle +++ b/apps/adresse-service/build.gradle @@ -19,9 +19,9 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' - implementation 'ma.glasnost.orika:orika-core:1.5.4' - implementation 'org.aspectj:aspectjweaver:1.9.7' + implementation "ma.glasnost.orika:orika-core:$versions.orika" + implementation "org.aspectj:aspectjweaver:$versions.jweaver" - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" + implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger" } diff --git a/apps/amelding-service/build.gradle b/apps/amelding-service/build.gradle index 16ed90044de..c2a4bbf4d5f 100644 --- a/apps/amelding-service/build.gradle +++ b/apps/amelding-service/build.gradle @@ -24,8 +24,8 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' + implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc" + implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger" testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } diff --git a/apps/app-tilgang-analyse-service/build.gradle b/apps/app-tilgang-analyse-service/build.gradle index 94508051277..88d3ffe411e 100644 --- a/apps/app-tilgang-analyse-service/build.gradle +++ b/apps/app-tilgang-analyse-service/build.gradle @@ -25,8 +25,8 @@ dependencies { implementation 'org.flywaydb:flyway-core' implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' + implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc" + implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger" testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } diff --git a/apps/arbeidsforhold-service/build.gradle b/apps/arbeidsforhold-service/build.gradle index 9fa78862913..089e3d8c9fc 100644 --- a/apps/arbeidsforhold-service/build.gradle +++ b/apps/arbeidsforhold-service/build.gradle @@ -11,10 +11,10 @@ sonarqube { dependencies { - implementation 'com.google.guava:guava:33.2.0-jre' - implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2' - implementation 'javax.activation:activation:1.1.1' - implementation 'org.glassfish.jaxb:jaxb-runtime' + implementation "com.google.guava:guava:$versions.guava" + implementation "jakarta.xml.bind:jakarta.xml.bind-api:$versions.jakartaXmlBindApi" + implementation "javax.activation:activation:$versions.javaxActivation" + implementation "org.glassfish.jaxb:jaxb-runtime:$versions.jaxb" implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml' implementation 'no.nav.testnav.libs:commands' @@ -29,9 +29,9 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config - implementation 'javax.annotation:javax.annotation-api:1.3.2' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' + implementation "javax.annotation:javax.annotation-api:$versions.javaxAnnotation" + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" + implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger" testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } diff --git a/apps/batch-bestilling-service/build.gradle b/apps/batch-bestilling-service/build.gradle index 628be93c515..5cfd5693cab 100644 --- a/apps/batch-bestilling-service/build.gradle +++ b/apps/batch-bestilling-service/build.gradle @@ -23,8 +23,8 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework.boot:spring-boot-starter-security' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" + implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger" testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } diff --git a/apps/brreg-stub/build.gradle b/apps/brreg-stub/build.gradle index f80ab4a9e55..48e8a1d39ae 100644 --- a/apps/brreg-stub/build.gradle +++ b/apps/brreg-stub/build.gradle @@ -47,15 +47,15 @@ dependencies { implementation 'com.h2database:h2' implementation 'wsdl4j:wsdl4j' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" + implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger" implementation 'no.nav.common:auth' implementation 'no.nav.common:util' 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" + implementation "com.sun.xml.ws:jaxws-rt:$versions.jaxws" testImplementation 'org.testcontainers:junit-jupiter' testImplementation 'org.testcontainers:postgresql' implementation 'jakarta.jws:jakarta.jws-api:3.0.0' //TODO upgrade to JUnit5 diff --git a/apps/bruker-service/build.gradle b/apps/bruker-service/build.gradle index ce15cdca0ee..d2d3a9c73f0 100644 --- a/apps/bruker-service/build.gradle +++ b/apps/bruker-service/build.gradle @@ -23,7 +23,7 @@ sonarqube { } dependencies { - implementation 'com.auth0:java-jwt:4.4.0' + implementation "com.auth0:java-jwt:$versions.jwt" implementation 'no.nav.testnav.libs:security-core' implementation 'no.nav.testnav.libs:reactive-core' @@ -35,8 +35,8 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' + implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc" + implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger" implementation 'io.r2dbc:r2dbc-h2' implementation 'org.postgresql:r2dbc-postgresql' @@ -45,10 +45,10 @@ dependencies { runtimeOnly 'org.postgresql:postgresql' runtimeOnly 'com.h2database:h2' - testImplementation 'io.projectreactor:reactor-test' + testImplementation "io.projectreactor:reactor-test:$versions.reactorTest" testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - testImplementation 'org.assertj:assertj-core:3.26.0' + testImplementation "org.assertj:assertj-core:$versions.assertj" testImplementation 'no.nav.testnav.libs:integration-test' - testImplementation 'com.squareup.okhttp3:okhttp:4.10.0' - testImplementation 'com.squareup.okhttp3:mockwebserver:4.10.0' + testImplementation "com.squareup.okhttp3:okhttp:$versions.okhttp" + testImplementation "com.squareup.okhttp3:mockwebserver:$versions.okhttp" } diff --git a/apps/budpro-service/build.gradle b/apps/budpro-service/build.gradle index a04fdddbcb5..ca5df53ed97 100644 --- a/apps/budpro-service/build.gradle +++ b/apps/budpro-service/build.gradle @@ -10,7 +10,7 @@ dependencies { implementation "no.nav.testnav.libs:servlet-core" implementation "no.nav.testnav.libs:servlet-insecure-security" implementation "no.nav.testnav.libs:servlet-security" - implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.5.0" + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" implementation "org.springframework.boot:spring-boot-starter-oauth2-client" implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server" implementation "org.springframework.boot:spring-boot-starter-security" diff --git a/apps/dolly-backend/build.gradle b/apps/dolly-backend/build.gradle index e72ffcbdff7..2adde405cba 100644 --- a/apps/dolly-backend/build.gradle +++ b/apps/dolly-backend/build.gradle @@ -22,8 +22,8 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-vault-config-databases' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" + implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger" implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' @@ -31,31 +31,31 @@ 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.6' + implementation 'org.springframework.retry:spring-retry' implementation 'org.springframework.boot:spring-boot-starter-data-elasticsearch' - implementation 'org.opensearch.client:spring-data-opensearch:1.4.0' + implementation "org.opensearch.client:spring-data-opensearch:$versions.opensearch" - implementation 'org.apache.commons:commons-lang3:3.14.0' + implementation 'org.apache.commons:commons-lang3' implementation 'org.springframework.boot:spring-boot-starter-cache' implementation 'com.github.ben-manes.caffeine:caffeine' implementation 'org.ehcache:ehcache:3.10.8' - implementation 'com.fasterxml.jackson.core:jackson-core:2.17.1' + implementation "com.fasterxml.jackson.core:jackson-core:$versions.jackson" implementation 'org.postgresql:postgresql' implementation 'org.flywaydb:flyway-core' - implementation 'ma.glasnost.orika:orika-core:1.5.4' + implementation "ma.glasnost.orika:orika-core:$versions.orika" implementation 'org.codehaus.jettison:jettison:1.5.4' - implementation 'org.apache.poi:poi:5.2.5' - implementation 'org.apache.poi:poi-ooxml:5.2.5' + implementation "org.apache.poi:poi:$versions.apachePoi" + implementation "org.apache.poi:poi-ooxml:$versions.apachePoi" testImplementation 'org.opensearch:opensearch-testcontainers:2.0.1' 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.6.5' + testImplementation "io.projectreactor:reactor-test:$versions.reactorTest" testImplementation 'org.testcontainers:junit-jupiter' testImplementation 'org.testcontainers:postgresql' testImplementation 'org.bitbucket.b_c:jose4j:0.9.6' diff --git a/apps/endringsmelding-service/build.gradle b/apps/endringsmelding-service/build.gradle index 2efc7c7d5d6..06911756cd6 100644 --- a/apps/endringsmelding-service/build.gradle +++ b/apps/endringsmelding-service/build.gradle @@ -20,8 +20,8 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' + implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc" + implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger" testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } diff --git a/apps/ereg-batch-status-service/build.gradle b/apps/ereg-batch-status-service/build.gradle index 975d7537c32..d0262742b65 100644 --- a/apps/ereg-batch-status-service/build.gradle +++ b/apps/ereg-batch-status-service/build.gradle @@ -23,8 +23,8 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' + implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc" + implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger" testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } diff --git a/apps/generer-arbeidsforhold-populasjon-service/build.gradle b/apps/generer-arbeidsforhold-populasjon-service/build.gradle index 683138fe87c..96d217a72ff 100644 --- a/apps/generer-arbeidsforhold-populasjon-service/build.gradle +++ b/apps/generer-arbeidsforhold-populasjon-service/build.gradle @@ -23,8 +23,8 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" + implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger" testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } diff --git a/apps/generer-navn-service/build.gradle b/apps/generer-navn-service/build.gradle index e9128a37078..daed7ca1a1f 100644 --- a/apps/generer-navn-service/build.gradle +++ b/apps/generer-navn-service/build.gradle @@ -21,8 +21,8 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework.boot:spring-boot-starter-security' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" + implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger" testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } diff --git a/apps/generer-organisasjon-populasjon-service/build.gradle b/apps/generer-organisasjon-populasjon-service/build.gradle index 90f8dafb97e..9c1768c82f4 100644 --- a/apps/generer-organisasjon-populasjon-service/build.gradle +++ b/apps/generer-organisasjon-populasjon-service/build.gradle @@ -33,15 +33,15 @@ dependencies { implementation 'org.springframework.kafka:spring-kafka' - implementation 'io.confluent:kafka-avro-serializer:7.6.1' - implementation 'jakarta.validation:jakarta.validation-api:3.1.0' + implementation "io.confluent:kafka-avro-serializer:$versions.avro" + implementation "jakarta.validation:jakarta.validation-api:$versions.jakartaValidation" implementation 'org.flywaydb:flyway-core' implementation 'com.h2database:h2' implementation 'com.zaxxer:HikariCP' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' - implementation 'org.projectreactor:reactor-spring:1.0.1.RELEASE' + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" + implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger" + implementation "org.projectreactor:reactor-spring:$versions.reactorSpring" implementation 'org.postgresql:postgresql' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' diff --git a/apps/generer-synt-amelding-service/build.gradle b/apps/generer-synt-amelding-service/build.gradle index a7ab4499bfb..582abaf023a 100644 --- a/apps/generer-synt-amelding-service/build.gradle +++ b/apps/generer-synt-amelding-service/build.gradle @@ -23,8 +23,8 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" + implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger" testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } diff --git a/apps/helsepersonell-service/build.gradle b/apps/helsepersonell-service/build.gradle index d134383b9e3..f7535f9d68f 100644 --- a/apps/helsepersonell-service/build.gradle +++ b/apps/helsepersonell-service/build.gradle @@ -21,6 +21,6 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" + implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger" } \ No newline at end of file diff --git a/apps/inntektsmelding-generator-service/build.gradle b/apps/inntektsmelding-generator-service/build.gradle index 1f3408ebc17..22e95963649 100644 --- a/apps/inntektsmelding-generator-service/build.gradle +++ b/apps/inntektsmelding-generator-service/build.gradle @@ -18,17 +18,17 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework.boot:spring-boot-starter-security' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" + implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger" - implementation 'org.aspectj:aspectjweaver:1.9.22' + implementation "org.aspectj:aspectjweaver:$versions.jweaver" - implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2' - implementation 'org.glassfish.jaxb:jaxb-runtime:4.0.5' - implementation 'com.sun.xml.bind:jaxb-impl:4.0.5' - implementation 'com.sun.xml.bind:jaxb-core:4.0.5' + implementation "jakarta.xml.bind:jakarta.xml.bind-api:$versions.jakartaXmlBindApi" + implementation "org.glassfish.jaxb:jaxb-runtime:$versions.jaxb" + implementation "com.sun.xml.bind:jaxb-impl:$versions.jaxb" + implementation "com.sun.xml.bind:jaxb-core:$versions.jaxb" - implementation 'ma.glasnost.orika:orika-core:1.5.4' + implementation "ma.glasnost.orika:orika-core:$versions.orika" implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml' implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.0' diff --git a/apps/inntektsmelding-service/build.gradle b/apps/inntektsmelding-service/build.gradle index 77150e60bba..67622313baa 100644 --- a/apps/inntektsmelding-service/build.gradle +++ b/apps/inntektsmelding-service/build.gradle @@ -22,10 +22,10 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-security' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" + implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger" - implementation 'no.nav.tjenestespesifikasjoner:nav-altinn-inntektsmelding:1.2019.08.16-13.46-35cbdfd492d4' + implementation "no.nav.tjenestespesifikasjoner:nav-altinn-inntektsmelding:$versions.navAltinnInntektsmelding" implementation 'org.apache.commons:commons-io:1.3.2' diff --git a/apps/jenkins-batch-status-service/build.gradle b/apps/jenkins-batch-status-service/build.gradle index d8462adf3a0..96be491762b 100644 --- a/apps/jenkins-batch-status-service/build.gradle +++ b/apps/jenkins-batch-status-service/build.gradle @@ -24,8 +24,8 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" + implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger" testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } diff --git a/apps/joark-dokument-service/build.gradle b/apps/joark-dokument-service/build.gradle index a6fd3f3096a..27ac16d7327 100644 --- a/apps/joark-dokument-service/build.gradle +++ b/apps/joark-dokument-service/build.gradle @@ -22,8 +22,8 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" + implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger" testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } diff --git a/apps/kodeverk-service/build.gradle b/apps/kodeverk-service/build.gradle index 73c539385ad..4aeeb607350 100644 --- a/apps/kodeverk-service/build.gradle +++ b/apps/kodeverk-service/build.gradle @@ -20,8 +20,8 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-cache' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' + implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc" + implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger" implementation 'com.github.ben-manes.caffeine:caffeine' } diff --git a/apps/miljoer-service/build.gradle b/apps/miljoer-service/build.gradle index 3542a92e169..6ba4a6a7266 100644 --- a/apps/miljoer-service/build.gradle +++ b/apps/miljoer-service/build.gradle @@ -21,8 +21,8 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework.boot:spring-boot-starter-security' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" + implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger" testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } diff --git a/apps/oppsummeringsdokument-service/build.gradle b/apps/oppsummeringsdokument-service/build.gradle index c96e355d75b..98a6449f8ae 100644 --- a/apps/oppsummeringsdokument-service/build.gradle +++ b/apps/oppsummeringsdokument-service/build.gradle @@ -10,9 +10,9 @@ sonarqube { } dependencies { - implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2' - implementation 'javax.activation:activation:1.1.1' - implementation 'org.glassfish.jaxb:jaxb-runtime' + implementation "jakarta.xml.bind:jakarta.xml.bind-api:$versions.jakartaXmlBindApi" + implementation "javax.activation:activation:$versions.javaxActivation" + implementation "org.glassfish.jaxb:jaxb-runtime:$versions.jaxb" implementation 'no.nav.testnav.libs:servlet-core' implementation 'no.nav.testnav.libs:security-core' @@ -20,20 +20,20 @@ dependencies { implementation 'no.nav.testnav.libs:servlet-security' implementation 'no.nav.testnav.xsd:arbeidsforhold-xsd' - implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.17.1' + implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' - implementation 'org.opensearch.client:spring-data-opensearch:1.4.0' + implementation "org.opensearch.client:spring-data-opensearch:$versions.opensearch" implementation 'org.springframework.boot:spring-boot-starter-data-elasticsearch' - implementation 'com.fasterxml.jackson.core:jackson-core:2.17.1' + implementation "com.fasterxml.jackson.core:jackson-core:$versions.jackson" implementation 'org.springframework.kafka:spring-kafka' - implementation 'org.apache.kafka:kafka-clients:3.7.0' + implementation "org.apache.kafka:kafka-clients:$versions.apacheKafka" - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" + implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger" testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } diff --git a/apps/organisasjon-bestilling-service/build.gradle b/apps/organisasjon-bestilling-service/build.gradle index 49c26126d73..d0f03b0b23a 100644 --- a/apps/organisasjon-bestilling-service/build.gradle +++ b/apps/organisasjon-bestilling-service/build.gradle @@ -30,8 +30,8 @@ dependencies { implementation 'org.flywaydb:flyway-core' implementation 'org.postgresql:postgresql' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" + implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger" testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } diff --git a/apps/organisasjon-faste-data-service/build.gradle b/apps/organisasjon-faste-data-service/build.gradle index 6d25402d7f3..adb4ef27310 100644 --- a/apps/organisasjon-faste-data-service/build.gradle +++ b/apps/organisasjon-faste-data-service/build.gradle @@ -28,17 +28,17 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.cloud:spring-cloud-vault-config-databases' - implementation 'jakarta.validation:jakarta.validation-api:3.1.0' - implementation 'io.confluent:kafka-avro-serializer:7.6.1' + implementation "jakarta.validation:jakarta.validation-api:$versions.jakartaValidation" + implementation "io.confluent:kafka-avro-serializer:$versions.avro" implementation 'org.flywaydb:flyway-core' implementation 'com.zaxxer:HikariCP' implementation 'com.h2database:h2' implementation 'org.postgresql:postgresql' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' - implementation 'org.projectreactor:reactor-spring:1.0.1.RELEASE' + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" + implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger" + implementation "org.projectreactor:reactor-spring:$versions.reactorSpring" testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } diff --git a/apps/organisasjon-forvalter/build.gradle b/apps/organisasjon-forvalter/build.gradle index a797e956911..03052c5a3ec 100644 --- a/apps/organisasjon-forvalter/build.gradle +++ b/apps/organisasjon-forvalter/build.gradle @@ -33,14 +33,14 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-vault-config-databases' - implementation 'org.apache.avro:avro:1.11.3' + implementation "org.apache.avro:avro:$versions.apacheAvro" implementation 'org.flywaydb:flyway-core' implementation 'org.postgresql:postgresql' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" - implementation 'ma.glasnost.orika:orika-core:1.5.4' + implementation "ma.glasnost.orika:orika-core:$versions.orika" testImplementation 'com.h2database:h2' testImplementation 'no.nav.testnav.libs:testing' diff --git a/apps/organisasjon-mottak-service/build.gradle b/apps/organisasjon-mottak-service/build.gradle index 3cc4f014c31..e2205e6ad42 100644 --- a/apps/organisasjon-mottak-service/build.gradle +++ b/apps/organisasjon-mottak-service/build.gradle @@ -28,10 +28,10 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config implementation 'org.springframework.kafka:spring-kafka' - implementation 'org.apache.kafka:kafka-clients:3.7.0' - implementation 'io.confluent:kafka-avro-serializer:7.6.1' + implementation "org.apache.kafka:kafka-clients:$versions.apacheKafka" + implementation "io.confluent:kafka-avro-serializer:$versions.avro" - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } diff --git a/apps/organisasjon-service/build.gradle b/apps/organisasjon-service/build.gradle index 15983dd6171..504d05dcd93 100644 --- a/apps/organisasjon-service/build.gradle +++ b/apps/organisasjon-service/build.gradle @@ -22,10 +22,10 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" testImplementation 'junit:junit:4.13.2' //TODO upgrade to JUnit5 testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' testImplementation 'no.nav.testnav.libs:testing' - testImplementation 'org.assertj:assertj-core:3.26.0' + testImplementation "org.assertj:assertj-core:$versions.assertj" } diff --git a/apps/organisasjon-tilgang-service/build.gradle b/apps/organisasjon-tilgang-service/build.gradle index cac64614994..3989bbbfd80 100644 --- a/apps/organisasjon-tilgang-service/build.gradle +++ b/apps/organisasjon-tilgang-service/build.gradle @@ -21,10 +21,10 @@ dependencies { implementation 'org.postgresql:r2dbc-postgresql' implementation 'org.flywaydb:flyway-core' - implementation 'ma.glasnost.orika:orika-core:1.5.4' + implementation "ma.glasnost.orika:orika-core:$versions.orika" - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' + implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc" + implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger" testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } diff --git a/apps/orgnummer-service/build.gradle b/apps/orgnummer-service/build.gradle index 6747304bad4..1a79299b6c6 100644 --- a/apps/orgnummer-service/build.gradle +++ b/apps/orgnummer-service/build.gradle @@ -24,13 +24,13 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.cloud:spring-cloud-vault-config-databases' - implementation 'jakarta.validation:jakarta.validation-api:3.1.0' + implementation "jakarta.validation:jakarta.validation-api:$versions.jakartaValidation" implementation 'org.flywaydb:flyway-core' implementation 'com.h2database:h2' implementation 'com.zaxxer:HikariCP' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" + implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger" implementation 'org.postgresql:postgresql' } diff --git a/apps/oversikt-frontend/build.gradle b/apps/oversikt-frontend/build.gradle index ad38e381713..a396a86e94f 100644 --- a/apps/oversikt-frontend/build.gradle +++ b/apps/oversikt-frontend/build.gradle @@ -26,7 +26,7 @@ dependencies { implementation 'org.springframework.session:spring-session-core' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0' + implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc" testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } diff --git a/apps/pdl-forvalter/build.gradle b/apps/pdl-forvalter/build.gradle index a12c382a9e5..abdf9719dab 100644 --- a/apps/pdl-forvalter/build.gradle +++ b/apps/pdl-forvalter/build.gradle @@ -30,15 +30,15 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-validation' - implementation 'ma.glasnost.orika:orika-core:1.5.4' + implementation "ma.glasnost.orika:orika-core:$versions.orika" - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" + implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger" implementation 'org.postgresql:postgresql' implementation 'org.flywaydb:flyway-core' - implementation 'com.fasterxml.jackson.core:jackson-core:2.17.1' + implementation "com.fasterxml.jackson.core:jackson-core:$versions.jackson" testImplementation 'no.nav.testnav.libs:testing' } \ No newline at end of file diff --git a/apps/person-faste-data-service/build.gradle b/apps/person-faste-data-service/build.gradle index db7f8c23a30..745a0854d4d 100644 --- a/apps/person-faste-data-service/build.gradle +++ b/apps/person-faste-data-service/build.gradle @@ -25,9 +25,9 @@ dependencies { implementation 'com.zaxxer:HikariCP' implementation 'org.postgresql:postgresql' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0' + implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc" - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' + implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger" testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } diff --git a/apps/person-organisasjon-tilgang-service/build.gradle b/apps/person-organisasjon-tilgang-service/build.gradle index b42ef832505..d7959ce9df3 100644 --- a/apps/person-organisasjon-tilgang-service/build.gradle +++ b/apps/person-organisasjon-tilgang-service/build.gradle @@ -28,12 +28,12 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0' + implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc" - implementation 'com.fasterxml.jackson.core:jackson-core:2.17.1' + implementation "com.fasterxml.jackson.core:jackson-core:$versions.jackson" testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' testImplementation 'no.nav.testnav.libs:integration-test' - testImplementation 'com.squareup.okhttp3:okhttp:4.10.0' - testImplementation 'com.squareup.okhttp3:mockwebserver:4.10.0' + testImplementation "com.squareup.okhttp3:okhttp:$versions.okhttp" + testImplementation "com.squareup.okhttp3:mockwebserver:$versions.okhttp" } diff --git a/apps/person-search-service/build.gradle b/apps/person-search-service/build.gradle index 35180b607e3..02965927619 100644 --- a/apps/person-search-service/build.gradle +++ b/apps/person-search-service/build.gradle @@ -18,18 +18,18 @@ dependencies { implementation 'no.nav.testnav.libs:servlet-security' implementation 'org.springframework.boot:spring-boot-starter-data-elasticsearch' - implementation 'org.opensearch.client:spring-data-opensearch:1.4.0' + implementation "org.opensearch.client:spring-data-opensearch:$versions.opensearch" - implementation 'com.fasterxml.jackson.core:jackson-core:2.17.1' + implementation "com.fasterxml.jackson.core:jackson-core:$versions.jackson" implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-cache' - implementation 'ma.glasnost.orika:orika-core:1.5.4' + implementation "ma.glasnost.orika:orika-core:$versions.orika" - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } \ No newline at end of file diff --git a/apps/person-service/build.gradle b/apps/person-service/build.gradle index 31e404e1828..1b0944a8593 100644 --- a/apps/person-service/build.gradle +++ b/apps/person-service/build.gradle @@ -23,8 +23,8 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-cache' - implementation 'ma.glasnost.orika:orika-core:1.5.4' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation "ma.glasnost.orika:orika-core:$versions.orika" + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } diff --git a/apps/profil-api/build.gradle b/apps/profil-api/build.gradle index 46e2b97e3f5..05b7ac72f0d 100644 --- a/apps/profil-api/build.gradle +++ b/apps/profil-api/build.gradle @@ -24,7 +24,7 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } diff --git a/apps/skattekort-service/build.gradle b/apps/skattekort-service/build.gradle index a798e1c8744..a49aaa40e38 100644 --- a/apps/skattekort-service/build.gradle +++ b/apps/skattekort-service/build.gradle @@ -1,43 +1,13 @@ plugins { - id 'java' - id "org.sonarqube" version "4.4.1.3373" - id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.4" - id "jacoco" + id "dolly-apps" + id 'org.unbroken-dome.xjc' version '2.0.0' } sonarqube { properties { - property "sonar.dynamicAnalysis", "reuseReports" - property "sonar.host.url", "https://sonarcloud.io" - property "sonar.java.coveragePlugin", "jacoco" - property "sonar.language", "java" - property "sonar.token", System.getenv("SONAR_TOKEN") - property "sonar.organization", "navikt" - property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-skattekort-service" property "sonar.projectName", "testnav-skattekort-service" - property "sonar.sourceEncoding", "UTF-8" - } -} - -bootJar { - archiveFileName = "app.jar" - mainClass = 'no.nav.skattekortservice.SkattekortServiceApplicationStarter' - duplicatesStrategy = DuplicatesStrategy.EXCLUDE -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' - } -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) } } @@ -52,21 +22,9 @@ xjc { srcDirName = 'resources/schema' } -repositories { - mavenCentral() - maven { - name = "GitHubPackages" - url = uri('https://maven.pkg.github.com/navikt/maven-release') - credentials(PasswordCredentials) { - password System.getenv("NAV_TOKEN") - username 'token' - } - } -} - dependencies { - implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0' - implementation 'org.glassfish.jaxb:jaxb-runtime:4.0.0' + implementation "jakarta.xml.bind:jakarta.xml.bind-api:$versions.jakartaXmlBindApi" + implementation "org.glassfish.jaxb:jaxb-runtime:$versions.jaxb" implementation 'org.json:json:20231013' implementation 'no.nav.testnav.libs:security-core' @@ -74,26 +32,13 @@ dependencies { implementation 'no.nav.testnav.libs:reactive-security' implementation 'no.nav.testnav.libs:data-transfer-objects' - implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-security' 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' - 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.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' - implementation 'ma.glasnost.orika:orika-core:1.5.4' - annotationProcessor 'org.projectlombok:lombok' - implementation 'org.projectlombok:lombok' + implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc" + implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger" - testImplementation 'org.springframework.boot:spring-boot-starter-test' + implementation "ma.glasnost.orika:orika-core:$versions.orika" } \ No newline at end of file diff --git a/apps/skattekort-service/settings.gradle b/apps/skattekort-service/settings.gradle index b42e15f1e9a..a35cbdbc703 100644 --- a/apps/skattekort-service/settings.gradle +++ b/apps/skattekort-service/settings.gradle @@ -4,6 +4,8 @@ plugins { rootProject.name = 'skattekort-service' +includeBuild "../../plugins/java" + includeBuild '../../libs/security-core' includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-security' diff --git a/apps/sykemelding-api/build.gradle b/apps/sykemelding-api/build.gradle index 83c6eddff06..ca0ef57453e 100644 --- a/apps/sykemelding-api/build.gradle +++ b/apps/sykemelding-api/build.gradle @@ -21,18 +21,18 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-security' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' + implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc" + implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger" - implementation 'com.ibm.mq:mq-jms-spring-boot-starter:3.2.3' + implementation "com.ibm.mq:mq-jms-spring-boot-starter:$versions.mq" implementation 'org.springframework.kafka:spring-kafka' - implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2' - implementation 'jakarta.activation:jakarta.activation-api:2.1.3' - implementation 'org.glassfish.jaxb:jaxb-runtime' + implementation "jakarta.xml.bind:jakarta.xml.bind-api:$versions.jakartaXmlBindApi" + implementation "jakarta.activation:jakarta.activation-api:$versions.jakartaActivation" + implementation "org.glassfish.jaxb:jaxb-runtime:$versions.jaxb" implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml' - implementation 'org.apache.kafka:kafka-clients:3.7.0' - implementation 'io.confluent:kafka-avro-serializer:7.6.1' + implementation "org.apache.kafka:kafka-clients:$versions.apacheKafka" + implementation "io.confluent:kafka-avro-serializer:$versions.avro" testImplementation 'no.nav.testnav.libs:testing' testImplementation 'org.springframework.security:spring-security-test' diff --git a/apps/synt-sykemelding-api/build.gradle b/apps/synt-sykemelding-api/build.gradle index eb83949743f..d16feb5f7f2 100644 --- a/apps/synt-sykemelding-api/build.gradle +++ b/apps/synt-sykemelding-api/build.gradle @@ -22,7 +22,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework.boot:spring-boot-starter-security' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" testImplementation 'no.nav.testnav.libs:testing' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' diff --git a/apps/synt-vedtakshistorikk-service/build.gradle b/apps/synt-vedtakshistorikk-service/build.gradle index dfb441da87d..1cc0aa03dd3 100644 --- a/apps/synt-vedtakshistorikk-service/build.gradle +++ b/apps/synt-vedtakshistorikk-service/build.gradle @@ -21,9 +21,9 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework.boot:spring-boot-starter-security' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" - implementation 'com.google.guava:guava:33.2.0-jre' + implementation "com.google.guava:guava:$versions.guava" testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' testImplementation 'junit:junit:4.13.2' //TODO upgrade to JUnit5 diff --git a/apps/tenor-search-service/build.gradle b/apps/tenor-search-service/build.gradle index 6fdabd19299..ea1398e40d3 100644 --- a/apps/tenor-search-service/build.gradle +++ b/apps/tenor-search-service/build.gradle @@ -17,7 +17,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0' + implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc" testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' testImplementation 'no.nav.testnav.libs:integration-test' diff --git a/apps/testnav-ident-pool/build.gradle b/apps/testnav-ident-pool/build.gradle index 5193965cf39..0bb3e37d932 100644 --- a/apps/testnav-ident-pool/build.gradle +++ b/apps/testnav-ident-pool/build.gradle @@ -30,15 +30,15 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config implementation 'org.springframework.retry:spring-retry' - implementation 'org.aspectj:aspectjweaver' + implementation "org.aspectj:aspectjweaver:$versions.jweaver" implementation 'com.h2database:h2' implementation 'org.flywaydb:flyway-core' implementation 'org.postgresql:postgresql' - implementation 'ma.glasnost.orika:orika-core:1.5.4' + implementation "ma.glasnost.orika:orika-core:$versions.orika" - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' testImplementation 'org.springframework.security:spring-security-test' diff --git a/apps/testnorge-statisk-data-forvalter/build.gradle b/apps/testnorge-statisk-data-forvalter/build.gradle index b5edf50c4d2..6dd8cd066e7 100644 --- a/apps/testnorge-statisk-data-forvalter/build.gradle +++ b/apps/testnorge-statisk-data-forvalter/build.gradle @@ -10,7 +10,7 @@ sonarqube { } dependencies { - implementation 'com.google.guava:guava:33.2.0-jre' + implementation "com.google.guava:guava:$versions.guava" implementation 'no.nav.testnav.libs:security-core' implementation 'no.nav.testnav.libs:servlet-security' @@ -24,7 +24,7 @@ dependencies { implementation 'no.nav.testnav.libs:csv-converter' implementation 'org.springframework.kafka:spring-kafka' - implementation 'io.confluent:kafka-avro-serializer:7.6.1' + implementation "io.confluent:kafka-avro-serializer:$versions.avro" implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-web' @@ -34,7 +34,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' - implementation 'org.aspectj:aspectjweaver:1.9.22' + implementation "org.aspectj:aspectjweaver:$versions.jweaver" implementation 'org.postgresql:postgresql' implementation 'com.zaxxer:HikariCP' @@ -43,14 +43,14 @@ dependencies { implementation 'com.h2database:h2' implementation 'org.apache.httpcomponents.client5:httpclient5:5.3.1' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' - implementation 'com.squareup.okhttp3:okhttp:4.9.3' + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" + implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger" + implementation "com.squareup.okhttp3:okhttp:$versions.okhttp" testImplementation 'no.nav.testnav.libs:testing' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' testImplementation 'org.springframework.security:spring-security-test' - testImplementation 'com.squareup.okhttp3:mockwebserver:4.9.3' + testImplementation "com.squareup.okhttp3:mockwebserver:$versions.okhttp" } description = 'testnorge-statisk-data-forvalter' diff --git a/apps/tilbakemelding-api/build.gradle b/apps/tilbakemelding-api/build.gradle index 18c30dc7887..cbb640e8bfe 100644 --- a/apps/tilbakemelding-api/build.gradle +++ b/apps/tilbakemelding-api/build.gradle @@ -22,13 +22,13 @@ 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.3.0' + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config implementation 'org.reactivestreams:reactive-streams:1.0.4' - implementation 'org.projectreactor:reactor-spring:1.0.1.RELEASE' + implementation "org.projectreactor:reactor-spring:$versions.reactorSpring" testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } diff --git a/apps/tps-messaging-service/build.gradle b/apps/tps-messaging-service/build.gradle index a294779524b..f6c23a4d1d4 100644 --- a/apps/tps-messaging-service/build.gradle +++ b/apps/tps-messaging-service/build.gradle @@ -28,20 +28,20 @@ dependencies { implementation 'com.fasterxml.jackson.core:jackson-annotations' implementation 'com.fasterxml.jackson.core:jackson-databind' - implementation 'com.ibm.mq:mq-jms-spring-boot-starter:3.2.3' + implementation "com.ibm.mq:mq-jms-spring-boot-starter:$versions.mq" 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 "jakarta.xml.bind:jakarta.xml.bind-api:$versions.jakartaXmlBindApi" + implementation "com.sun.xml.bind:jaxb-core:$versions.jaxb" + implementation "org.glassfish.jaxb:jaxb-runtime:$versions.jaxb" implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml' - implementation 'no.nav.repository.fellesreg.tpsws:nav-repository-fellesregister-jaxb-tps-s610-domain:2020.08.27-09.53-183ead3d81eb' - implementation 'no.nav.repository.fellesreg.tpsws:nav-repository-fellesregister-jaxb-tps-m201-domain:2020.08.27-09.53-183ead3d81eb' - implementation 'no.nav.repository.fellesreg.tpsws:nav-repository-fellesregister-castor-tps-s018-domain:2020.08.27-09.53-183ead3d81eb' + implementation "no.nav.repository.fellesreg.tpsws:nav-repository-fellesregister-jaxb-tps-s610-domain:$versions.navFellesregister" + implementation "no.nav.repository.fellesreg.tpsws:nav-repository-fellesregister-jaxb-tps-m201-domain:$versions.navFellesregister" + implementation "no.nav.repository.fellesreg.tpsws:nav-repository-fellesregister-castor-tps-s018-domain:$versions.navFellesregister" - implementation 'ma.glasnost.orika:orika-core:1.5.4' - implementation 'org.aspectj:aspectjweaver:1.9.22' + implementation "ma.glasnost.orika:orika-core:$versions.orika" + implementation "org.aspectj:aspectjweaver:$versions.jweaver" - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" } \ No newline at end of file diff --git a/apps/udi-stub/build.gradle b/apps/udi-stub/build.gradle index 2d3e7ca0d9b..b9afdb2c571 100644 --- a/apps/udi-stub/build.gradle +++ b/apps/udi-stub/build.gradle @@ -23,7 +23,7 @@ configurations { dependencies { implementation platform('org.testcontainers:testcontainers-bom:1.19.8') - implementation "com.sun.xml.ws:jaxws-rt:4.0.2" + implementation "com.sun.xml.ws:jaxws-rt:$versions.jaxws" implementation 'no.nav.testnav.libs:servlet-core' implementation 'no.nav.testnav.libs:servlet-security' implementation 'no.nav.testnav.libs:database' @@ -43,9 +43,9 @@ dependencies { implementation 'org.flywaydb:flyway-core' implementation 'com.zaxxer:HikariCP' - implementation 'ma.glasnost.orika:orika-core:1.5.4' + implementation "ma.glasnost.orika:orika-core:$versions.orika" - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" testImplementation 'com.h2database:h2' testImplementation 'org.testcontainers:junit-jupiter' diff --git a/apps/varslinger-service/build.gradle b/apps/varslinger-service/build.gradle index dddc98bead8..1735ab74ece 100644 --- a/apps/varslinger-service/build.gradle +++ b/apps/varslinger-service/build.gradle @@ -11,7 +11,7 @@ sonarqube { dependencies { - implementation 'com.google.guava:guava:33.2.0-jre' + implementation "com.google.guava:guava:$versions.guava" implementation 'no.nav.testnav.libs:security-core' implementation 'no.nav.testnav.libs:servlet-core' implementation 'no.nav.testnav.libs:database' @@ -27,7 +27,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc" implementation 'com.h2database:h2' implementation 'com.zaxxer:HikariCP' diff --git a/examples/reactive-rest-example/build.gradle b/examples/reactive-rest-example/build.gradle index 9ee8384b058..27ed8451880 100644 --- a/examples/reactive-rest-example/build.gradle +++ b/examples/reactive-rest-example/build.gradle @@ -28,7 +28,7 @@ dependencies { runtimeOnly 'org.postgresql:postgresql' runtimeOnly 'com.h2database:h2' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' + implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc" + implementation "net.logstash.logback:logstash-logback-encoder:$versions.logback" implementation 'org.hibernate.validator:hibernate-validator' } diff --git a/libs/avro-schema/build.gradle b/libs/avro-schema/build.gradle index 274ce6210ae..09e3817af9a 100644 --- a/libs/avro-schema/build.gradle +++ b/libs/avro-schema/build.gradle @@ -10,6 +10,6 @@ sonarqube { } dependencies { - implementation 'org.apache.avro:avro-compiler:1.11.3' - implementation 'org.apache.avro:avro-maven-plugin:1.11.3' + implementation "org.apache.avro:avro-compiler:$versions.apacheAvro" + implementation "org.apache.avro:avro-maven-plugin:$versions.apacheAvro" } \ No newline at end of file diff --git a/libs/data-transfer-objects/build.gradle b/libs/data-transfer-objects/build.gradle index 3275231900d..108ee4d21e2 100644 --- a/libs/data-transfer-objects/build.gradle +++ b/libs/data-transfer-objects/build.gradle @@ -14,14 +14,14 @@ 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.21' - implementation 'jakarta.validation:jakarta.validation-api' - implementation 'jakarta.xml.bind:jakarta.xml.bind-api' + implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger" + implementation "jakarta.validation:jakarta.validation-api:$versions.jakartaValidation" + implementation "jakarta.xml.bind:jakarta.xml.bind-api:$versions.jakartaXmlBindApi" implementation 'javax.xml.bind:jaxb-api:2.4.0-b180830.0359' implementation 'org.apache.commons:commons-lang3' implementation 'org.springframework:spring-web' - implementation 'no.nav.tjenestespesifikasjoner:nav-altinn-inntektsmelding:1.2019.08.16-13.46-35cbdfd492d4' + implementation "no.nav.tjenestespesifikasjoner:nav-altinn-inntektsmelding:$versions.navAltinnInntektsmelding" } tasks.withType(JavaCompile) { diff --git a/libs/data-transfer-search-objects/build.gradle b/libs/data-transfer-search-objects/build.gradle index e01561121ca..0ed6e488199 100644 --- a/libs/data-transfer-search-objects/build.gradle +++ b/libs/data-transfer-search-objects/build.gradle @@ -14,9 +14,9 @@ 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.21' - implementation 'jakarta.validation:jakarta.validation-api' - implementation 'jakarta.xml.bind:jakarta.xml.bind-api' + implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger" + implementation "jakarta.validation:jakarta.validation-api:$versions.jakartaValidation" + implementation "jakarta.xml.bind:jakarta.xml.bind-api:$versions.jakartaXmlBindApi" implementation 'javax.xml.bind:jaxb-api:2.4.0-b180830.0359' implementation 'org.apache.commons:commons-lang3' implementation 'org.springframework:spring-web' diff --git a/libs/domain/build.gradle b/libs/domain/build.gradle index feecda27c3e..a8586d3d0e8 100644 --- a/libs/domain/build.gradle +++ b/libs/domain/build.gradle @@ -12,8 +12,8 @@ sonarqube { dependencies { implementation 'com.fasterxml.jackson.core:jackson-annotations' implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml' - implementation 'com.fasterxml.jackson.core:jackson-core:2.17.1' + implementation "com.fasterxml.jackson.core:jackson-core:$versions.jackson" - implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2' + implementation "jakarta.xml.bind:jakarta.xml.bind-api:$versions.jakartaXmlBindApi" implementation 'io.springfox:springfox-swagger2:3.0.0' } \ No newline at end of file diff --git a/libs/kafka-producers/build.gradle b/libs/kafka-producers/build.gradle index e82832e1e78..1f09eb7b21d 100644 --- a/libs/kafka-producers/build.gradle +++ b/libs/kafka-producers/build.gradle @@ -14,7 +14,7 @@ dependencies { implementation 'no.nav.testnav.libs:avro-schema' implementation 'org.springframework.kafka:spring-kafka' - implementation 'io.confluent:kafka-avro-serializer:7.6.1' + implementation "io.confluent:kafka-avro-serializer:$versions.avro" implementation 'org.springframework.boot:spring-boot-starter-web' } \ No newline at end of file diff --git a/libs/reactive-core/build.gradle b/libs/reactive-core/build.gradle index bf27e78235e..7af354a3b43 100644 --- a/libs/reactive-core/build.gradle +++ b/libs/reactive-core/build.gradle @@ -27,7 +27,7 @@ publishing { dependencies { implementation 'org.springframework.boot:spring-boot-starter-webflux' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' + implementation "net.logstash.logback:logstash-logback-encoder:$versions.logback" - testImplementation 'io.projectreactor:reactor-test:3.6.5' + testImplementation "io.projectreactor:reactor-test:$versions.reactorTest" } \ No newline at end of file diff --git a/libs/reactive-security/build.gradle b/libs/reactive-security/build.gradle index 0bff93a11d6..4f4646a99ae 100644 --- a/libs/reactive-security/build.gradle +++ b/libs/reactive-security/build.gradle @@ -45,7 +45,7 @@ publishing { dependencies { implementation 'no.nav.testnav.libs:security-core' - implementation 'com.auth0:java-jwt:4.4.0' + implementation "com.auth0:java-jwt:$versions.jwt" 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 be94578b17a..d2a0c1ae784 100644 --- a/libs/reactive-session-security/build.gradle +++ b/libs/reactive-session-security/build.gradle @@ -10,7 +10,7 @@ sonarqube { } dependencies { - implementation 'com.auth0:java-jwt:4.4.0' + implementation "com.auth0:java-jwt:$versions.jwt" implementation 'no.nav.testnav.libs:security-core' implementation "org.springframework.session:spring-session-core" diff --git a/libs/security-core/build.gradle b/libs/security-core/build.gradle index 58a7de01e46..c2f472acaa5 100644 --- a/libs/security-core/build.gradle +++ b/libs/security-core/build.gradle @@ -14,7 +14,7 @@ tasks.named('compileJava') { } dependencies { - implementation 'com.auth0:java-jwt:4.4.0' + implementation "com.auth0:java-jwt:$versions.jwt" implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework.boot:spring-boot-starter-validation' diff --git a/libs/servlet-core/build.gradle b/libs/servlet-core/build.gradle index 002ebbe4a64..37aba9ca55a 100644 --- a/libs/servlet-core/build.gradle +++ b/libs/servlet-core/build.gradle @@ -11,8 +11,8 @@ sonarqube { dependencies { - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' + implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger" + implementation "net.logstash.logback:logstash-logback-encoder:$versions.logback" implementation 'org.springframework.boot:spring-boot-starter-web' diff --git a/libs/servlet-security/build.gradle b/libs/servlet-security/build.gradle index 37487ce71cf..44a67aa7bed 100644 --- a/libs/servlet-security/build.gradle +++ b/libs/servlet-security/build.gradle @@ -12,7 +12,7 @@ sonarqube { dependencies { implementation 'no.nav.testnav.libs:security-core' - implementation 'com.auth0:java-jwt:4.4.0' + implementation "com.auth0:java-jwt:$versions.jwt" implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' implementation 'org.springframework.boot:spring-boot-starter-actuator' diff --git a/libs/testing/build.gradle b/libs/testing/build.gradle index 69120f53847..8e52747b710 100644 --- a/libs/testing/build.gradle +++ b/libs/testing/build.gradle @@ -11,6 +11,6 @@ sonarqube { dependencies { implementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - implementation 'com.fasterxml.jackson.core:jackson-core' + implementation "com.fasterxml.jackson.core:jackson-core:$versions.jackson" implementation 'com.fasterxml.jackson.core:jackson-databind' } \ No newline at end of file diff --git a/mocks/maskinporten-mock/build.gradle b/mocks/maskinporten-mock/build.gradle index e737db4165e..2ee420309f3 100644 --- a/mocks/maskinporten-mock/build.gradle +++ b/mocks/maskinporten-mock/build.gradle @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation 'com.auth0:java-jwt:4.4.0' + implementation "com.auth0:java-jwt:$versions.jwt" implementation 'no.nav.testnav.libs:security-core' implementation 'no.nav.testnav.libs:reactive-core' @@ -11,7 +11,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.5.0' + implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc" - compileOnly 'jakarta.servlet:jakarta.servlet-api:6.0.0' + compileOnly 'jakarta.servlet:jakarta.servlet-api' } diff --git a/mocks/tokendings-mock/build.gradle b/mocks/tokendings-mock/build.gradle index 1f70a420e11..f5f11a9570d 100644 --- a/mocks/tokendings-mock/build.gradle +++ b/mocks/tokendings-mock/build.gradle @@ -3,7 +3,7 @@ plugins { } dependencies { - implementation 'com.auth0:java-jwt:4.4.0' + implementation "com.auth0:java-jwt:$versions.jwt" implementation 'no.nav.testnav.libs:security-core' implementation 'no.nav.testnav.libs:reactive-core' @@ -12,7 +12,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.5.0' + implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc" - compileOnly 'jakarta.servlet:jakarta.servlet-api:6.0.0' + compileOnly 'jakarta.servlet:jakarta.servlet-api' } diff --git a/plugins/java/src/main/groovy/dolly-apps.gradle b/plugins/java/src/main/groovy/dolly-apps.gradle index ba686f8b995..3426f98bdd1 100644 --- a/plugins/java/src/main/groovy/dolly-apps.gradle +++ b/plugins/java/src/main/groovy/dolly-apps.gradle @@ -1,5 +1,6 @@ plugins { id "dolly-sonar" + id "dolly-versions" id "io.spring.dependency-management" // See ../../../build.gradle for version. id "java" @@ -20,7 +21,7 @@ dependencies { developmentOnly "org.springframework.boot:spring-boot-devtools" - implementation "net.logstash.logback:logstash-logback-encoder:7.4" + implementation "net.logstash.logback:logstash-logback-encoder:$versions.logback" implementation "org.hibernate.validator:hibernate-validator" implementation "org.projectlombok:lombok" implementation "org.springframework.boot:spring-boot-starter-actuator" @@ -37,9 +38,9 @@ dependencies { dependencyManagement { applyMavenExclusions = false imports { - mavenBom "org.springframework.boot:spring-boot-dependencies:3.2.1" - mavenBom "org.springframework.cloud:spring-cloud-dependencies:2023.0.1" - mavenBom "org.springframework.session:spring-session-bom:2021.2.3" + mavenBom "org.springframework.boot:spring-boot-dependencies:$versions.springBoot" + mavenBom "org.springframework.cloud:spring-cloud-dependencies:$versions.springCloud" + mavenBom "org.springframework.session:spring-session-bom:$versions.springSession" } } diff --git a/plugins/java/src/main/groovy/dolly-libs.gradle b/plugins/java/src/main/groovy/dolly-libs.gradle index fd21bb5f6e0..9002e295ad3 100644 --- a/plugins/java/src/main/groovy/dolly-libs.gradle +++ b/plugins/java/src/main/groovy/dolly-libs.gradle @@ -1,5 +1,6 @@ plugins { id "dolly-sonar" + id "dolly-versions" id "io.spring.dependency-management" // See ../../../build.gradle for version. id "java-library" @@ -16,8 +17,8 @@ configurations { dependencyManagement { applyMavenExclusions = false imports { - mavenBom "org.springframework.boot:spring-boot-dependencies:3.2.1" - mavenBom "org.springframework.cloud:spring-cloud-dependencies:2023.0.1" + mavenBom "org.springframework.boot:spring-boot-dependencies:$versions.springBoot" + mavenBom "org.springframework.cloud:spring-cloud-dependencies:$versions.springCloud" } } diff --git a/plugins/java/src/main/groovy/dolly-proxies.gradle b/plugins/java/src/main/groovy/dolly-proxies.gradle index e6b941df7e7..ea907c260bf 100644 --- a/plugins/java/src/main/groovy/dolly-proxies.gradle +++ b/plugins/java/src/main/groovy/dolly-proxies.gradle @@ -1,5 +1,6 @@ plugins { id "dolly-sonar" + id "dolly-versions" id "io.spring.dependency-management" // See ../../../build.gradle for version. id "java" @@ -20,7 +21,7 @@ dependencies { developmentOnly "org.springframework.boot:spring-boot-devtools" - implementation "net.logstash.logback:logstash-logback-encoder:7.4" + implementation "net.logstash.logback:logstash-logback-encoder:$versions.logback" implementation "no.nav.testnav.libs:reactive-core" implementation "no.nav.testnav.libs:reactive-proxy" implementation "org.hibernate.validator:hibernate-validator" @@ -40,9 +41,9 @@ dependencies { dependencyManagement { applyMavenExclusions = false imports { - mavenBom "org.springframework.boot:spring-boot-dependencies:3.2.1" - mavenBom "org.springframework.cloud:spring-cloud-dependencies:2023.0.1" - mavenBom "org.springframework.session:spring-session-bom:2021.2.3" + mavenBom "org.springframework.boot:spring-boot-dependencies:$versions.springBoot" + mavenBom "org.springframework.cloud:spring-cloud-dependencies:$versions.springCloud" + mavenBom "org.springframework.session:spring-session-bom:$versions.springSession" } } diff --git a/plugins/java/src/main/groovy/dolly-versions.gradle b/plugins/java/src/main/groovy/dolly-versions.gradle new file mode 100644 index 00000000000..27445a6f0da --- /dev/null +++ b/plugins/java/src/main/groovy/dolly-versions.gradle @@ -0,0 +1,36 @@ +extensions.create("versions", DollyVersionCatalog) + +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 apacheAvro = "1.11.3" + String apacheKafka = "3.7.0" + String apachePoi = "5.2.5" + String assertj = "3.26.0" + String avro = "7.6.1" + String guava = "33.2.0-jre" + String jackson = "2.17.1" + String jakartaActivation = "2.1.3" + String jakartaValidation = "3.1.0" + String jakartaXmlBindApi = "4.0.2" + String javaxActivation = "1.1.1" + String javaxAnnotation = "1.3.2" + String jaxb = "4.0.5" + String jaxws = "4.0.2" + String jweaver = "1.9.22" + String jwt = "4.4.0" + String logback = "7.4" + String mq = "3.2.3" + String okhttp = "4.10.0" + String opensearch = "1.4.0" + String orika = "1.5.4" + String reactorSpring = "1.0.1.RELEASE" + String reactorTest = "3.6.5" + String springdoc = "2.5.0" + String swagger = "2.2.21" +} \ No newline at end of file diff --git a/xsd/arbeidsforhold-xsd/build.gradle b/xsd/arbeidsforhold-xsd/build.gradle index 850de59b639..c5174f16d0d 100644 --- a/xsd/arbeidsforhold-xsd/build.gradle +++ b/xsd/arbeidsforhold-xsd/build.gradle @@ -11,12 +11,12 @@ sonarqube { group = 'no.nav.testnav.xsd' dependencies { - implementation 'jakarta.activation:jakarta.activation-api:2.1.3' - implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2' + implementation "jakarta.activation:jakarta.activation-api:$versions.jakartaActivation" + implementation "jakarta.xml.bind:jakarta.xml.bind-api:$versions.jakartaXmlBindApi" - xjc 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2' + xjc "jakarta.xml.bind:jakarta.xml.bind-api:$versions.jakartaXmlBindApi" xjc 'org.glassfish.jaxb:jaxb-xjc:4.0.5' - xjc 'com.sun.xml.bind:jaxb-impl:4.0.5' + xjc "com.sun.xml.bind:jaxb-impl:$versions.jaxb" xjc 'com.sun.istack:istack-commons-runtime:4.2.0' }