diff --git a/.github/workflows/app.adresse-service.yml b/.github/workflows/app.adresse-service.yml index 1d9e5a693fd..7e90f169a3b 100644 --- a/.github/workflows/app.adresse-service.yml +++ b/.github/workflows/app.adresse-service.yml @@ -3,6 +3,7 @@ name: adresse-service on: push: paths: + - "plugins/**" - libs/data-transfer-objects - libs/security-core - libs/servlet-core diff --git a/.github/workflows/app.amelding-service.yml b/.github/workflows/app.amelding-service.yml index 4ca6ecf0943..6ad932e6adf 100644 --- a/.github/workflows/app.amelding-service.yml +++ b/.github/workflows/app.amelding-service.yml @@ -3,6 +3,7 @@ name: amelding-service on: push: paths: + - "plugins/**" - libs/avro-schema - libs/commands - libs/data-transfer-objects diff --git a/.github/workflows/app.app-tilgang-analyse-service.yml b/.github/workflows/app.app-tilgang-analyse-service.yml index 3193c80d81f..0113b62d688 100644 --- a/.github/workflows/app.app-tilgang-analyse-service.yml +++ b/.github/workflows/app.app-tilgang-analyse-service.yml @@ -3,6 +3,7 @@ name: app-tilgang-analyse-service on: push: paths: + - "plugins/**" - libs/data-transfer-objects - libs/reactive-core - libs/reactive-security diff --git a/.github/workflows/app.arbeidsforhold-service.yml b/.github/workflows/app.arbeidsforhold-service.yml index fd352934840..fe87912f849 100644 --- a/.github/workflows/app.arbeidsforhold-service.yml +++ b/.github/workflows/app.arbeidsforhold-service.yml @@ -3,6 +3,7 @@ name: arbeidsforhold-service on: push: paths: + - "plugins/**" - libs/commands - libs/data-transfer-objects - libs/reactive-core diff --git a/.github/workflows/app.batch-bestilling-service.yml b/.github/workflows/app.batch-bestilling-service.yml index d2fd49c3391..a3a97112764 100644 --- a/.github/workflows/app.batch-bestilling-service.yml +++ b/.github/workflows/app.batch-bestilling-service.yml @@ -3,6 +3,7 @@ name: batch-bestilling-service on: push: paths: + - "plugins/**" - libs/commands - libs/data-transfer-objects - libs/reactive-core diff --git a/.github/workflows/app.brreg-stub.yml b/.github/workflows/app.brreg-stub.yml index f486b493200..a5b7d9775e8 100644 --- a/.github/workflows/app.brreg-stub.yml +++ b/.github/workflows/app.brreg-stub.yml @@ -3,6 +3,7 @@ name: brreg-stub on: push: paths: + - "plugins/**" - libs/database - libs/servlet-core - apps/brreg-stub/** diff --git a/.github/workflows/app.bruker-service.yml b/.github/workflows/app.bruker-service.yml index fb9dd8ff020..7b7ea372317 100644 --- a/.github/workflows/app.bruker-service.yml +++ b/.github/workflows/app.bruker-service.yml @@ -3,6 +3,7 @@ name: bruker-service on: push: paths: + - "plugins/**" - libs/data-transfer-objects - libs/integration-test - libs/reactive-core diff --git a/.github/workflows/app.budpro-service.yml b/.github/workflows/app.budpro-service.yml index 489c3c21fee..f1d95348fe4 100644 --- a/.github/workflows/app.budpro-service.yml +++ b/.github/workflows/app.budpro-service.yml @@ -3,6 +3,7 @@ name: budpro-service on: push: paths: + - "plugins/**" - libs/commands - libs/data-transfer-objects - libs/reactive-core diff --git a/.github/workflows/app.dolly-backend.yml b/.github/workflows/app.dolly-backend.yml index 969eb36be87..c87d005fee7 100644 --- a/.github/workflows/app.dolly-backend.yml +++ b/.github/workflows/app.dolly-backend.yml @@ -3,6 +3,7 @@ name: dolly-backend on: push: paths: + - "plugins/**" - libs/data-transfer-objects/** - libs/data-transfer-search-objects/** - libs/database/** diff --git a/.github/workflows/app.dolly-frontend.yml b/.github/workflows/app.dolly-frontend.yml index b67445bb6af..8231ab067f0 100644 --- a/.github/workflows/app.dolly-frontend.yml +++ b/.github/workflows/app.dolly-frontend.yml @@ -3,6 +3,7 @@ name: dolly-frontend on: push: paths: + - "plugins/**" - libs/data-transfer-objects - libs/reactive-core - libs/reactive-frontend diff --git a/.github/workflows/app.dollystatus.yml b/.github/workflows/app.dollystatus.yml index d4d4d53546c..1e01ec0e8f5 100644 --- a/.github/workflows/app.dollystatus.yml +++ b/.github/workflows/app.dollystatus.yml @@ -3,6 +3,7 @@ name: dollystatus on: push: paths: + - "plugins/**" - apps/dollystatus/** - .github/workflows/app.dollystatus.yml diff --git a/.github/workflows/app.endringsmelding-frontend.yml b/.github/workflows/app.endringsmelding-frontend.yml index 0e2feae5349..60b2672417e 100644 --- a/.github/workflows/app.endringsmelding-frontend.yml +++ b/.github/workflows/app.endringsmelding-frontend.yml @@ -3,6 +3,7 @@ name: endringsmelding-frontend on: push: paths: + - "plugins/**" - libs/reactive-core - libs/reactive-frontend - libs/reactive-session-security diff --git a/.github/workflows/app.endringsmelding-service.yml b/.github/workflows/app.endringsmelding-service.yml index f413c732a1e..473936ffe9c 100644 --- a/.github/workflows/app.endringsmelding-service.yml +++ b/.github/workflows/app.endringsmelding-service.yml @@ -3,6 +3,7 @@ name: endringsmelding-service on: push: paths: + - "plugins/**" - libs/data-transfer-objects - libs/data-transfer-search-objects - libs/reactive-core diff --git a/.github/workflows/app.ereg-batch-status-service.yml b/.github/workflows/app.ereg-batch-status-service.yml index 3547091010a..6c2714fb430 100644 --- a/.github/workflows/app.ereg-batch-status-service.yml +++ b/.github/workflows/app.ereg-batch-status-service.yml @@ -3,6 +3,7 @@ name: ereg-batch-status-service on: push: paths: + - "plugins/**" - libs/data-transfer-objects - libs/reactive-core - libs/servlet-core diff --git a/.github/workflows/app.faste-data-frontend.yml b/.github/workflows/app.faste-data-frontend.yml index 9b70f555e74..f823bf38e11 100644 --- a/.github/workflows/app.faste-data-frontend.yml +++ b/.github/workflows/app.faste-data-frontend.yml @@ -3,6 +3,7 @@ name: faste-data-frontend on: push: paths: + - "plugins/**" - libs/reactive-core - libs/reactive-frontend - libs/reactive-session-security diff --git a/.github/workflows/app.generer-arbeidsforhold-populasjon-service.yml b/.github/workflows/app.generer-arbeidsforhold-populasjon-service.yml index b3c6e0ae6ae..699cd0886e8 100644 --- a/.github/workflows/app.generer-arbeidsforhold-populasjon-service.yml +++ b/.github/workflows/app.generer-arbeidsforhold-populasjon-service.yml @@ -3,6 +3,7 @@ name: generer-arbeidsforhold-populasjon-service on: push: paths: + - "plugins/**" - libs/commands - libs/data-transfer-objects - libs/security-core diff --git a/.github/workflows/app.generer-navn-service.yml b/.github/workflows/app.generer-navn-service.yml index 49c9f19449d..3d1ba3071f7 100644 --- a/.github/workflows/app.generer-navn-service.yml +++ b/.github/workflows/app.generer-navn-service.yml @@ -3,6 +3,7 @@ name: generer-navn-service on: push: paths: + - "plugins/**" - libs/commands - libs/data-transfer-objects - libs/security-core diff --git a/.github/workflows/app.generer-organisasjon-populasjon-service.yml b/.github/workflows/app.generer-organisasjon-populasjon-service.yml index 9f8acf25d08..27e3c270d23 100644 --- a/.github/workflows/app.generer-organisasjon-populasjon-service.yml +++ b/.github/workflows/app.generer-organisasjon-populasjon-service.yml @@ -3,6 +3,7 @@ name: generer-organisasjon-populasjon-service on: push: paths: + - "plugins/**" - libs/avro-schema - libs/commands - libs/data-transfer-objects diff --git a/.github/workflows/app.generer-synt-amelding-service.yml b/.github/workflows/app.generer-synt-amelding-service.yml index 07a4959b9f4..2a58b0444ef 100644 --- a/.github/workflows/app.generer-synt-amelding-service.yml +++ b/.github/workflows/app.generer-synt-amelding-service.yml @@ -3,6 +3,7 @@ name: generer-synt-amelding-service on: push: paths: + - "plugins/**" - libs/domain - libs/reactive-core - libs/security-core diff --git a/.github/workflows/app.helsepersonell-service.yml b/.github/workflows/app.helsepersonell-service.yml index 0d6ef0d170d..8e86d7ada58 100644 --- a/.github/workflows/app.helsepersonell-service.yml +++ b/.github/workflows/app.helsepersonell-service.yml @@ -3,6 +3,7 @@ name: helsepersonell-service on: push: paths: + - "plugins/**" - libs/data-transfer-objects - libs/reactive-core - libs/security-core diff --git a/.github/workflows/app.inntektsmelding-generator-service.yml b/.github/workflows/app.inntektsmelding-generator-service.yml index e635b582b95..124e94604b0 100644 --- a/.github/workflows/app.inntektsmelding-generator-service.yml +++ b/.github/workflows/app.inntektsmelding-generator-service.yml @@ -3,6 +3,7 @@ name: inntektsmelding-generator-service on: push: paths: + - "plugins/**" - libs/data-transfer-objects - libs/servlet-core - libs/servlet-security diff --git a/.github/workflows/app.inntektsmelding-service.yml b/.github/workflows/app.inntektsmelding-service.yml index 5055dd43a71..ca5f3ac3556 100644 --- a/.github/workflows/app.inntektsmelding-service.yml +++ b/.github/workflows/app.inntektsmelding-service.yml @@ -3,6 +3,7 @@ name: inntektsmelding-service on: push: paths: + - "plugins/**" - libs/data-transfer-objects - libs/security-core - libs/servlet-core diff --git a/.github/workflows/app.jenkins-batch-status-service.yml b/.github/workflows/app.jenkins-batch-status-service.yml index abfdf4f8402..58de12428fb 100644 --- a/.github/workflows/app.jenkins-batch-status-service.yml +++ b/.github/workflows/app.jenkins-batch-status-service.yml @@ -3,6 +3,7 @@ name: jenkins-batch-status-service on: push: paths: + - "plugins/**" - libs/commands - libs/data-transfer-objects - libs/reactive-core diff --git a/.github/workflows/app.joark-dokument-service.yml b/.github/workflows/app.joark-dokument-service.yml index 8cee3172ca2..43cde386980 100644 --- a/.github/workflows/app.joark-dokument-service.yml +++ b/.github/workflows/app.joark-dokument-service.yml @@ -3,6 +3,7 @@ name: joark-dokument-service on: push: paths: + - "plugins/**" - libs/data-transfer-objects - libs/domain - libs/reactive-core diff --git a/.github/workflows/app.kodeverk-service.yml b/.github/workflows/app.kodeverk-service.yml index eafe4803772..3dde08184f7 100644 --- a/.github/workflows/app.kodeverk-service.yml +++ b/.github/workflows/app.kodeverk-service.yml @@ -3,6 +3,7 @@ name: kodeverk-service on: push: paths: + - "plugins/**" - libs/security-core - libs/reactive-core - libs/reactive-security diff --git a/.github/workflows/app.miljoer-service.yml b/.github/workflows/app.miljoer-service.yml index 3f74924820b..e28f29bdb39 100644 --- a/.github/workflows/app.miljoer-service.yml +++ b/.github/workflows/app.miljoer-service.yml @@ -3,6 +3,7 @@ name: miljoer-service on: push: paths: + - "plugins/**" - libs/commands - libs/data-transfer-objects - libs/security-core diff --git a/.github/workflows/app.oppsummeringsdokument-service.yml b/.github/workflows/app.oppsummeringsdokument-service.yml index 1a6f227bfb8..8a387f98571 100644 --- a/.github/workflows/app.oppsummeringsdokument-service.yml +++ b/.github/workflows/app.oppsummeringsdokument-service.yml @@ -3,6 +3,7 @@ name: oppsummeringsdokument-service on: push: paths: + - "plugins/**" - libs/data-transfer-objects - libs/security-core - libs/servlet-core diff --git a/.github/workflows/app.organisasjon-bestilling-service.yml b/.github/workflows/app.organisasjon-bestilling-service.yml index 903d696dda7..6122515acda 100644 --- a/.github/workflows/app.organisasjon-bestilling-service.yml +++ b/.github/workflows/app.organisasjon-bestilling-service.yml @@ -3,6 +3,7 @@ name: organisasjon-bestilling-service on: push: paths: + - "plugins/**" - libs/commands - libs/data-transfer-objects - libs/reactive-core diff --git a/.github/workflows/app.organisasjon-faste-data-service.yml b/.github/workflows/app.organisasjon-faste-data-service.yml index fdfa1bc0257..c7193ddf3fa 100644 --- a/.github/workflows/app.organisasjon-faste-data-service.yml +++ b/.github/workflows/app.organisasjon-faste-data-service.yml @@ -3,6 +3,7 @@ name: organisasjon-faste-data-service on: push: paths: + - "plugins/**" - libs/avro-schema - libs/commands - libs/data-transfer-objects diff --git a/.github/workflows/app.organisasjon-forvalter.yml b/.github/workflows/app.organisasjon-forvalter.yml index fc9acfc26ff..3ecb4d6d283 100644 --- a/.github/workflows/app.organisasjon-forvalter.yml +++ b/.github/workflows/app.organisasjon-forvalter.yml @@ -3,6 +3,7 @@ name: organisasjon-forvalter on: push: paths: + - "plugins/**" - libs/avro-schema - libs/commands - libs/data-transfer-objects diff --git a/.github/workflows/app.organisasjon-mottak-service.yml b/.github/workflows/app.organisasjon-mottak-service.yml index 00ade707220..b71d1722c34 100644 --- a/.github/workflows/app.organisasjon-mottak-service.yml +++ b/.github/workflows/app.organisasjon-mottak-service.yml @@ -3,6 +3,7 @@ name: organisasjon-mottak-service on: push: paths: + - "plugins/**" - libs/avro-schema - libs/commands - libs/data-transfer-objects diff --git a/.github/workflows/app.organisasjon-service.yml b/.github/workflows/app.organisasjon-service.yml index 98e04c2185f..21a5ca84e40 100644 --- a/.github/workflows/app.organisasjon-service.yml +++ b/.github/workflows/app.organisasjon-service.yml @@ -3,6 +3,7 @@ name: organisasjon-service on: push: paths: + - "plugins/**" - libs/commands - libs/data-transfer-objects - libs/reactive-core diff --git a/.github/workflows/app.organisasjon-tilgang-frontend.yml b/.github/workflows/app.organisasjon-tilgang-frontend.yml index eb94f433f93..a5427ef42da 100644 --- a/.github/workflows/app.organisasjon-tilgang-frontend.yml +++ b/.github/workflows/app.organisasjon-tilgang-frontend.yml @@ -3,6 +3,7 @@ name: organisasjon-tilgang-frontend on: push: paths: + - "plugins/**" - libs/reactive-core - libs/reactive-frontend - libs/reactive-session-security diff --git a/.github/workflows/app.organisasjon-tilgang-service.yml b/.github/workflows/app.organisasjon-tilgang-service.yml index 2057885c7ff..e93ed0219e7 100644 --- a/.github/workflows/app.organisasjon-tilgang-service.yml +++ b/.github/workflows/app.organisasjon-tilgang-service.yml @@ -3,6 +3,7 @@ name: organisasjon-tilgang-service on: push: paths: + - "plugins/**" - libs/reactive-core - libs/reactive-security - apps/organisasjon-tilgang-service/** diff --git a/.github/workflows/app.orgnummer-service.yml b/.github/workflows/app.orgnummer-service.yml index d0b77ea9709..b218fcab8d7 100644 --- a/.github/workflows/app.orgnummer-service.yml +++ b/.github/workflows/app.orgnummer-service.yml @@ -3,6 +3,7 @@ name: orgnummer-service on: push: paths: + - "plugins/**" - libs/commands - libs/data-transfer-objects - libs/database diff --git a/.github/workflows/app.oversikt-frontend.yml b/.github/workflows/app.oversikt-frontend.yml index 7523948aa0c..c700d7b3f8b 100644 --- a/.github/workflows/app.oversikt-frontend.yml +++ b/.github/workflows/app.oversikt-frontend.yml @@ -3,6 +3,7 @@ name: oversikt-frontend on: push: paths: + - "plugins/**" - libs/reactive-core - libs/reactive-frontend - libs/reactive-security diff --git a/.github/workflows/app.pdl-forvalter.yml b/.github/workflows/app.pdl-forvalter.yml index ef8aa2bc3eb..18839dfb57c 100644 --- a/.github/workflows/app.pdl-forvalter.yml +++ b/.github/workflows/app.pdl-forvalter.yml @@ -3,6 +3,7 @@ name: pdl-forvalter on: push: paths: + - "plugins/**" - libs/data-transfer-objects - libs/data-transfer-search-objects - libs/database diff --git a/.github/workflows/app.person-faste-data-service.yml b/.github/workflows/app.person-faste-data-service.yml index 27a4f546098..ffdadd22f88 100644 --- a/.github/workflows/app.person-faste-data-service.yml +++ b/.github/workflows/app.person-faste-data-service.yml @@ -3,6 +3,7 @@ name: person-faste-data-service on: push: paths: + - "plugins/**" - libs/data-transfer-objects - libs/reactive-core - libs/reactive-security diff --git a/.github/workflows/app.person-organisasjon-tilgang-service.yml b/.github/workflows/app.person-organisasjon-tilgang-service.yml index e5976bee414..fd1f874742f 100644 --- a/.github/workflows/app.person-organisasjon-tilgang-service.yml +++ b/.github/workflows/app.person-organisasjon-tilgang-service.yml @@ -3,6 +3,7 @@ name: person-organisasjon-tilgang-service on: push: paths: + - "plugins/**" - libs/integration-test - libs/reactive-core - libs/reactive-security diff --git a/.github/workflows/app.person-search-service.yml b/.github/workflows/app.person-search-service.yml index f62702c4f0d..3bfffa3a6c4 100644 --- a/.github/workflows/app.person-search-service.yml +++ b/.github/workflows/app.person-search-service.yml @@ -3,6 +3,7 @@ name: person-search-service on: push: paths: + - "plugins/**" - libs/data-transfer-objects - libs/reactive-core - libs/security-core diff --git a/.github/workflows/app.person-service.yml b/.github/workflows/app.person-service.yml index 5ca03046837..f210094236e 100644 --- a/.github/workflows/app.person-service.yml +++ b/.github/workflows/app.person-service.yml @@ -3,6 +3,7 @@ name: person-service on: push: paths: + - "plugins/**" - libs/commands - libs/data-transfer-objects - libs/reactive-core diff --git a/.github/workflows/app.profil-api.yml b/.github/workflows/app.profil-api.yml index 52be5e8d0f2..9aa4b0088a5 100644 --- a/.github/workflows/app.profil-api.yml +++ b/.github/workflows/app.profil-api.yml @@ -3,6 +3,7 @@ name: profil-api on: push: paths: + - "plugins/**" - libs/data-transfer-objects - libs/reactive-core - libs/security-core diff --git a/.github/workflows/app.sykemelding-api.yml b/.github/workflows/app.sykemelding-api.yml index e0c753fa319..4641e97dc85 100644 --- a/.github/workflows/app.sykemelding-api.yml +++ b/.github/workflows/app.sykemelding-api.yml @@ -3,6 +3,7 @@ name: sykemelding-api on: push: paths: + - "plugins/**" - libs/avro-schema - libs/data-transfer-objects - libs/servlet-core diff --git a/.github/workflows/app.synt-sykemelding-api.yml b/.github/workflows/app.synt-sykemelding-api.yml index 02c11f0cf9c..ad0279bf498 100644 --- a/.github/workflows/app.synt-sykemelding-api.yml +++ b/.github/workflows/app.synt-sykemelding-api.yml @@ -3,6 +3,7 @@ name: synt-sykemelding-api on: push: paths: + - "plugins/**" - libs/commands - libs/data-transfer-objects - libs/reactive-core diff --git a/.github/workflows/app.synt-vedtakshistorikk-service.yml b/.github/workflows/app.synt-vedtakshistorikk-service.yml index 6859c17f98f..c0b181f96ec 100644 --- a/.github/workflows/app.synt-vedtakshistorikk-service.yml +++ b/.github/workflows/app.synt-vedtakshistorikk-service.yml @@ -3,6 +3,7 @@ name: synt-vedtakshistorikk-service on: push: paths: + - "plugins/**" - libs/data-transfer-objects - libs/domain - libs/security-core diff --git a/.github/workflows/app.team-dolly-lokal-app.yml b/.github/workflows/app.team-dolly-lokal-app.yml index e773ca59994..d898cbfb9fd 100644 --- a/.github/workflows/app.team-dolly-lokal-app.yml +++ b/.github/workflows/app.team-dolly-lokal-app.yml @@ -3,6 +3,7 @@ name: team-dolly-lokal-app on: push: paths: + - "plugins/**" - .nais/team-dolly-lokal-app.yml - .github/workflows/app.team-dolly-lokal-app.yml diff --git a/.github/workflows/app.tenor-search-service.yml b/.github/workflows/app.tenor-search-service.yml index 0daf67eb2f2..5f40dd9ed41 100644 --- a/.github/workflows/app.tenor-search-service.yml +++ b/.github/workflows/app.tenor-search-service.yml @@ -3,6 +3,7 @@ name: tenor-search-service on: push: paths: + - "plugins/**" - libs/integration-test - libs/reactive-core - libs/reactive-security diff --git a/.github/workflows/app.testnav-ident-pool.yml b/.github/workflows/app.testnav-ident-pool.yml index dbe8b61277d..e8fe6d75656 100644 --- a/.github/workflows/app.testnav-ident-pool.yml +++ b/.github/workflows/app.testnav-ident-pool.yml @@ -3,6 +3,7 @@ name: testnav-ident-pool on: push: paths: + - "plugins/**" - libs/database - libs/security-core - libs/servlet-core diff --git a/.github/workflows/app.testnorge-statisk-data-forvalter.yml b/.github/workflows/app.testnorge-statisk-data-forvalter.yml index aa71a077e87..b164c01e498 100644 --- a/.github/workflows/app.testnorge-statisk-data-forvalter.yml +++ b/.github/workflows/app.testnorge-statisk-data-forvalter.yml @@ -3,6 +3,7 @@ name: testnorge-statisk-data-forvalter on: push: paths: + - "plugins/**" - libs/avro-schema - libs/commands - libs/csv-converter diff --git a/.github/workflows/app.tilbakemelding-api.yml b/.github/workflows/app.tilbakemelding-api.yml index 3797097f960..eb496fe56b7 100644 --- a/.github/workflows/app.tilbakemelding-api.yml +++ b/.github/workflows/app.tilbakemelding-api.yml @@ -3,6 +3,7 @@ name: tilbakemelding-api on: push: paths: + - "plugins/**" - libs/data-transfer-objects - libs/reactive-core - libs/security-core diff --git a/.github/workflows/app.tps-messaging-service.yml b/.github/workflows/app.tps-messaging-service.yml index b360d30d016..60269fe5596 100644 --- a/.github/workflows/app.tps-messaging-service.yml +++ b/.github/workflows/app.tps-messaging-service.yml @@ -3,6 +3,7 @@ name: tps-messaging-service on: push: paths: + - "plugins/**" - libs/data-transfer-objects - libs/data-transfer-search-objects - libs/security-core diff --git a/.github/workflows/app.udi-stub.yml b/.github/workflows/app.udi-stub.yml index c88b7a6f023..a4878aa96a5 100644 --- a/.github/workflows/app.udi-stub.yml +++ b/.github/workflows/app.udi-stub.yml @@ -3,6 +3,7 @@ name: testnav-udi-stub on: push: paths: + - "plugins/**" - libs/data-transfer-objects - libs/database - libs/servlet-core diff --git a/.github/workflows/app.varslinger-service.yml b/.github/workflows/app.varslinger-service.yml index f4a5ce1f473..52b99d4a2ef 100644 --- a/.github/workflows/app.varslinger-service.yml +++ b/.github/workflows/app.varslinger-service.yml @@ -3,6 +3,7 @@ name: varslinger-service on: push: paths: + - "plugins/**" - libs/data-transfer-objects - libs/database - libs/security-core diff --git a/.github/workflows/lib.commands.yml b/.github/workflows/lib.commands.yml index 024386b48f7..fe42de59148 100644 --- a/.github/workflows/lib.commands.yml +++ b/.github/workflows/lib.commands.yml @@ -3,6 +3,7 @@ name: commands on: push: paths: + - "plugins/**" - libs/commands/** - .github/workflows/lib.commands.yml diff --git a/.github/workflows/lib.csv-converter.yml b/.github/workflows/lib.csv-converter.yml index cd135c78b2e..7a4f7741bfa 100644 --- a/.github/workflows/lib.csv-converter.yml +++ b/.github/workflows/lib.csv-converter.yml @@ -3,6 +3,7 @@ name: csv-converter on: push: paths: + - "plugins/**" - libs/csv-converter/** - .github/workflows/lib.csv-converter.yml diff --git a/.github/workflows/lib.data-transfer-objects.yml b/.github/workflows/lib.data-transfer-objects.yml index 34cb149eca6..10d6aac991e 100644 --- a/.github/workflows/lib.data-transfer-objects.yml +++ b/.github/workflows/lib.data-transfer-objects.yml @@ -3,6 +3,7 @@ name: data-transfer-objects on: push: paths: + - "plugins/**" - libs/data-transfer-objects/** - .github/workflows/lib.data-transfer-objects.yml diff --git a/.github/workflows/lib.domain.yml b/.github/workflows/lib.domain.yml index c0accda3d06..1ad4cb33284 100644 --- a/.github/workflows/lib.domain.yml +++ b/.github/workflows/lib.domain.yml @@ -3,6 +3,7 @@ name: domain on: push: paths: + - "plugins/**" - libs/domain/** - .github/workflows/lib.domain.yml diff --git a/.github/workflows/lib.frontend.dolly-assets.yml b/.github/workflows/lib.frontend.dolly-assets.yml index d918815ada6..c18c6a997e5 100644 --- a/.github/workflows/lib.frontend.dolly-assets.yml +++ b/.github/workflows/lib.frontend.dolly-assets.yml @@ -3,6 +3,7 @@ name: dolly-assets on: push: paths: + - "plugins/**" - navikt/dolly-assets/** - .github/workflows/lib.frontend.dolly-assets.yml diff --git a/.github/workflows/lib.frontend.dolly-komponenter.yml b/.github/workflows/lib.frontend.dolly-komponenter.yml index 4ada60ac058..32f933b8eeb 100644 --- a/.github/workflows/lib.frontend.dolly-komponenter.yml +++ b/.github/workflows/lib.frontend.dolly-komponenter.yml @@ -3,6 +3,7 @@ name: dolly-komponenter on: push: paths: + - "plugins/**" - navikt/dolly-komponenter/** - .github/workflows/lib.frontend.dolly-komponenter.yml diff --git a/.github/workflows/lib.frontend.dolly-lib.yml b/.github/workflows/lib.frontend.dolly-lib.yml index 674fb2d881c..d8681fbd394 100644 --- a/.github/workflows/lib.frontend.dolly-lib.yml +++ b/.github/workflows/lib.frontend.dolly-lib.yml @@ -3,6 +3,7 @@ name: dolly-lib on: push: paths: + - "plugins/**" - navikt/dolly-lib/** - .github/workflows/lib.frontend.dolly-lib.yml diff --git a/.github/workflows/lib.integration-test.yml b/.github/workflows/lib.integration-test.yml index 479fc9cefcd..2d1c7b06fa1 100644 --- a/.github/workflows/lib.integration-test.yml +++ b/.github/workflows/lib.integration-test.yml @@ -3,6 +3,7 @@ name: integration-test on: push: paths: + - "plugins/**" - libs/integration-test/** - .github/workflows/lib.reactive-core.yml diff --git a/.github/workflows/lib.kafka-config.yml b/.github/workflows/lib.kafka-config.yml index 542bb5ece3b..a1dcd3a4c5c 100644 --- a/.github/workflows/lib.kafka-config.yml +++ b/.github/workflows/lib.kafka-config.yml @@ -3,6 +3,7 @@ name: kafka-config on: push: paths: + - "plugins/**" - libs/kafka-config/** - .github/workflows/lib.kafka-config.yml diff --git a/.github/workflows/lib.kafka-producers.yml b/.github/workflows/lib.kafka-producers.yml index cc8ccb27a49..52ccd54f2a7 100644 --- a/.github/workflows/lib.kafka-producers.yml +++ b/.github/workflows/lib.kafka-producers.yml @@ -3,6 +3,7 @@ name: kafka-producers on: push: paths: + - "plugins/**" - libs/kafka-producers/** - .github/workflows/lib.kafka-producers.yml diff --git a/.github/workflows/lib.reactive-core.yml b/.github/workflows/lib.reactive-core.yml index b9a701d1e43..e8c4f42dc1a 100644 --- a/.github/workflows/lib.reactive-core.yml +++ b/.github/workflows/lib.reactive-core.yml @@ -3,6 +3,7 @@ name: reactive-core on: push: paths: + - "plugins/**" - libs/reactive-core/** - .github/workflows/lib.reactive-core.yml diff --git a/.github/workflows/lib.reactive-frontend.yml b/.github/workflows/lib.reactive-frontend.yml index 4f92ae87e1b..f0af8e405aa 100644 --- a/.github/workflows/lib.reactive-frontend.yml +++ b/.github/workflows/lib.reactive-frontend.yml @@ -3,6 +3,7 @@ name: reactive-frontend on: push: paths: + - "plugins/**" - libs/reactive-frontend/** - .github/workflows/lib.reactive-frontend.yml diff --git a/.github/workflows/lib.reactive-proxy.yml b/.github/workflows/lib.reactive-proxy.yml index e01b695b0fc..cf533e942d2 100644 --- a/.github/workflows/lib.reactive-proxy.yml +++ b/.github/workflows/lib.reactive-proxy.yml @@ -3,6 +3,7 @@ name: reactive-proxy on: push: paths: + - "plugins/**" - libs/reactive-proxy/** - .github/workflows/lib.reactive-proxy.yml diff --git a/.github/workflows/lib.reactive-security.yml b/.github/workflows/lib.reactive-security.yml index 3c287c5ad0a..96be8f94a43 100644 --- a/.github/workflows/lib.reactive-security.yml +++ b/.github/workflows/lib.reactive-security.yml @@ -3,6 +3,7 @@ name: reactive-security on: push: paths: + - "plugins/**" - libs/reactive-security/** - .github/workflows/lib.reactive-security.yml diff --git a/.github/workflows/lib.reactive-session-security.yml b/.github/workflows/lib.reactive-session-security.yml index f9a633266bb..47653017564 100644 --- a/.github/workflows/lib.reactive-session-security.yml +++ b/.github/workflows/lib.reactive-session-security.yml @@ -3,6 +3,7 @@ name: reactive-session-security on: push: paths: + - "plugins/**" - libs/reactive-session-security/** - .github/workflows/lib.reactive-session-security.yml diff --git a/.github/workflows/lib.security-core.yml b/.github/workflows/lib.security-core.yml index 7a5faa7cb11..396a18dab4b 100644 --- a/.github/workflows/lib.security-core.yml +++ b/.github/workflows/lib.security-core.yml @@ -3,6 +3,7 @@ name: security-core on: push: paths: + - "plugins/**" - libs/security-core/** - .github/workflows/lib.security-core.yml diff --git a/.github/workflows/lib.security-token-service.yml b/.github/workflows/lib.security-token-service.yml index ed95e46fb93..7824af257d4 100644 --- a/.github/workflows/lib.security-token-service.yml +++ b/.github/workflows/lib.security-token-service.yml @@ -3,6 +3,7 @@ name: security-token-service on: push: paths: + - "plugins/**" - libs/security-token-service/** - .github/workflows/lib.security-token-service.yml diff --git a/.github/workflows/lib.servlet-core.yml b/.github/workflows/lib.servlet-core.yml index ec24d7bc64c..f17428a66b4 100644 --- a/.github/workflows/lib.servlet-core.yml +++ b/.github/workflows/lib.servlet-core.yml @@ -3,6 +3,7 @@ name: servlet-core on: push: paths: + - "plugins/**" - libs/servlet-core/** - .github/workflows/lib.servlet-core.yml diff --git a/.github/workflows/lib.servlet-insecure-security.yml b/.github/workflows/lib.servlet-insecure-security.yml index a1f69cfa306..a7dac8ae203 100644 --- a/.github/workflows/lib.servlet-insecure-security.yml +++ b/.github/workflows/lib.servlet-insecure-security.yml @@ -3,6 +3,7 @@ name: servlet-insecure-security on: push: paths: + - "plugins/**" - libs/servlet-insecure-security/** - .github/workflows/lib.servlet-insecure-security.yml diff --git a/.github/workflows/lib.servlet-security.yml b/.github/workflows/lib.servlet-security.yml index 534b8bd2364..099904ee040 100644 --- a/.github/workflows/lib.servlet-security.yml +++ b/.github/workflows/lib.servlet-security.yml @@ -3,6 +3,7 @@ name: servlet-security on: push: paths: + - "plugins/**" - libs/servlet-security/** - .github/workflows/lib.commanservlet-securityds.yml diff --git a/.github/workflows/lib.testing.yml b/.github/workflows/lib.testing.yml index 14f45d07c62..82d00726df0 100644 --- a/.github/workflows/lib.testing.yml +++ b/.github/workflows/lib.testing.yml @@ -3,6 +3,7 @@ name: testing on: push: paths: + - "plugins/**" - libs/testing/** - .github/workflows/lib.testing.yml diff --git a/.github/workflows/proxy.aareg-proxy.yml b/.github/workflows/proxy.aareg-proxy.yml index 632e76c7e4a..2bc7f795e9c 100644 --- a/.github/workflows/proxy.aareg-proxy.yml +++ b/.github/workflows/proxy.aareg-proxy.yml @@ -3,6 +3,7 @@ name: aareg-proxy on: push: paths: + - "plugins/**" - libs/reactive-core - libs/reactive-proxy - libs/reactive-security diff --git a/.github/workflows/proxy.aareg-synt-services-proxy.yml b/.github/workflows/proxy.aareg-synt-services-proxy.yml index 0e22fc20172..cc6054cf3c4 100644 --- a/.github/workflows/proxy.aareg-synt-services-proxy.yml +++ b/.github/workflows/proxy.aareg-synt-services-proxy.yml @@ -3,6 +3,7 @@ name: aareg-synt-services-proxy on: push: paths: + - "plugins/**" - libs/reactive-core - libs/reactive-proxy - proxies/aareg-synt-services-proxy/** diff --git a/.github/workflows/proxy.arbeidsplassencv-proxy.yml b/.github/workflows/proxy.arbeidsplassencv-proxy.yml index e77751fec2b..59ffdeb73d7 100644 --- a/.github/workflows/proxy.arbeidsplassencv-proxy.yml +++ b/.github/workflows/proxy.arbeidsplassencv-proxy.yml @@ -3,6 +3,7 @@ name: arbeidsplassencv-proxy on: push: paths: + - "plugins/**" - libs/reactive-core - libs/reactive-proxy - libs/reactive-security diff --git a/.github/workflows/proxy.arena-forvalteren-proxy.yml b/.github/workflows/proxy.arena-forvalteren-proxy.yml index 4331b3f2b5f..ead83894a33 100644 --- a/.github/workflows/proxy.arena-forvalteren-proxy.yml +++ b/.github/workflows/proxy.arena-forvalteren-proxy.yml @@ -3,6 +3,7 @@ name: arena-forvalteren-proxy on: push: paths: + - "plugins/**" - libs/reactive-core - libs/reactive-proxy - proxies/arena-forvalteren-proxy/** diff --git a/.github/workflows/proxy.batch-adeo-proxy.yml b/.github/workflows/proxy.batch-adeo-proxy.yml index 9d791c38e8c..bad9ea25d42 100644 --- a/.github/workflows/proxy.batch-adeo-proxy.yml +++ b/.github/workflows/proxy.batch-adeo-proxy.yml @@ -3,6 +3,7 @@ name: batch-adeo-proxy on: push: paths: + - "plugins/**" - libs/reactive-core - libs/reactive-proxy - proxies/batch-adeo-proxy/** diff --git a/.github/workflows/proxy.brregstub-proxy.yml b/.github/workflows/proxy.brregstub-proxy.yml index ab04f705939..b7520bed9fd 100644 --- a/.github/workflows/proxy.brregstub-proxy.yml +++ b/.github/workflows/proxy.brregstub-proxy.yml @@ -3,6 +3,7 @@ name: brregstub-proxy on: push: paths: + - "plugins/**" - libs/reactive-core - libs/reactive-proxy - proxies/brregstub-proxy/** diff --git a/.github/workflows/proxy.dokarkiv-proxy.yml b/.github/workflows/proxy.dokarkiv-proxy.yml index 80ee3cc0234..b8a1d303cb8 100644 --- a/.github/workflows/proxy.dokarkiv-proxy.yml +++ b/.github/workflows/proxy.dokarkiv-proxy.yml @@ -3,6 +3,7 @@ name: dokarkiv-proxy on: push: paths: + - "plugins/**" - libs/reactive-core - libs/reactive-proxy - libs/reactive-security diff --git a/.github/workflows/proxy.ereg-proxy.yml b/.github/workflows/proxy.ereg-proxy.yml index a197a017fe1..c3e4a4b7109 100644 --- a/.github/workflows/proxy.ereg-proxy.yml +++ b/.github/workflows/proxy.ereg-proxy.yml @@ -3,6 +3,7 @@ name: ereg-proxy on: push: paths: + - "plugins/**" - libs/reactive-core - libs/reactive-proxy - proxies/ereg-proxy/** diff --git a/.github/workflows/proxy.histark-proxy.yml b/.github/workflows/proxy.histark-proxy.yml index 046bc8be64e..c30d8a29606 100644 --- a/.github/workflows/proxy.histark-proxy.yml +++ b/.github/workflows/proxy.histark-proxy.yml @@ -3,6 +3,7 @@ name: histark-proxy on: push: paths: + - "plugins/**" - libs/reactive-core - libs/reactive-proxy - proxies/histark-proxy/** diff --git a/.github/workflows/proxy.inntektstub-proxy.yml b/.github/workflows/proxy.inntektstub-proxy.yml index e73bfc8e7c9..ae9e1dcbe2a 100644 --- a/.github/workflows/proxy.inntektstub-proxy.yml +++ b/.github/workflows/proxy.inntektstub-proxy.yml @@ -3,6 +3,7 @@ name: inntektstub-proxy on: push: paths: + - "plugins/**" - libs/reactive-core - libs/reactive-proxy - proxies/inntektstub-proxy/** diff --git a/.github/workflows/proxy.inst-proxy.yml b/.github/workflows/proxy.inst-proxy.yml index 39cbe07c379..d931982ae44 100644 --- a/.github/workflows/proxy.inst-proxy.yml +++ b/.github/workflows/proxy.inst-proxy.yml @@ -3,6 +3,7 @@ name: inst-proxy on: push: paths: + - "plugins/**" - libs/reactive-core - libs/reactive-proxy - proxies/inst-proxy/** diff --git a/.github/workflows/proxy.kontoregister-person-proxy.yml b/.github/workflows/proxy.kontoregister-person-proxy.yml index d2290ff5e0f..d355ccea4d4 100644 --- a/.github/workflows/proxy.kontoregister-person-proxy.yml +++ b/.github/workflows/proxy.kontoregister-person-proxy.yml @@ -3,6 +3,7 @@ name: kontoregister-person-proxy on: push: paths: + - "plugins/**" - libs/reactive-core - libs/reactive-proxy - libs/reactive-security diff --git a/.github/workflows/proxy.krrstub-proxy.yml b/.github/workflows/proxy.krrstub-proxy.yml index 3ede6c3da23..b0baebdf252 100644 --- a/.github/workflows/proxy.krrstub-proxy.yml +++ b/.github/workflows/proxy.krrstub-proxy.yml @@ -3,6 +3,7 @@ name: krrstub-proxy on: push: paths: + - "plugins/**" - libs/reactive-core - libs/reactive-proxy - libs/reactive-security diff --git a/.github/workflows/proxy.medl-proxy.yml b/.github/workflows/proxy.medl-proxy.yml index 43ec423a15e..e1314415413 100644 --- a/.github/workflows/proxy.medl-proxy.yml +++ b/.github/workflows/proxy.medl-proxy.yml @@ -3,6 +3,7 @@ name: medl-proxy on: push: paths: + - "plugins/**" - proxies/medl-proxy/** - libs/servlet-core - libs/servlet-security diff --git a/.github/workflows/proxy.modapp-ereg-proxy.yml b/.github/workflows/proxy.modapp-ereg-proxy.yml index ec4b0b6bdb9..25b98733bbf 100644 --- a/.github/workflows/proxy.modapp-ereg-proxy.yml +++ b/.github/workflows/proxy.modapp-ereg-proxy.yml @@ -3,6 +3,7 @@ name: modapp-ereg-proxy on: push: paths: + - "plugins/**" - libs/reactive-core - libs/reactive-proxy - libs/reactive-security diff --git a/.github/workflows/proxy.norg2-proxy.yml b/.github/workflows/proxy.norg2-proxy.yml index 8e2af7ab410..b9f4e2ef0ed 100644 --- a/.github/workflows/proxy.norg2-proxy.yml +++ b/.github/workflows/proxy.norg2-proxy.yml @@ -3,6 +3,7 @@ name: norg2-proxy on: push: paths: + - "plugins/**" - libs/reactive-core - libs/reactive-proxy - proxies/norg2-proxy/** diff --git a/.github/workflows/proxy.pdl-proxy.yml b/.github/workflows/proxy.pdl-proxy.yml index d04ca65f557..53c574f9f68 100644 --- a/.github/workflows/proxy.pdl-proxy.yml +++ b/.github/workflows/proxy.pdl-proxy.yml @@ -3,6 +3,7 @@ name: pdl-proxy on: push: paths: + - "plugins/**" - libs/reactive-core - libs/reactive-proxy - libs/reactive-security diff --git a/.github/workflows/proxy.pensjon-testdata-facade-proxy.yml b/.github/workflows/proxy.pensjon-testdata-facade-proxy.yml index 9b4fbacd883..9cc596e2ff6 100644 --- a/.github/workflows/proxy.pensjon-testdata-facade-proxy.yml +++ b/.github/workflows/proxy.pensjon-testdata-facade-proxy.yml @@ -3,6 +3,7 @@ name: pensjon-testdata-facade-proxy on: push: paths: + - "plugins/**" - libs/reactive-core - libs/reactive-proxy - libs/reactive-security diff --git a/.github/workflows/proxy.saf-proxy.yml b/.github/workflows/proxy.saf-proxy.yml index 1b391d20770..2b820a832a1 100644 --- a/.github/workflows/proxy.saf-proxy.yml +++ b/.github/workflows/proxy.saf-proxy.yml @@ -3,6 +3,7 @@ name: saf-proxy on: push: paths: + - "plugins/**" - libs/reactive-core - libs/reactive-proxy - libs/reactive-security diff --git a/.github/workflows/proxy.sigrunstub-proxy.yml b/.github/workflows/proxy.sigrunstub-proxy.yml index bf1c3192427..9dfedcc71aa 100644 --- a/.github/workflows/proxy.sigrunstub-proxy.yml +++ b/.github/workflows/proxy.sigrunstub-proxy.yml @@ -3,6 +3,7 @@ name: sigrunstub-proxy on: push: paths: + - "plugins/**" - libs/reactive-core - libs/reactive-proxy - proxies/sigrunstub-proxy/** diff --git a/.github/workflows/proxy.skjermingsregister-proxy.yml b/.github/workflows/proxy.skjermingsregister-proxy.yml index 75f5ee4bc6e..23188dcc289 100644 --- a/.github/workflows/proxy.skjermingsregister-proxy.yml +++ b/.github/workflows/proxy.skjermingsregister-proxy.yml @@ -3,6 +3,7 @@ name: skjermingsregister-proxy on: push: paths: + - "plugins/**" - libs/reactive-core - libs/reactive-proxy - libs/security-token-service diff --git a/.github/workflows/proxy.synthdata-meldekort-proxy.yml b/.github/workflows/proxy.synthdata-meldekort-proxy.yml index d4c0203c9b9..a7f6e1005e3 100644 --- a/.github/workflows/proxy.synthdata-meldekort-proxy.yml +++ b/.github/workflows/proxy.synthdata-meldekort-proxy.yml @@ -3,6 +3,7 @@ name: synthdata-meldekort-proxy on: push: paths: + - "plugins/**" - libs/reactive-core - libs/reactive-proxy - libs/reactive-security diff --git a/.github/workflows/proxy.udistub-proxy.yml b/.github/workflows/proxy.udistub-proxy.yml index 030f7c9c4bd..aebdd29b5a1 100644 --- a/.github/workflows/proxy.udistub-proxy.yml +++ b/.github/workflows/proxy.udistub-proxy.yml @@ -3,6 +3,7 @@ name: udistub-proxy on: push: paths: + - "plugins/**" - libs/reactive-core - libs/reactive-proxy - libs/reactive-security diff --git a/apps/adresse-service/build.gradle b/apps/adresse-service/build.gradle index 92af5f5116b..56d33d74b09 100644 --- a/apps/adresse-service/build.gradle +++ b/apps/adresse-service/build.gradle @@ -1,47 +1,14 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() - jvmArgs '--add-opens', 'java.base/java.lang=ALL-UNNAMED' + id "dolly-apps" } 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", "navit_testnorge_adresse_service" property "sonar.projectName", "testnav-adresse-service" - property "sonar.sourceEncoding", "UTF-8" - } -} - -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } -repositories { - mavenCentral() - mavenLocal() -} - dependencies { implementation 'no.nav.testnav.libs:security-core' implementation 'no.nav.testnav.libs:servlet-core' @@ -50,28 +17,11 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - - implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'ma.glasnost.orika:orika-core:1.5.4' - implementation 'org.hibernate.validator:hibernate-validator' implementation 'org.aspectj:aspectjweaver:1.9.7' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/apps/adresse-service/settings.gradle b/apps/adresse-service/settings.gradle index 53ed006ac5e..6a2058d2d50 100644 --- a/apps/adresse-service/settings.gradle +++ b/apps/adresse-service/settings.gradle @@ -4,11 +4,12 @@ plugins { rootProject.name = 'adresse-service' +includeBuild "../../plugins/java" + +includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/security-core' includeBuild '../../libs/servlet-core' includeBuild '../../libs/servlet-security' -includeBuild '../../libs/data-transfer-objects' - develocity { buildScan { diff --git a/apps/amelding-service/build.gradle b/apps/amelding-service/build.gradle index ce6f4eac045..16ed90044de 100644 --- a/apps/amelding-service/build.gradle +++ b/apps/amelding-service/build.gradle @@ -1,47 +1,14 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } 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", "navit_testnorge_amelding_service" property "sonar.projectName", "testnav-amelding-service" - property "sonar.sourceEncoding", "UTF-8" - } -} - - -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } -repositories { - mavenCentral() - mavenLocal() -} - dependencies { implementation 'no.nav.testnav.libs:security-core' @@ -52,31 +19,13 @@ dependencies { implementation 'no.nav.testnav.libs:avro-schema' 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' // TODO remove legacy bootstrap config - implementation 'org.springframework.boot:spring-boot-starter-actuator' - - implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.hibernate.validator:hibernate-validator' implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.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' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/apps/amelding-service/settings.gradle b/apps/amelding-service/settings.gradle index f895b524d00..09582fbd408 100644 --- a/apps/amelding-service/settings.gradle +++ b/apps/amelding-service/settings.gradle @@ -4,12 +4,14 @@ plugins { rootProject.name = 'amelding-service' -includeBuild '../../libs/security-core' -includeBuild '../../libs/reactive-core' -includeBuild '../../libs/reactive-security' -includeBuild '../../libs/commands' +includeBuild "../../plugins/java" + includeBuild '../../libs/avro-schema' +includeBuild '../../libs/commands' includeBuild '../../libs/data-transfer-objects' +includeBuild '../../libs/reactive-core' +includeBuild '../../libs/reactive-security' +includeBuild '../../libs/security-core' develocity { buildScan { diff --git a/apps/app-tilgang-analyse-service/build.gradle b/apps/app-tilgang-analyse-service/build.gradle index 868286dcb51..94508051277 100644 --- a/apps/app-tilgang-analyse-service/build.gradle +++ b/apps/app-tilgang-analyse-service/build.gradle @@ -1,46 +1,14 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } 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", "navit_testnorge_app_tilgang_analyse_service" property "sonar.projectName", "testnav-app-tilgang-analyse-service" - property "sonar.sourceEncoding", "UTF-8" - } -} - -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } -repositories { - mavenCentral() - mavenLocal() -} - dependencies { implementation 'no.nav.testnav.libs:reactive-core' implementation 'no.nav.testnav.libs:reactive-security' @@ -48,12 +16,8 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-r2dbc' 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.springframework.cloud:spring-cloud-starter-vault-config' - - implementation 'io.micrometer:micrometer-registry-prometheus' runtimeOnly 'com.h2database:h2' runtimeOnly 'org.postgresql:postgresql' implementation 'io.r2dbc:r2dbc-h2' @@ -61,19 +25,8 @@ dependencies { implementation 'org.flywaydb:flyway-core' implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0' implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/apps/app-tilgang-analyse-service/settings.gradle b/apps/app-tilgang-analyse-service/settings.gradle index acb9fa44e3c..9dbb9e11e77 100644 --- a/apps/app-tilgang-analyse-service/settings.gradle +++ b/apps/app-tilgang-analyse-service/settings.gradle @@ -4,9 +4,11 @@ plugins { rootProject.name = 'app-tilgang-analyse-service' +includeBuild "../../plugins/java" + +includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-security' -includeBuild '../../libs/data-transfer-objects' develocity { buildScan { diff --git a/apps/arbeidsforhold-service/build.gradle b/apps/arbeidsforhold-service/build.gradle index 57c2b724379..9fa78862913 100644 --- a/apps/arbeidsforhold-service/build.gradle +++ b/apps/arbeidsforhold-service/build.gradle @@ -1,47 +1,14 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } 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-arbeidsforhold-service" property "sonar.projectName", "testnav-arbeidsforhold-service" - property "sonar.sourceEncoding", "UTF-8" - } -} - - -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } -repositories { - mavenCentral() - mavenLocal() -} - dependencies { implementation 'com.google.guava:guava:33.2.0-jre' @@ -57,33 +24,14 @@ dependencies { implementation 'no.nav.testnav.libs:servlet-core' implementation 'no.nav.testnav.libs:servlet-security' - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config - implementation 'org.springframework.boot:spring-boot-starter-actuator' - implementation 'io.micrometer:micrometer-registry-prometheus' implementation '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 'net.logstash.logback:logstash-logback-encoder:7.4' - - implementation 'org.hibernate.validator:hibernate-validator' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/apps/arbeidsforhold-service/settings.gradle b/apps/arbeidsforhold-service/settings.gradle index 645d8dbf9a0..936af046ee4 100644 --- a/apps/arbeidsforhold-service/settings.gradle +++ b/apps/arbeidsforhold-service/settings.gradle @@ -4,6 +4,8 @@ plugins { rootProject.name = 'arbeidsforhold-service' +includeBuild "../../plugins/java" + includeBuild '../../libs/commands' includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/reactive-core' diff --git a/apps/batch-bestilling-service/build.gradle b/apps/batch-bestilling-service/build.gradle index d2244bf707e..628be93c515 100644 --- a/apps/batch-bestilling-service/build.gradle +++ b/apps/batch-bestilling-service/build.gradle @@ -1,44 +1,13 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } 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-batch-bestilling-service" property "sonar.projectName", "testnav-batch-bestilling-service" - property "sonar.sourceEncoding", "UTF-8" } } -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' - } -} - -repositories { - mavenCentral() - mavenLocal() -} dependencies { @@ -50,31 +19,12 @@ dependencies { implementation 'no.nav.testnav.libs:data-transfer-objects' implementation 'no.nav.testnav.libs:servlet-security' - implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework.boot:spring-boot-starter-security' - - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.boot:spring-boot-starter-actuator' - - implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/apps/batch-bestilling-service/settings.gradle b/apps/batch-bestilling-service/settings.gradle index 83c20b8635b..c3664eb2a8d 100644 --- a/apps/batch-bestilling-service/settings.gradle +++ b/apps/batch-bestilling-service/settings.gradle @@ -4,13 +4,15 @@ plugins { rootProject.name = 'batch-bestilling-service' +includeBuild "../../plugins/java" + +includeBuild '../../libs/commands' +includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/reactive-core' includeBuild '../../libs/security-core' includeBuild '../../libs/servlet-core' -includeBuild '../../libs/data-transfer-objects' -includeBuild '../../libs/servlet-security' includeBuild '../../libs/servlet-insecure-security' -includeBuild '../../libs/commands' +includeBuild '../../libs/servlet-security' develocity { buildScan { diff --git a/apps/brreg-stub/build.gradle b/apps/brreg-stub/build.gradle index d3a672cb909..f80ab4a9e55 100644 --- a/apps/brreg-stub/build.gradle +++ b/apps/brreg-stub/build.gradle @@ -1,68 +1,23 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id "uk.co.boothen.gradle.wsimport" version "0.21" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" - id("org.openrewrite.rewrite") version("6.6.4") -} + id "dolly-apps" -test { - useJUnitPlatform() + id "uk.co.boothen.gradle.wsimport" version "0.21" } 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", "brreg-stub" property "sonar.projectName", "brreg-stub" - property "sonar.sourceEncoding", "UTF-8" - } -} - -rewrite { - activeRecipe("org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_2") -} - - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' - } } -bootJar { - duplicatesStrategy(DuplicatesStrategy.INCLUDE) - archiveFileName = "app.jar" -} - wsimport { wsdl("Grunndata.wsdl") { packageName("no.nav.brregstub.tjenestekontrakter.ws") } } - -repositories { - mavenCentral() - maven { url "https://github-package-registry-mirror.gc.nav.no/cached/maven-release" } - maven { url "https://build.shibboleth.net/maven/releases/" } - mavenLocal() -} - dependencies { - - rewrite('org.openrewrite.recipe:rewrite-spring:5.10.0') - implementation('io.dropwizard:dropwizard-jackson:4.0.7') { exclude group: "com.google.code.findbugs" } @@ -71,18 +26,12 @@ dependencies { implementation 'no.nav.testnav.libs:servlet-core' implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-web-services' implementation 'org.springframework.boot:spring-boot-starter-data-jpa' - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' implementation 'org.springframework.cloud:spring-cloud-vault-config-databases' - implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'org.springframework.boot:spring-boot-starter-validation' - implementation 'io.micrometer:micrometer-registry-prometheus' - - implementation 'org.apache.cxf:cxf-rt-bindings-soap' implementation 'org.apache.cxf:cxf-rt-ws-policy' implementation 'org.apache.cxf:cxf-core' @@ -98,7 +47,6 @@ dependencies { implementation 'com.h2database:h2' implementation 'wsdl4j:wsdl4j' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' @@ -112,16 +60,4 @@ dependencies { testImplementation 'org.testcontainers:postgresql' implementation 'jakarta.jws:jakarta.jws-api:3.0.0' //TODO upgrade to JUnit5 testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - testImplementation 'org.springframework.boot:spring-boot-starter-test' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' - - testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/apps/brreg-stub/settings.gradle b/apps/brreg-stub/settings.gradle index ceb67c0a896..2126bfa8ba8 100644 --- a/apps/brreg-stub/settings.gradle +++ b/apps/brreg-stub/settings.gradle @@ -4,6 +4,8 @@ plugins { rootProject.name = 'brreg-stub' +includeBuild "../../plugins/java" + includeBuild '../../libs/database' includeBuild '../../libs/servlet-core' diff --git a/apps/bruker-service/build.gradle b/apps/bruker-service/build.gradle index 5dec71beac0..ce15cdca0ee 100644 --- a/apps/bruker-service/build.gradle +++ b/apps/bruker-service/build.gradle @@ -1,9 +1,5 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" + id "dolly-apps" } def test = tasks.named("test") { @@ -21,35 +17,11 @@ def iTest = tasks.register("iTest", Test) { 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-bruker-service" property "sonar.projectName", "testnav-bruker-service" - property "sonar.sourceEncoding", "UTF-8" } } -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' - } -} - -repositories { - mavenCentral() - mavenLocal() -} - dependencies { implementation 'com.auth0:java-jwt:4.4.0' @@ -58,20 +30,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-oauth2-resource-server' implementation 'org.springframework.boot:spring-boot-starter-data-r2dbc' implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - - implementation 'org.springframework.boot:spring-boot-starter-actuator' - implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0' implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' implementation 'io.r2dbc:r2dbc-h2' implementation 'org.postgresql:r2dbc-postgresql' @@ -81,20 +46,9 @@ dependencies { runtimeOnly 'com.h2database:h2' testImplementation 'io.projectreactor:reactor-test' - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' testImplementation 'org.assertj:assertj-core:3.26.0' testImplementation 'no.nav.testnav.libs:integration-test' testImplementation 'com.squareup.okhttp3:okhttp:4.10.0' testImplementation 'com.squareup.okhttp3:mockwebserver:4.10.0' - - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/apps/bruker-service/settings.gradle b/apps/bruker-service/settings.gradle index 7612ac852e7..dabd186654a 100644 --- a/apps/bruker-service/settings.gradle +++ b/apps/bruker-service/settings.gradle @@ -4,11 +4,13 @@ plugins { rootProject.name = 'bruker-service' +includeBuild "../../plugins/java" + +includeBuild '../../libs/data-transfer-objects' +includeBuild '../../libs/integration-test' includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-security' includeBuild '../../libs/security-core' -includeBuild '../../libs/data-transfer-objects' -includeBuild '../../libs/integration-test' develocity { buildScan { diff --git a/apps/budpro-service/build.gradle b/apps/budpro-service/build.gradle index d7c43b73561..a04fdddbcb5 100644 --- a/apps/budpro-service/build.gradle +++ b/apps/budpro-service/build.gradle @@ -1,31 +1,22 @@ plugins { - id "dolly-java-conventions" - id("org.openrewrite.rewrite") version("6.6.4") -} - -rewrite { - activeRecipe("org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_2") + id "dolly-apps" } dependencies { - rewrite('org.openrewrite.recipe:rewrite-spring:5.10.0') - - implementation 'no.nav.testnav.libs:commands' - implementation 'no.nav.testnav.libs:data-transfer-objects' - implementation 'no.nav.testnav.libs:reactive-core' - implementation 'no.nav.testnav.libs:security-core' - 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.3.0' - 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' - implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springframework.boot:spring-boot-starter-webflux' - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' + implementation "no.nav.testnav.libs:commands" + implementation "no.nav.testnav.libs:data-transfer-objects" + implementation "no.nav.testnav.libs:reactive-core" + implementation "no.nav.testnav.libs:security-core" + 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.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" + implementation "org.springframework.boot:spring-boot-starter-web" - testImplementation 'org.testcontainers:junit-jupiter' + testImplementation "org.testcontainers:junit-jupiter" } sonarqube { diff --git a/apps/budpro-service/settings.gradle b/apps/budpro-service/settings.gradle index fcf71e60808..1c99b24ef24 100644 --- a/apps/budpro-service/settings.gradle +++ b/apps/budpro-service/settings.gradle @@ -4,7 +4,7 @@ plugins { rootProject.name = 'budpro-service' -includeBuild '../../plugins/java' +includeBuild "../../plugins/java" includeBuild '../../libs/commands' includeBuild '../../libs/data-transfer-objects' diff --git a/apps/dolly-backend/build.gradle b/apps/dolly-backend/build.gradle index 926feba0ff5..e72ffcbdff7 100644 --- a/apps/dolly-backend/build.gradle +++ b/apps/dolly-backend/build.gradle @@ -1,58 +1,11 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() - jvmArgs '--add-opens', 'java.base/java.lang=ALL-UNNAMED' + id "dolly-apps" } 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-dolly-backend" property "sonar.projectName", "testnav-dolly-backend" - property "sonar.sourceEncoding", "UTF-8" - } -} - -bootJar { - archiveFileName = "app.jar" - mainClass = 'no.nav.dolly.DollyBackendApplicationStarter' -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' - } -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } -} - -repositories { - mavenCentral() - maven { - name = "GitHubPackages" - url = uri('https://maven.pkg.github.com/navikt/maven-release') - credentials(PasswordCredentials) { - password System.getenv("NAV_TOKEN") - username 'token' - } } } @@ -67,15 +20,12 @@ dependencies { implementation 'no.nav.testnav.libs:data-transfer-search-objects' implementation 'no.nav.testnav.libs:reactive-core' - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' implementation 'org.springframework.cloud:spring-cloud-vault-config-databases' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springframework.boot:spring-boot-starter-webflux' 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-data-jpa' @@ -95,13 +45,11 @@ dependencies { implementation 'org.postgresql:postgresql' implementation 'org.flywaydb:flyway-core' - implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'ma.glasnost.orika:orika-core:1.5.4' implementation 'org.codehaus.jettison:jettison:1.5.4' implementation 'org.apache.poi:poi:5.2.5' implementation 'org.apache.poi:poi-ooxml:5.2.5' - testImplementation "org.springframework.boot:spring-boot-starter-test" testImplementation 'org.opensearch:opensearch-testcontainers:2.0.1' testImplementation 'org.springframework.security:spring-security-test' @@ -113,8 +61,4 @@ dependencies { testImplementation 'org.bitbucket.b_c:jose4j:0.9.6' implementation 'net.java.dev.jna:jna:5.14.0' - - annotationProcessor 'org.projectlombok:lombok' - implementation 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' } \ No newline at end of file diff --git a/apps/dolly-backend/settings.gradle b/apps/dolly-backend/settings.gradle index 7799b717abe..ceeb7716ddc 100644 --- a/apps/dolly-backend/settings.gradle +++ b/apps/dolly-backend/settings.gradle @@ -4,15 +4,17 @@ plugins { rootProject.name = 'dolly-backend' +includeBuild "../../plugins/java" + +includeBuild '../../.github/workflows' +includeBuild '../../libs/data-transfer-objects' +includeBuild '../../libs/data-transfer-search-objects' +includeBuild '../../libs/database' includeBuild '../../libs/reactive-core' +includeBuild '../../libs/security-core' includeBuild '../../libs/servlet-core' -includeBuild '../../libs/servlet-security' includeBuild '../../libs/servlet-insecure-security' -includeBuild '../../libs/security-core' -includeBuild '../../libs/database' -includeBuild '../../libs/data-transfer-objects' -includeBuild '../../libs/data-transfer-search-objects' -includeBuild '../../.github/workflows' +includeBuild '../../libs/servlet-security' develocity { buildScan { diff --git a/apps/dolly-frontend/build.gradle b/apps/dolly-frontend/build.gradle index 18c9cfef1b8..92c4a4dae0e 100644 --- a/apps/dolly-frontend/build.gradle +++ b/apps/dolly-frontend/build.gradle @@ -1,60 +1,21 @@ plugins { - id "org.sonarqube" version "5.0.0.4638" - id 'java' - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } 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", "dolly-frontend" property "sonar.projectName", "dolly-frontend" - property "sonar.sourceEncoding", "UTF-8" property 'sonar.sources', 'src/main/java,src/main/js' } } -bootJar { - archiveFileName = "app.jar" -} -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' - mavenBom 'org.springframework.session:spring-session-bom:2021.2.3' - - } -} - -repositories { - mavenCentral() - mavenLocal() -} - configurations { configureEach { exclude group: 'org.springframework.boot', module: 'spring-boot-starter-actuator' } } -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } -} - dependencies { implementation 'no.nav.testnav.libs:security-core' implementation 'no.nav.testnav.libs:reactive-core' @@ -69,22 +30,12 @@ dependencies { implementation 'org.springframework.session:spring-session-core' implementation 'org.springframework.session:spring-session-data-redis' - implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-data-redis' - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' } \ No newline at end of file diff --git a/apps/dolly-frontend/settings.gradle b/apps/dolly-frontend/settings.gradle index a9afc681dd0..aff0f7d00e4 100644 --- a/apps/dolly-frontend/settings.gradle +++ b/apps/dolly-frontend/settings.gradle @@ -4,15 +4,17 @@ plugins { rootProject.name = 'dolly-frontend' +includeBuild "../../plugins/java" + +includeBuild '../../.github/workflows' +includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/reactive-core' +includeBuild '../../libs/reactive-frontend' +includeBuild '../../libs/reactive-proxy' includeBuild '../../libs/reactive-security' includeBuild '../../libs/reactive-session-security' includeBuild '../../libs/security-core' -includeBuild '../../libs/reactive-frontend' -includeBuild '../../libs/reactive-proxy' -includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/security-core' -includeBuild '../../.github/workflows' develocity { buildScan { diff --git a/apps/dollystatus/build.gradle b/apps/dollystatus/build.gradle index 162014f21f7..b8a85394b88 100644 --- a/apps/dollystatus/build.gradle +++ b/apps/dollystatus/build.gradle @@ -1,52 +1,15 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } 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-dollystatus" property "sonar.projectName", "testnav-dollystatus" - property "sonar.sourceEncoding", "UTF-8" property 'sonar.sources', 'src/main/java,src/main/js' } } -bootJar { - archiveFileName = "app.jar" -} -dependencyManagement { - applyMavenExclusions = false - imports { - } -} - -repositories { - mavenCentral() - mavenLocal() -} - dependencies { implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - testImplementation 'org.springframework.boot:spring-boot-starter-test' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/apps/dollystatus/settings.gradle b/apps/dollystatus/settings.gradle index f864b6f87f4..b2b73bf4094 100644 --- a/apps/dollystatus/settings.gradle +++ b/apps/dollystatus/settings.gradle @@ -4,6 +4,8 @@ plugins { rootProject.name = 'dollystatus' +includeBuild "../../plugins/java" + develocity { buildScan { termsOfUseUrl = "https://gradle.com/terms-of-service" diff --git a/apps/endringsmelding-frontend/build.gradle b/apps/endringsmelding-frontend/build.gradle index f0f0c61c7e8..24a8ee7adbc 100644 --- a/apps/endringsmelding-frontend/build.gradle +++ b/apps/endringsmelding-frontend/build.gradle @@ -1,47 +1,16 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } 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-endringsmelding-frontend" property "sonar.projectName", "testnav-endringsmelding-frontend" - property "sonar.sourceEncoding", "UTF-8" property 'sonar.sources', 'src/main/java,src/main/js' property 'sonar.tests', 'src/test/java' } } -bootJar { - archiveFileName = "app.jar" -} -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' - } -} - -repositories { - mavenCentral() - mavenLocal() -} - configurations { configureEach { exclude group: 'org.springframework.boot', module: 'spring-boot-starter-actuator' @@ -62,27 +31,9 @@ dependencies { implementation 'no.nav.testnav.libs:reactive-frontend' - implementation 'org.springframework.boot:spring-boot-starter-webflux' 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-gateway' - implementation 'org.springframework.boot:spring-boot-starter-actuator' - - implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/apps/endringsmelding-frontend/settings.gradle b/apps/endringsmelding-frontend/settings.gradle index bb1e3ed5b09..6f85d6501c5 100644 --- a/apps/endringsmelding-frontend/settings.gradle +++ b/apps/endringsmelding-frontend/settings.gradle @@ -4,11 +4,12 @@ plugins { rootProject.name = 'endringsmelding-frontend' +includeBuild "../../plugins/java" includeBuild '../../libs/reactive-core' -includeBuild '../../libs/security-core' -includeBuild '../../libs/reactive-session-security' includeBuild '../../libs/reactive-frontend' +includeBuild '../../libs/reactive-session-security' +includeBuild '../../libs/security-core' develocity { buildScan { diff --git a/apps/endringsmelding-service/build.gradle b/apps/endringsmelding-service/build.gradle index b7545bf7e07..2efc7c7d5d6 100644 --- a/apps/endringsmelding-service/build.gradle +++ b/apps/endringsmelding-service/build.gradle @@ -1,45 +1,14 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } 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-endringsmelding-service" property "sonar.projectName", "testnav-endringsmelding-service" - property "sonar.sourceEncoding", "UTF-8" - } -} - -bootJar { - archiveFileName = "app.jar" -} -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' } } -repositories { - mavenCentral() - mavenLocal() -} - dependencies { implementation 'no.nav.testnav.libs:security-core' implementation 'no.nav.testnav.libs:reactive-core' @@ -47,29 +16,12 @@ dependencies { implementation 'no.nav.testnav.libs:data-transfer-objects' implementation 'no.nav.testnav.libs:data-transfer-search-objects' - implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config - implementation 'org.springframework.boot:spring-boot-starter-actuator' - implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.hibernate.validator:hibernate-validator' implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0' implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/apps/endringsmelding-service/settings.gradle b/apps/endringsmelding-service/settings.gradle index 195644bd8c1..4d0b0949ca0 100644 --- a/apps/endringsmelding-service/settings.gradle +++ b/apps/endringsmelding-service/settings.gradle @@ -4,11 +4,13 @@ plugins { rootProject.name = 'endringsmelding-service' -includeBuild '../../libs/security-core' -includeBuild '../../libs/reactive-core' -includeBuild '../../libs/reactive-security' +includeBuild "../../plugins/java" + includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/data-transfer-search-objects' +includeBuild '../../libs/reactive-core' +includeBuild '../../libs/reactive-security' +includeBuild '../../libs/security-core' develocity { buildScan { diff --git a/apps/ereg-batch-status-service/build.gradle b/apps/ereg-batch-status-service/build.gradle index f1770bf46e8..975d7537c32 100644 --- a/apps/ereg-batch-status-service/build.gradle +++ b/apps/ereg-batch-status-service/build.gradle @@ -1,44 +1,14 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } 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-ereg-batch-status-service" property "sonar.projectName", "testnav-ereg-batch-status-service" - property "sonar.sourceEncoding", "UTF-8" - } -} -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } -repositories { - mavenCentral() - mavenLocal() -} dependencies { @@ -47,33 +17,14 @@ dependencies { implementation 'no.nav.testnav.libs:reactive-security' implementation 'no.nav.testnav.libs:security-core' - implementation 'org.springframework.boot:spring-boot-starter-webflux' 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' implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - - implementation 'org.springframework.boot:spring-boot-starter-actuator' - implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0' implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/apps/ereg-batch-status-service/settings.gradle b/apps/ereg-batch-status-service/settings.gradle index eb73708e812..bcd8fc92ccc 100644 --- a/apps/ereg-batch-status-service/settings.gradle +++ b/apps/ereg-batch-status-service/settings.gradle @@ -4,6 +4,8 @@ plugins { rootProject.name = 'ereg-batch-status-service' +includeBuild "../../plugins/java" + includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-security' diff --git a/apps/faste-data-frontend/build.gradle b/apps/faste-data-frontend/build.gradle index f5e99c74ca0..8c9baa24c51 100644 --- a/apps/faste-data-frontend/build.gradle +++ b/apps/faste-data-frontend/build.gradle @@ -1,47 +1,16 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } 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-faste-data-frontend" property "sonar.projectName", "testnav-faste-data-frontend" - property "sonar.sourceEncoding", "UTF-8" property 'sonar.sources', 'src/main/java,src/main/js' property 'sonar.tests', 'src/test/java' } } -bootJar { - archiveFileName = "app.jar" -} -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' - } -} - -repositories { - mavenCentral() - mavenLocal() -} - configurations { configureEach { exclude group: 'ch.qos.logback', module: 'logback-classic' @@ -62,27 +31,9 @@ dependencies { implementation 'no.nav.testnav.libs:reactive-frontend' - implementation 'org.springframework.boot:spring-boot-starter-webflux' 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-gateway' - implementation 'org.springframework.boot:spring-boot-starter-actuator' - - implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/apps/faste-data-frontend/settings.gradle b/apps/faste-data-frontend/settings.gradle index e6abb754462..921b9e7763e 100644 --- a/apps/faste-data-frontend/settings.gradle +++ b/apps/faste-data-frontend/settings.gradle @@ -4,10 +4,12 @@ plugins { rootProject.name = 'faste-data-frontend' +includeBuild "../../plugins/java" + includeBuild '../../libs/reactive-core' -includeBuild '../../libs/security-core' -includeBuild '../../libs/reactive-session-security' includeBuild '../../libs/reactive-frontend' +includeBuild '../../libs/reactive-session-security' +includeBuild '../../libs/security-core' develocity { buildScan { diff --git a/apps/generer-arbeidsforhold-populasjon-service/build.gradle b/apps/generer-arbeidsforhold-populasjon-service/build.gradle index 504d1eb7244..683138fe87c 100644 --- a/apps/generer-arbeidsforhold-populasjon-service/build.gradle +++ b/apps/generer-arbeidsforhold-populasjon-service/build.gradle @@ -1,45 +1,14 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } 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-generer-arbeidsforhold-populasjon-service" property "sonar.projectName", "testnav-generer-arbeidsforhold-populasjon-service" - property "sonar.sourceEncoding", "UTF-8" - } -} - -bootJar { - archiveFileName = "app.jar" -} -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } -repositories { - mavenCentral() - mavenLocal() -} - dependencies { @@ -51,27 +20,11 @@ dependencies { implementation 'no.nav.testnav.libs:commands' implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - - implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' - implementation 'org.hibernate.validator:hibernate-validator' - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/apps/generer-arbeidsforhold-populasjon-service/settings.gradle b/apps/generer-arbeidsforhold-populasjon-service/settings.gradle index ea5cee3eeb2..8489d0c4c11 100644 --- a/apps/generer-arbeidsforhold-populasjon-service/settings.gradle +++ b/apps/generer-arbeidsforhold-populasjon-service/settings.gradle @@ -4,12 +4,13 @@ plugins { rootProject.name = 'generer-arbeidsforhold-populasjon-service' +includeBuild "../../plugins/java" +includeBuild '../../libs/commands' +includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/security-core' includeBuild '../../libs/servlet-core' includeBuild '../../libs/servlet-insecure-security' -includeBuild '../../libs/commands' -includeBuild '../../libs/data-transfer-objects' develocity { buildScan { diff --git a/apps/generer-navn-service/build.gradle b/apps/generer-navn-service/build.gradle index 7d0da904ed8..e9128a37078 100644 --- a/apps/generer-navn-service/build.gradle +++ b/apps/generer-navn-service/build.gradle @@ -1,44 +1,14 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } 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-generer-navn-service" property "sonar.projectName", "testnav-generer-navn-service" - property "sonar.sourceEncoding", "UTF-8" - } -} -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } -repositories { - mavenCentral() - mavenLocal() -} dependencies { implementation 'no.nav.testnav.libs:security-core' @@ -47,30 +17,12 @@ dependencies { implementation 'no.nav.testnav.libs:data-transfer-objects' implementation 'no.nav.testnav.libs:servlet-security' - implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework.boot:spring-boot-starter-security' - - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.boot:spring-boot-starter-actuator' - implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/apps/generer-navn-service/settings.gradle b/apps/generer-navn-service/settings.gradle index 6b1c7e0c795..cd3395308ff 100644 --- a/apps/generer-navn-service/settings.gradle +++ b/apps/generer-navn-service/settings.gradle @@ -4,10 +4,12 @@ plugins { rootProject.name = 'generer-navn-service' -includeBuild '../../libs/security-core' -includeBuild '../../libs/servlet-core' +includeBuild "../../plugins/java" + includeBuild '../../libs/commands' includeBuild '../../libs/data-transfer-objects' +includeBuild '../../libs/security-core' +includeBuild '../../libs/servlet-core' includeBuild '../../libs/servlet-security' includeBuild '../../libs/testing' diff --git a/apps/generer-organisasjon-populasjon-service/build.gradle b/apps/generer-organisasjon-populasjon-service/build.gradle index 04fc5fbc162..90f8dafb97e 100644 --- a/apps/generer-organisasjon-populasjon-service/build.gradle +++ b/apps/generer-organisasjon-populasjon-service/build.gradle @@ -1,47 +1,14 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } 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-generer-organisasjon-populasjon-service" property "sonar.projectName", "testnav-generer-organisasjon-populasjon-service" - property "sonar.sourceEncoding", "UTF-8" - } -} -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } -repositories { - mavenCentral() - mavenLocal() - maven { - url = uri('https://packages.confluent.io/maven/') - } -} dependencies { implementation 'no.nav.testnav.libs:avro-schema' @@ -56,42 +23,26 @@ dependencies { implementation 'no.nav.testnav.libs:servlet-security' implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springframework.boot:spring-boot-starter-webflux' 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-data-jpa' - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' implementation 'org.springframework.cloud:spring-cloud-vault-config-databases' implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config - implementation 'org.springframework.boot:spring-boot-starter-actuator' - implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'org.springframework.kafka:spring-kafka' - implementation 'io.confluent:kafka-avro-serializer:7.5.1' + implementation 'io.confluent:kafka-avro-serializer:7.6.1' implementation 'jakarta.validation:jakarta.validation-api:3.1.0' implementation 'org.flywaydb:flyway-core' implementation 'com.h2database:h2' implementation 'com.zaxxer:HikariCP' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' implementation 'org.projectreactor:reactor-spring:1.0.1.RELEASE' - implementation 'org.hibernate.validator:hibernate-validator' implementation 'org.postgresql:postgresql' - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/apps/generer-organisasjon-populasjon-service/settings.gradle b/apps/generer-organisasjon-populasjon-service/settings.gradle index 059701787b3..27ad3a8130f 100644 --- a/apps/generer-organisasjon-populasjon-service/settings.gradle +++ b/apps/generer-organisasjon-populasjon-service/settings.gradle @@ -4,6 +4,8 @@ plugins { rootProject.name = 'generer-organisasjon-populasjon-service' +includeBuild "../../plugins/java" + includeBuild '../../libs/avro-schema' includeBuild '../../libs/commands' includeBuild '../../libs/data-transfer-objects' diff --git a/apps/generer-synt-amelding-service/build.gradle b/apps/generer-synt-amelding-service/build.gradle index 0f8e7ecafcd..a7ab4499bfb 100644 --- a/apps/generer-synt-amelding-service/build.gradle +++ b/apps/generer-synt-amelding-service/build.gradle @@ -1,44 +1,14 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } 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-generer-synt-amelding-service" property "sonar.projectName", "testnav-generer-synt-amelding-service" - property "sonar.sourceEncoding", "UTF-8" - } -} -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } -repositories { - mavenCentral() - mavenLocal() -} dependencies { implementation 'no.nav.testnav.libs:domain' @@ -47,32 +17,14 @@ dependencies { implementation 'no.nav.testnav.libs:servlet-core' implementation 'no.nav.testnav.libs:servlet-security' - implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework.boot:spring-boot-starter-security' - - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config - implementation 'org.springframework.boot:spring-boot-starter-actuator' - implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/apps/generer-synt-amelding-service/settings.gradle b/apps/generer-synt-amelding-service/settings.gradle index 94ab8321af6..ef0b90b9536 100644 --- a/apps/generer-synt-amelding-service/settings.gradle +++ b/apps/generer-synt-amelding-service/settings.gradle @@ -4,6 +4,8 @@ plugins { rootProject.name = 'generer-synt-amelding-service' +includeBuild "../../plugins/java" + includeBuild '../../libs/domain' includeBuild '../../libs/reactive-core' includeBuild '../../libs/security-core' diff --git a/apps/helsepersonell-service/build.gradle b/apps/helsepersonell-service/build.gradle index 5b3300c58b7..d134383b9e3 100644 --- a/apps/helsepersonell-service/build.gradle +++ b/apps/helsepersonell-service/build.gradle @@ -1,44 +1,14 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } 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-helsepersonell-service" property "sonar.projectName", "testnav-helsepersonell-service" - property "sonar.sourceEncoding", "UTF-8" } } -bootJar { - archiveFileName = "app.jar" -} -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' - } -} - -repositories { - mavenCentral() - mavenLocal() -} dependencies { implementation 'no.nav.testnav.libs:data-transfer-objects' @@ -46,31 +16,11 @@ dependencies { implementation 'no.nav.testnav.libs:security-core' implementation 'no.nav.testnav.libs:servlet-core' implementation 'no.nav.testnav.libs:servlet-security' - - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' implementation 'org.springframework.boot:spring-boot-starter-security' - implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' - implementation 'org.springframework.boot:spring-boot-starter-actuator' - implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' - - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } \ No newline at end of file diff --git a/apps/helsepersonell-service/settings.gradle b/apps/helsepersonell-service/settings.gradle index 034fd5b9ce8..68390be5bd8 100644 --- a/apps/helsepersonell-service/settings.gradle +++ b/apps/helsepersonell-service/settings.gradle @@ -4,6 +4,8 @@ plugins { rootProject.name = 'helsepersonell-service' +includeBuild "../../plugins/java" + includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/reactive-core' includeBuild '../../libs/security-core' diff --git a/apps/inntektsmelding-generator-service/build.gradle b/apps/inntektsmelding-generator-service/build.gradle index dda73849c21..1f3408ebc17 100644 --- a/apps/inntektsmelding-generator-service/build.gradle +++ b/apps/inntektsmelding-generator-service/build.gradle @@ -1,59 +1,23 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() - jvmArgs '--add-opens', 'java.base/java.lang=ALL-UNNAMED' + id "dolly-apps" } 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-inntektsmelding-generator-service" property "sonar.projectName", "testnav-inntektsmelding-generator-service" - property "sonar.sourceEncoding", "UTF-8" - } -} -bootJar { - archiveFileName = "app.jar" - duplicatesStrategy = DuplicatesStrategy.EXCLUDE -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } -repositories { - mavenCentral() - mavenLocal() -} - dependencies { implementation 'no.nav.testnav.libs:servlet-core' implementation 'no.nav.testnav.libs:data-transfer-objects' implementation 'no.nav.testnav.libs:servlet-security' implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework.boot:spring-boot-starter-security' - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.hibernate.validator:hibernate-validator' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' @@ -70,17 +34,5 @@ dependencies { implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.17.0' implementation 'org.apache.commons:commons-text:1.11.0' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/apps/inntektsmelding-generator-service/settings.gradle b/apps/inntektsmelding-generator-service/settings.gradle index 97d6a6db0cc..3935a9c629f 100644 --- a/apps/inntektsmelding-generator-service/settings.gradle +++ b/apps/inntektsmelding-generator-service/settings.gradle @@ -4,8 +4,10 @@ plugins { rootProject.name = 'inntektsmelding-generator-service' -includeBuild '../../libs/servlet-core' +includeBuild "../../plugins/java" + includeBuild '../../libs/data-transfer-objects' +includeBuild '../../libs/servlet-core' includeBuild '../../libs/servlet-security' develocity { diff --git a/apps/inntektsmelding-service/build.gradle b/apps/inntektsmelding-service/build.gradle index b761765be6a..77150e60bba 100644 --- a/apps/inntektsmelding-service/build.gradle +++ b/apps/inntektsmelding-service/build.gradle @@ -1,44 +1,14 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } 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-inntektsmelding-service" property "sonar.projectName", "testnav-inntektsmelding-service" - property "sonar.sourceEncoding", "UTF-8" } } -bootJar { - archiveFileName = "app.jar" -} -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' - } -} - -repositories { - mavenCentral() - mavenLocal() -} dependencies { implementation 'no.nav.testnav.libs:security-core' @@ -50,17 +20,11 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework.boot:spring-boot-starter-data-jpa' - implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-security' - implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' - implementation 'org.hibernate.validator:hibernate-validator' - implementation 'io.micrometer:micrometer-registry-prometheus' - - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'no.nav.tjenestespesifikasjoner:nav-altinn-inntektsmelding:1.2019.08.16-13.46-35cbdfd492d4' implementation 'org.apache.commons:commons-io:1.3.2' @@ -68,16 +32,4 @@ dependencies { implementation 'org.flywaydb:flyway-core' implementation 'com.h2database:h2' implementation 'org.postgresql:postgresql' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/apps/inntektsmelding-service/settings.gradle b/apps/inntektsmelding-service/settings.gradle index 8067b84e6da..c21b8727a14 100644 --- a/apps/inntektsmelding-service/settings.gradle +++ b/apps/inntektsmelding-service/settings.gradle @@ -4,9 +4,11 @@ plugins { rootProject.name = 'inntektsmelding-service' -includeBuild '../../libs/servlet-core' -includeBuild '../../libs/security-core' +includeBuild "../../plugins/java" + includeBuild '../../libs/data-transfer-objects' +includeBuild '../../libs/security-core' +includeBuild '../../libs/servlet-core' includeBuild '../../libs/servlet-security' develocity { diff --git a/apps/jenkins-batch-status-service/build.gradle b/apps/jenkins-batch-status-service/build.gradle index 3602d672715..d8462adf3a0 100644 --- a/apps/jenkins-batch-status-service/build.gradle +++ b/apps/jenkins-batch-status-service/build.gradle @@ -1,45 +1,14 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } 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-jenkins-batch-status-service" property "sonar.projectName", "testnav-jenkins-batch-status-service" - property "sonar.sourceEncoding", "UTF-8" - } -} - -bootJar { - archiveFileName = "app.jar" -} -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } -repositories { - mavenCentral() - mavenLocal() -} - dependencies { implementation 'no.nav.testnav.libs:commands' @@ -49,32 +18,14 @@ dependencies { implementation 'no.nav.testnav.libs:servlet-core' implementation 'no.nav.testnav.libs:servlet-security' - implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config - - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.boot:spring-boot-starter-actuator' - implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/apps/jenkins-batch-status-service/settings.gradle b/apps/jenkins-batch-status-service/settings.gradle index ea6d3d34ebc..fc49d836f47 100644 --- a/apps/jenkins-batch-status-service/settings.gradle +++ b/apps/jenkins-batch-status-service/settings.gradle @@ -4,6 +4,8 @@ plugins { rootProject.name = 'jenkins-batch-status-service' +includeBuild "../../plugins/java" + includeBuild '../../libs/commands' includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/reactive-core' diff --git a/apps/joark-dokument-service/build.gradle b/apps/joark-dokument-service/build.gradle index 36736059766..a6fd3f3096a 100644 --- a/apps/joark-dokument-service/build.gradle +++ b/apps/joark-dokument-service/build.gradle @@ -1,44 +1,14 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } 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-joark-dokument-service" property "sonar.projectName", "testnav-joark-dokument-service" - property "sonar.sourceEncoding", "UTF-8" - } -} -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } -repositories { - mavenCentral() - mavenLocal() -} dependencies { implementation 'no.nav.testnav.libs:domain' @@ -47,31 +17,13 @@ dependencies { implementation 'no.nav.testnav.libs:servlet-core' implementation 'no.nav.testnav.libs:servlet-security' - implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config - - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.boot:spring-boot-starter-actuator' - implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/apps/joark-dokument-service/settings.gradle b/apps/joark-dokument-service/settings.gradle index 528397d2541..3616ad10c4e 100644 --- a/apps/joark-dokument-service/settings.gradle +++ b/apps/joark-dokument-service/settings.gradle @@ -4,6 +4,8 @@ plugins { rootProject.name = 'joark-dokument-service' +includeBuild "../../plugins/java" + includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/domain' includeBuild '../../libs/reactive-core' diff --git a/apps/kodeverk-service/build.gradle b/apps/kodeverk-service/build.gradle index 9b21f20210f..73c539385ad 100644 --- a/apps/kodeverk-service/build.gradle +++ b/apps/kodeverk-service/build.gradle @@ -1,45 +1,14 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } 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-kodeverk-service" property "sonar.projectName", "testnav-kodeverk-service" - property "sonar.sourceEncoding", "UTF-8" - } -} -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } -repositories { - mavenCentral() - mavenLocal() -} - dependencies { implementation 'no.nav.testnav.libs:security-core' @@ -47,30 +16,14 @@ 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-oauth2-resource-server' - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' implementation 'org.springframework.boot:spring-boot-starter-cache' - implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0' implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' - implementation 'com.github.ben-manes.caffeine:caffeine' - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' } description = 'kodeverk-service' -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } -} diff --git a/apps/kodeverk-service/settings.gradle b/apps/kodeverk-service/settings.gradle index 2d8d1f9732e..b0f70bc2265 100644 --- a/apps/kodeverk-service/settings.gradle +++ b/apps/kodeverk-service/settings.gradle @@ -4,10 +4,12 @@ plugins { rootProject.name = 'kodeverk-service' -includeBuild '../../libs/security-core' +includeBuild "../../plugins/java" + +includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-security' -includeBuild '../../libs/data-transfer-objects' +includeBuild '../../libs/security-core' develocity { buildScan { diff --git a/apps/miljoer-service/build.gradle b/apps/miljoer-service/build.gradle index 2268a8ded03..3542a92e169 100644 --- a/apps/miljoer-service/build.gradle +++ b/apps/miljoer-service/build.gradle @@ -1,44 +1,13 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } 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-miljoer-service" property "sonar.projectName", "testnav-miljoer-service" - property "sonar.sourceEncoding", "UTF-8" } } -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' - } -} - -repositories { - mavenCentral() - mavenLocal() -} dependencies { @@ -48,31 +17,12 @@ dependencies { implementation 'no.nav.testnav.libs:data-transfer-objects' implementation 'no.nav.testnav.libs:servlet-security' - implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework.boot:spring-boot-starter-security' - - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.boot:spring-boot-starter-actuator' - - implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/apps/miljoer-service/settings.gradle b/apps/miljoer-service/settings.gradle index b47213c8199..339b7c0335f 100644 --- a/apps/miljoer-service/settings.gradle +++ b/apps/miljoer-service/settings.gradle @@ -4,11 +4,13 @@ plugins { rootProject.name = 'miljoer-service' +includeBuild "../../plugins/java" + +includeBuild '../../libs/commands' +includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/security-core' includeBuild '../../libs/servlet-core' -includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/servlet-security' -includeBuild '../../libs/commands' develocity { buildScan { diff --git a/apps/oppsummeringsdokument-service/build.gradle b/apps/oppsummeringsdokument-service/build.gradle index 966479ebb08..c96e355d75b 100644 --- a/apps/oppsummeringsdokument-service/build.gradle +++ b/apps/oppsummeringsdokument-service/build.gradle @@ -1,53 +1,11 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } 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", "oppsummeringsdokument-service" property "sonar.projectName", "oppsummeringsdokument-service" - property "sonar.sourceEncoding", "UTF-8" - } -} -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' - } -} - -repositories { - mavenCentral() - mavenLocal() - maven { - url = uri('https://packages.confluent.io/maven/') - } - maven { - name = "GitHubPackages" - url = uri('https://maven.pkg.github.com/navikt/maven-release') - credentials(PasswordCredentials) { - password System.getenv("NAV_TOKEN") - username 'token' - } } } @@ -65,36 +23,17 @@ dependencies { implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.17.1' implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.opensearch.client:spring-data-opensearch:1.4.0' implementation 'org.springframework.boot:spring-boot-starter-data-elasticsearch' implementation 'com.fasterxml.jackson.core:jackson-core:2.17.1' - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.boot:spring-boot-starter-actuator' - - implementation 'io.micrometer:micrometer-registry-prometheus' - - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.springframework.kafka:spring-kafka' implementation 'org.apache.kafka:kafka-clients:3.7.0' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' - implementation 'org.hibernate.validator:hibernate-validator' - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/apps/oppsummeringsdokument-service/settings.gradle b/apps/oppsummeringsdokument-service/settings.gradle index 8a131f075be..c63fd9917c8 100644 --- a/apps/oppsummeringsdokument-service/settings.gradle +++ b/apps/oppsummeringsdokument-service/settings.gradle @@ -4,10 +4,11 @@ plugins { rootProject.name = 'oppsummeringsdokument-service' +includeBuild "../../plugins/java" -includeBuild '../../libs/servlet-core' -includeBuild '../../libs/security-core' includeBuild '../../libs/data-transfer-objects' +includeBuild '../../libs/security-core' +includeBuild '../../libs/servlet-core' includeBuild '../../libs/servlet-security' includeBuild '../../xsd/arbeidsforhold-xsd' diff --git a/apps/organisasjon-bestilling-service/build.gradle b/apps/organisasjon-bestilling-service/build.gradle index 3e83640c871..49c26126d73 100644 --- a/apps/organisasjon-bestilling-service/build.gradle +++ b/apps/organisasjon-bestilling-service/build.gradle @@ -1,45 +1,14 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } 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", "organisasjon-bestilling-service" property "sonar.projectName", "organisasjon-bestilling-service" - property "sonar.sourceEncoding", "UTF-8" } } -bootJar { - archiveFileName = "app.jar" -} -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' - } -} - -repositories { - mavenCentral() - mavenLocal() -} - dependencies { @@ -52,36 +21,17 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework.boot:spring-boot-starter-data-jpa' - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config - implementation 'org.springframework.boot:spring-boot-starter-actuator' - implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'com.h2database:h2' implementation 'com.zaxxer:HikariCP' implementation 'org.flywaydb:flyway-core' implementation 'org.postgresql:postgresql' - implementation 'org.hibernate.validator:hibernate-validator' - - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/apps/organisasjon-bestilling-service/settings.gradle b/apps/organisasjon-bestilling-service/settings.gradle index 9be29dd957e..4f619dfb811 100644 --- a/apps/organisasjon-bestilling-service/settings.gradle +++ b/apps/organisasjon-bestilling-service/settings.gradle @@ -4,6 +4,8 @@ plugins { rootProject.name = 'organisasjon-bestilling-service' +includeBuild "../../plugins/java" + includeBuild '../../libs/commands' includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/reactive-core' diff --git a/apps/organisasjon-faste-data-service/build.gradle b/apps/organisasjon-faste-data-service/build.gradle index 1fe73c4c4b4..6d25402d7f3 100644 --- a/apps/organisasjon-faste-data-service/build.gradle +++ b/apps/organisasjon-faste-data-service/build.gradle @@ -1,45 +1,11 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } 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-organisasjon-faste-data-service" property "sonar.projectName", "testnav-organisasjon-faste-data-service" - property "sonar.sourceEncoding", "UTF-8" - } -} -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' - } -} - -repositories { - mavenCentral() - mavenLocal() - maven { - url = uri('https://packages.confluent.io/maven/') } } @@ -57,39 +23,22 @@ dependencies { implementation 'no.nav.testnav.libs:servlet-security' implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springframework.boot:spring-boot-starter-webflux' 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-data-jpa' - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' implementation 'org.springframework.cloud:spring-cloud-vault-config-databases' - implementation 'org.springframework.boot:spring-boot-starter-actuator' - - implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'jakarta.validation:jakarta.validation-api:3.1.0' - implementation 'io.confluent:kafka-avro-serializer:7.5.1' + implementation 'io.confluent:kafka-avro-serializer:7.6.1' implementation 'org.flywaydb:flyway-core' implementation 'com.zaxxer:HikariCP' implementation 'com.h2database:h2' implementation 'org.postgresql:postgresql' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' implementation 'org.projectreactor:reactor-spring:1.0.1.RELEASE' - implementation 'org.hibernate.validator:hibernate-validator' - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/apps/organisasjon-faste-data-service/settings.gradle b/apps/organisasjon-faste-data-service/settings.gradle index 3ebd1db7e45..d46480ab27e 100644 --- a/apps/organisasjon-faste-data-service/settings.gradle +++ b/apps/organisasjon-faste-data-service/settings.gradle @@ -4,6 +4,8 @@ plugins { rootProject.name = 'organisasjon-faste-data-service' +includeBuild "../../plugins/java" + includeBuild '../../libs/avro-schema' includeBuild '../../libs/commands' includeBuild '../../libs/data-transfer-objects' diff --git a/apps/organisasjon-forvalter/build.gradle b/apps/organisasjon-forvalter/build.gradle index d50c5463ff5..a797e956911 100644 --- a/apps/organisasjon-forvalter/build.gradle +++ b/apps/organisasjon-forvalter/build.gradle @@ -1,39 +1,11 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() - jvmArgs '--add-opens', 'java.base/java.lang=ALL-UNNAMED' + id "dolly-apps" } 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-organisasjon-forvalter" property "sonar.projectName", "testnav-organisasjon-forvalter" - property "sonar.sourceEncoding", "UTF-8" - } -} - -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } @@ -41,20 +13,6 @@ properties { compileJava.options.encoding = 'UTF-8' } -repositories { - mavenCentral() - mavenLocal() - maven { - url = uri('https://packages.confluent.io/maven/') - } -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } -} - dependencies { implementation 'no.nav.testnav.libs:kafka-config' @@ -68,32 +26,24 @@ dependencies { implementation 'no.nav.testnav.libs:commands' implementation 'no.nav.testnav.libs:data-transfer-objects' - implementation 'org.springframework.boot:spring-boot-starter-webflux' 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-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-security' - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' implementation 'org.springframework.cloud:spring-cloud-vault-config-databases' implementation 'org.apache.avro:avro:1.11.3' implementation 'org.flywaydb:flyway-core' implementation 'org.postgresql:postgresql' - implementation 'org.hibernate.validator:hibernate-validator' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'ma.glasnost.orika:orika-core:1.5.4' - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testImplementation 'com.h2database:h2' testImplementation 'no.nav.testnav.libs:testing' - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } diff --git a/apps/organisasjon-forvalter/settings.gradle b/apps/organisasjon-forvalter/settings.gradle index cad79edd348..a196306f3e1 100644 --- a/apps/organisasjon-forvalter/settings.gradle +++ b/apps/organisasjon-forvalter/settings.gradle @@ -4,16 +4,17 @@ plugins { rootProject.name = 'organisasjon-forvalter' +includeBuild "../../plugins/java" -includeBuild '../../libs/security-core' -includeBuild '../../libs/servlet-core' -includeBuild '../../libs/database' -includeBuild '../../libs/servlet-security' -includeBuild '../../libs/data-transfer-objects' +includeBuild '../../libs/avro-schema' includeBuild '../../libs/commands' +includeBuild '../../libs/data-transfer-objects' +includeBuild '../../libs/database' includeBuild '../../libs/kafka-config' includeBuild '../../libs/kafka-producers' -includeBuild '../../libs/avro-schema' +includeBuild '../../libs/security-core' +includeBuild '../../libs/servlet-core' +includeBuild '../../libs/servlet-security' includeBuild '../../libs/testing' develocity { diff --git a/apps/organisasjon-mottak-service/build.gradle b/apps/organisasjon-mottak-service/build.gradle index c2bbd7c2a80..3cc4f014c31 100644 --- a/apps/organisasjon-mottak-service/build.gradle +++ b/apps/organisasjon-mottak-service/build.gradle @@ -1,45 +1,11 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } 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-organisasjon-mottak-service" property "sonar.projectName", "testnav-organisasjon-mottak-service" - property "sonar.sourceEncoding", "UTF-8" - } -} -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' - } -} - -repositories { - mavenCentral() - mavenLocal() - maven { - url = uri('https://packages.confluent.io/maven/') } } @@ -57,33 +23,15 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - - implementation 'org.springframework.boot:spring-boot-starter-actuator' - - implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.hibernate.validator:hibernate-validator' implementation 'org.springframework.kafka:spring-kafka' implementation 'org.apache.kafka:kafka-clients:3.7.0' - implementation 'io.confluent:kafka-avro-serializer:7.5.1' + implementation 'io.confluent:kafka-avro-serializer:7.6.1' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/apps/organisasjon-mottak-service/settings.gradle b/apps/organisasjon-mottak-service/settings.gradle index 38065f51b2f..9e68b2ca4c2 100644 --- a/apps/organisasjon-mottak-service/settings.gradle +++ b/apps/organisasjon-mottak-service/settings.gradle @@ -4,6 +4,8 @@ plugins { rootProject.name = 'organisasjon-mottak-service' +includeBuild "../../plugins/java" + includeBuild '../../libs/avro-schema' includeBuild '../../libs/commands' includeBuild '../../libs/data-transfer-objects' diff --git a/apps/organisasjon-service/build.gradle b/apps/organisasjon-service/build.gradle index d350a163b7f..15983dd6171 100644 --- a/apps/organisasjon-service/build.gradle +++ b/apps/organisasjon-service/build.gradle @@ -1,45 +1,14 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } 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-organisasjon-service" property "sonar.projectName", "testnav-organisasjon-service" - property "sonar.sourceEncoding", "UTF-8" - } -} -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } -repositories { - mavenCentral() - mavenLocal() -} - dependencies { implementation 'no.nav.testnav.libs:commands' @@ -51,30 +20,12 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' - implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - - implementation 'org.springframework.boot:spring-boot-starter-actuator' - - implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.hibernate.validator:hibernate-validator' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' testImplementation 'junit:junit:4.13.2' //TODO upgrade to JUnit5 - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' testImplementation 'no.nav.testnav.libs:testing' testImplementation 'org.assertj:assertj-core:3.26.0' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/apps/organisasjon-service/settings.gradle b/apps/organisasjon-service/settings.gradle index 03965dbd46a..4539eac79ba 100644 --- a/apps/organisasjon-service/settings.gradle +++ b/apps/organisasjon-service/settings.gradle @@ -4,6 +4,8 @@ plugins { rootProject.name = 'organisasjon-service' +includeBuild "../../plugins/java" + includeBuild '../../libs/commands' includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/reactive-core' diff --git a/apps/organisasjon-tilgang-frontend/build.gradle b/apps/organisasjon-tilgang-frontend/build.gradle index 7d6cdc16fa0..d7f2f825d07 100644 --- a/apps/organisasjon-tilgang-frontend/build.gradle +++ b/apps/organisasjon-tilgang-frontend/build.gradle @@ -1,47 +1,16 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } 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-organisasjon-tilgang-frontend" property "sonar.projectName", "testnav-organisasjon-tilgang-frontend" - property "sonar.sourceEncoding", "UTF-8" property 'sonar.sources', 'src/main/java,src/main/js' property 'sonar.tests', 'src/test/java' } } -bootJar { - archiveFileName = "app.jar" -} -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' - } -} - -repositories { - mavenCentral() - mavenLocal() -} - dependencies { implementation ('no.nav.testnav.libs:security-core') { exclude group: 'org.springframework.session', module: 'spring-session-data-redis' @@ -56,28 +25,9 @@ dependencies { implementation 'no.nav.testnav.libs:reactive-frontend' - implementation 'org.springframework.boot:spring-boot-starter-webflux' 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-gateway' - implementation 'org.springframework.boot:spring-boot-starter-actuator' - - implementation 'io.micrometer:micrometer-registry-prometheus' - - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/apps/organisasjon-tilgang-frontend/settings.gradle b/apps/organisasjon-tilgang-frontend/settings.gradle index 9cc55b92a41..c690a5eb76b 100644 --- a/apps/organisasjon-tilgang-frontend/settings.gradle +++ b/apps/organisasjon-tilgang-frontend/settings.gradle @@ -4,11 +4,12 @@ plugins { rootProject.name = 'organisasjon-tilgang-frontend' +includeBuild "../../plugins/java" includeBuild '../../libs/reactive-core' -includeBuild '../../libs/security-core' -includeBuild '../../libs/reactive-session-security' includeBuild '../../libs/reactive-frontend' +includeBuild '../../libs/reactive-session-security' +includeBuild '../../libs/security-core' develocity { buildScan { diff --git a/apps/organisasjon-tilgang-service/build.gradle b/apps/organisasjon-tilgang-service/build.gradle index c3a6e793975..cac64614994 100644 --- a/apps/organisasjon-tilgang-service/build.gradle +++ b/apps/organisasjon-tilgang-service/build.gradle @@ -1,61 +1,20 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } 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-organisasjon-tilgang-service" property "sonar.projectName", "testnav-organisasjon-tilgang-service" - property "sonar.sourceEncoding", "UTF-8" } } -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } -} - -bootJar { - archiveFileName = "app.jar" -} -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' - } -} - -repositories { - mavenCentral() - mavenLocal() -} - dependencies { implementation 'no.nav.testnav.libs:reactive-core' implementation 'no.nav.testnav.libs:reactive-security' - implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.boot:spring-boot-starter-actuator' - implementation 'org.springframework.boot:spring-boot-starter-data-r2dbc' runtimeOnly 'org.postgresql:postgresql' implementation 'io.r2dbc:r2dbc-h2' @@ -63,17 +22,10 @@ dependencies { implementation 'org.flywaydb:flyway-core' implementation 'ma.glasnost.orika:orika-core:1.5.4' - implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0' implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' } diff --git a/apps/organisasjon-tilgang-service/settings.gradle b/apps/organisasjon-tilgang-service/settings.gradle index 421605989a6..29ccda116b3 100644 --- a/apps/organisasjon-tilgang-service/settings.gradle +++ b/apps/organisasjon-tilgang-service/settings.gradle @@ -4,6 +4,7 @@ plugins { rootProject.name = 'organisasjon-tilgang-service' +includeBuild "../../plugins/java" includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-security' diff --git a/apps/orgnummer-service/build.gradle b/apps/orgnummer-service/build.gradle index b8ce1940989..6747304bad4 100644 --- a/apps/orgnummer-service/build.gradle +++ b/apps/orgnummer-service/build.gradle @@ -1,45 +1,11 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } 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", "orgnummer-service" property "sonar.projectName", "orgnummer-service" - property "sonar.sourceEncoding", "UTF-8" - } -} -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' - } -} - -repositories { - mavenCentral() - mavenLocal() - maven { - url = uri('https://packages.confluent.io/maven/') } } @@ -54,35 +20,17 @@ dependencies { implementation 'no.nav.testnav.libs:servlet-security' implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' implementation 'org.springframework.boot:spring-boot-starter-data-jpa' - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' implementation 'org.springframework.cloud:spring-cloud-vault-config-databases' - implementation 'org.springframework.boot:spring-boot-starter-actuator' - - implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'jakarta.validation:jakarta.validation-api:3.1.0' implementation 'org.flywaydb:flyway-core' implementation 'com.h2database:h2' implementation 'com.zaxxer:HikariCP' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' - implementation 'org.hibernate.validator:hibernate-validator' implementation 'org.postgresql:postgresql' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/apps/orgnummer-service/settings.gradle b/apps/orgnummer-service/settings.gradle index 0dd87b3ba6a..c2f25516dae 100644 --- a/apps/orgnummer-service/settings.gradle +++ b/apps/orgnummer-service/settings.gradle @@ -4,6 +4,8 @@ plugins { rootProject.name = 'orgnummer-service' +includeBuild "../../plugins/java" + includeBuild '../../libs/commands' includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/database' diff --git a/apps/oversikt-frontend/build.gradle b/apps/oversikt-frontend/build.gradle index 78420dc18cb..ad38e381713 100644 --- a/apps/oversikt-frontend/build.gradle +++ b/apps/oversikt-frontend/build.gradle @@ -1,47 +1,15 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } 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-oversikt-frontend" property "sonar.projectName", "testnav-oversikt-frontend" - property "sonar.sourceEncoding", "UTF-8" property 'sonar.sources', 'src/main/java,src/main/js' } } -bootJar { - archiveFileName = "app.jar" -} -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' - mavenBom 'org.springframework.session:spring-session-bom:2021.2.0' - } -} - -repositories { - mavenCentral() - mavenLocal() -} - dependencies { implementation('no.nav.testnav.libs:security-core') { exclude group: 'org.springframework.session', module: 'spring-session-data-redis' @@ -53,29 +21,12 @@ dependencies { implementation 'no.nav.testnav.libs:reactive-frontend' implementation 'no.nav.testnav.libs:reactive-security' - implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' implementation 'org.springframework.cloud:spring-cloud-starter-gateway' implementation 'org.springframework.session:spring-session-core' - implementation 'org.springframework.boot:spring-boot-starter-actuator' - - implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/apps/oversikt-frontend/settings.gradle b/apps/oversikt-frontend/settings.gradle index 4f6bf9fcd12..77232fe6e5f 100644 --- a/apps/oversikt-frontend/settings.gradle +++ b/apps/oversikt-frontend/settings.gradle @@ -4,11 +4,12 @@ plugins { rootProject.name = 'oversikt-frontend' +includeBuild "../../plugins/java" includeBuild '../../libs/reactive-core' -includeBuild '../../libs/security-core' -includeBuild '../../libs/reactive-security' includeBuild '../../libs/reactive-frontend' +includeBuild '../../libs/reactive-security' +includeBuild '../../libs/security-core' develocity { buildScan { diff --git a/apps/pdl-forvalter/build.gradle b/apps/pdl-forvalter/build.gradle index 2cf9801566e..a12c382a9e5 100644 --- a/apps/pdl-forvalter/build.gradle +++ b/apps/pdl-forvalter/build.gradle @@ -1,59 +1,18 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() - jvmArgs '--add-opens', 'java.base/java.lang=ALL-UNNAMED' + id "dolly-apps" } 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-pdl-forvalter" property "sonar.projectName", "testnav-pdl-forvalter" - property "sonar.sourceEncoding", "UTF-8" - } -} - -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } - properties { compileJava.options.encoding = 'UTF-8' } -repositories { - mavenCentral() - mavenLocal() -} - - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } -} - dependencies { implementation 'no.nav.testnav.libs:database' @@ -64,20 +23,15 @@ dependencies { implementation 'no.nav.testnav.libs:security-core' implementation 'no.nav.testnav.libs:servlet-insecure-security' - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' implementation 'org.springframework.cloud:spring-cloud-vault-config-databases' implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-security' - implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-validation' - implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'ma.glasnost.orika:orika-core:1.5.4' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' @@ -86,11 +40,5 @@ dependencies { implementation 'com.fasterxml.jackson.core:jackson-core:2.17.1' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' - testImplementation 'no.nav.testnav.libs:testing' - testImplementation 'org.springframework.boot:spring-boot-starter-test' } \ No newline at end of file diff --git a/apps/pdl-forvalter/settings.gradle b/apps/pdl-forvalter/settings.gradle index 9d998d4804d..c5eee4e5ef0 100644 --- a/apps/pdl-forvalter/settings.gradle +++ b/apps/pdl-forvalter/settings.gradle @@ -4,12 +4,14 @@ plugins { rootProject.name = 'pdl-forvalter' -includeBuild '../../libs/security-core' -includeBuild '../../libs/database' +includeBuild "../../plugins/java" + includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/data-transfer-search-objects' -includeBuild '../../libs/servlet-core' +includeBuild '../../libs/database' includeBuild '../../libs/reactive-core' +includeBuild '../../libs/security-core' +includeBuild '../../libs/servlet-core' includeBuild '../../libs/servlet-insecure-security' includeBuild '../../libs/testing' diff --git a/apps/person-faste-data-service/build.gradle b/apps/person-faste-data-service/build.gradle index 80db0b91523..db7f8c23a30 100644 --- a/apps/person-faste-data-service/build.gradle +++ b/apps/person-faste-data-service/build.gradle @@ -1,44 +1,13 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } 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-person-faste-data-service" property "sonar.projectName", "testnav-person-faste-data-service" - property "sonar.sourceEncoding", "UTF-8" } } -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' - } -} - -repositories { - mavenCentral() - mavenLocal() -} dependencies { @@ -47,15 +16,9 @@ dependencies { implementation 'no.nav.testnav.libs:data-transfer-objects' implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-data-jpa' - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config - implementation 'org.springframework.boot:spring-boot-starter-actuator' - - implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'org.flywaydb:flyway-core' implementation 'com.h2database:h2' @@ -65,18 +28,6 @@ dependencies { implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0' implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/apps/person-faste-data-service/settings.gradle b/apps/person-faste-data-service/settings.gradle index a6ad03e9358..1afbd34226a 100644 --- a/apps/person-faste-data-service/settings.gradle +++ b/apps/person-faste-data-service/settings.gradle @@ -4,10 +4,11 @@ plugins { rootProject.name = 'person-faste-data-service' +includeBuild "../../plugins/java" -includeBuild '../../libs/reactive-security' -includeBuild '../../libs/reactive-core' includeBuild '../../libs/data-transfer-objects' +includeBuild '../../libs/reactive-core' +includeBuild '../../libs/reactive-security' develocity { buildScan { diff --git a/apps/person-organisasjon-tilgang-service/build.gradle b/apps/person-organisasjon-tilgang-service/build.gradle index 4c4d50f53a0..b42ef832505 100644 --- a/apps/person-organisasjon-tilgang-service/build.gradle +++ b/apps/person-organisasjon-tilgang-service/build.gradle @@ -1,14 +1,7 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" + id "dolly-apps" } -test { - useJUnitPlatform() -} def test = tasks.named("test") { useJUnitPlatform { excludeTags "integration" @@ -23,64 +16,24 @@ def iTest = tasks.register("iTest", Test) { 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-person-organisasjon-tilgang-service" property "sonar.projectName", "testnav-person-organisasjon-tilgang-service" - property "sonar.sourceEncoding", "UTF-8" - } -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) } } -bootJar { - archiveFileName = "app.jar" -} -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' - } -} - -repositories { - mavenCentral() - mavenLocal() -} - dependencies { implementation 'no.nav.testnav.libs:reactive-core' implementation 'no.nav.testnav.libs:reactive-security' implementation 'no.nav.testnav.libs:security-core' - implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - - implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'com.fasterxml.jackson.core:jackson-core:2.17.1' - testImplementation 'org.springframework.boot:spring-boot-starter-test' 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' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' } diff --git a/apps/person-organisasjon-tilgang-service/settings.gradle b/apps/person-organisasjon-tilgang-service/settings.gradle index dc0c7088c66..6c93b49e1a4 100644 --- a/apps/person-organisasjon-tilgang-service/settings.gradle +++ b/apps/person-organisasjon-tilgang-service/settings.gradle @@ -4,11 +4,12 @@ plugins { rootProject.name = 'person-organisasjon-tilgang-service' +includeBuild "../../plugins/java" +includeBuild '../../libs/integration-test' includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-security' includeBuild '../../libs/security-core' -includeBuild '../../libs/integration-test' develocity { buildScan { diff --git a/apps/person-search-service/build.gradle b/apps/person-search-service/build.gradle index f565c55dd44..35180b607e3 100644 --- a/apps/person-search-service/build.gradle +++ b/apps/person-search-service/build.gradle @@ -1,53 +1,14 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() - jvmArgs '--add-opens', 'java.base/java.lang=ALL-UNNAMED' + id "dolly-apps" } 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", "person-search-service" property "sonar.projectName", "person-search-service" - property "sonar.sourceEncoding", "UTF-8" - } -} - -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } -} - -repositories { - mavenCentral() - mavenLocal() -} - dependencies { implementation 'no.nav.testnav.libs:data-transfer-objects' @@ -62,26 +23,13 @@ dependencies { implementation 'com.fasterxml.jackson.core:jackson-core:2.17.1' implementation 'org.springframework.boot:spring-boot-starter-security' - implementation 'org.springframework.boot:spring-boot-starter-webflux' 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 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.boot:spring-boot-starter-actuator' - - implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'ma.glasnost.orika:orika-core:1.5.4' - implementation 'org.hibernate.validator:hibernate-validator' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' } \ No newline at end of file diff --git a/apps/person-search-service/settings.gradle b/apps/person-search-service/settings.gradle index e645f4baec8..373092ece6d 100644 --- a/apps/person-search-service/settings.gradle +++ b/apps/person-search-service/settings.gradle @@ -4,6 +4,8 @@ plugins { rootProject.name = 'person-search-service' +includeBuild "../../plugins/java" + includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/reactive-core' includeBuild '../../libs/security-core' diff --git a/apps/person-service/build.gradle b/apps/person-service/build.gradle index f0050f6a288..31e404e1828 100644 --- a/apps/person-service/build.gradle +++ b/apps/person-service/build.gradle @@ -1,51 +1,14 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } 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-person-service" property "sonar.projectName", "testnav-person-service" - property "sonar.sourceEncoding", "UTF-8" - } -} - -bootJar { - archiveFileName = "app.jar" -} -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } -} - -repositories { - mavenCentral() - mavenLocal() -} - dependencies { implementation 'no.nav.testnav.libs:commands' @@ -56,27 +19,12 @@ dependencies { implementation 'no.nav.testnav.libs:servlet-security' implementation 'org.springframework.boot:spring-boot-starter-security' - implementation 'org.springframework.boot:spring-boot-starter-webflux' 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 'org.springframework.cloud:spring-cloud-starter-vault-config' - - implementation 'org.springframework.boot:spring-boot-starter-actuator' - - implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'ma.glasnost.orika:orika-core:1.5.4' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' - implementation 'org.hibernate.validator:hibernate-validator' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' } diff --git a/apps/person-service/settings.gradle b/apps/person-service/settings.gradle index 19d12c5be56..9ebfc24c114 100644 --- a/apps/person-service/settings.gradle +++ b/apps/person-service/settings.gradle @@ -4,6 +4,8 @@ plugins { rootProject.name = 'person-service' +includeBuild "../../plugins/java" + includeBuild '../../libs/commands' includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/reactive-core' diff --git a/apps/profil-api/build.gradle b/apps/profil-api/build.gradle index b5322d86cc7..46e2b97e3f5 100644 --- a/apps/profil-api/build.gradle +++ b/apps/profil-api/build.gradle @@ -1,46 +1,14 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } 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", "testnorge-profil-api" property "sonar.projectName", "testnorge-profil-api" - property "sonar.sourceEncoding", "UTF-8" } } -bootJar { - archiveFileName = "app.jar" -} -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' - } -} - -repositories { - mavenCentral() - mavenLocal() -} - - dependencies { implementation 'no.nav.testnav.libs:reactive-core' @@ -52,30 +20,13 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config - implementation 'org.springframework.boot:spring-boot-starter-actuator' - - implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } description = 'profil-api' -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } -} diff --git a/apps/profil-api/settings.gradle b/apps/profil-api/settings.gradle index 7855b77d9af..3ad637cb7fa 100644 --- a/apps/profil-api/settings.gradle +++ b/apps/profil-api/settings.gradle @@ -4,6 +4,8 @@ plugins { rootProject.name = 'profil-api' +includeBuild "../../plugins/java" + includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/reactive-core' includeBuild '../../libs/security-core' diff --git a/apps/sykemelding-api/build.gradle b/apps/sykemelding-api/build.gradle index edb750227a3..83c6eddff06 100644 --- a/apps/sykemelding-api/build.gradle +++ b/apps/sykemelding-api/build.gradle @@ -1,53 +1,11 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } 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", "testnorge-sykemelding-api" property "sonar.projectName", "testnorge-sykemelding-api" - property "sonar.sourceEncoding", "UTF-8" - } -} -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' - } -} - -repositories { - mavenCentral() - mavenLocal() - maven { - name = "GitHubPackages" - url = uri('https://maven.pkg.github.com/navikt/maven-release') - credentials(PasswordCredentials) { - password System.getenv("NAV_TOKEN") - username 'token' - } - } - maven { - url = uri('https://packages.confluent.io/maven/') } } @@ -61,16 +19,10 @@ dependencies { implementation 'no.nav.testnav.libs:data-transfer-objects' implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-security' - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.boot:spring-boot-starter-actuator' - - implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0' implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'com.ibm.mq:mq-jms-spring-boot-starter:3.2.3' implementation 'org.springframework.kafka:spring-kafka' @@ -80,19 +32,9 @@ dependencies { implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml' implementation 'org.apache.kafka:kafka-clients:3.7.0' - implementation 'io.confluent:kafka-avro-serializer:7.5.1' + implementation 'io.confluent:kafka-avro-serializer:7.6.1' testImplementation 'no.nav.testnav.libs:testing' - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.security:spring-security-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/apps/sykemelding-api/settings.gradle b/apps/sykemelding-api/settings.gradle index 90a4a4ede91..8dce3838ae4 100644 --- a/apps/sykemelding-api/settings.gradle +++ b/apps/sykemelding-api/settings.gradle @@ -4,15 +4,16 @@ plugins { rootProject.name = 'sykemelding-api' +includeBuild "../../plugins/java" +includeBuild '../../libs/avro-schema' includeBuild '../../libs/commands' -includeBuild '../../libs/testing' +includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/reactive-core' +includeBuild '../../libs/security-core' includeBuild '../../libs/servlet-core' includeBuild '../../libs/servlet-security' -includeBuild '../../libs/security-core' -includeBuild '../../libs/avro-schema' -includeBuild '../../libs/data-transfer-objects' +includeBuild '../../libs/testing' develocity { buildScan { diff --git a/apps/synt-sykemelding-api/build.gradle b/apps/synt-sykemelding-api/build.gradle index 9636e654fcb..eb83949743f 100644 --- a/apps/synt-sykemelding-api/build.gradle +++ b/apps/synt-sykemelding-api/build.gradle @@ -1,45 +1,14 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } 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", "testnorge-synt-sykemelding-api" property "sonar.projectName", "testnorge-synt-sykemelding-api" - property "sonar.sourceEncoding", "UTF-8" } } -bootJar { - archiveFileName = "app.jar" -} -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' - } -} - -repositories { - mavenCentral() - mavenLocal() -} - dependencies { implementation 'no.nav.testnav.libs:commands' @@ -49,33 +18,13 @@ dependencies { implementation 'no.nav.testnav.libs:servlet-core' implementation 'no.nav.testnav.libs:servlet-security' - implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework.boot:spring-boot-starter-security' - - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.boot:spring-boot-starter-actuator' - - implementation 'io.micrometer:micrometer-registry-prometheus' - - implementation 'org.hibernate.validator:hibernate-validator' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' testImplementation 'no.nav.testnav.libs:testing' - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' testImplementation 'junit:junit:4.13.2' //TODO upgrade to JUnit5 - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/apps/synt-sykemelding-api/settings.gradle b/apps/synt-sykemelding-api/settings.gradle index 8d59ae02b01..1effa97ad87 100644 --- a/apps/synt-sykemelding-api/settings.gradle +++ b/apps/synt-sykemelding-api/settings.gradle @@ -4,6 +4,8 @@ plugins { rootProject.name = 'synt-sykemelding-api' +includeBuild "../../plugins/java" + includeBuild '../../libs/commands' includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/reactive-core' diff --git a/apps/synt-vedtakshistorikk-service/build.gradle b/apps/synt-vedtakshistorikk-service/build.gradle index 18a6d2776a5..dfb441da87d 100644 --- a/apps/synt-vedtakshistorikk-service/build.gradle +++ b/apps/synt-vedtakshistorikk-service/build.gradle @@ -1,48 +1,11 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } 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-synt-vedtakshistorikk-service" property "sonar.projectName", "testnav-synt-vedtakshistorikk-service" - property "sonar.sourceEncoding", "UTF-8" - } -} - -bootJar { - archiveFileName = "app.jar" -} -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' - } -} - -repositories { - mavenCentral() - mavenLocal() -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) } } @@ -54,27 +17,14 @@ dependencies { implementation 'no.nav.testnav.libs:security-core' implementation 'no.nav.testnav.libs:data-transfer-objects' - implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework.boot:spring-boot-starter-security' - - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - - implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' implementation 'com.google.guava:guava:33.2.0-jre' - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' testImplementation 'junit:junit:4.13.2' //TODO upgrade to JUnit5 - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' } diff --git a/apps/synt-vedtakshistorikk-service/settings.gradle b/apps/synt-vedtakshistorikk-service/settings.gradle index f2760d46c25..26c841f5cbd 100644 --- a/apps/synt-vedtakshistorikk-service/settings.gradle +++ b/apps/synt-vedtakshistorikk-service/settings.gradle @@ -4,13 +4,14 @@ plugins { rootProject.name = 'synt-vedtakshistorikk-service' +includeBuild "../../plugins/java" -includeBuild '../../libs/servlet-core' -includeBuild '../../libs/servlet-security' -includeBuild '../../libs/servlet-insecure-security' +includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/domain' includeBuild '../../libs/security-core' -includeBuild '../../libs/data-transfer-objects' +includeBuild '../../libs/servlet-core' +includeBuild '../../libs/servlet-insecure-security' +includeBuild '../../libs/servlet-security' develocity { buildScan { diff --git a/apps/tenor-search-service/build.gradle b/apps/tenor-search-service/build.gradle index 434768f421d..6fdabd19299 100644 --- a/apps/tenor-search-service/build.gradle +++ b/apps/tenor-search-service/build.gradle @@ -1,72 +1,24 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } sonarqube { properties { - property "sonar.dynamicAnalysis", "reuseReports" - property "sonar.host.url", "https://sonarcloud.io" - property "sonar.java.coveragePlugin", "jacoco" - property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") - property "sonar.organization", "navikt" - property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-tenor-search-service" property "sonar.projectName", "testnav-tenor-search-service" - property "sonar.sourceEncoding", "UTF-8" - } -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } -} - -bootJar { - archiveFileName = "app.jar" -} -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } -repositories { - mavenCentral() - mavenLocal() -} - dependencies { implementation 'no.nav.testnav.libs:reactive-core' implementation 'no.nav.testnav.libs:reactive-security' implementation 'no.nav.testnav.libs:security-core' implementation 'no.nav.testnav.libs:data-transfer-objects' - implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - - implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' testImplementation 'no.nav.testnav.libs:integration-test' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' } diff --git a/apps/tenor-search-service/settings.gradle b/apps/tenor-search-service/settings.gradle index 3a378b442ac..39bbdfb050c 100644 --- a/apps/tenor-search-service/settings.gradle +++ b/apps/tenor-search-service/settings.gradle @@ -4,11 +4,13 @@ plugins { rootProject.name = 'tenor-search-service' +includeBuild "../../plugins/java" + +includeBuild '../../libs/data-transfer-objects' +includeBuild '../../libs/integration-test' includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-security' includeBuild '../../libs/security-core' -includeBuild '../../libs/data-transfer-objects' -includeBuild '../../libs/integration-test' develocity { buildScan { diff --git a/apps/testnav-ident-pool/build.gradle b/apps/testnav-ident-pool/build.gradle index bcf2dd726f8..5193965cf39 100644 --- a/apps/testnav-ident-pool/build.gradle +++ b/apps/testnav-ident-pool/build.gradle @@ -1,39 +1,11 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() - jvmArgs '--add-opens', 'java.base/java.lang=ALL-UNNAMED' + id "dolly-apps" } 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-ident-pool" property "sonar.projectName", "testnav-ident-pool" - property "sonar.sourceEncoding", "UTF-8" - } -} - -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } @@ -41,29 +13,6 @@ properties { compileJava.options.encoding = 'UTF-8' } -bootJar { - archiveFileName = "app.jar" -} - -repositories { - mavenCentral() - mavenLocal() - maven { - name = "GitHubPackages" - url = uri('https://maven.pkg.github.com/navikt/maven-release') - credentials(PasswordCredentials) { - password System.getenv("NAV_TOKEN") - username 'token' - } - } -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } -} - dependencies { implementation 'no.nav.testnav.libs:security-core' implementation 'no.nav.testnav.libs:servlet-core' @@ -71,22 +20,17 @@ dependencies { implementation 'no.nav.testnav.libs:servlet-insecure-security' implementation 'no.nav.testnav.libs:database' - implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.security:spring-security-oauth2-jose' implementation 'org.springframework.boot:spring-boot-starter-validation' - implementation 'org.springframework.boot:spring-boot-configuration-processor' - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' implementation 'org.springframework.cloud:spring-cloud-vault-config-databases' implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config implementation 'org.springframework.retry:spring-retry' implementation 'org.aspectj:aspectjweaver' - implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'com.h2database:h2' @@ -95,15 +39,10 @@ dependencies { implementation 'ma.glasnost.orika:orika-core:1.5.4' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.security:spring-security-test' testImplementation 'no.nav.testnav.libs:testing' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' } description = 'testnav-ident-pool' diff --git a/apps/testnav-ident-pool/settings.gradle b/apps/testnav-ident-pool/settings.gradle index 9ac11a4b4d1..3e7b8c08fd6 100644 --- a/apps/testnav-ident-pool/settings.gradle +++ b/apps/testnav-ident-pool/settings.gradle @@ -4,14 +4,15 @@ plugins { rootProject.name = 'testnav-ident-pool' -includeBuild '../../libs/security-core' +includeBuild "../../plugins/java" + includeBuild '../../libs/database' +includeBuild '../../libs/security-core' includeBuild '../../libs/servlet-core' -includeBuild '../../libs/servlet-security' includeBuild '../../libs/servlet-insecure-security' +includeBuild '../../libs/servlet-security' includeBuild '../../libs/testing' - develocity { buildScan { termsOfUseUrl = "https://gradle.com/terms-of-service" diff --git a/apps/testnorge-statisk-data-forvalter/build.gradle b/apps/testnorge-statisk-data-forvalter/build.gradle index e46776446da..b5edf50c4d2 100644 --- a/apps/testnorge-statisk-data-forvalter/build.gradle +++ b/apps/testnorge-statisk-data-forvalter/build.gradle @@ -1,47 +1,11 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } 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", "testnorge-statisk-data-forvalter" property "sonar.projectName", "testnorge-statisk-data-forvalter" - property "sonar.sourceEncoding", "UTF-8" - } -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' - } -} - -bootJar { - archiveFileName = "app.jar" -} - -repositories { - mavenCentral() - mavenLocal() - - maven { - url = uri('https://packages.confluent.io/maven/') } } @@ -60,48 +24,33 @@ dependencies { implementation 'no.nav.testnav.libs:csv-converter' implementation 'org.springframework.kafka:spring-kafka' - implementation 'io.confluent:kafka-avro-serializer:7.5.1' + implementation 'io.confluent:kafka-avro-serializer:7.6.1' implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'org.springframework.boot:spring-boot-starter-security' - implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config implementation 'org.springframework.cloud:spring-cloud-vault-config-databases' - - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' + implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.aspectj:aspectjweaver:1.9.22' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.postgresql:postgresql' implementation 'com.zaxxer:HikariCP' implementation 'org.flywaydb:flyway-core' implementation 'com.h2database:h2' - implementation 'org.hibernate.validator:hibernate-validator' 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.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' - testImplementation 'no.nav.testnav.libs:testing' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.security:spring-security-test' testImplementation 'com.squareup.okhttp3:mockwebserver:4.9.3' } description = 'testnorge-statisk-data-forvalter' -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } -} diff --git a/apps/testnorge-statisk-data-forvalter/settings.gradle b/apps/testnorge-statisk-data-forvalter/settings.gradle index cb0d8c6d113..1acf1847522 100644 --- a/apps/testnorge-statisk-data-forvalter/settings.gradle +++ b/apps/testnorge-statisk-data-forvalter/settings.gradle @@ -4,17 +4,18 @@ plugins { rootProject.name = 'testnorge-statisk-data-forvalter' +includeBuild "../../plugins/java" -includeBuild '../../libs/security-core' -includeBuild '../../libs/servlet-security' -includeBuild '../../libs/kafka-config' -includeBuild '../../libs/kafka-producers' includeBuild '../../libs/avro-schema' -includeBuild '../../libs/data-transfer-objects' -includeBuild '../../libs/servlet-core' -includeBuild '../../libs/database' includeBuild '../../libs/commands' includeBuild '../../libs/csv-converter' +includeBuild '../../libs/data-transfer-objects' +includeBuild '../../libs/database' +includeBuild '../../libs/kafka-config' +includeBuild '../../libs/kafka-producers' +includeBuild '../../libs/security-core' +includeBuild '../../libs/servlet-core' +includeBuild '../../libs/servlet-security' includeBuild '../../libs/testing' develocity { diff --git a/apps/tilbakemelding-api/build.gradle b/apps/tilbakemelding-api/build.gradle index 96522c96b3e..18c30dc7887 100644 --- a/apps/tilbakemelding-api/build.gradle +++ b/apps/tilbakemelding-api/build.gradle @@ -1,45 +1,14 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } 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", "testnorge-tilbakemelding-api" property "sonar.projectName", "testnorge-tilbakemelding-api" - property "sonar.sourceEncoding", "UTF-8" - } -} -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } -repositories { - mavenCentral() - mavenLocal() -} - dependencies { implementation 'no.nav.testnav.libs:reactive-core' @@ -50,34 +19,16 @@ dependencies { implementation 'no.nav.testnav.libs:data-transfer-objects' - implementation 'org.springframework.boot:spring-boot-starter-webflux' 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.hibernate.validator:hibernate-validator' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config - - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.boot:spring-boot-starter-actuator' - - implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'org.reactivestreams:reactive-streams:1.0.4' implementation 'org.projectreactor:reactor-spring:1.0.1.RELEASE' - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/apps/tilbakemelding-api/settings.gradle b/apps/tilbakemelding-api/settings.gradle index bd17a86d3fb..ff9d177fc6e 100644 --- a/apps/tilbakemelding-api/settings.gradle +++ b/apps/tilbakemelding-api/settings.gradle @@ -4,6 +4,8 @@ plugins { rootProject.name = 'tilbakemelding-api' +includeBuild "../../plugins/java" + includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/reactive-core' includeBuild '../../libs/security-core' diff --git a/apps/tps-messaging-service/build.gradle b/apps/tps-messaging-service/build.gradle index 3f03080c01f..a294779524b 100644 --- a/apps/tps-messaging-service/build.gradle +++ b/apps/tps-messaging-service/build.gradle @@ -1,64 +1,11 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" - id("org.openrewrite.rewrite") version("6.6.4") -} - -test { - useJUnitPlatform() - jvmArgs '--add-opens', 'java.base/java.lang=ALL-UNNAMED' -} - -rewrite { - activeRecipe("org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_2") + id "dolly-apps" } 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", "tps-messaging-service" property "sonar.projectName", "tps-messaging-service" - property "sonar.sourceEncoding", "UTF-8" - } -} - -bootJar { - duplicatesStrategy(DuplicatesStrategy.INCLUDE) - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' - } -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } -} - -repositories { - mavenLocal() - mavenCentral() - maven { - name = "GitHubPackages" - url = uri('https://maven.pkg.github.com/navikt/maven-release') - credentials(PasswordCredentials) { - password System.getenv("NAV_TOKEN") - username 'token' - } } } @@ -68,7 +15,6 @@ configurations.implementation { } dependencies { - rewrite('org.openrewrite.recipe:rewrite-spring:5.10.0') implementation 'no.nav.testnav.libs:security-core' implementation 'no.nav.testnav.libs:servlet-core' implementation 'no.nav.testnav.libs:servlet-security' @@ -76,7 +22,6 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'io.netty:netty-transport-native-epoll' // See above exclusion. implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' @@ -91,25 +36,12 @@ dependencies { implementation 'org.glassfish.jaxb:jaxb-runtime' implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml' - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - 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 'io.micrometer:micrometer-registry-prometheus' implementation 'ma.glasnost.orika:orika-core:1.5.4' - implementation 'org.hibernate.validator:hibernate-validator' implementation 'org.aspectj:aspectjweaver:1.9.22' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' - - testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2' } \ No newline at end of file diff --git a/apps/tps-messaging-service/settings.gradle b/apps/tps-messaging-service/settings.gradle index db135da9e41..4eef351ae4e 100644 --- a/apps/tps-messaging-service/settings.gradle +++ b/apps/tps-messaging-service/settings.gradle @@ -4,11 +4,12 @@ plugins { rootProject.name = 'tps-messaging-service' +includeBuild "../../plugins/java" + +includeBuild '../../libs/data-transfer-search-objects' includeBuild '../../libs/security-core' includeBuild '../../libs/servlet-core' includeBuild '../../libs/servlet-security' -includeBuild '../../libs/data-transfer-search-objects' - develocity { buildScan { diff --git a/apps/udi-stub/build.gradle b/apps/udi-stub/build.gradle index f821bc5598d..2d3e7ca0d9b 100644 --- a/apps/udi-stub/build.gradle +++ b/apps/udi-stub/build.gradle @@ -1,41 +1,13 @@ plugins { - id "org.sonarqube" version "5.0.0.4638" - id 'java' - id "uk.co.boothen.gradle.wsimport" version "0.21" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id("org.openrewrite.rewrite") version("6.6.4") - id "jacoco" -} + id "dolly-apps" -test { - useJUnitPlatform() - jvmArgs '--add-opens', 'java.base/java.lang=ALL-UNNAMED' -} - -rewrite { - activeRecipe("org.openrewrite.java.spring.boot3.UpgradeSpringBoot_3_2") + id "uk.co.boothen.gradle.wsimport" version "0.21" } 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", "udi-stub" property "sonar.projectName", "udi-stub" - property "sonar.sourceEncoding", "UTF-8" - } -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } @@ -48,33 +20,7 @@ configurations { jaxb } -bootJar { - duplicatesStrategy(DuplicatesStrategy.INCLUDE) - archiveFileName = "app.jar" -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } -} - -repositories { - mavenCentral() - mavenLocal() - maven { - name = "GitHubPackages" - url = uri('https://maven.pkg.github.com/navikt/maven-release') - credentials(PasswordCredentials) { - password System.getenv("NAV_TOKEN") - username 'token' - } - } -} dependencies { - - rewrite('org.openrewrite.recipe:rewrite-spring:5.10.0') - implementation platform('org.testcontainers:testcontainers-bom:1.19.8') implementation "com.sun.xml.ws:jaxws-rt:4.0.2" @@ -82,19 +28,16 @@ dependencies { implementation 'no.nav.testnav.libs:servlet-security' implementation 'no.nav.testnav.libs:database' - implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework.boot:spring-boot-starter-data-jpa' - implementation 'org.springframework.boot:spring-boot-configuration-processor' implementation 'org.springframework.boot:spring-boot-starter-web-services' implementation 'org.springframework.ws:spring-ws-security' jaxb 'org.glassfish.jaxb:jaxb-xjc' implementation 'wsdl4j:wsdl4j' implementation 'org.springframework.cloud:spring-cloud-vault-config-databases' - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' implementation 'org.postgresql:postgresql' implementation 'org.flywaydb:flyway-core' @@ -103,19 +46,12 @@ dependencies { implementation 'ma.glasnost.orika:orika-core:1.5.4' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'com.h2database:h2' - testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2' testImplementation 'org.testcontainers:junit-jupiter' testImplementation 'org.testcontainers:postgresql' - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' //TODO upgrade to JUnit5 testImplementation 'org.mockito:mockito-junit-jupiter:5.12.0' - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' } diff --git a/apps/udi-stub/settings.gradle b/apps/udi-stub/settings.gradle index 4aa740b5b88..8eabd549fb1 100644 --- a/apps/udi-stub/settings.gradle +++ b/apps/udi-stub/settings.gradle @@ -4,10 +4,12 @@ plugins { rootProject.name = 'udi-stub' -includeBuild '../../libs/servlet-core' -includeBuild '../../libs/servlet-security' +includeBuild "../../plugins/java" + includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/database' +includeBuild '../../libs/servlet-core' +includeBuild '../../libs/servlet-security' develocity { buildScan { diff --git a/apps/varslinger-service/build.gradle b/apps/varslinger-service/build.gradle index b78e4c2bbdf..dddc98bead8 100644 --- a/apps/varslinger-service/build.gradle +++ b/apps/varslinger-service/build.gradle @@ -1,45 +1,11 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } 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-varslinger-service" property "sonar.projectName", "testnav-varslinger-service" - property "sonar.sourceEncoding", "UTF-8" - } -} -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' - } -} - -repositories { - mavenCentral() - mavenLocal() - maven { - url = uri('https://packages.confluent.io/maven/') } } @@ -53,7 +19,6 @@ dependencies { implementation 'no.nav.testnav.libs:servlet-security' implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' implementation 'org.springframework.cloud:spring-cloud-vault-config-databases' @@ -61,32 +26,15 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-jpa' 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-webflux' - implementation 'org.springframework.boot:spring-boot-starter-actuator' - - implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - - implementation 'org.hibernate.validator:hibernate-validator' implementation 'com.h2database:h2' implementation 'com.zaxxer:HikariCP' implementation 'org.flywaydb:flyway-core' implementation 'org.postgresql:postgresql' - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } description = 'varslinger-service' -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } -} diff --git a/apps/varslinger-service/settings.gradle b/apps/varslinger-service/settings.gradle index 8dd27df6ad2..4f583e6c517 100644 --- a/apps/varslinger-service/settings.gradle +++ b/apps/varslinger-service/settings.gradle @@ -4,10 +4,12 @@ plugins { rootProject.name = 'varslinger-service' -includeBuild '../../libs/servlet-core' -includeBuild '../../libs/security-core' -includeBuild '../../libs/database' +includeBuild "../../plugins/java" + includeBuild '../../libs/data-transfer-objects' +includeBuild '../../libs/database' +includeBuild '../../libs/security-core' +includeBuild '../../libs/servlet-core' includeBuild '../../libs/servlet-security' develocity { diff --git a/examples/reactive-rest-example/build.gradle b/examples/reactive-rest-example/build.gradle index a798212b517..9ee8384b058 100644 --- a/examples/reactive-rest-example/build.gradle +++ b/examples/reactive-rest-example/build.gradle @@ -1,45 +1,14 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-apps" } 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-reactive-rest-example" property "sonar.projectName", "testnav-reactive-rest-example" - property "sonar.sourceEncoding", "UTF-8" - } -} - -bootJar { - archiveFileName = "app.jar" -} -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } -repositories { - mavenCentral() - mavenLocal() -} - dependencies { implementation 'no.nav.testnav.libs:reactive-core' implementation 'no.nav.testnav.libs:reactive-security' @@ -62,13 +31,4 @@ dependencies { implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/examples/reactive-rest-example/settings.gradle b/examples/reactive-rest-example/settings.gradle index ae015c2baee..4b0053dd8f8 100644 --- a/examples/reactive-rest-example/settings.gradle +++ b/examples/reactive-rest-example/settings.gradle @@ -4,6 +4,7 @@ plugins { rootProject.name = 'reactive-rest-example' +includeBuild "../../plugins/java" includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-security' diff --git a/libs/avro-schema/build.gradle b/libs/avro-schema/build.gradle index 17e85c91f90..274ce6210ae 100644 --- a/libs/avro-schema/build.gradle +++ b/libs/avro-schema/build.gradle @@ -1,49 +1,14 @@ plugins { - id "org.sonarqube" version "5.0.0.4638" - id 'java-library' - id 'maven-publish' + id "dolly-libs" + id "dolly-libs-publish" + id 'com.github.davidmc24.gradle.plugin.avro' version '1.9.1' } -group = 'no.nav.testnav.libs' - sonarqube { skipProject = true } -repositories { - mavenCentral() - mavenLocal() -} - -if (project.hasProperty("releaseVersion")) { - version = releaseVersion -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } -} - -publishing { - repositories { - maven { - name = "github" - url = uri('https://maven.pkg.github.com/navikt/testnorge') - credentials(PasswordCredentials) { - username = System.getenv("GITHUB_ACTOR") - password = System.getenv("GITHUB_TOKEN") - } - } - } - publications { - gpr(MavenPublication) { - from(components.java) - } - } -} - dependencies { implementation 'org.apache.avro:avro-compiler:1.11.3' implementation 'org.apache.avro:avro-maven-plugin:1.11.3' diff --git a/libs/avro-schema/settings.gradle b/libs/avro-schema/settings.gradle index aa4f4f9140f..a26d0793ec1 100644 --- a/libs/avro-schema/settings.gradle +++ b/libs/avro-schema/settings.gradle @@ -4,6 +4,7 @@ plugins { rootProject.name = 'avro-schema' +includeBuild "../../plugins/java" develocity { buildScan { diff --git a/libs/commands/build.gradle b/libs/commands/build.gradle index dd3d2127ac8..7ebfac2c873 100644 --- a/libs/commands/build.gradle +++ b/libs/commands/build.gradle @@ -1,50 +1,15 @@ plugins { - id "org.sonarqube" version "5.0.0.4638" - id 'java-library' - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" + id "dolly-libs" } 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-commands" property "sonar.projectName", "testnav-commands" - property "sonar.sourceEncoding", "UTF-8" - } -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' - } -} - -group = 'no.nav.testnav.libs' - -repositories { - mavenCentral() - mavenLocal() -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) } } dependencies { implementation "no.nav.testnav.libs:data-transfer-objects" implementation 'org.springframework.boot:spring-boot-starter-webflux' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' } diff --git a/libs/commands/settings.gradle b/libs/commands/settings.gradle index de45dffd1d7..55bac8531e8 100644 --- a/libs/commands/settings.gradle +++ b/libs/commands/settings.gradle @@ -4,6 +4,8 @@ plugins { rootProject.name = 'commands' +includeBuild "../../plugins/java" + includeBuild '../data-transfer-objects' develocity { diff --git a/libs/csv-converter/build.gradle b/libs/csv-converter/build.gradle index 6d30d766506..60118785d45 100644 --- a/libs/csv-converter/build.gradle +++ b/libs/csv-converter/build.gradle @@ -1,49 +1,14 @@ plugins { - id "org.sonarqube" version "5.0.0.4638" - id 'java-library' - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" + id "dolly-libs" } 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-csv-converter" property "sonar.projectName", "testnav-csv-converter" - property "sonar.sourceEncoding", "UTF-8" - } -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' - } -} - -group = 'no.nav.testnav.libs' - -repositories { - mavenCentral() - mavenLocal() -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) } } dependencies { implementation 'org.apache.commons:commons-csv:1.10.0' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' } \ No newline at end of file diff --git a/libs/csv-converter/settings.gradle b/libs/csv-converter/settings.gradle index 8d2def7c322..4a36f6b4364 100644 --- a/libs/csv-converter/settings.gradle +++ b/libs/csv-converter/settings.gradle @@ -4,6 +4,7 @@ plugins { rootProject.name = 'csv-converter' +includeBuild "../../plugins/java" develocity { buildScan { diff --git a/libs/data-transfer-objects/build.gradle b/libs/data-transfer-objects/build.gradle index 402f61a77d7..3275231900d 100644 --- a/libs/data-transfer-objects/build.gradle +++ b/libs/data-transfer-objects/build.gradle @@ -1,48 +1,15 @@ plugins { - id "org.sonarqube" version "5.0.0.4638" - id 'java-library' - id 'maven-publish' - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" + id "dolly-libs" + id "dolly-libs-publish" } 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-data-transfer-objects" property "sonar.projectName", "testnav-data-transfer-objects" - property "sonar.sourceEncoding", "UTF-8" } } -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' - } -} - -group = 'no.nav.testnav.libs' - -repositories { - mavenCentral() - maven { - name = "GitHubPackages" - url = uri('https://maven.pkg.github.com/navikt/maven-release') - credentials(PasswordCredentials) { - password System.getenv("NAV_TOKEN") - username 'token' - } - } - mavenLocal() -} - dependencies { implementation 'com.fasterxml.jackson.core:jackson-annotations' implementation 'com.fasterxml.jackson.core:jackson-databind' @@ -55,38 +22,6 @@ dependencies { implementation 'org.springframework:spring-web' implementation 'no.nav.tjenestespesifikasjoner:nav-altinn-inntektsmelding:1.2019.08.16-13.46-35cbdfd492d4' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} - -if (project.hasProperty("releaseVersion")) { - version = releaseVersion -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } -} - -publishing { - repositories { - maven { - name = "github" - url = uri('https://maven.pkg.github.com/navikt/testnorge') - credentials(PasswordCredentials) { - username = System.getenv("GITHUB_ACTOR") - password = System.getenv("GITHUB_TOKEN") - } - } - } - publications { - gpr(MavenPublication) { - from(components.java) - } - } } tasks.withType(JavaCompile) { diff --git a/libs/data-transfer-objects/settings.gradle b/libs/data-transfer-objects/settings.gradle index edc5eea9c79..bf0c2aedf48 100644 --- a/libs/data-transfer-objects/settings.gradle +++ b/libs/data-transfer-objects/settings.gradle @@ -4,6 +4,7 @@ plugins { rootProject.name = 'data-transfer-objects' +includeBuild "../../plugins/java" develocity { buildScan { diff --git a/libs/data-transfer-search-objects/build.gradle b/libs/data-transfer-search-objects/build.gradle index bccd8a03396..e01561121ca 100644 --- a/libs/data-transfer-search-objects/build.gradle +++ b/libs/data-transfer-search-objects/build.gradle @@ -1,48 +1,15 @@ plugins { - id "org.sonarqube" version "5.0.0.4638" - id 'java-library' - id 'maven-publish' - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" + id "dolly-libs" + id "dolly-libs-publish" } 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-data-transfer-search-objects" property "sonar.projectName", "testnav-data-transfer-search-objects" - property "sonar.sourceEncoding", "UTF-8" } } -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' - } -} - -group = 'no.nav.testnav.libs' - -repositories { - mavenCentral() - maven { - name = "GitHubPackages" - url = uri('https://maven.pkg.github.com/navikt/maven-release') - credentials(PasswordCredentials) { - password System.getenv("NAV_TOKEN") - username 'token' - } - } - mavenLocal() -} - dependencies { implementation 'com.fasterxml.jackson.core:jackson-annotations' implementation 'com.fasterxml.jackson.core:jackson-databind' @@ -55,38 +22,6 @@ dependencies { implementation 'org.springframework:spring-web' implementation 'org.springframework.data:spring-data-elasticsearch' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} - -if (project.hasProperty("releaseVersion")) { - version = releaseVersion -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } -} - -publishing { - repositories { - maven { - name = "github" - url = uri('https://maven.pkg.github.com/navikt/testnorge') - credentials(PasswordCredentials) { - username = System.getenv("GITHUB_ACTOR") - password = System.getenv("GITHUB_TOKEN") - } - } - } - publications { - gpr(MavenPublication) { - from(components.java) - } - } } tasks.withType(JavaCompile) { diff --git a/libs/data-transfer-search-objects/settings.gradle b/libs/data-transfer-search-objects/settings.gradle index 270d27385d6..7b9d9ce8240 100644 --- a/libs/data-transfer-search-objects/settings.gradle +++ b/libs/data-transfer-search-objects/settings.gradle @@ -4,6 +4,7 @@ plugins { rootProject.name = 'data-transfer-search-objects' +includeBuild "../../plugins/java" develocity { buildScan { diff --git a/libs/database/build.gradle b/libs/database/build.gradle index cf83f9abf8e..4c3f4f3d551 100644 --- a/libs/database/build.gradle +++ b/libs/database/build.gradle @@ -1,45 +1,14 @@ plugins { - id "org.sonarqube" version "5.0.0.4638" - id 'java-library' - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" + id "dolly-libs" } 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-database" property "sonar.projectName", "testnav-database" - property "sonar.sourceEncoding", "UTF-8" } } -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' - } -} - -group = 'no.nav.testnav.libs' - -repositories { - mavenCentral() - mavenLocal() -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } -} dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-jpa' @@ -47,8 +16,4 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-vault-config-databases' implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' implementation 'org.flywaydb:flyway-core' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' } diff --git a/libs/database/settings.gradle b/libs/database/settings.gradle index be91471dc1b..8ad6f78209f 100644 --- a/libs/database/settings.gradle +++ b/libs/database/settings.gradle @@ -4,6 +4,7 @@ plugins { rootProject.name = 'database' +includeBuild "../../plugins/java" develocity { buildScan { diff --git a/libs/domain/build.gradle b/libs/domain/build.gradle index 1908e3f3b4f..feecda27c3e 100644 --- a/libs/domain/build.gradle +++ b/libs/domain/build.gradle @@ -1,46 +1,14 @@ plugins { - id "org.sonarqube" version "5.0.0.4638" - id 'java-library' - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" + id "dolly-libs" } 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-domain" property "sonar.projectName", "testnav-domain" - property "sonar.sourceEncoding", "UTF-8" } } -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' - } -} - -group = 'no.nav.testnav.libs' - -repositories { - mavenCentral() - mavenLocal() -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } -} - - dependencies { implementation 'com.fasterxml.jackson.core:jackson-annotations' implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml' @@ -48,8 +16,4 @@ dependencies { implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2' implementation 'io.springfox:springfox-swagger2:3.0.0' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' } \ No newline at end of file diff --git a/libs/domain/settings.gradle b/libs/domain/settings.gradle index 97962625795..429bfd5cf11 100644 --- a/libs/domain/settings.gradle +++ b/libs/domain/settings.gradle @@ -4,6 +4,7 @@ plugins { rootProject.name = 'domain' +includeBuild "../../plugins/java" develocity { buildScan { diff --git a/libs/integration-test/build.gradle b/libs/integration-test/build.gradle index df1149e1c4b..f7cc9d26991 100644 --- a/libs/integration-test/build.gradle +++ b/libs/integration-test/build.gradle @@ -1,58 +1,15 @@ plugins { - id "org.sonarqube" version "5.0.0.4638" - id 'java-library' - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-libs" } 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-integration-test" property "sonar.projectName", "testnav-integration-test" - property "sonar.sourceEncoding", "UTF-8" - } -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' - } -} - -group = 'no.nav.testnav.libs' - -repositories { - mavenCentral() - mavenLocal() -} - -if (project.hasProperty("releaseVersion")) { - version = releaseVersion -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) } } dependencies { implementation 'no.nav.testnav.libs:security-core' implementation 'org.springframework.boot:spring-boot-starter-webflux' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' } diff --git a/libs/integration-test/settings.gradle b/libs/integration-test/settings.gradle index 6c51a2805e4..fa42a1beedc 100644 --- a/libs/integration-test/settings.gradle +++ b/libs/integration-test/settings.gradle @@ -4,6 +4,8 @@ plugins { rootProject.name = 'integration-test' +includeBuild "../../plugins/java" + includeBuild '../security-core' develocity { diff --git a/libs/kafka-config/build.gradle b/libs/kafka-config/build.gradle index 20b402a233d..4c1b057e288 100644 --- a/libs/kafka-config/build.gradle +++ b/libs/kafka-config/build.gradle @@ -1,50 +1,14 @@ plugins { - id "org.sonarqube" version "5.0.0.4638" - id 'java-library' - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" + id "dolly-libs" } 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-kafka-config" property "sonar.projectName", "testnav-kafka-config" - property "sonar.sourceEncoding", "UTF-8" - } -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' - } -} - - -group = 'no.nav.testnav.libs' - -repositories { - mavenCentral() - mavenLocal() -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) } } dependencies { implementation 'org.springframework.boot:spring-boot-starter-web' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' } diff --git a/libs/kafka-config/settings.gradle b/libs/kafka-config/settings.gradle index 4f066b14ee1..475c79704c8 100644 --- a/libs/kafka-config/settings.gradle +++ b/libs/kafka-config/settings.gradle @@ -4,6 +4,8 @@ plugins { rootProject.name = 'kafka-config' +includeBuild "../../plugins/java" + develocity { buildScan { termsOfUseUrl = "https://gradle.com/terms-of-service" diff --git a/libs/kafka-producers/build.gradle b/libs/kafka-producers/build.gradle index 59251c883e4..e82832e1e78 100644 --- a/libs/kafka-producers/build.gradle +++ b/libs/kafka-producers/build.gradle @@ -1,58 +1,20 @@ plugins { - id "org.sonarqube" version "5.0.0.4638" - id 'java-library' - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" + id "dolly-libs" } 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-kafka-producers" property "sonar.projectName", "testnav-kafka-producers" - property "sonar.sourceEncoding", "UTF-8" } } -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' - } -} -group = 'no.nav.testnav.libs' - -repositories { - mavenCentral() - mavenLocal() - maven { - url = uri('https://packages.confluent.io/maven/') - } -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } -} - - dependencies { implementation 'no.nav.testnav.libs:kafka-config' implementation 'no.nav.testnav.libs:avro-schema' implementation 'org.springframework.kafka:spring-kafka' - implementation 'io.confluent:kafka-avro-serializer:7.5.1' + implementation 'io.confluent:kafka-avro-serializer:7.6.1' implementation 'org.springframework.boot:spring-boot-starter-web' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' } \ No newline at end of file diff --git a/libs/kafka-producers/settings.gradle b/libs/kafka-producers/settings.gradle index 3b611ba488d..b1f8521a0c3 100644 --- a/libs/kafka-producers/settings.gradle +++ b/libs/kafka-producers/settings.gradle @@ -4,6 +4,8 @@ plugins { rootProject.name = 'kafka-producers' +includeBuild "../../plugins/java" + includeBuild '../kafka-config' includeBuild '../avro-schema' diff --git a/libs/reactive-core/build.gradle b/libs/reactive-core/build.gradle index f574020d41d..bf27e78235e 100644 --- a/libs/reactive-core/build.gradle +++ b/libs/reactive-core/build.gradle @@ -1,70 +1,18 @@ plugins { - id "org.sonarqube" version "5.0.0.4638" - id 'java-library' - id 'maven-publish' - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-libs" + id "dolly-libs-publish" } 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-reactive-core" property "sonar.projectName", "testnav-reactive-core" - property "sonar.sourceEncoding", "UTF-8" - } -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' - } -} - - -group = 'no.nav.testnav.libs' - -repositories { - mavenCentral() - mavenLocal() -} - -if (project.hasProperty("releaseVersion")) { - version = releaseVersion -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) } } publishing { - repositories { - maven { - name = "github" - url = uri('https://maven.pkg.github.com/navikt/testnorge') - credentials(PasswordCredentials) { - username = System.getenv("GITHUB_ACTOR") - password = System.getenv("GITHUB_TOKEN") - } - } - } publications { gpr(MavenPublication) { - from(components.java) - versionMapping { usage('java-api') { fromResolutionOf('runtimeClasspath') @@ -78,14 +26,8 @@ publishing { } dependencies { - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' - implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'io.projectreactor:reactor-test:3.6.5' } \ No newline at end of file diff --git a/libs/reactive-core/settings.gradle b/libs/reactive-core/settings.gradle index 410e2bff48f..6c2e5fc542a 100644 --- a/libs/reactive-core/settings.gradle +++ b/libs/reactive-core/settings.gradle @@ -4,6 +4,8 @@ plugins { rootProject.name = 'reactive-core' +includeBuild "../../plugins/java" + develocity { buildScan { termsOfUseUrl = "https://gradle.com/terms-of-service" diff --git a/libs/reactive-frontend/build.gradle b/libs/reactive-frontend/build.gradle index eee5df3257a..b337a0fb293 100644 --- a/libs/reactive-frontend/build.gradle +++ b/libs/reactive-frontend/build.gradle @@ -1,53 +1,20 @@ plugins { - id "org.sonarqube" version "5.0.0.4638" - id 'java-library' + id "dolly-libs" + id 'maven-publish' - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" } 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-reactive-frontend" property "sonar.projectName", "testnav-reactive-frontend" - property "sonar.sourceEncoding", "UTF-8" } } - -group = 'no.nav.testnav.libs' - -repositories { - mavenCentral() - mavenLocal() -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' - } -} - - if (project.hasProperty("releaseVersion")) { version = releaseVersion } -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } -} - publishing { repositories { maven { @@ -78,10 +45,6 @@ publishing { dependencies { implementation 'no.nav.testnav.libs:security-core' - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' - implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' implementation 'org.springframework.boot:spring-boot-starter-webflux' diff --git a/libs/reactive-frontend/settings.gradle b/libs/reactive-frontend/settings.gradle index cf279db27a9..9cb4b90d1eb 100644 --- a/libs/reactive-frontend/settings.gradle +++ b/libs/reactive-frontend/settings.gradle @@ -4,6 +4,8 @@ plugins { rootProject.name = 'reactive-frontend' +includeBuild "../../plugins/java" + includeBuild '../security-core' develocity { diff --git a/libs/reactive-proxy/build.gradle b/libs/reactive-proxy/build.gradle index d08bcb4e6b5..4cb6a426e9e 100644 --- a/libs/reactive-proxy/build.gradle +++ b/libs/reactive-proxy/build.gradle @@ -1,38 +1,13 @@ plugins { - id "org.sonarqube" version "5.0.0.4638" - id 'java-library' + id "dolly-libs" + id 'maven-publish' - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" } 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-reactive-proxy" property "sonar.projectName", "testnav-reactive-proxy" - property "sonar.sourceEncoding", "UTF-8" - } -} - -group = 'no.nav.testnav.libs' - -repositories { - mavenCentral() - mavenLocal() -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' } } @@ -40,12 +15,6 @@ if (project.hasProperty("releaseVersion")) { version = releaseVersion } -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } -} - publishing { repositories { maven { @@ -76,9 +45,6 @@ publishing { dependencies { implementation 'no.nav.testnav.libs:reactive-security' - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' implementation 'org.springframework.boot:spring-boot-starter-webflux' diff --git a/libs/reactive-proxy/settings.gradle b/libs/reactive-proxy/settings.gradle index 88b8c3de9c9..1fb5ddc6adf 100644 --- a/libs/reactive-proxy/settings.gradle +++ b/libs/reactive-proxy/settings.gradle @@ -4,6 +4,8 @@ plugins { rootProject.name = 'reactive-proxy' +includeBuild "../../plugins/java" + includeBuild '../reactive-security' develocity { diff --git a/libs/reactive-security/build.gradle b/libs/reactive-security/build.gradle index 57a0a0c7f00..0bff93a11d6 100644 --- a/libs/reactive-security/build.gradle +++ b/libs/reactive-security/build.gradle @@ -1,47 +1,20 @@ plugins { - id "org.sonarqube" version "5.0.0.4638" - id 'java-library' - id 'maven-publish' - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} + id "dolly-libs" -test { - useJUnitPlatform() + id 'maven-publish' } 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-reactive-security" property "sonar.projectName", "testnav-reactive-security" - property "sonar.sourceEncoding", "UTF-8" } } - -group = 'no.nav.testnav.libs' - -repositories { - mavenCentral() - mavenLocal() -} if (project.hasProperty("releaseVersion")) { version = releaseVersion } -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } -} - publishing { repositories { maven { @@ -69,13 +42,6 @@ publishing { } } -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' - } -} - dependencies { implementation 'no.nav.testnav.libs:security-core' @@ -86,10 +52,4 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework.boot:spring-boot-starter-security' - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' - } \ No newline at end of file diff --git a/libs/reactive-security/settings.gradle b/libs/reactive-security/settings.gradle index ff147ef435f..d817940ddef 100644 --- a/libs/reactive-security/settings.gradle +++ b/libs/reactive-security/settings.gradle @@ -4,6 +4,8 @@ plugins { rootProject.name = 'reactive-security' +includeBuild "../../plugins/java" + includeBuild '../security-core' develocity { diff --git a/libs/reactive-session-security/build.gradle b/libs/reactive-session-security/build.gradle index 8f4c127d702..be94578b17a 100644 --- a/libs/reactive-session-security/build.gradle +++ b/libs/reactive-session-security/build.gradle @@ -1,43 +1,11 @@ plugins { - id "org.sonarqube" version "5.0.0.4638" - id 'java-library' - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" + id "dolly-libs" } 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-reactive-session-security" property "sonar.projectName", "testnav-reactive-session-security" - property "sonar.sourceEncoding", "UTF-8" - } -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' - mavenBom 'org.springframework.session:spring-session-bom:2021.0.3' - } -} - -group = 'no.nav.testnav.libs' - -repositories { - mavenCentral() - mavenLocal() -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) } } @@ -53,8 +21,4 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-data-redis' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' } \ No newline at end of file diff --git a/libs/reactive-session-security/settings.gradle b/libs/reactive-session-security/settings.gradle index 40cc147e68e..900e3f4ad3c 100644 --- a/libs/reactive-session-security/settings.gradle +++ b/libs/reactive-session-security/settings.gradle @@ -4,6 +4,7 @@ plugins { rootProject.name = 'reactive-session-security' +includeBuild "../../plugins/java" includeBuild '../security-core' diff --git a/libs/security-core/build.gradle b/libs/security-core/build.gradle index 62ff874fa90..58a7de01e46 100644 --- a/libs/security-core/build.gradle +++ b/libs/security-core/build.gradle @@ -1,42 +1,11 @@ plugins { - id "org.sonarqube" version "5.0.0.4638" - id 'java-library' - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" + id "dolly-libs" } 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-security-core" property "sonar.projectName", "testnav-security-core" - property "sonar.sourceEncoding", "UTF-8" - } -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' - } -} - -group = 'no.nav.testnav.libs' - -repositories { - mavenCentral() - mavenLocal() -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) } } @@ -47,13 +16,7 @@ tasks.named('compileJava') { dependencies { implementation 'com.auth0:java-jwt:4.4.0' - annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor' implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' implementation 'org.springframework.boot:spring-boot-starter-validation' implementation 'org.springframework.boot:spring-boot-starter-webflux' - testImplementation 'org.springframework.boot:spring-boot-starter-test' - - annotationProcessor 'org.projectlombok:lombok' - implementation 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' } \ No newline at end of file diff --git a/libs/security-core/settings.gradle b/libs/security-core/settings.gradle index bf49db8ddb4..97da9574a43 100644 --- a/libs/security-core/settings.gradle +++ b/libs/security-core/settings.gradle @@ -4,6 +4,8 @@ plugins { rootProject.name = 'security-core' +includeBuild "../../plugins/java" + develocity { buildScan { termsOfUseUrl = "https://gradle.com/terms-of-service" diff --git a/libs/security-core/src/test/java/no/nav/testnav/libs/securitycore/domain/ServerPropertiesTest.java b/libs/security-core/src/test/java/no/nav/testnav/libs/securitycore/domain/ServerPropertiesTest.java index 62522781eef..c4fa5663fc1 100644 --- a/libs/security-core/src/test/java/no/nav/testnav/libs/securitycore/domain/ServerPropertiesTest.java +++ b/libs/security-core/src/test/java/no/nav/testnav/libs/securitycore/domain/ServerPropertiesTest.java @@ -13,6 +13,10 @@ class ServerPropertiesTest { void testAllPropertiesMissing() { try (var factory = Validation.buildDefaultValidatorFactory()) { var props = new TestServerProperties(); + props.setCluster(null); + props.setName(null); + props.setNamespace(null); + props.setUrl(null); var violations = factory.getValidator().validate(props); assertThat(violations) .hasSize(4) diff --git a/libs/security-token-service/build.gradle b/libs/security-token-service/build.gradle index 93fa5d5bedb..4268a403456 100644 --- a/libs/security-token-service/build.gradle +++ b/libs/security-token-service/build.gradle @@ -1,48 +1,14 @@ plugins { - id "org.sonarqube" version "5.0.0.4638" - id 'java-library' - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" + id "dolly-libs" } 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-security-token-service" property "sonar.projectName", "testnav-security-token-service" - property "sonar.sourceEncoding", "UTF-8" - } -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' - } -} - -repositories { - mavenCentral() - mavenLocal() -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) } } dependencies { - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' - implementation 'org.springframework.boot:spring-boot-starter-webflux' -} -group = 'no.nav.testnav.libs' \ No newline at end of file +} \ No newline at end of file diff --git a/libs/security-token-service/settings.gradle b/libs/security-token-service/settings.gradle index 393aeb31201..3f51d1f6555 100644 --- a/libs/security-token-service/settings.gradle +++ b/libs/security-token-service/settings.gradle @@ -4,6 +4,7 @@ plugins { rootProject.name = 'security-token-service' +includeBuild "../../plugins/java" develocity { buildScan { diff --git a/libs/servlet-core/build.gradle b/libs/servlet-core/build.gradle index d24eea9bd0b..002ebbe4a64 100644 --- a/libs/servlet-core/build.gradle +++ b/libs/servlet-core/build.gradle @@ -1,46 +1,11 @@ plugins { - id "org.sonarqube" version "5.0.0.4638" - id 'java-library' - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-libs" } 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-servlet-core" property "sonar.projectName", "testnav-servlet-core" - property "sonar.sourceEncoding", "UTF-8" - } -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' - } -} - -group = 'no.nav.testnav.libs' - -repositories { - mavenCentral() - mavenLocal() -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) } } @@ -52,10 +17,4 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-actuator' - - testImplementation "org.springframework.boot:spring-boot-starter-test" - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' } \ No newline at end of file diff --git a/libs/servlet-core/settings.gradle b/libs/servlet-core/settings.gradle index cfb84c7c17e..4b9a208fed3 100644 --- a/libs/servlet-core/settings.gradle +++ b/libs/servlet-core/settings.gradle @@ -4,6 +4,7 @@ plugins { rootProject.name = 'servlet-core' +includeBuild "../../plugins/java" develocity { buildScan { diff --git a/libs/servlet-insecure-security/build.gradle b/libs/servlet-insecure-security/build.gradle index bf8f98918fa..21a166d7a93 100644 --- a/libs/servlet-insecure-security/build.gradle +++ b/libs/servlet-insecure-security/build.gradle @@ -1,42 +1,11 @@ plugins { - id "org.sonarqube" version "5.0.0.4638" - id 'java-library' - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" + id "dolly-libs" } 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-servlet-insecure-security" property "sonar.projectName", "testnav-servlet-insecure-security" - property "sonar.sourceEncoding", "UTF-8" - } -} - -group = 'no.nav.testnav.libs' - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' - } -} - -repositories { - mavenCentral() - mavenLocal() -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) } } @@ -49,8 +18,4 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' } \ No newline at end of file diff --git a/libs/servlet-insecure-security/settings.gradle b/libs/servlet-insecure-security/settings.gradle index 53ea95bc271..5e531cbdd58 100644 --- a/libs/servlet-insecure-security/settings.gradle +++ b/libs/servlet-insecure-security/settings.gradle @@ -4,6 +4,7 @@ plugins { rootProject.name = 'servlet-insecure-security' +includeBuild "../../plugins/java" includeBuild '../security-core' diff --git a/libs/servlet-security/build.gradle b/libs/servlet-security/build.gradle index 6c8170e03c2..37487ce71cf 100644 --- a/libs/servlet-security/build.gradle +++ b/libs/servlet-security/build.gradle @@ -1,43 +1,11 @@ plugins { - id "org.sonarqube" version "5.0.0.4638" - id 'java-library' - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" + id "dolly-libs" } 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-servlet-security" property "sonar.projectName", "testnav-servlet-security" - property "sonar.sourceEncoding", "UTF-8" - } -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' - } -} - - -group = 'no.nav.testnav.libs' - -repositories { - mavenCentral() - mavenLocal() -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) } } @@ -51,8 +19,4 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' } \ No newline at end of file diff --git a/libs/servlet-security/settings.gradle b/libs/servlet-security/settings.gradle index 6d44ec692cb..bf346e6828a 100644 --- a/libs/servlet-security/settings.gradle +++ b/libs/servlet-security/settings.gradle @@ -4,6 +4,7 @@ plugins { rootProject.name = 'servlet-security' +includeBuild "../../plugins/java" includeBuild '../security-core' diff --git a/libs/slack/build.gradle b/libs/slack/build.gradle index e0dd48d67c9..8c2b2a4064b 100644 --- a/libs/slack/build.gradle +++ b/libs/slack/build.gradle @@ -1,50 +1,15 @@ plugins { - id "org.sonarqube" version "5.0.0.4638" - id 'java-library' - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" + id "dolly-libs" } 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-slack" property "sonar.projectName", "testnav-slack" - property "sonar.sourceEncoding", "UTF-8" - } -} -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' - } -} - - -group = 'no.nav.testnav.libs' - -repositories { - mavenCentral() - mavenLocal() -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) } } dependencies { implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework:spring-web' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' } \ No newline at end of file diff --git a/libs/slack/settings.gradle b/libs/slack/settings.gradle index 378a320c9b7..2b5e7dd90be 100644 --- a/libs/slack/settings.gradle +++ b/libs/slack/settings.gradle @@ -4,6 +4,7 @@ plugins { rootProject.name = 'slack' +includeBuild "../../plugins/java" develocity { buildScan { diff --git a/libs/testing/build.gradle b/libs/testing/build.gradle index b8b683be3e5..69120f53847 100644 --- a/libs/testing/build.gradle +++ b/libs/testing/build.gradle @@ -1,53 +1,16 @@ plugins { - id "org.sonarqube" version "5.0.0.4638" - id 'java-library' - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" + id "dolly-libs" } 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-testing" property "sonar.projectName", "testnav-testing" - property "sonar.sourceEncoding", "UTF-8" - } -} - -group = 'no.nav.testnav.libs' - -repositories { - mavenCentral() - mavenLocal() -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' - mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' - } -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) } } dependencies { - implementation 'org.springframework.boot:spring-boot-starter-test' implementation 'org.springframework.cloud:spring-cloud-contract-wiremock' implementation 'com.fasterxml.jackson.core:jackson-core' implementation 'com.fasterxml.jackson.core:jackson-databind' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' } \ No newline at end of file diff --git a/libs/testing/settings.gradle b/libs/testing/settings.gradle index f47f547a9de..8680009f9bc 100644 --- a/libs/testing/settings.gradle +++ b/libs/testing/settings.gradle @@ -4,6 +4,8 @@ plugins { rootProject.name = 'testing' +includeBuild "../../plugins/java" + develocity { buildScan { termsOfUseUrl = "https://gradle.com/terms-of-service" diff --git a/mocks/azuread-mock/gradle/wrapper/gradle-wrapper.properties b/mocks/azuread-mock/gradle/wrapper/gradle-wrapper.properties deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/mocks/maskinporten-mock/build.gradle b/mocks/maskinporten-mock/build.gradle index b8a94843de2..e737db4165e 100644 --- a/mocks/maskinporten-mock/build.gradle +++ b/mocks/maskinporten-mock/build.gradle @@ -1,27 +1,5 @@ plugins { - id 'java' - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" -} - -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' - } -} - -test { - useJUnitPlatform() -} - -repositories { - mavenCentral() - mavenLocal() + id "dolly-apps" } dependencies { @@ -36,13 +14,4 @@ dependencies { implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0' compileOnly 'jakarta.servlet:jakarta.servlet-api:6.0.0' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/mocks/maskinporten-mock/settings.gradle b/mocks/maskinporten-mock/settings.gradle index 898f175ed43..19d2870c4fa 100644 --- a/mocks/maskinporten-mock/settings.gradle +++ b/mocks/maskinporten-mock/settings.gradle @@ -4,8 +4,10 @@ plugins { rootProject.name = 'maskinporten-mock' -includeBuild '../../libs/security-core' +includeBuild "../../plugins/java" + includeBuild '../../libs/reactive-core' +includeBuild '../../libs/security-core' develocity { buildScan { diff --git a/mocks/tokendings-mock/build.gradle b/mocks/tokendings-mock/build.gradle index c31677834d6..1f70a420e11 100644 --- a/mocks/tokendings-mock/build.gradle +++ b/mocks/tokendings-mock/build.gradle @@ -1,27 +1,5 @@ plugins { - id 'java' - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" -} - -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' - } -} - -test { - useJUnitPlatform() -} - -repositories { - mavenCentral() - mavenLocal() + id "dolly-apps" } dependencies { @@ -37,12 +15,4 @@ dependencies { implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0' compileOnly 'jakarta.servlet:jakarta.servlet-api:6.0.0' - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/mocks/tokendings-mock/settings.gradle b/mocks/tokendings-mock/settings.gradle index 121f6831265..280e84b5bd9 100644 --- a/mocks/tokendings-mock/settings.gradle +++ b/mocks/tokendings-mock/settings.gradle @@ -4,8 +4,10 @@ plugins { rootProject.name = 'tokendings-mock' -includeBuild '../../libs/security-core' +includeBuild "../../plugins/java" + includeBuild '../../libs/reactive-core' +includeBuild '../../libs/security-core' develocity { buildScan { diff --git a/plugins/java/src/main/groovy/dolly-apps.gradle b/plugins/java/src/main/groovy/dolly-apps.gradle new file mode 100644 index 00000000000..ba686f8b995 --- /dev/null +++ b/plugins/java/src/main/groovy/dolly-apps.gradle @@ -0,0 +1,81 @@ +plugins { + id "dolly-sonar" + + id "io.spring.dependency-management" // See ../../../build.gradle for version. + id "java" + id "org.springframework.boot" // See ../../../build.gradle for version. +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +dependencies { + annotationProcessor "org.projectlombok:lombok" + annotationProcessor "org.springframework.boot:spring-boot-configuration-processor" + + compileOnly "org.projectlombok:lombok" + + developmentOnly "org.springframework.boot:spring-boot-devtools" + + implementation "net.logstash.logback:logstash-logback-encoder:7.4" + implementation "org.hibernate.validator:hibernate-validator" + implementation "org.projectlombok:lombok" + implementation "org.springframework.boot:spring-boot-starter-actuator" + implementation "org.springframework.boot:spring-boot-starter-webflux" + implementation "org.springframework.cloud:spring-cloud-starter-vault-config" + + runtimeOnly "io.micrometer:micrometer-registry-prometheus" + + testAnnotationProcessor "org.projectlombok:lombok" + + testImplementation "org.springframework.boot:spring-boot-starter-test" +} + +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" + } +} + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + +repositories { + mavenCentral() + maven { + name = "GitHub Packages" + url = uri("https://maven.pkg.github.com/navikt/maven-release") + credentials(PasswordCredentials) { + username "token" + password System.getenv("NAV_TOKEN") + } + } + maven { + name = "Confluent" + url = uri("https://packages.confluent.io/maven/") + } + maven { + name = "Shibboleth" + url = uri("https://build.shibboleth.net/maven/releases/") + } + mavenLocal() +} + +tasks.bootJar { + archiveFileName = "app.jar" + duplicatesStrategy = DuplicatesStrategy.WARN +} + +tasks.test { + useJUnitPlatform() + jvmArgs "--add-opens", "java.base/java.lang=ALL-UNNAMED" +} \ No newline at end of file diff --git a/plugins/java/src/main/groovy/dolly-java-conventions.gradle b/plugins/java/src/main/groovy/dolly-java-conventions.gradle deleted file mode 100644 index ee03bb4d25f..00000000000 --- a/plugins/java/src/main/groovy/dolly-java-conventions.gradle +++ /dev/null @@ -1,81 +0,0 @@ -plugins { - id "io.spring.dependency-management" // See ../../../build.gradle for version. - id "jacoco" - id "java" - id "org.sonarqube" // See ../../../build.gradle for version. - id "org.springframework.boot" // See ../../../build.gradle for version. -} - -tasks.bootJar { - archiveFileName = "app.jar" -} - -configurations { - compileOnly { - extendsFrom annotationProcessor - } -} - -dependencies { - annotationProcessor 'org.projectlombok:lombok' - annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor' - - compileOnly 'org.projectlombok:lombok' - - developmentOnly 'org.springframework.boot:spring-boot-devtools' - - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.projectlombok:lombok' - implementation 'org.springframework.boot:spring-boot-starter-actuator' - - runtimeOnly 'io.micrometer:micrometer-registry-prometheus' - - testAnnotationProcessor 'org.projectlombok:lombok' - - testImplementation "org.junit.jupiter:junit-jupiter:5.10.1" - testImplementation 'org.springframework.boot:spring-boot-starter-test' -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom "org.springframework.cloud:spring-cloud-dependencies:2023.0.0" - } -} - -repositories { - mavenLocal() - mavenCentral() - maven { - name = "GitHubPackages" - url = uri('https://maven.pkg.github.com/navikt/maven-release') - credentials(PasswordCredentials) { - username 'token' - password System.getenv("NAV_TOKEN") - } - } -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } -} - -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.sourceEncoding", "UTF-8" - } -} - -tasks.test { - useJUnitPlatform() - jvmArgs '--add-opens', 'java.base/java.lang=ALL-UNNAMED' -} \ No newline at end of file diff --git a/plugins/java/src/main/groovy/dolly-libs-publish.gradle b/plugins/java/src/main/groovy/dolly-libs-publish.gradle new file mode 100644 index 00000000000..7a0a47d8ff1 --- /dev/null +++ b/plugins/java/src/main/groovy/dolly-libs-publish.gradle @@ -0,0 +1,25 @@ +plugins { + id "maven-publish" +} + +if (project.hasProperty("releaseVersion")) { + version = releaseVersion +} + +publishing { + repositories { + maven { + name = "github" + url = uri('https://maven.pkg.github.com/navikt/testnorge') + credentials(PasswordCredentials) { + username = System.getenv("GITHUB_ACTOR") + password = System.getenv("GITHUB_TOKEN") + } + } + } + publications { + gpr(MavenPublication) { + from(components.java) + } + } +} \ No newline at end of file diff --git a/plugins/java/src/main/groovy/dolly-libs.gradle b/plugins/java/src/main/groovy/dolly-libs.gradle new file mode 100644 index 00000000000..fd21bb5f6e0 --- /dev/null +++ b/plugins/java/src/main/groovy/dolly-libs.gradle @@ -0,0 +1,53 @@ +plugins { + id "dolly-sonar" + + id "io.spring.dependency-management" // See ../../../build.gradle for version. + id "java-library" +} + +group = "no.nav.testnav.libs" + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +dependencyManagement { + applyMavenExclusions = false + imports { + mavenBom "org.springframework.boot:spring-boot-dependencies:3.2.1" + mavenBom "org.springframework.cloud:spring-cloud-dependencies:2023.0.1" + } +} + +dependencies { + annotationProcessor "org.projectlombok:lombok" + annotationProcessor "org.springframework.boot:spring-boot-configuration-processor" + + implementation "org.projectlombok:lombok" + + testAnnotationProcessor "org.projectlombok:lombok" + + testImplementation "org.springframework.boot:spring-boot-starter-test" +} + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + +repositories { + mavenCentral() + maven { + name = "Confluent" + url = uri("https://packages.confluent.io/maven/") + } + mavenLocal() +} + +tasks.test { + useJUnitPlatform() + jvmArgs "--add-opens", "java.base/java.lang=ALL-UNNAMED" +} \ No newline at end of file diff --git a/plugins/java/src/main/groovy/dolly-proxies.gradle b/plugins/java/src/main/groovy/dolly-proxies.gradle new file mode 100644 index 00000000000..e6b941df7e7 --- /dev/null +++ b/plugins/java/src/main/groovy/dolly-proxies.gradle @@ -0,0 +1,84 @@ +plugins { + id "dolly-sonar" + + id "io.spring.dependency-management" // See ../../../build.gradle for version. + id "java" + id "org.springframework.boot" // See ../../../build.gradle for version. +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +dependencies { + annotationProcessor "org.projectlombok:lombok" + annotationProcessor "org.springframework.boot:spring-boot-configuration-processor" + + compileOnly "org.projectlombok:lombok" + + developmentOnly "org.springframework.boot:spring-boot-devtools" + + implementation "net.logstash.logback:logstash-logback-encoder:7.4" + implementation "no.nav.testnav.libs:reactive-core" + implementation "no.nav.testnav.libs:reactive-proxy" + implementation "org.hibernate.validator:hibernate-validator" + implementation "org.projectlombok:lombok" + implementation "org.springframework.boot:spring-boot-starter-actuator" + implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server" + implementation "org.springframework.cloud:spring-cloud-starter-gateway" + + runtimeOnly "io.micrometer:micrometer-registry-prometheus" + + testAnnotationProcessor "org.projectlombok:lombok" + + testImplementation "org.springframework.boot:spring-boot-starter-test" + testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock" +} + +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" + } +} + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + +repositories { + mavenCentral() + maven { + name = "GitHub Packages" + url = uri("https://maven.pkg.github.com/navikt/maven-release") + credentials(PasswordCredentials) { + username "token" + password System.getenv("NAV_TOKEN") + } + } + maven { + name = "Confluent" + url = uri("https://packages.confluent.io/maven/") + } + maven { + name = "Shibboleth" + url = uri("https://build.shibboleth.net/maven/releases/") + } + mavenLocal() +} + +tasks.bootJar { + archiveFileName = "app.jar" + duplicatesStrategy = DuplicatesStrategy.WARN +} + +tasks.test { + useJUnitPlatform() + jvmArgs "--add-opens", "java.base/java.lang=ALL-UNNAMED" +} \ No newline at end of file diff --git a/plugins/java/src/main/groovy/dolly-sonar.gradle b/plugins/java/src/main/groovy/dolly-sonar.gradle new file mode 100644 index 00000000000..7ef76b56442 --- /dev/null +++ b/plugins/java/src/main/groovy/dolly-sonar.gradle @@ -0,0 +1,17 @@ +plugins { + id "jacoco" + id "org.sonarqube" // See ../../../build.gradle for version. +} + +sonarqube { + properties { + property "sonar.dynamicAnalysis", "reuseReports" + property "sonar.host.url", "https://sonarcloud.io" + property "sonar.java.coveragePlugin", "jacoco" + property "sonar.language", "java" + property "sonar.organization", "navikt" + property "sonar.project.monorepo.enabled", true + property "sonar.sourceEncoding", "UTF-8" + property "sonar.token", System.getenv("SONAR_TOKEN") + } +} \ No newline at end of file diff --git a/proxies/aareg-proxy/build.gradle b/proxies/aareg-proxy/build.gradle index 10f5e78eb73..aa9e185cc03 100644 --- a/proxies/aareg-proxy/build.gradle +++ b/proxies/aareg-proxy/build.gradle @@ -1,72 +1,17 @@ plugins { - id 'io.spring.dependency-management' version "1.1.5" - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-proxies" } 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-aareg-proxy" property "sonar.projectName", "testnav-aareg-proxy" - property "sonar.sourceEncoding", "UTF-8" } } -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' - } -} - -repositories { - mavenCentral() - mavenLocal() -} dependencies { - - annotationProcessor "org.springframework.boot:spring-boot-configuration-processor" - - implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - implementation 'org.springframework.boot:spring-boot-starter-webflux' - - implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' - - implementation 'no.nav.testnav.libs:reactive-core' - implementation 'no.nav.testnav.libs:reactive-proxy' - implementation 'no.nav.testnav.libs:reactive-security' - implementation 'no.nav.testnav.libs:security-core' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } + implementation "no.nav.testnav.libs:reactive-security" + implementation "no.nav.testnav.libs:security-core" + implementation "org.springframework.boot:spring-boot-starter-webflux" + implementation "org.springframework.cloud:spring-cloud-starter-vault-config" } diff --git a/proxies/aareg-proxy/settings.gradle b/proxies/aareg-proxy/settings.gradle index 99ed0360802..a2b3817b5a1 100644 --- a/proxies/aareg-proxy/settings.gradle +++ b/proxies/aareg-proxy/settings.gradle @@ -4,10 +4,12 @@ plugins { rootProject.name = 'aareg-proxy' +includeBuild "../../plugins/java" + includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-proxy' -includeBuild '../../libs/security-core' includeBuild '../../libs/reactive-security' +includeBuild '../../libs/security-core' develocity { buildScan { diff --git a/proxies/aareg-synt-services-proxy/build.gradle b/proxies/aareg-synt-services-proxy/build.gradle index d32ca22ddbd..71c8a758344 100644 --- a/proxies/aareg-synt-services-proxy/build.gradle +++ b/proxies/aareg-synt-services-proxy/build.gradle @@ -1,63 +1,10 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-proxies" } 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", "aareg-synt-services-proxy" property "sonar.projectName", "aareg-synt-services-proxy" - property "sonar.sourceEncoding", "UTF-8" - } -} -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' - } -} - -repositories { - mavenCentral() - mavenLocal() -} - -dependencies { - - implementation 'no.nav.testnav.libs:reactive-core' - implementation 'no.nav.testnav.libs:reactive-proxy' - - implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - implementation 'org.springframework.boot:spring-boot-starter-webflux' - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) } } diff --git a/proxies/aareg-synt-services-proxy/settings.gradle b/proxies/aareg-synt-services-proxy/settings.gradle index 3526329c16a..f3bd3e404e8 100644 --- a/proxies/aareg-synt-services-proxy/settings.gradle +++ b/proxies/aareg-synt-services-proxy/settings.gradle @@ -4,6 +4,7 @@ plugins { rootProject.name = 'aareg-synt-services-proxy' +includeBuild "../../plugins/java" includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-proxy' diff --git a/proxies/arbeidsplassencv-proxy/build.gradle b/proxies/arbeidsplassencv-proxy/build.gradle index 738744f1b9d..79f23c05157 100644 --- a/proxies/arbeidsplassencv-proxy/build.gradle +++ b/proxies/arbeidsplassencv-proxy/build.gradle @@ -1,70 +1,17 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-proxies" } 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-arbeidsplassencv-proxy" property "sonar.projectName", "testnav-arbeidsplassencv-proxy" - property "sonar.sourceEncoding", "UTF-8" - } -} - -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } -repositories { - mavenCentral() - mavenLocal() -} - dependencies { - - implementation 'no.nav.testnav.libs:reactive-core' - implementation 'no.nav.testnav.libs:reactive-proxy' - implementation 'no.nav.testnav.libs:reactive-security' - implementation 'no.nav.testnav.libs:security-core' - - implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - implementation 'org.springframework.boot:spring-boot-starter-webflux' - - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } + implementation "no.nav.testnav.libs:reactive-security" + implementation "no.nav.testnav.libs:security-core" + implementation "org.springframework.boot:spring-boot-starter-webflux" + implementation "org.springframework.cloud:spring-cloud-starter-vault-config" } diff --git a/proxies/arbeidsplassencv-proxy/settings.gradle b/proxies/arbeidsplassencv-proxy/settings.gradle index 77a3c02d1c1..fffa0bc93a9 100644 --- a/proxies/arbeidsplassencv-proxy/settings.gradle +++ b/proxies/arbeidsplassencv-proxy/settings.gradle @@ -4,10 +4,12 @@ plugins { rootProject.name = 'arbeidsplassencv-proxy' +includeBuild "../../plugins/java" + includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-proxy' -includeBuild '../../libs/security-core' includeBuild '../../libs/reactive-security' +includeBuild '../../libs/security-core' develocity { buildScan { diff --git a/proxies/arena-forvalteren-proxy/build.gradle b/proxies/arena-forvalteren-proxy/build.gradle index 24103d0b473..c6f0b1257e3 100644 --- a/proxies/arena-forvalteren-proxy/build.gradle +++ b/proxies/arena-forvalteren-proxy/build.gradle @@ -1,71 +1,15 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-proxies" } 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-arena-forvalteren-proxy" property "sonar.projectName", "testnav-arena-forvalteren-proxy" - property "sonar.sourceEncoding", "UTF-8" } } -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' - } -} - -repositories { - mavenCentral() - mavenLocal() -} - dependencies { - - implementation 'no.nav.testnav.libs:reactive-core' - implementation 'no.nav.testnav.libs:reactive-proxy' implementation 'no.nav.testnav.libs:security-core' implementation 'no.nav.testnav.libs:data-transfer-objects' - - implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - implementation 'org.springframework.boot:spring-boot-starter-webflux' - - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/proxies/arena-forvalteren-proxy/settings.gradle b/proxies/arena-forvalteren-proxy/settings.gradle index c8a340ea0db..0cff2b5dcf1 100644 --- a/proxies/arena-forvalteren-proxy/settings.gradle +++ b/proxies/arena-forvalteren-proxy/settings.gradle @@ -4,11 +4,12 @@ plugins { rootProject.name = 'arena-forvalteren-proxy' +includeBuild "../../plugins/java" +includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-proxy' includeBuild '../../libs/security-core' -includeBuild '../../libs/data-transfer-objects' develocity { buildScan { diff --git a/proxies/batch-adeo-proxy/build.gradle b/proxies/batch-adeo-proxy/build.gradle index 118492dccb3..12df8fce778 100644 --- a/proxies/batch-adeo-proxy/build.gradle +++ b/proxies/batch-adeo-proxy/build.gradle @@ -1,64 +1,10 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-proxies" } 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", "testnorge-batch-adeo-proxy" property "sonar.projectName", "testnorge-batch-adeo-proxy" - property "sonar.sourceEncoding", "UTF-8" - } -} -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' - } -} - -repositories { - mavenCentral() - mavenLocal() -} - -dependencies { - - implementation 'no.nav.testnav.libs:reactive-core' - implementation 'no.nav.testnav.libs:reactive-proxy' - - implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - implementation 'org.springframework.boot:spring-boot-starter-webflux' - - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) } } diff --git a/proxies/batch-adeo-proxy/settings.gradle b/proxies/batch-adeo-proxy/settings.gradle index f6d53c5bbe2..f9b06323d97 100644 --- a/proxies/batch-adeo-proxy/settings.gradle +++ b/proxies/batch-adeo-proxy/settings.gradle @@ -4,6 +4,7 @@ plugins { rootProject.name = 'batch-adeo-proxy' +includeBuild "../../plugins/java" includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-proxy' diff --git a/proxies/brregstub-proxy/build.gradle b/proxies/brregstub-proxy/build.gradle index aeb3b502796..d01cc5da0b9 100644 --- a/proxies/brregstub-proxy/build.gradle +++ b/proxies/brregstub-proxy/build.gradle @@ -1,66 +1,14 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-proxies" } 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-brregstub-proxy" property "sonar.projectName", "testnav-brregstub-proxy" - property "sonar.sourceEncoding", "UTF-8" - } -} - -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } -repositories { - mavenCentral() - mavenLocal() -} - dependencies { - - implementation 'no.nav.testnav.libs:reactive-core' - implementation 'no.nav.testnav.libs:reactive-proxy' implementation 'no.nav.testnav.libs:data-transfer-objects' - - implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - implementation 'org.springframework.boot:spring-boot-starter-webflux' - - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/proxies/brregstub-proxy/settings.gradle b/proxies/brregstub-proxy/settings.gradle index e4d8f5a1350..d62fa6c4630 100644 --- a/proxies/brregstub-proxy/settings.gradle +++ b/proxies/brregstub-proxy/settings.gradle @@ -4,9 +4,10 @@ plugins { rootProject.name = 'brregstub-proxy' +includeBuild "../../plugins/java" -includeBuild '../../libs/reactive-core' includeBuild '../../libs/data-transfer-objects' +includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-proxy' develocity { diff --git a/proxies/dokarkiv-proxy/build.gradle b/proxies/dokarkiv-proxy/build.gradle index 9a4b6390331..8af2a3da534 100644 --- a/proxies/dokarkiv-proxy/build.gradle +++ b/proxies/dokarkiv-proxy/build.gradle @@ -1,73 +1,18 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version '1.0.11.RELEASE' - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-proxies" } 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-dokarkiv-proxy" property "sonar.projectName", "testnav-dokarkiv-proxy" - property "sonar.sourceEncoding", "UTF-8" } } -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' - } -} - -repositories { - mavenCentral() - mavenLocal() -} - dependencies { - - implementation 'no.nav.testnav.libs:security-core' - implementation 'no.nav.testnav.libs:reactive-core' - implementation 'no.nav.testnav.libs:reactive-proxy' - implementation 'no.nav.testnav.libs:reactive-security' - implementation 'no.nav.testnav.libs:data-transfer-objects' - - implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - implementation 'org.springframework.boot:spring-boot-starter-webflux' - - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - - - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - annotationProcessor 'org.projectlombok:lombok' - implementation 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } + implementation "no.nav.testnav.libs:data-transfer-objects" + implementation "no.nav.testnav.libs:reactive-security" + implementation "no.nav.testnav.libs:security-core" + implementation "org.springframework.boot:spring-boot-starter-webflux" + implementation "org.springframework.cloud:spring-cloud-starter-vault-config" } diff --git a/proxies/dokarkiv-proxy/settings.gradle b/proxies/dokarkiv-proxy/settings.gradle index 42e8c0c238d..67900969191 100644 --- a/proxies/dokarkiv-proxy/settings.gradle +++ b/proxies/dokarkiv-proxy/settings.gradle @@ -4,11 +4,13 @@ plugins { rootProject.name = 'dokarkiv-proxy' +includeBuild "../../plugins/java" + +includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-proxy' -includeBuild '../../libs/security-core' includeBuild '../../libs/reactive-security' -includeBuild '../../libs/data-transfer-objects' +includeBuild '../../libs/security-core' develocity { buildScan { diff --git a/proxies/ereg-proxy/build.gradle b/proxies/ereg-proxy/build.gradle index 5dddd389be2..c6691217659 100644 --- a/proxies/ereg-proxy/build.gradle +++ b/proxies/ereg-proxy/build.gradle @@ -1,66 +1,14 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-proxies" } 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-ereg-proxy" property "sonar.projectName", "testnav-ereg-proxy" - property "sonar.sourceEncoding", "UTF-8" - } -} - -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } -repositories { - mavenCentral() - mavenLocal() -} - dependencies { - - implementation 'no.nav.testnav.libs:reactive-core' - implementation 'no.nav.testnav.libs:reactive-proxy' - - implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - - - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/proxies/ereg-proxy/settings.gradle b/proxies/ereg-proxy/settings.gradle index e2dbc9336c0..e9af2b16174 100644 --- a/proxies/ereg-proxy/settings.gradle +++ b/proxies/ereg-proxy/settings.gradle @@ -4,6 +4,7 @@ plugins { rootProject.name = 'ereg-proxy' +includeBuild "../../plugins/java" includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-proxy' diff --git a/proxies/histark-proxy/build.gradle b/proxies/histark-proxy/build.gradle index 1ad1986ef3e..8f7add698c7 100644 --- a/proxies/histark-proxy/build.gradle +++ b/proxies/histark-proxy/build.gradle @@ -1,66 +1,14 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-proxies" } 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-histark-proxy" property "sonar.projectName", "testnav-histark-proxy" - property "sonar.sourceEncoding", "UTF-8" - } -} -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } -repositories { - mavenCentral() - mavenLocal() -} - dependencies { - - implementation 'no.nav.testnav.libs:reactive-core' - implementation 'no.nav.testnav.libs:reactive-proxy' implementation 'no.nav.testnav.libs:data-transfer-objects' - - implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - implementation 'org.springframework.boot:spring-boot-starter-webflux' - - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - - - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/proxies/histark-proxy/settings.gradle b/proxies/histark-proxy/settings.gradle index 3bf954de439..bc95d92dfa8 100644 --- a/proxies/histark-proxy/settings.gradle +++ b/proxies/histark-proxy/settings.gradle @@ -4,10 +4,11 @@ plugins { rootProject.name = 'histark-proxy' +includeBuild "../../plugins/java" +includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-proxy' -includeBuild '../../libs/data-transfer-objects' develocity { buildScan { diff --git a/proxies/inntektstub-proxy/build.gradle b/proxies/inntektstub-proxy/build.gradle index 0022ee70a81..9eb49e640bc 100644 --- a/proxies/inntektstub-proxy/build.gradle +++ b/proxies/inntektstub-proxy/build.gradle @@ -1,66 +1,14 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-proxies" } 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-inntektstub-proxy" property "sonar.projectName", "testnav-inntektstub-proxy" - property "sonar.sourceEncoding", "UTF-8" - } -} -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } -repositories { - mavenCentral() - mavenLocal() -} - dependencies { - - implementation 'no.nav.testnav.libs:reactive-core' - implementation 'no.nav.testnav.libs:reactive-proxy' implementation 'no.nav.testnav.libs:data-transfer-objects' - - implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - implementation 'org.springframework.boot:spring-boot-starter-webflux' - - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - - - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/proxies/inntektstub-proxy/settings.gradle b/proxies/inntektstub-proxy/settings.gradle index 4876362e467..cbfbd25ac18 100644 --- a/proxies/inntektstub-proxy/settings.gradle +++ b/proxies/inntektstub-proxy/settings.gradle @@ -4,10 +4,11 @@ plugins { rootProject.name = 'inntektstub-proxy' +includeBuild "../../plugins/java" +includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-proxy' -includeBuild '../../libs/data-transfer-objects' develocity { buildScan { diff --git a/proxies/inst-proxy/build.gradle b/proxies/inst-proxy/build.gradle index f09ffa9d631..118496766d2 100644 --- a/proxies/inst-proxy/build.gradle +++ b/proxies/inst-proxy/build.gradle @@ -1,70 +1,16 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-proxies" } 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-inst-proxy" property "sonar.projectName", "testnav-inst-proxy" - property "sonar.sourceEncoding", "UTF-8" - } -} - -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } -repositories { - mavenCentral() - mavenLocal() -} - dependencies { - implementation 'no.nav.testnav.libs:security-core' - implementation 'no.nav.testnav.libs:reactive-core' - implementation 'no.nav.testnav.libs:reactive-proxy' implementation 'no.nav.testnav.libs:data-transfer-objects' implementation 'no.nav.testnav.libs:reactive-security' - - implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - implementation 'org.springframework.boot:spring-boot-starter-webflux' - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' - - annotationProcessor 'org.projectlombok:lombok' - implementation 'org.projectlombok:lombok' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } \ No newline at end of file diff --git a/proxies/inst-proxy/settings.gradle b/proxies/inst-proxy/settings.gradle index 1d831e8cc34..c45b408e9f9 100644 --- a/proxies/inst-proxy/settings.gradle +++ b/proxies/inst-proxy/settings.gradle @@ -4,12 +4,13 @@ plugins { rootProject.name = 'inst-proxy' +includeBuild "../../plugins/java" -includeBuild '../../libs/security-core' +includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-proxy' includeBuild '../../libs/reactive-security' -includeBuild '../../libs/data-transfer-objects' +includeBuild '../../libs/security-core' develocity { buildScan { diff --git a/proxies/kontoregister-person-proxy/build.gradle b/proxies/kontoregister-person-proxy/build.gradle index 9d82da61997..fc7754f76fd 100644 --- a/proxies/kontoregister-person-proxy/build.gradle +++ b/proxies/kontoregister-person-proxy/build.gradle @@ -1,72 +1,18 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-proxies" } 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-kontoregister-person-proxy" property "sonar.projectName", "testnav-kontoregister-person-proxy" - property "sonar.sourceEncoding", "UTF-8" - } -} -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } -repositories { - mavenCentral() - mavenLocal() -} - dependencies { - - implementation 'no.nav.testnav.libs:security-core' - implementation 'no.nav.testnav.libs:reactive-core' - implementation 'no.nav.testnav.libs:reactive-proxy' - implementation 'no.nav.testnav.libs:reactive-security' - implementation 'no.nav.testnav.libs:data-transfer-objects' - - implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - implementation 'org.springframework.boot:spring-boot-starter-webflux' - - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - - - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - annotationProcessor 'org.projectlombok:lombok' - implementation 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } + implementation "no.nav.testnav.libs:data-transfer-objects" + implementation "no.nav.testnav.libs:reactive-security" + implementation "no.nav.testnav.libs:security-core" + implementation "org.springframework.boot:spring-boot-starter-webflux" + implementation "org.springframework.cloud:spring-cloud-starter-vault-config" } diff --git a/proxies/kontoregister-person-proxy/settings.gradle b/proxies/kontoregister-person-proxy/settings.gradle index 858370e65a0..308e11806f5 100644 --- a/proxies/kontoregister-person-proxy/settings.gradle +++ b/proxies/kontoregister-person-proxy/settings.gradle @@ -4,12 +4,13 @@ plugins { rootProject.name = 'kontoregister-person-proxy' +includeBuild "../../plugins/java" +includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-proxy' -includeBuild '../../libs/security-core' includeBuild '../../libs/reactive-security' -includeBuild '../../libs/data-transfer-objects' +includeBuild '../../libs/security-core' develocity { buildScan { diff --git a/proxies/krrstub-proxy/build.gradle b/proxies/krrstub-proxy/build.gradle index aa0ceba8adb..1efccd36a7e 100644 --- a/proxies/krrstub-proxy/build.gradle +++ b/proxies/krrstub-proxy/build.gradle @@ -1,71 +1,17 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-proxies" } 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-krrstub-proxy" property "sonar.projectName", "testnav-krrstub-proxy" - property "sonar.sourceEncoding", "UTF-8" - } -} -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } -repositories { - mavenCentral() - mavenLocal() -} - dependencies { - - implementation 'no.nav.testnav.libs:security-core' - implementation 'no.nav.testnav.libs:reactive-core' - implementation 'no.nav.testnav.libs:reactive-proxy' - implementation 'no.nav.testnav.libs:reactive-security' - - implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - implementation 'org.springframework.boot:spring-boot-starter-webflux' - - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - - - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - annotationProcessor 'org.projectlombok:lombok' - implementation 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } + implementation "no.nav.testnav.libs:reactive-security" + implementation "no.nav.testnav.libs:security-core" + implementation "org.springframework.boot:spring-boot-starter-webflux" + implementation "org.springframework.cloud:spring-cloud-starter-vault-config" } diff --git a/proxies/krrstub-proxy/settings.gradle b/proxies/krrstub-proxy/settings.gradle index f85d04c3a5e..c78c01fb986 100644 --- a/proxies/krrstub-proxy/settings.gradle +++ b/proxies/krrstub-proxy/settings.gradle @@ -4,11 +4,12 @@ plugins { rootProject.name = 'krrstub-proxy' +includeBuild "../../plugins/java" includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-proxy' -includeBuild '../../libs/security-core' includeBuild '../../libs/reactive-security' +includeBuild '../../libs/security-core' develocity { buildScan { diff --git a/proxies/medl-proxy/build.gradle b/proxies/medl-proxy/build.gradle index 20046c06ab6..5ca42ccd62f 100644 --- a/proxies/medl-proxy/build.gradle +++ b/proxies/medl-proxy/build.gradle @@ -1,71 +1,17 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-proxies" } sonarqube { properties { - property "sonar.sourceEncoding", "UTF-8" property "sonar.projectKey", "testnav-medl-proxy" property "sonar.projectName", "testnav-medl-proxy" - property "sonar.organization", "navikt" - 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.project.monorepo.enabled", true - } -} -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } -repositories { - mavenCentral() - mavenLocal() -} - dependencies { - - implementation 'no.nav.testnav.libs:security-core' - implementation 'no.nav.testnav.libs:reactive-core' - implementation 'no.nav.testnav.libs:reactive-proxy' - implementation 'no.nav.testnav.libs:reactive-security' - - implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - implementation 'org.springframework.boot:spring-boot-starter-webflux' - - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - - - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - annotationProcessor 'org.projectlombok:lombok' - implementation 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } + implementation "no.nav.testnav.libs:reactive-security" + implementation "no.nav.testnav.libs:security-core" + implementation "org.springframework.boot:spring-boot-starter-webflux" + implementation "org.springframework.cloud:spring-cloud-starter-vault-config" } diff --git a/proxies/medl-proxy/settings.gradle b/proxies/medl-proxy/settings.gradle index bb438579e70..e59a1fa89e2 100644 --- a/proxies/medl-proxy/settings.gradle +++ b/proxies/medl-proxy/settings.gradle @@ -4,11 +4,12 @@ plugins { rootProject.name = 'medl-proxy' +includeBuild "../../plugins/java" includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-proxy' -includeBuild '../../libs/security-core' includeBuild '../../libs/reactive-security' +includeBuild '../../libs/security-core' develocity { buildScan { diff --git a/proxies/modapp-ereg-proxy/build.gradle b/proxies/modapp-ereg-proxy/build.gradle index 095366f635b..329955971cd 100644 --- a/proxies/modapp-ereg-proxy/build.gradle +++ b/proxies/modapp-ereg-proxy/build.gradle @@ -1,71 +1,15 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-proxies" } 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-modapp-ereg-proxy" property "sonar.projectName", "testnav-modapp-ereg-proxy" - property "sonar.sourceEncoding", "UTF-8" - } -} -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } -repositories { - mavenCentral() - mavenLocal() -} - dependencies { - implementation 'no.nav.testnav.libs:security-core' - implementation 'no.nav.testnav.libs:reactive-core' - implementation 'no.nav.testnav.libs:reactive-proxy' implementation 'no.nav.testnav.libs:reactive-security' - - implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - implementation 'org.springframework.boot:spring-boot-starter-webflux' - - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - - - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - annotationProcessor 'org.projectlombok:lombok' - implementation 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/proxies/modapp-ereg-proxy/settings.gradle b/proxies/modapp-ereg-proxy/settings.gradle index 6e1b87dfcf5..0cbbadb0020 100644 --- a/proxies/modapp-ereg-proxy/settings.gradle +++ b/proxies/modapp-ereg-proxy/settings.gradle @@ -4,11 +4,12 @@ plugins { rootProject.name = 'modapp-ereg-proxy' +includeBuild "../../plugins/java" includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-proxy' -includeBuild '../../libs/security-core' includeBuild '../../libs/reactive-security' +includeBuild '../../libs/security-core' develocity { buildScan { diff --git a/proxies/norg2-proxy/build.gradle b/proxies/norg2-proxy/build.gradle index d49d5278547..270390b7e8f 100644 --- a/proxies/norg2-proxy/build.gradle +++ b/proxies/norg2-proxy/build.gradle @@ -1,66 +1,16 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-proxies" } 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-norg2-proxy" property "sonar.projectName", "testnav-norg2-proxy" - property "sonar.sourceEncoding", "UTF-8" } } -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' - } -} - -repositories { - mavenCentral() - mavenLocal() -} dependencies { - - implementation 'no.nav.testnav.libs:reactive-core' - implementation 'no.nav.testnav.libs:reactive-proxy' implementation 'no.nav.testnav.libs:data-transfer-objects' - implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - - - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/proxies/norg2-proxy/settings.gradle b/proxies/norg2-proxy/settings.gradle index c7c427ab008..5a5b5daafb2 100644 --- a/proxies/norg2-proxy/settings.gradle +++ b/proxies/norg2-proxy/settings.gradle @@ -4,10 +4,11 @@ plugins { rootProject.name = 'norg2-proxy' +includeBuild "../../plugins/java" +includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-proxy' -includeBuild '../../libs/data-transfer-objects' develocity { buildScan { diff --git a/proxies/pdl-proxy/build.gradle b/proxies/pdl-proxy/build.gradle index 0ac8c44103f..25af4e6c02a 100644 --- a/proxies/pdl-proxy/build.gradle +++ b/proxies/pdl-proxy/build.gradle @@ -1,72 +1,19 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-proxies" } 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-pdl-proxy" property "sonar.projectName", "testnav-pdl-proxy" - property "sonar.sourceEncoding", "UTF-8" - } -} -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } -repositories { - mavenCentral() - mavenLocal() -} - dependencies { - - implementation 'no.nav.testnav.libs:security-core' - implementation 'no.nav.testnav.libs:reactive-core' - implementation 'no.nav.testnav.libs:reactive-proxy' - implementation 'no.nav.testnav.libs:reactive-security' - implementation 'no.nav.testnav.libs:data-transfer-objects' - - implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - implementation 'org.springframework.boot:spring-boot-starter-webflux' - implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config. - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - - - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } + implementation "no.nav.testnav.libs:data-transfer-objects" + implementation "no.nav.testnav.libs:reactive-security" + implementation "no.nav.testnav.libs:security-core" + implementation "org.springframework.boot:spring-boot-starter-webflux" + implementation "org.springframework.cloud:spring-cloud-starter-bootstrap" // TODO remove legacy bootstrap config. + implementation "org.springframework.cloud:spring-cloud-starter-vault-config" } diff --git a/proxies/pdl-proxy/settings.gradle b/proxies/pdl-proxy/settings.gradle index 6b78346bf9f..a1b491845af 100644 --- a/proxies/pdl-proxy/settings.gradle +++ b/proxies/pdl-proxy/settings.gradle @@ -4,11 +4,13 @@ plugins { rootProject.name = 'pdl-proxy' -includeBuild '../../libs/security-core' +includeBuild "../../plugins/java" + includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-proxy' includeBuild '../../libs/reactive-security' +includeBuild '../../libs/security-core' develocity { buildScan { diff --git a/proxies/pensjon-testdata-facade-proxy/build.gradle b/proxies/pensjon-testdata-facade-proxy/build.gradle index dba4d691a91..2878fc888db 100644 --- a/proxies/pensjon-testdata-facade-proxy/build.gradle +++ b/proxies/pensjon-testdata-facade-proxy/build.gradle @@ -1,72 +1,18 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-proxies" } 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-pensjon-testdata-facade-proxy" property "sonar.projectName", "testnav-pensjon-testdata-facade-proxy" - property "sonar.sourceEncoding", "UTF-8" - } -} -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } -repositories { - mavenCentral() - mavenLocal() -} - dependencies { - - implementation 'no.nav.testnav.libs:security-core' - implementation 'no.nav.testnav.libs:reactive-core' - implementation 'no.nav.testnav.libs:reactive-proxy' - implementation 'no.nav.testnav.libs:reactive-security' - implementation 'no.nav.testnav.libs:data-transfer-objects' - - implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - implementation 'org.springframework.boot:spring-boot-starter-webflux' - - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - - - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - implementation 'org.projectlombok:lombok' - annotationProcessor 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } + implementation "no.nav.testnav.libs:data-transfer-objects" + implementation "no.nav.testnav.libs:reactive-security" + implementation "no.nav.testnav.libs:security-core" + implementation "org.springframework.boot:spring-boot-starter-webflux" + implementation "org.springframework.cloud:spring-cloud-starter-vault-config" } diff --git a/proxies/pensjon-testdata-facade-proxy/settings.gradle b/proxies/pensjon-testdata-facade-proxy/settings.gradle index 7ef3a7a29fc..4f1d9f4f7fa 100644 --- a/proxies/pensjon-testdata-facade-proxy/settings.gradle +++ b/proxies/pensjon-testdata-facade-proxy/settings.gradle @@ -4,12 +4,13 @@ plugins { rootProject.name = 'pensjon-testdata-facade-proxy' +includeBuild "../../plugins/java" +includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-proxy' -includeBuild '../../libs/security-core' includeBuild '../../libs/reactive-security' -includeBuild '../../libs/data-transfer-objects' +includeBuild '../../libs/security-core' develocity { buildScan { diff --git a/proxies/saf-proxy/build.gradle b/proxies/saf-proxy/build.gradle index a778eaa8c7d..21e34da52ab 100644 --- a/proxies/saf-proxy/build.gradle +++ b/proxies/saf-proxy/build.gradle @@ -1,72 +1,16 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-proxies" } 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-saf-proxy" property "sonar.projectName", "testnav-saf-proxy" - property "sonar.sourceEncoding", "UTF-8" - } -} -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } -repositories { - mavenCentral() - mavenLocal() -} - dependencies { - implementation 'no.nav.testnav.libs:security-core' - implementation 'no.nav.testnav.libs:reactive-core' - implementation 'no.nav.testnav.libs:reactive-proxy' implementation 'no.nav.testnav.libs:reactive-security' implementation 'no.nav.testnav.libs:data-transfer-objects' - - implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - implementation 'org.springframework.boot:spring-boot-starter-webflux' - - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - - - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - annotationProcessor 'org.projectlombok:lombok' - implementation 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/proxies/saf-proxy/settings.gradle b/proxies/saf-proxy/settings.gradle index 62d62463c5f..c9a953f65f9 100644 --- a/proxies/saf-proxy/settings.gradle +++ b/proxies/saf-proxy/settings.gradle @@ -4,12 +4,13 @@ plugins { rootProject.name = 'saf-proxy' +includeBuild "../../plugins/java" +includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-proxy' -includeBuild '../../libs/security-core' includeBuild '../../libs/reactive-security' -includeBuild '../../libs/data-transfer-objects' +includeBuild '../../libs/security-core' develocity { buildScan { diff --git a/proxies/sigrunstub-proxy/build.gradle b/proxies/sigrunstub-proxy/build.gradle index cba116b6582..c04eb27cc23 100644 --- a/proxies/sigrunstub-proxy/build.gradle +++ b/proxies/sigrunstub-proxy/build.gradle @@ -1,65 +1,14 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-proxies" } 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-sigrunstub-proxy" property "sonar.projectName", "testnav-sigrunstub-proxy" - property "sonar.sourceEncoding", "UTF-8" - } -} -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } -repositories { - mavenCentral() - mavenLocal() -} - dependencies { - - implementation 'no.nav.testnav.libs:reactive-core' - implementation 'no.nav.testnav.libs:reactive-proxy' implementation 'no.nav.testnav.libs:data-transfer-objects' - - implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - implementation 'org.springframework.boot:spring-boot-starter-webflux' - - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/proxies/sigrunstub-proxy/settings.gradle b/proxies/sigrunstub-proxy/settings.gradle index a5b701b492f..f932ff84792 100644 --- a/proxies/sigrunstub-proxy/settings.gradle +++ b/proxies/sigrunstub-proxy/settings.gradle @@ -4,10 +4,11 @@ plugins { rootProject.name = 'sigrunstub-proxy' +includeBuild "../../plugins/java" +includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-proxy' -includeBuild '../../libs/data-transfer-objects' develocity { buildScan { diff --git a/proxies/skjermingsregister-proxy/build.gradle b/proxies/skjermingsregister-proxy/build.gradle index 1ba2ac69875..920b573d608 100644 --- a/proxies/skjermingsregister-proxy/build.gradle +++ b/proxies/skjermingsregister-proxy/build.gradle @@ -1,73 +1,18 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-proxies" } sonarqube { properties { - property "sonar.dynamicAnalysis", "reuseReports" - property "sonar.host.url", "https://sonarcloud.io" - property "sonar.java.coveragePlugin", "jacoco" - property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") - property "sonar.organization", "navikt" - property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-skjermingsregister-proxy" property "sonar.projectName", "testnav-skjermingsregister-proxy" - property "sonar.sourceEncoding", "UTF-8" - } -} - -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } -repositories { - mavenCentral() - mavenLocal() -} - dependencies { - implementation 'no.nav.testnav.libs:security-core' - implementation 'no.nav.testnav.libs:reactive-core' - implementation 'no.nav.testnav.libs:reactive-proxy' implementation 'no.nav.testnav.libs:reactive-security' implementation 'no.nav.testnav.libs:data-transfer-objects' - implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - implementation 'org.springframework.boot:spring-boot-starter-webflux' - - implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' testImplementation 'org.springframework.security:spring-security-test' - - annotationProcessor 'org.projectlombok:lombok' - implementation 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/proxies/skjermingsregister-proxy/settings.gradle b/proxies/skjermingsregister-proxy/settings.gradle index 46db687b832..2e2c0d9128d 100644 --- a/proxies/skjermingsregister-proxy/settings.gradle +++ b/proxies/skjermingsregister-proxy/settings.gradle @@ -4,11 +4,12 @@ plugins { rootProject.name = 'skjermingsregister-proxy' +includeBuild "../../plugins/java" +includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-proxy' includeBuild '../../libs/security-token-service' -includeBuild '../../libs/data-transfer-objects' develocity { buildScan { diff --git a/proxies/synthdata-meldekort-proxy/build.gradle b/proxies/synthdata-meldekort-proxy/build.gradle index 0d86e0ece22..2ae52b3d2af 100644 --- a/proxies/synthdata-meldekort-proxy/build.gradle +++ b/proxies/synthdata-meldekort-proxy/build.gradle @@ -1,77 +1,24 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-proxies" } 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-synthdata-meldekort-proxy" property "sonar.projectName", "testnav-synthdata-meldekort-proxy" - property "sonar.sourceEncoding", "UTF-8" - } -} -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } configurations { configureEach { - exclude group: 'org.springframework.boot', module: 'spring-boot-starter-actuator' + exclude group: "org.springframework.boot", module: "spring-boot-starter-actuator" } } -repositories { - mavenCentral() - mavenLocal() -} - dependencies { - - implementation 'no.nav.testnav.libs:security-core' - implementation 'no.nav.testnav.libs:reactive-core' - implementation 'no.nav.testnav.libs:reactive-proxy' - implementation 'no.nav.testnav.libs:reactive-security' - implementation 'no.nav.testnav.libs:data-transfer-objects' - - implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - implementation 'org.springframework.boot:spring-boot-starter-webflux' - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - - - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - annotationProcessor 'org.projectlombok:lombok' - implementation 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } + implementation "no.nav.testnav.libs:data-transfer-objects" + implementation "no.nav.testnav.libs:reactive-security" + implementation "no.nav.testnav.libs:security-core" + implementation "org.springframework.boot:spring-boot-starter-webflux" + implementation "org.springframework.cloud:spring-cloud-starter-vault-config" } \ No newline at end of file diff --git a/proxies/synthdata-meldekort-proxy/settings.gradle b/proxies/synthdata-meldekort-proxy/settings.gradle index 137c4a11356..51a14287d37 100644 --- a/proxies/synthdata-meldekort-proxy/settings.gradle +++ b/proxies/synthdata-meldekort-proxy/settings.gradle @@ -4,12 +4,13 @@ plugins { rootProject.name = 'synthdata-meldekort-proxy' +includeBuild "../../plugins/java" +includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-proxy' -includeBuild '../../libs/security-core' includeBuild '../../libs/reactive-security' -includeBuild '../../libs/data-transfer-objects' +includeBuild '../../libs/security-core' develocity { buildScan { diff --git a/proxies/udistub-proxy/build.gradle b/proxies/udistub-proxy/build.gradle index 3daffc90326..9fc11aa32fc 100644 --- a/proxies/udistub-proxy/build.gradle +++ b/proxies/udistub-proxy/build.gradle @@ -1,73 +1,18 @@ plugins { - id 'java' - id "org.sonarqube" version "5.0.0.4638" - id 'org.springframework.boot' version "3.2.6" - id 'io.spring.dependency-management' version "1.1.5" - id "jacoco" -} - -test { - useJUnitPlatform() + id "dolly-proxies" } 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-udistub-proxy" property "sonar.projectName", "testnav-udistub-proxy" - property "sonar.sourceEncoding", "UTF-8" - } -} - -bootJar { - archiveFileName = "app.jar" -} - -dependencyManagement { - applyMavenExclusions = false - imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } -repositories { - mavenCentral() - mavenLocal() -} - dependencies { - implementation 'no.nav.testnav.libs:security-core' - implementation 'no.nav.testnav.libs:reactive-core' - implementation 'no.nav.testnav.libs:reactive-proxy' implementation 'no.nav.testnav.libs:reactive-security' implementation 'no.nav.testnav.libs:data-transfer-objects' - implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config - implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' - implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - - - implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'org.hibernate.validator:hibernate-validator' - - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' - - annotationProcessor 'org.projectlombok:lombok' - implementation 'org.projectlombok:lombok' - testAnnotationProcessor 'org.projectlombok:lombok' -} -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } } diff --git a/proxies/udistub-proxy/settings.gradle b/proxies/udistub-proxy/settings.gradle index 9a60f8f83c5..0c5fe7eb36a 100644 --- a/proxies/udistub-proxy/settings.gradle +++ b/proxies/udistub-proxy/settings.gradle @@ -4,12 +4,13 @@ plugins { rootProject.name = 'udistub-proxy' +includeBuild "../../plugins/java" +includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-proxy' -includeBuild '../../libs/security-core' includeBuild '../../libs/reactive-security' -includeBuild '../../libs/data-transfer-objects' +includeBuild '../../libs/security-core' develocity { buildScan { diff --git a/xsd/arbeidsforhold-xsd/build.gradle b/xsd/arbeidsforhold-xsd/build.gradle index 8f5ae356516..850de59b639 100644 --- a/xsd/arbeidsforhold-xsd/build.gradle +++ b/xsd/arbeidsforhold-xsd/build.gradle @@ -1,6 +1,6 @@ plugins { - id "org.sonarqube" version "5.0.0.4638" - id 'java-library' + id "dolly-libs" + id 'com.github.edeandrea.xjc-generation' version '1.6' } @@ -10,17 +10,6 @@ sonarqube { group = 'no.nav.testnav.xsd' -repositories { - mavenCentral() - mavenLocal() -} - -java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } -} - dependencies { implementation 'jakarta.activation:jakarta.activation-api:2.1.3' implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2' diff --git a/xsd/arbeidsforhold-xsd/settings.gradle b/xsd/arbeidsforhold-xsd/settings.gradle index 0a345fb24f3..7a53de06949 100644 --- a/xsd/arbeidsforhold-xsd/settings.gradle +++ b/xsd/arbeidsforhold-xsd/settings.gradle @@ -4,6 +4,7 @@ plugins { rootProject.name = 'arbeidsforhold-xsd' +includeBuild "../../plugins/java" develocity { buildScan {