Ny plugin med proxy boilerplate.

rfc3092 · rfc3092 · commit 0bf69c99fce1 · 2024-06-18T08:40:00.000+02:00
diff --git a/plugins/java/src/main/groovy/dolly-proxies.gradle 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"
+}
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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'
 }
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/proxies/saf-proxy/build.gradle b/proxies/saf-proxy/build.gradle
diff --git a/proxies/sigrunstub-proxy/build.gradle b/proxies/sigrunstub-proxy/build.gradle
diff --git a/proxies/skjermingsregister-proxy/build.gradle b/proxies/skjermingsregister-proxy/build.gradle
diff --git a/proxies/synthdata-meldekort-proxy/build.gradle b/proxies/synthdata-meldekort-proxy/build.gradle
diff --git a/proxies/udistub-proxy/build.gradle b/proxies/udistub-proxy/build.gradle

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`plugins {`
`2`	`2`	`id "dolly-apps"`
	`3`	`+ id "dolly-proxies"`
`3`	`4`	`}`
`4`	`5`
`5`	`6`	`sonarqube {`
`@@ -10,14 +11,6 @@ sonarqube {`
`10`	`11`	`}`
`11`	`12`
`12`	`13`	`dependencies {`
`13`		`- implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'`
`14`		`-`
`15`		`- implementation 'org.springframework.cloud:spring-cloud-starter-gateway'`
`16`		`-`
`17`		`- implementation 'no.nav.testnav.libs:reactive-core'`
`18`		`- implementation 'no.nav.testnav.libs:reactive-proxy'`
`19`	`14`	`implementation 'no.nav.testnav.libs:reactive-security'`
`20`	`15`	`implementation 'no.nav.testnav.libs:security-core'`
`21`		`-`
`22`		`- testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'`
`23`	`16`	`}`