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..e93cc47f9a7 --- /dev/null +++ b/plugins/java/src/main/groovy/dolly-proxies.gradle @@ -0,0 +1,9 @@ +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.cloud:spring-cloud-starter-gateway" + + testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock" +} \ No newline at end of file diff --git a/proxies/aareg-proxy/build.gradle b/proxies/aareg-proxy/build.gradle index 270db26a0b3..9ed20c29155 100644 --- a/proxies/aareg-proxy/build.gradle +++ b/proxies/aareg-proxy/build.gradle @@ -1,5 +1,6 @@ plugins { id "dolly-apps" + id "dolly-proxies" } sonarqube { @@ -10,14 +11,6 @@ sonarqube { } dependencies { - implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - - implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - - 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.cloud:spring-cloud-contract-wiremock' } diff --git a/proxies/aareg-synt-services-proxy/build.gradle b/proxies/aareg-synt-services-proxy/build.gradle index 69242c1dd00..61bd56a7cd9 100644 --- a/proxies/aareg-synt-services-proxy/build.gradle +++ b/proxies/aareg-synt-services-proxy/build.gradle @@ -1,5 +1,6 @@ plugins { id "dolly-apps" + id "dolly-proxies" } sonarqube { @@ -8,14 +9,3 @@ sonarqube { property "sonar.projectName", "aareg-synt-services-proxy" } } - -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.cloud:spring-cloud-starter-gateway' - - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' -} diff --git a/proxies/arbeidsplassencv-proxy/build.gradle b/proxies/arbeidsplassencv-proxy/build.gradle index a1397f0f785..e30ab7b6148 100644 --- a/proxies/arbeidsplassencv-proxy/build.gradle +++ b/proxies/arbeidsplassencv-proxy/build.gradle @@ -1,5 +1,6 @@ plugins { id "dolly-apps" + id "dolly-proxies" } sonarqube { @@ -10,15 +11,6 @@ sonarqube { } 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.cloud:spring-cloud-starter-gateway' - - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } diff --git a/proxies/arena-forvalteren-proxy/build.gradle b/proxies/arena-forvalteren-proxy/build.gradle index 9898ef221f5..5c171667b43 100644 --- a/proxies/arena-forvalteren-proxy/build.gradle +++ b/proxies/arena-forvalteren-proxy/build.gradle @@ -1,5 +1,6 @@ plugins { id "dolly-apps" + id "dolly-proxies" } sonarqube { @@ -10,15 +11,6 @@ sonarqube { } 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.cloud:spring-cloud-starter-gateway' - - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } diff --git a/proxies/batch-adeo-proxy/build.gradle b/proxies/batch-adeo-proxy/build.gradle index fa1c21edc40..f643f4f8e72 100644 --- a/proxies/batch-adeo-proxy/build.gradle +++ b/proxies/batch-adeo-proxy/build.gradle @@ -1,5 +1,6 @@ plugins { id "dolly-apps" + id "dolly-proxies" } sonarqube { @@ -8,15 +9,3 @@ sonarqube { property "sonar.projectName", "testnorge-batch-adeo-proxy" } } - -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.cloud:spring-cloud-starter-gateway' - - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' -} diff --git a/proxies/brregstub-proxy/build.gradle b/proxies/brregstub-proxy/build.gradle index 53b15ce52e8..ab9c67fc9be 100644 --- a/proxies/brregstub-proxy/build.gradle +++ b/proxies/brregstub-proxy/build.gradle @@ -1,5 +1,6 @@ plugins { id "dolly-apps" + id "dolly-proxies" } sonarqube { @@ -10,14 +11,5 @@ sonarqube { } 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.cloud:spring-cloud-starter-gateway' - - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } diff --git a/proxies/dokarkiv-proxy/build.gradle b/proxies/dokarkiv-proxy/build.gradle index 9817cf13b16..a3d204f83d9 100644 --- a/proxies/dokarkiv-proxy/build.gradle +++ b/proxies/dokarkiv-proxy/build.gradle @@ -1,5 +1,6 @@ plugins { id "dolly-apps" + id "dolly-proxies" } sonarqube { @@ -10,16 +11,7 @@ sonarqube { } 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.cloud:spring-cloud-starter-gateway' - - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } diff --git a/proxies/ereg-proxy/build.gradle b/proxies/ereg-proxy/build.gradle index a63a2e4652c..ed7b6f578ad 100644 --- a/proxies/ereg-proxy/build.gradle +++ b/proxies/ereg-proxy/build.gradle @@ -1,5 +1,6 @@ plugins { id "dolly-apps" + id "dolly-proxies" } sonarqube { @@ -10,13 +11,5 @@ sonarqube { } 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.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config - implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } diff --git a/proxies/histark-proxy/build.gradle b/proxies/histark-proxy/build.gradle index 8a267301696..3b20c9583c1 100644 --- a/proxies/histark-proxy/build.gradle +++ b/proxies/histark-proxy/build.gradle @@ -1,5 +1,6 @@ plugins { id "dolly-apps" + id "dolly-proxies" } sonarqube { @@ -10,14 +11,5 @@ sonarqube { } 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.cloud:spring-cloud-starter-gateway' - - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } diff --git a/proxies/inntektstub-proxy/build.gradle b/proxies/inntektstub-proxy/build.gradle index 0d46db1457a..bae43aecff2 100644 --- a/proxies/inntektstub-proxy/build.gradle +++ b/proxies/inntektstub-proxy/build.gradle @@ -1,5 +1,6 @@ plugins { id "dolly-apps" + id "dolly-proxies" } sonarqube { @@ -10,14 +11,5 @@ sonarqube { } 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.cloud:spring-cloud-starter-gateway' - - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } diff --git a/proxies/inst-proxy/build.gradle b/proxies/inst-proxy/build.gradle index 1dce8ccd8fc..d135280c470 100644 --- a/proxies/inst-proxy/build.gradle +++ b/proxies/inst-proxy/build.gradle @@ -1,5 +1,6 @@ plugins { id "dolly-apps" + id "dolly-proxies" } sonarqube { @@ -10,15 +11,7 @@ sonarqube { } 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.cloud:spring-cloud-starter-gateway' - - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } \ No newline at end of file diff --git a/proxies/kontoregister-person-proxy/build.gradle b/proxies/kontoregister-person-proxy/build.gradle index ed7b32cfaac..daf60879da1 100644 --- a/proxies/kontoregister-person-proxy/build.gradle +++ b/proxies/kontoregister-person-proxy/build.gradle @@ -1,5 +1,6 @@ plugins { id "dolly-apps" + id "dolly-proxies" } sonarqube { @@ -10,16 +11,7 @@ sonarqube { } 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.cloud:spring-cloud-starter-gateway' - - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } diff --git a/proxies/krrstub-proxy/build.gradle b/proxies/krrstub-proxy/build.gradle index 5b818a2f4c9..81eaaa904f3 100644 --- a/proxies/krrstub-proxy/build.gradle +++ b/proxies/krrstub-proxy/build.gradle @@ -1,5 +1,6 @@ plugins { id "dolly-apps" + id "dolly-proxies" } sonarqube { @@ -10,15 +11,6 @@ sonarqube { } 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.cloud:spring-cloud-starter-gateway' - - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } diff --git a/proxies/medl-proxy/build.gradle b/proxies/medl-proxy/build.gradle index 22018a3b8df..da722917c56 100644 --- a/proxies/medl-proxy/build.gradle +++ b/proxies/medl-proxy/build.gradle @@ -1,5 +1,6 @@ plugins { id "dolly-apps" + id "dolly-proxies" } sonarqube { @@ -10,15 +11,6 @@ sonarqube { } 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.cloud:spring-cloud-starter-gateway' - - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } diff --git a/proxies/modapp-ereg-proxy/build.gradle b/proxies/modapp-ereg-proxy/build.gradle index 83238b08847..0c946150ec2 100644 --- a/proxies/modapp-ereg-proxy/build.gradle +++ b/proxies/modapp-ereg-proxy/build.gradle @@ -1,5 +1,6 @@ plugins { id "dolly-apps" + id "dolly-proxies" } sonarqube { @@ -10,15 +11,6 @@ sonarqube { } 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.cloud:spring-cloud-starter-gateway' - - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } diff --git a/proxies/norg2-proxy/build.gradle b/proxies/norg2-proxy/build.gradle index b8c19e2d7b5..f289c19a4b3 100644 --- a/proxies/norg2-proxy/build.gradle +++ b/proxies/norg2-proxy/build.gradle @@ -1,5 +1,6 @@ plugins { id "dolly-apps" + id "dolly-proxies" } sonarqube { @@ -10,14 +11,7 @@ sonarqube { } 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.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config - implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } diff --git a/proxies/pdl-proxy/build.gradle b/proxies/pdl-proxy/build.gradle index dfe4f6c5e23..6839b09fa68 100644 --- a/proxies/pdl-proxy/build.gradle +++ b/proxies/pdl-proxy/build.gradle @@ -1,5 +1,6 @@ plugins { id "dolly-apps" + id "dolly-proxies" } sonarqube { @@ -10,16 +11,9 @@ sonarqube { } 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.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config. - implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } diff --git a/proxies/pensjon-testdata-facade-proxy/build.gradle b/proxies/pensjon-testdata-facade-proxy/build.gradle index 860aa786346..70c1cd25da6 100644 --- a/proxies/pensjon-testdata-facade-proxy/build.gradle +++ b/proxies/pensjon-testdata-facade-proxy/build.gradle @@ -1,5 +1,6 @@ plugins { id "dolly-apps" + id "dolly-proxies" } sonarqube { @@ -10,16 +11,7 @@ sonarqube { } 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.cloud:spring-cloud-starter-gateway' - - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } diff --git a/proxies/saf-proxy/build.gradle b/proxies/saf-proxy/build.gradle index 00aa9c66459..f5a015a1dc2 100644 --- a/proxies/saf-proxy/build.gradle +++ b/proxies/saf-proxy/build.gradle @@ -1,5 +1,6 @@ plugins { id "dolly-apps" + id "dolly-proxies" } sonarqube { @@ -10,16 +11,7 @@ sonarqube { } 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.cloud:spring-cloud-starter-gateway' - - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } diff --git a/proxies/sigrunstub-proxy/build.gradle b/proxies/sigrunstub-proxy/build.gradle index fb9e9c9082f..92a962ecc07 100644 --- a/proxies/sigrunstub-proxy/build.gradle +++ b/proxies/sigrunstub-proxy/build.gradle @@ -1,5 +1,6 @@ plugins { id "dolly-apps" + id "dolly-proxies" } sonarqube { @@ -10,14 +11,5 @@ sonarqube { } 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.cloud:spring-cloud-starter-gateway' - - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } diff --git a/proxies/skjermingsregister-proxy/build.gradle b/proxies/skjermingsregister-proxy/build.gradle index 8eaf539fae2..fc89bfbe637 100644 --- a/proxies/skjermingsregister-proxy/build.gradle +++ b/proxies/skjermingsregister-proxy/build.gradle @@ -1,5 +1,6 @@ plugins { id "dolly-apps" + id "dolly-proxies" } sonarqube { @@ -10,17 +11,9 @@ sonarqube { } 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.cloud:spring-cloud-starter-gateway' - - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' testImplementation 'org.springframework.security:spring-security-test' } diff --git a/proxies/synthdata-meldekort-proxy/build.gradle b/proxies/synthdata-meldekort-proxy/build.gradle index 7691b5670b4..3e580b3244f 100644 --- a/proxies/synthdata-meldekort-proxy/build.gradle +++ b/proxies/synthdata-meldekort-proxy/build.gradle @@ -1,5 +1,6 @@ plugins { id "dolly-apps" + id "dolly-proxies" } sonarqube { @@ -16,15 +17,7 @@ configurations { } 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.cloud:spring-cloud-starter-gateway' - - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' } \ No newline at end of file diff --git a/proxies/udistub-proxy/build.gradle b/proxies/udistub-proxy/build.gradle index d9651dc5fd1..00a8e89bd44 100644 --- a/proxies/udistub-proxy/build.gradle +++ b/proxies/udistub-proxy/build.gradle @@ -1,5 +1,6 @@ plugins { id "dolly-apps" + id "dolly-proxies" } sonarqube { @@ -10,16 +11,9 @@ sonarqube { } 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.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config - implementation 'org.springframework.cloud:spring-cloud-starter-gateway' - - testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' }