Removes obsolete dependency on org.springframework.cloud:spring-cloud…

…-starter-bootstrap.

apps/amelding-service/build.gradle

@@ -10,21 +10,18 @@ sonarqube {
 }
 
 dependencies {
+    implementation "no.nav.testnav.libs:avro-schema"
+    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:reactive-security"
     implementation "no.nav.testnav.libs:security-core"
 
-    implementation "no.nav.testnav.libs:commands"
-    implementation "no.nav.testnav.libs:avro-schema"
-    implementation "no.nav.testnav.libs:data-transfer-objects"
-
-    implementation "org.springframework.boot:spring-boot-starter-security"
     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.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc"
     implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
+    implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc"
 
     testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock"
 }

apps/arbeidsforhold-service/build.gradle

@@ -10,28 +10,25 @@ sonarqube {
 }
 
 dependencies {
-
-    implementation "com.google.guava:guava:$versions.guava"
-    implementation "jakarta.xml.bind:jakarta.xml.bind-api:$versions.jakartaXmlBindApi"
-    implementation "javax.activation:activation:$versions.javaxActivation"
-    implementation "org.glassfish.jaxb:jaxb-runtime:$versions.jaxb"
-    implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml"
-
     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-security"
 
-    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.boot:spring-boot-starter-web"
 
+    implementation "com.fasterxml.jackson.dataformat:jackson-dataformat-xml"
+    implementation "com.google.guava:guava:$versions.guava"
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
+    implementation "jakarta.xml.bind:jakarta.xml.bind-api:$versions.jakartaXmlBindApi"
+    implementation "javax.activation:activation:$versions.javaxActivation"
     implementation "javax.annotation:javax.annotation-api:$versions.javaxAnnotation"
+    implementation "org.glassfish.jaxb:jaxb-runtime:$versions.jaxb"
     implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
-    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
 
     testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock"
 }

apps/bruker-service/build.gradle

@@ -23,33 +23,30 @@ sonarqube {
 }
 
 dependencies {
-    implementation "com.auth0:java-jwt:$versions.jwt"
-
     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:security-core"
 
-    implementation "org.springframework.boot:spring-boot-starter-oauth2-resource-server"
     implementation "org.springframework.boot:spring-boot-starter-data-r2dbc"
+    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.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc"
-    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
-
+    implementation "com.auth0:java-jwt:$versions.jwt"
     implementation "io.r2dbc:r2dbc-h2"
-    implementation "org.postgresql:r2dbc-postgresql"
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
+    implementation "org.bouncycastle:bcprov-jdk18on:$versions.bouncyCastle"
     implementation "org.flywaydb:flyway-core"
     implementation "org.flywaydb:flyway-database-postgresql"
+    implementation "org.postgresql:r2dbc-postgresql"
+    implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc"
 
-    runtimeOnly "org.postgresql:postgresql"
     runtimeOnly "com.h2database:h2"
+    runtimeOnly "org.postgresql:postgresql"
 
+    testImplementation "com.squareup.okhttp3:mockwebserver:$versions.okhttp"
+    testImplementation "com.squareup.okhttp3:okhttp:$versions.okhttp"
     testImplementation "io.projectreactor:reactor-test:$versions.reactorTest"
-    testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock"
-    testImplementation "org.assertj:assertj-core:$versions.assertj"
     testImplementation "no.nav.testnav.libs:integration-test"
-    testImplementation "com.squareup.okhttp3:okhttp:$versions.okhttp"
-    testImplementation "com.squareup.okhttp3:mockwebserver:$versions.okhttp"
+    testImplementation "org.assertj:assertj-core:$versions.assertj"
+    testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock"
 }

apps/endringsmelding-service/build.gradle

@@ -18,10 +18,8 @@ dependencies {
 
     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.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc"
     implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
+    implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc"
 
     testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock"
 }

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

@@ -20,26 +20,22 @@ dependencies {
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:servlet-security"
 
-    implementation "org.springframework.boot:spring-boot-starter-web"
+    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-data-jpa"
-
-    implementation "org.springframework.cloud:spring-cloud-starter-bootstrap" // TODO remove legacy bootstrap config
-
+    implementation "org.springframework.boot:spring-boot-starter-web"
     implementation "org.springframework.kafka:spring-kafka"
 
+    implementation "com.h2database:h2"
+    implementation "com.zaxxer:HikariCP"
     implementation "io.confluent:kafka-avro-serializer:$versions.avroSerializer"
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
     implementation "jakarta.validation:jakarta.validation-api:$versions.jakartaValidation"
     implementation "org.flywaydb:flyway-core"
     implementation "org.flywaydb:flyway-database-postgresql"
-    implementation "com.h2database:h2"
-    implementation "com.zaxxer:HikariCP"
-
-    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
-    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
-    implementation "org.projectreactor:reactor-spring:$versions.reactorSpring"
     implementation "org.postgresql:postgresql"
+    implementation "org.projectreactor:reactor-spring:$versions.reactorSpring"
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
 
     testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock"
 }

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

@@ -16,14 +16,12 @@ dependencies {
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:servlet-security"
 
-    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.boot:spring-boot-starter-web"
 
-    implementation "org.springframework.cloud:spring-cloud-starter-bootstrap" // TODO remove legacy bootstrap config
-
-    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
     implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
 
     testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock"
 }

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

@@ -17,14 +17,12 @@ dependencies {
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:servlet-security"
 
-    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.boot:spring-boot-starter-web"
 
-    implementation "org.springframework.cloud:spring-cloud-starter-bootstrap" // TODO remove legacy bootstrap config
-
-    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
     implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
 
     testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock"
 }

apps/joark-dokument-service/build.gradle

@@ -16,13 +16,12 @@ dependencies {
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:servlet-security"
 
-    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.boot:spring-boot-starter-web"
 
-    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
     implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
 
     testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock"
 }

apps/organisasjon-bestilling-service/build.gradle

@@ -17,20 +17,19 @@ dependencies {
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:servlet-security"
 
+    implementation "org.springframework.boot:spring-boot-starter-data-jpa"
+    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"
-    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-bootstrap" // TODO remove legacy bootstrap config
 
     implementation "com.h2database:h2"
     implementation "com.zaxxer:HikariCP"
     implementation "org.flywaydb:flyway-core"
     implementation "org.flywaydb:flyway-database-postgresql"
     implementation "org.postgresql:postgresql"
 
-    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
     implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
 
     testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock"
 }

apps/organisasjon-mottak-service/build.gradle

@@ -20,17 +20,14 @@ dependencies {
     implementation "no.nav.testnav.libs:servlet-core"
     implementation "no.nav.testnav.libs:servlet-insecure-security"
 
+    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"
-    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.kafka:spring-kafka"
+
+    implementation "io.confluent:kafka-avro-serializer:$versions.avroSerializer"
     implementation "org.apache.httpcomponents.core5:httpcore5:5.3"
     implementation "org.apache.kafka:kafka-clients:$versions.apacheKafka"
-    implementation "io.confluent:kafka-avro-serializer:$versions.avroSerializer"
-
     implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
 
     testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock"

apps/person-faste-data-service/build.gradle

@@ -14,21 +14,16 @@ dependencies {
     implementation "no.nav.testnav.libs:reactive-core"
     implementation "no.nav.testnav.libs:reactive-security"
 
-    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-oauth2-resource-server"
 
-    implementation "org.springframework.cloud:spring-cloud-starter-bootstrap" // TODO remove legacy bootstrap config
-
-    implementation "org.flywaydb:flyway-core"
-    implementation "org.flywaydb:flyway-database-postgresql"
-
     implementation "com.h2database:h2"
     implementation "com.zaxxer:HikariCP"
+    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
+    implementation "org.flywaydb:flyway-core"
+    implementation "org.flywaydb:flyway-database-postgresql"
     implementation "org.postgresql:postgresql"
-
     implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc"
 
-    implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
-
     testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock"
 }

apps/profil-api/build.gradle

@@ -10,18 +10,15 @@ sonarqube {
 }
 
 dependencies {
+    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-security"
 
-    implementation "no.nav.testnav.libs:data-transfer-objects"
-
-    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-security"
     implementation "org.springframework.boot:spring-boot-starter-web"
-
-    implementation "org.springframework.cloud:spring-cloud-starter-bootstrap" // TODO remove legacy bootstrap config
 
     implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
 

apps/skattekort-service/build.gradle

@@ -23,24 +23,20 @@ xjc {
 }
 
 dependencies {
-    implementation "jakarta.xml.bind:jakarta.xml.bind-api:$versions.jakartaXmlBindApi"
-    implementation "org.glassfish.jaxb:jaxb-runtime:$versions.jaxb"
-    implementation "org.json:json:20231013"
-
     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:security-core"
 
-    implementation "org.apache.httpcomponents.core5:httpcore5:5.3"
-
-    implementation "org.springframework.boot:spring-boot-starter-security"
     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"
-
-    implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc"
     implementation "io.swagger.core.v3:swagger-annotations-jakarta:$versions.swagger"
+    implementation "jakarta.xml.bind:jakarta.xml.bind-api:$versions.jakartaXmlBindApi"
+    implementation "org.apache.httpcomponents.core5:httpcore5:5.3"
+    implementation "org.glassfish.jaxb:jaxb-runtime:$versions.jaxb"
+    implementation "org.json:json:20231013"
+    implementation "org.springdoc:springdoc-openapi-starter-webflux-ui:$versions.springdoc"
 
     implementation "ma.glasnost.orika:orika-core:$versions.orika"
 }

apps/testnav-ident-pool/build.gradle

@@ -19,24 +19,19 @@ dependencies {
     implementation "no.nav.testnav.libs:servlet-insecure-security"
     implementation "no.nav.testnav.libs:servlet-security"
 
-    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.security:spring-security-oauth2-jose"
     implementation "org.springframework.boot:spring-boot-starter-validation"
-
-    implementation "org.springframework.cloud:spring-cloud-starter-bootstrap" // TODO remove legacy bootstrap config
+    implementation "org.springframework.boot:spring-boot-starter-web"
     implementation "org.springframework.retry:spring-retry"
-
-    implementation "org.aspectj:aspectjweaver:$versions.jweaver"
+    implementation "org.springframework.security:spring-security-oauth2-jose"
 
     implementation "com.h2database:h2"
-
+    implementation "ma.glasnost.orika:orika-core:$versions.orika"
+    implementation "org.aspectj:aspectjweaver:$versions.jweaver"
     implementation "org.flywaydb:flyway-core"
     implementation "org.flywaydb:flyway-database-postgresql"
     implementation "org.postgresql:postgresql"
-    implementation "ma.glasnost.orika:orika-core:$versions.orika"
-
     implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
 
     testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock"

apps/tilbakemelding-api/build.gradle

@@ -10,24 +10,20 @@ sonarqube {
 }
 
 dependencies {
+    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-security"
     implementation "no.nav.testnav.libs:slack"
 
-    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-web"
     implementation "org.springframework.boot:spring-boot-starter-security"
-    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
-
-    implementation "org.springframework.cloud:spring-cloud-starter-bootstrap" // TODO remove legacy bootstrap config
-
-    implementation "org.reactivestreams:reactive-streams:1.0.4"
+    implementation "org.springframework.boot:spring-boot-starter-web"
 
     implementation "org.projectreactor:reactor-spring:$versions.reactorSpring"
+    implementation "org.reactivestreams:reactive-streams:1.0.4"
+    implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:$versions.springdoc"
 
     testImplementation "org.springframework.cloud:spring-cloud-contract-wiremock"
 }