diff --git a/apps/adresse-service/build.gradle b/apps/adresse-service/build.gradle index 79e599ba831..a7c60fde2e8 100644 --- a/apps/adresse-service/build.gradle +++ b/apps/adresse-service/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/apps/amelding-service/build.gradle b/apps/amelding-service/build.gradle index 9edf0323b6f..c2a4bbf4d5f 100644 --- a/apps/amelding-service/build.gradle +++ b/apps/amelding-service/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/apps/app-tilgang-analyse-service/build.gradle b/apps/app-tilgang-analyse-service/build.gradle index c147daed852..88d3ffe411e 100644 --- a/apps/app-tilgang-analyse-service/build.gradle +++ b/apps/app-tilgang-analyse-service/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/apps/arbeidsforhold-service/build.gradle b/apps/arbeidsforhold-service/build.gradle index 89c96b91cd3..089e3d8c9fc 100644 --- a/apps/arbeidsforhold-service/build.gradle +++ b/apps/arbeidsforhold-service/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/apps/batch-bestilling-service/build.gradle b/apps/batch-bestilling-service/build.gradle index 1e6836a3162..5cfd5693cab 100644 --- a/apps/batch-bestilling-service/build.gradle +++ b/apps/batch-bestilling-service/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/apps/brreg-stub/build.gradle b/apps/brreg-stub/build.gradle index 08ef4fc43d8..48e8a1d39ae 100644 --- a/apps/brreg-stub/build.gradle +++ b/apps/brreg-stub/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" id "uk.co.boothen.gradle.wsimport" version "0.21" } diff --git a/apps/bruker-service/build.gradle b/apps/bruker-service/build.gradle index ccf84e29172..d2d3a9c73f0 100644 --- a/apps/bruker-service/build.gradle +++ b/apps/bruker-service/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } def test = tasks.named("test") { diff --git a/apps/budpro-service/build.gradle b/apps/budpro-service/build.gradle index 8dc5c22ad92..ca5df53ed97 100644 --- a/apps/budpro-service/build.gradle +++ b/apps/budpro-service/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } dependencies { diff --git a/apps/dolly-backend/build.gradle b/apps/dolly-backend/build.gradle index 18f6545bac6..2adde405cba 100644 --- a/apps/dolly-backend/build.gradle +++ b/apps/dolly-backend/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/apps/endringsmelding-service/build.gradle b/apps/endringsmelding-service/build.gradle index 6ab53b363a5..06911756cd6 100644 --- a/apps/endringsmelding-service/build.gradle +++ b/apps/endringsmelding-service/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/apps/ereg-batch-status-service/build.gradle b/apps/ereg-batch-status-service/build.gradle index 4427b2e1fa8..d0262742b65 100644 --- a/apps/ereg-batch-status-service/build.gradle +++ b/apps/ereg-batch-status-service/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/apps/generer-arbeidsforhold-populasjon-service/build.gradle b/apps/generer-arbeidsforhold-populasjon-service/build.gradle index 000e9a94530..96d217a72ff 100644 --- a/apps/generer-arbeidsforhold-populasjon-service/build.gradle +++ b/apps/generer-arbeidsforhold-populasjon-service/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/apps/generer-navn-service/build.gradle b/apps/generer-navn-service/build.gradle index 458d8dad4f2..daed7ca1a1f 100644 --- a/apps/generer-navn-service/build.gradle +++ b/apps/generer-navn-service/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/apps/generer-organisasjon-populasjon-service/build.gradle b/apps/generer-organisasjon-populasjon-service/build.gradle index e9e4ef00d3d..9c1768c82f4 100644 --- a/apps/generer-organisasjon-populasjon-service/build.gradle +++ b/apps/generer-organisasjon-populasjon-service/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/apps/generer-synt-amelding-service/build.gradle b/apps/generer-synt-amelding-service/build.gradle index 795b5303dd0..582abaf023a 100644 --- a/apps/generer-synt-amelding-service/build.gradle +++ b/apps/generer-synt-amelding-service/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/apps/helsepersonell-service/build.gradle b/apps/helsepersonell-service/build.gradle index 2c78ef9d12f..f7535f9d68f 100644 --- a/apps/helsepersonell-service/build.gradle +++ b/apps/helsepersonell-service/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/apps/inntektsmelding-generator-service/build.gradle b/apps/inntektsmelding-generator-service/build.gradle index 0a4de96f970..22e95963649 100644 --- a/apps/inntektsmelding-generator-service/build.gradle +++ b/apps/inntektsmelding-generator-service/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/apps/inntektsmelding-service/build.gradle b/apps/inntektsmelding-service/build.gradle index a62ee04a40b..67622313baa 100644 --- a/apps/inntektsmelding-service/build.gradle +++ b/apps/inntektsmelding-service/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/apps/jenkins-batch-status-service/build.gradle b/apps/jenkins-batch-status-service/build.gradle index 402843eb670..96be491762b 100644 --- a/apps/jenkins-batch-status-service/build.gradle +++ b/apps/jenkins-batch-status-service/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/apps/joark-dokument-service/build.gradle b/apps/joark-dokument-service/build.gradle index 28d52e8daf0..27ac16d7327 100644 --- a/apps/joark-dokument-service/build.gradle +++ b/apps/joark-dokument-service/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/apps/kodeverk-service/build.gradle b/apps/kodeverk-service/build.gradle index bdb3de16d0f..4aeeb607350 100644 --- a/apps/kodeverk-service/build.gradle +++ b/apps/kodeverk-service/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/apps/miljoer-service/build.gradle b/apps/miljoer-service/build.gradle index c89050a8b14..6ba4a6a7266 100644 --- a/apps/miljoer-service/build.gradle +++ b/apps/miljoer-service/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/apps/oppsummeringsdokument-service/build.gradle b/apps/oppsummeringsdokument-service/build.gradle index 95982496104..98a6449f8ae 100644 --- a/apps/oppsummeringsdokument-service/build.gradle +++ b/apps/oppsummeringsdokument-service/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/apps/organisasjon-bestilling-service/build.gradle b/apps/organisasjon-bestilling-service/build.gradle index 7462a06f9a4..d0f03b0b23a 100644 --- a/apps/organisasjon-bestilling-service/build.gradle +++ b/apps/organisasjon-bestilling-service/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/apps/organisasjon-faste-data-service/build.gradle b/apps/organisasjon-faste-data-service/build.gradle index cfb6370cf76..adb4ef27310 100644 --- a/apps/organisasjon-faste-data-service/build.gradle +++ b/apps/organisasjon-faste-data-service/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/apps/organisasjon-forvalter/build.gradle b/apps/organisasjon-forvalter/build.gradle index 07a73303f52..03052c5a3ec 100644 --- a/apps/organisasjon-forvalter/build.gradle +++ b/apps/organisasjon-forvalter/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/apps/organisasjon-mottak-service/build.gradle b/apps/organisasjon-mottak-service/build.gradle index 9a714005642..e2205e6ad42 100644 --- a/apps/organisasjon-mottak-service/build.gradle +++ b/apps/organisasjon-mottak-service/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/apps/organisasjon-service/build.gradle b/apps/organisasjon-service/build.gradle index a300e09b158..504d05dcd93 100644 --- a/apps/organisasjon-service/build.gradle +++ b/apps/organisasjon-service/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/apps/organisasjon-tilgang-service/build.gradle b/apps/organisasjon-tilgang-service/build.gradle index 8919349b5c1..3989bbbfd80 100644 --- a/apps/organisasjon-tilgang-service/build.gradle +++ b/apps/organisasjon-tilgang-service/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/apps/orgnummer-service/build.gradle b/apps/orgnummer-service/build.gradle index d2b511d7ff1..1a79299b6c6 100644 --- a/apps/orgnummer-service/build.gradle +++ b/apps/orgnummer-service/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/apps/oversikt-frontend/build.gradle b/apps/oversikt-frontend/build.gradle index a140cb073f2..a396a86e94f 100644 --- a/apps/oversikt-frontend/build.gradle +++ b/apps/oversikt-frontend/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/apps/pdl-forvalter/build.gradle b/apps/pdl-forvalter/build.gradle index a8d3bb737af..abdf9719dab 100644 --- a/apps/pdl-forvalter/build.gradle +++ b/apps/pdl-forvalter/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/apps/person-faste-data-service/build.gradle b/apps/person-faste-data-service/build.gradle index 7ab65eaa1e4..745a0854d4d 100644 --- a/apps/person-faste-data-service/build.gradle +++ b/apps/person-faste-data-service/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/apps/person-organisasjon-tilgang-service/build.gradle b/apps/person-organisasjon-tilgang-service/build.gradle index d528fb4c6ec..d7959ce9df3 100644 --- a/apps/person-organisasjon-tilgang-service/build.gradle +++ b/apps/person-organisasjon-tilgang-service/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } def test = tasks.named("test") { diff --git a/apps/person-search-service/build.gradle b/apps/person-search-service/build.gradle index 865ea9d95fc..02965927619 100644 --- a/apps/person-search-service/build.gradle +++ b/apps/person-search-service/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/apps/person-service/build.gradle b/apps/person-service/build.gradle index 2361db78da3..1b0944a8593 100644 --- a/apps/person-service/build.gradle +++ b/apps/person-service/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/apps/profil-api/build.gradle b/apps/profil-api/build.gradle index 5dd4b5973b2..05b7ac72f0d 100644 --- a/apps/profil-api/build.gradle +++ b/apps/profil-api/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/apps/skattekort-service/build.gradle b/apps/skattekort-service/build.gradle index f7cd5e91e91..1a6a27fa80a 100644 --- a/apps/skattekort-service/build.gradle +++ b/apps/skattekort-service/build.gradle @@ -1,5 +1,4 @@ plugins { - id "dolly-versions" id 'java' id "org.sonarqube" version "4.4.1.3373" diff --git a/apps/sykemelding-api/build.gradle b/apps/sykemelding-api/build.gradle index c170db83ce8..ca0ef57453e 100644 --- a/apps/sykemelding-api/build.gradle +++ b/apps/sykemelding-api/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/apps/synt-sykemelding-api/build.gradle b/apps/synt-sykemelding-api/build.gradle index 668908c5697..d16feb5f7f2 100644 --- a/apps/synt-sykemelding-api/build.gradle +++ b/apps/synt-sykemelding-api/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/apps/synt-vedtakshistorikk-service/build.gradle b/apps/synt-vedtakshistorikk-service/build.gradle index 204047d2417..1cc0aa03dd3 100644 --- a/apps/synt-vedtakshistorikk-service/build.gradle +++ b/apps/synt-vedtakshistorikk-service/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/apps/tenor-search-service/build.gradle b/apps/tenor-search-service/build.gradle index 0c42a7486fc..ea1398e40d3 100644 --- a/apps/tenor-search-service/build.gradle +++ b/apps/tenor-search-service/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/apps/testnav-ident-pool/build.gradle b/apps/testnav-ident-pool/build.gradle index c4d36db65ce..0bb3e37d932 100644 --- a/apps/testnav-ident-pool/build.gradle +++ b/apps/testnav-ident-pool/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/apps/testnorge-statisk-data-forvalter/build.gradle b/apps/testnorge-statisk-data-forvalter/build.gradle index a9ebb32d45a..6dd8cd066e7 100644 --- a/apps/testnorge-statisk-data-forvalter/build.gradle +++ b/apps/testnorge-statisk-data-forvalter/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/apps/tilbakemelding-api/build.gradle b/apps/tilbakemelding-api/build.gradle index dedf5bc855b..cbb640e8bfe 100644 --- a/apps/tilbakemelding-api/build.gradle +++ b/apps/tilbakemelding-api/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/apps/tps-messaging-service/build.gradle b/apps/tps-messaging-service/build.gradle index 364c2c831fc..f6c23a4d1d4 100644 --- a/apps/tps-messaging-service/build.gradle +++ b/apps/tps-messaging-service/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/apps/udi-stub/build.gradle b/apps/udi-stub/build.gradle index 1fc6500fa41..b9afdb2c571 100644 --- a/apps/udi-stub/build.gradle +++ b/apps/udi-stub/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" id "uk.co.boothen.gradle.wsimport" version "0.21" } diff --git a/apps/varslinger-service/build.gradle b/apps/varslinger-service/build.gradle index b416b3409d0..1735ab74ece 100644 --- a/apps/varslinger-service/build.gradle +++ b/apps/varslinger-service/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/examples/reactive-rest-example/build.gradle b/examples/reactive-rest-example/build.gradle index b8cdc9c2689..27ed8451880 100644 --- a/examples/reactive-rest-example/build.gradle +++ b/examples/reactive-rest-example/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } sonarqube { diff --git a/libs/avro-schema/build.gradle b/libs/avro-schema/build.gradle index 0318ba26734..09e3817af9a 100644 --- a/libs/avro-schema/build.gradle +++ b/libs/avro-schema/build.gradle @@ -1,7 +1,6 @@ plugins { id "dolly-libs" id "dolly-libs-publish" - id "dolly-versions" id 'com.github.davidmc24.gradle.plugin.avro' version '1.9.1' } diff --git a/libs/data-transfer-objects/build.gradle b/libs/data-transfer-objects/build.gradle index cec45205043..108ee4d21e2 100644 --- a/libs/data-transfer-objects/build.gradle +++ b/libs/data-transfer-objects/build.gradle @@ -1,7 +1,6 @@ plugins { id "dolly-libs" id "dolly-libs-publish" - id "dolly-versions" } sonarqube { diff --git a/libs/data-transfer-search-objects/build.gradle b/libs/data-transfer-search-objects/build.gradle index 1d7706a3b87..0ed6e488199 100644 --- a/libs/data-transfer-search-objects/build.gradle +++ b/libs/data-transfer-search-objects/build.gradle @@ -1,7 +1,6 @@ plugins { id "dolly-libs" id "dolly-libs-publish" - id "dolly-versions" } sonarqube { diff --git a/libs/domain/build.gradle b/libs/domain/build.gradle index 9401cf69e0a..a8586d3d0e8 100644 --- a/libs/domain/build.gradle +++ b/libs/domain/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-libs" - id "dolly-versions" } sonarqube { diff --git a/libs/kafka-producers/build.gradle b/libs/kafka-producers/build.gradle index b152829f867..1f09eb7b21d 100644 --- a/libs/kafka-producers/build.gradle +++ b/libs/kafka-producers/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-libs" - id "dolly-versions" } sonarqube { diff --git a/libs/reactive-core/build.gradle b/libs/reactive-core/build.gradle index 43e55d2d52f..7af354a3b43 100644 --- a/libs/reactive-core/build.gradle +++ b/libs/reactive-core/build.gradle @@ -1,7 +1,6 @@ plugins { id "dolly-libs" id "dolly-libs-publish" - id "dolly-versions" } sonarqube { diff --git a/libs/reactive-security/build.gradle b/libs/reactive-security/build.gradle index 165c90d1939..4f4646a99ae 100644 --- a/libs/reactive-security/build.gradle +++ b/libs/reactive-security/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-libs" - id "dolly-versions" id 'maven-publish' } diff --git a/libs/reactive-session-security/build.gradle b/libs/reactive-session-security/build.gradle index 5755d0d9c71..d2a0c1ae784 100644 --- a/libs/reactive-session-security/build.gradle +++ b/libs/reactive-session-security/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-libs" - id "dolly-versions" } sonarqube { diff --git a/libs/security-core/build.gradle b/libs/security-core/build.gradle index 33fb6ac5a12..c2f472acaa5 100644 --- a/libs/security-core/build.gradle +++ b/libs/security-core/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-libs" - id "dolly-versions" } sonarqube { diff --git a/libs/servlet-core/build.gradle b/libs/servlet-core/build.gradle index 6c826255815..37aba9ca55a 100644 --- a/libs/servlet-core/build.gradle +++ b/libs/servlet-core/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-libs" - id "dolly-versions" } sonarqube { diff --git a/libs/servlet-security/build.gradle b/libs/servlet-security/build.gradle index ac28088320f..44a67aa7bed 100644 --- a/libs/servlet-security/build.gradle +++ b/libs/servlet-security/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-libs" - id "dolly-versions" } sonarqube { diff --git a/libs/testing/build.gradle b/libs/testing/build.gradle index f83b7639921..8e52747b710 100644 --- a/libs/testing/build.gradle +++ b/libs/testing/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-libs" - id "dolly-versions" } sonarqube { diff --git a/mocks/maskinporten-mock/build.gradle b/mocks/maskinporten-mock/build.gradle index 2261f1337bd..2ee420309f3 100644 --- a/mocks/maskinporten-mock/build.gradle +++ b/mocks/maskinporten-mock/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } dependencies { diff --git a/mocks/tokendings-mock/build.gradle b/mocks/tokendings-mock/build.gradle index dfd6c9ab4e6..f5f11a9570d 100644 --- a/mocks/tokendings-mock/build.gradle +++ b/mocks/tokendings-mock/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-apps" - id "dolly-versions" } dependencies { 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 index 2229a6588ad..27445a6f0da 100644 --- a/plugins/java/src/main/groovy/dolly-versions.gradle +++ b/plugins/java/src/main/groovy/dolly-versions.gradle @@ -4,6 +4,10 @@ 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" diff --git a/xsd/arbeidsforhold-xsd/build.gradle b/xsd/arbeidsforhold-xsd/build.gradle index 0dda0876868..c5174f16d0d 100644 --- a/xsd/arbeidsforhold-xsd/build.gradle +++ b/xsd/arbeidsforhold-xsd/build.gradle @@ -1,6 +1,5 @@ plugins { id "dolly-libs" - id "dolly-versions" id 'com.github.edeandrea.xjc-generation' version '1.6' }