Moved dependency on no.nav.testnav.libs:testing from plugins to build…

…s, for consistency and readability. (#3759)

Also fixed issues with VaultTokenApplicationContextInitializer.

apps/adresse-service/build.gradle

@@ -14,6 +14,7 @@ dependencies {
     implementation "no.nav.testnav.libs:security-core"
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:servlet-security"
+    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-security"
     implementation "org.springframework.boot:spring-boot-starter-web"

apps/altinn3-tilgang-service/build.gradle

@@ -13,6 +13,7 @@ dependencies {
     implementation "no.nav.testnav.libs:data-transfer-objects"
     implementation "no.nav.testnav.libs:reactive-core"
     implementation "no.nav.testnav.libs:reactive-security"
+    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-data-r2dbc"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"

apps/amelding-service/build.gradle

@@ -16,6 +16,7 @@ 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:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
     implementation "org.springframework.boot:spring-boot-starter-security"

apps/app-tilgang-analyse-service/build.gradle

@@ -13,6 +13,7 @@ dependencies {
     implementation "no.nav.testnav.libs:data-transfer-objects"
     implementation "no.nav.testnav.libs:reactive-core"
     implementation "no.nav.testnav.libs:reactive-security"
+    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-data-r2dbc"
     implementation "org.springframework.boot:spring-boot-starter-security"

apps/arbeidsforhold-service/build.gradle

@@ -16,6 +16,7 @@ dependencies {
     implementation "no.nav.testnav.libs:security-core"
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:servlet-security"
+    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
     implementation "org.springframework.boot:spring-boot-starter-security"

apps/batch-bestilling-service/build.gradle

@@ -18,6 +18,7 @@ dependencies {
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:servlet-insecure-security"
     implementation "no.nav.testnav.libs:servlet-security"
+    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-web"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client"

apps/brreg-stub/build.gradle

@@ -27,6 +27,7 @@ dependencies {
 
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:vault"
+    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-web"
     implementation "org.springframework.boot:spring-boot-starter-web-services"

apps/bruker-service/build.gradle

@@ -27,6 +27,7 @@ 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:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-data-r2dbc"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"

apps/budpro-service/build.gradle

@@ -10,6 +10,7 @@ dependencies {
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:servlet-insecure-security"
     implementation "no.nav.testnav.libs:servlet-security"
+    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client"

apps/dolly-backend/build.gradle

@@ -10,54 +10,56 @@ sonarqube {
 }
 
 dependencies {
-    implementation 'no.nav.testnav.libs:servlet-core'
-    implementation 'no.nav.testnav.libs:servlet-security'
-    implementation 'no.nav.testnav.libs:servlet-insecure-security'
-    implementation 'no.nav.testnav.libs:security-core'
-    implementation 'no.nav.testnav.libs:data-transfer-objects'
-    implementation 'no.nav.testnav.libs:data-transfer-search-objects'
-    implementation 'no.nav.testnav.libs:reactive-core'
+    implementation "no.nav.testnav.libs:servlet-core"
+    implementation "no.nav.testnav.libs:servlet-security"
+    implementation "no.nav.testnav.libs:servlet-insecure-security"
+    implementation "no.nav.testnav.libs:security-core"
+    implementation "no.nav.testnav.libs:data-transfer-objects"
+    implementation "no.nav.testnav.libs:data-transfer-search-objects"
+    implementation "no.nav.testnav.libs:reactive-core"
+    implementation "no.nav.testnav.libs:reactive-security"
+    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
     implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
 
-    implementation 'org.springframework.boot:spring-boot-starter-web'
-    implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
-    implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
-    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
-    implementation 'org.springframework.boot:spring-boot-starter-security'
-    implementation 'org.springframework.boot:spring-boot-starter-validation'
-    implementation 'org.springframework.retry:spring-retry'
+    implementation "org.springframework.boot:spring-boot-starter-web"
+    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"
+    implementation "org.springframework.boot:spring-boot-starter-security"
+    implementation "org.springframework.boot:spring-boot-starter-validation"
+    implementation "org.springframework.retry:spring-retry"
 
-    implementation 'org.springframework.boot:spring-boot-starter-data-elasticsearch'
+    implementation "org.springframework.boot:spring-boot-starter-data-elasticsearch"
     implementation "org.opensearch.client:spring-data-opensearch:$versions.opensearch"
 
-    implementation 'org.apache.commons:commons-lang3'
-    implementation 'org.springframework.boot:spring-boot-starter-cache'
-    implementation 'com.github.ben-manes.caffeine:caffeine'
+    implementation "org.apache.commons:commons-lang3"
+    implementation "org.springframework.boot:spring-boot-starter-cache"
+    implementation "com.github.ben-manes.caffeine:caffeine"
 
-    implementation 'org.ehcache:ehcache:3.10.8'
+    implementation "org.ehcache:ehcache:3.10.8"
     implementation "com.fasterxml.jackson.core:jackson-core:$versions.jackson"
 
-    implementation 'org.postgresql:postgresql'
-    implementation 'org.flywaydb:flyway-core'
-    implementation 'org.flywaydb:flyway-database-postgresql'
+    implementation "org.postgresql:postgresql"
+    implementation "org.flywaydb:flyway-core"
+    implementation "org.flywaydb:flyway-database-postgresql"
 
     implementation "ma.glasnost.orika:orika-core:$versions.orika"
-    implementation 'org.codehaus.jettison:jettison:1.5.4'
+    implementation "org.codehaus.jettison:jettison:1.5.4"
     implementation "org.apache.poi:poi:$versions.apachePoi"
     implementation "org.apache.poi:poi-ooxml:$versions.apachePoi"
 
-    testImplementation 'org.opensearch:opensearch-testcontainers:2.1.2'
+    testImplementation "org.opensearch:opensearch-testcontainers:2.1.2"
 
-    testImplementation 'org.springframework.security:spring-security-test'
-    testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
-    testImplementation 'com.h2database:h2'
+    testImplementation "org.springframework.security:spring-security-test"
+    testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock"
+    testImplementation "com.h2database:h2"
     testImplementation "io.projectreactor:reactor-test:$versions.reactorTest"
-    testImplementation 'org.testcontainers:junit-jupiter'
-    testImplementation 'org.springframework.boot:spring-boot-testcontainers'
-    testImplementation 'org.testcontainers:postgresql'
-    testImplementation 'org.bitbucket.b_c:jose4j:0.9.6'
+    testImplementation "org.testcontainers:junit-jupiter"
+    testImplementation "org.springframework.boot:spring-boot-testcontainers"
+    testImplementation "org.testcontainers:postgresql"
+    testImplementation "org.bitbucket.b_c:jose4j:0.9.6"
 
-    implementation 'net.java.dev.jna:jna:5.14.0'
+    implementation "net.java.dev.jna:jna:5.14.0"
 }

apps/dolly-backend/settings.gradle

@@ -9,6 +9,7 @@ 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"
 includeBuild "../../libs/servlet-core"
 includeBuild "../../libs/servlet-insecure-security"

apps/dolly-frontend/build.gradle

@@ -26,6 +26,7 @@ dependencies {
     implementation "no.nav.testnav.libs:reactive-security"
     implementation "no.nav.testnav.libs:reactive-session-security"
     implementation "no.nav.testnav.libs:security-core"
+    implementation "no.nav.testnav.libs:testing"
 
     // Session
     implementation "redis.clients:jedis:5.2.0"

apps/dollystatus/build.gradle

@@ -11,5 +11,7 @@ sonarqube {
 }
 
 dependencies {
+    implementation "no.nav.testnav.libs:testing"
+
     implementation 'org.springframework.boot:spring-boot-starter-web'
 }

apps/endringsmelding-frontend/build.gradle

@@ -18,8 +18,6 @@ configurations {
 }
 
 dependencies {
-    implementation "io.grpc:grpc-netty:$versions.grpc"
-
     implementation "no.nav.testnav.libs:reactive-core"
     implementation "no.nav.testnav.libs:reactive-frontend"
     implementation("no.nav.testnav.libs:reactive-session-security") {
@@ -29,9 +27,10 @@ dependencies {
     implementation("no.nav.testnav.libs:security-core") {
         exclude group: "org.springframework.session", module: "spring-session-data-redis"
     }
+    implementation "no.nav.testnav.libs:testing"
 
+    implementation "io.grpc:grpc-netty:$versions.grpc"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
-
     implementation "org.springframework.cloud:spring-cloud-starter-gateway"
 
     testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock"

apps/endringsmelding-service/build.gradle

@@ -15,6 +15,7 @@ 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:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"
 

apps/faste-data-frontend/build.gradle

@@ -18,8 +18,6 @@ configurations {
 }
 
 dependencies {
-    implementation "io.grpc:grpc-netty:$versions.grpc"
-
     implementation "no.nav.testnav.libs:reactive-core"
     implementation "no.nav.testnav.libs:reactive-frontend"
     implementation("no.nav.testnav.libs:reactive-session-security") {
@@ -29,9 +27,10 @@ dependencies {
     implementation("no.nav.testnav.libs:security-core") {
         exclude group: "org.springframework.session", module: "spring-session-data-redis"
     }
+    implementation "no.nav.testnav.libs:testing"
 
+    implementation "io.grpc:grpc-netty:$versions.grpc"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
-
     implementation "org.springframework.cloud:spring-cloud-starter-gateway"
 
     testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock"

apps/generer-arbeidsforhold-populasjon-service/build.gradle

@@ -15,6 +15,7 @@ dependencies {
     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:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-web"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"

apps/generer-navn-service/build.gradle

@@ -15,6 +15,7 @@ dependencies {
     implementation "no.nav.testnav.libs:security-core"
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:servlet-security"
+    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-web"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client"

apps/generer-organisasjon-populasjon-service/build.gradle

@@ -19,6 +19,7 @@ dependencies {
     implementation "no.nav.testnav.libs:security-core"
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:servlet-security"
+    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-data-jpa"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"

apps/generer-synt-amelding-service/build.gradle

@@ -15,6 +15,7 @@ dependencies {
     implementation "no.nav.testnav.libs:security-core"
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:servlet-security"
+    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
     implementation "org.springframework.boot:spring-boot-starter-security"

apps/helsepersonell-service/build.gradle

@@ -15,6 +15,7 @@ dependencies {
     implementation "no.nav.testnav.libs:security-core"
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:servlet-security"
+    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-security"
     implementation "org.springframework.boot:spring-boot-starter-web"

apps/inntektsmelding-generator-service/build.gradle

@@ -13,6 +13,7 @@ dependencies {
     implementation "no.nav.testnav.libs:data-transfer-objects"
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:servlet-security"
+    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-web"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client"

apps/inntektsmelding-service/build.gradle

@@ -14,6 +14,7 @@ dependencies {
     implementation "no.nav.testnav.libs:security-core"
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:servlet-security"
+    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-web"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client"

apps/jenkins-batch-status-service/build.gradle

@@ -16,6 +16,7 @@ dependencies {
     implementation "no.nav.testnav.libs:security-core"
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:servlet-security"
+    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
     implementation "org.springframework.boot:spring-boot-starter-security"

apps/joark-dokument-service/build.gradle

@@ -15,6 +15,7 @@ dependencies {
     implementation "no.nav.testnav.libs:security-core"
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:servlet-security"
+    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
     implementation "org.springframework.boot:spring-boot-starter-security"

apps/kodeverk-service/build.gradle

@@ -15,6 +15,7 @@ dependencies {
     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:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-web"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client"

apps/levende-arbeidsforhold-ansettelse/build.gradle

@@ -16,6 +16,7 @@ dependencies {
     implementation "no.nav.testnav.libs:security-core"
     implementation "no.nav.testnav.libs:reactive-security"
     implementation "no.nav.testnav.libs:servlet-insecure-security"
+    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-data-r2dbc"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"

apps/levende-arbeidsforhold-scheduler/build.gradle

@@ -15,6 +15,7 @@ dependencies {
     implementation "no.nav.testnav.libs:data-transfer-objects"
     implementation "no.nav.testnav.libs:servlet-security"
     implementation "no.nav.testnav.libs:servlet-insecure-security"
+    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-web"
     implementation "org.springframework.boot:spring-boot-starter-quartz"

apps/levende-arbeidsforhold-service/build.gradle

@@ -10,20 +10,19 @@ sonarqube {
 }
 
 dependencies {
-    implementation "io.confluent:kafka-avro-serializer:$versions.avroSerializer"
-    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
-
     implementation "no.nav.testnav.libs:avro-schema"
     implementation "no.nav.testnav.libs:data-transfer-objects"
     implementation "no.nav.testnav.libs:kafka-config"
     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:testing"
 
+    implementation "io.confluent:kafka-avro-serializer:$versions.avroSerializer"
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
     implementation "org.apache.kafka:kafka-clients:$versions.apacheKafka"
     implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
-
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client"
     implementation "org.springframework.boot:spring-boot-starter-security"
     implementation "org.springframework.boot:spring-boot-starter-web"

apps/levende-arbeidsforhold-service/settings.gradle

@@ -5,13 +5,13 @@ plugins {
 rootProject.name = "levende-arbeidsforhold-service"
 
 includeBuild "../../libs/avro-schema"
-includeBuild "../../libs/kafka-config"
-includeBuild "../../libs/testing"
 includeBuild "../../libs/data-transfer-objects"
+includeBuild "../../libs/kafka-config"
 includeBuild "../../libs/reactive-core"
 includeBuild "../../libs/security-core"
 includeBuild "../../libs/servlet-core"
 includeBuild "../../libs/servlet-insecure-security"
+includeBuild "../../libs/testing"
 
 develocity {
     buildScan {

apps/miljoer-service/build.gradle

@@ -15,6 +15,7 @@ dependencies {
     implementation "no.nav.testnav.libs:security-core"
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:servlet-security"
+    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-web"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client"

apps/oppsummeringsdokument-service/build.gradle

@@ -19,6 +19,7 @@ dependencies {
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:servlet-security"
     implementation "no.nav.testnav.xsd:arbeidsforhold-xsd"
+    implementation "no.nav.testnav.libs:testing"
 
     implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml"
 

apps/organisasjon-bestilling-service/build.gradle

@@ -16,6 +16,7 @@ dependencies {
     implementation "no.nav.testnav.libs:security-core"
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:servlet-security"
+    implementation "no.nav.testnav.libs:testing"
 
     implementation "org.springframework.boot:spring-boot-starter-data-jpa"
     implementation "org.springframework.boot:spring-boot-starter-oauth2-client"