Oppdatert spring boot til 3.2 og samtidig oppgradert en del dependenc…

…ies. Fikset utdatert bootstrap.yml oppsett og fjernet den avhengigheten

#deploy-brreg-stub
#deploy-test-dolly-backend

apps/adresse-service/build.gradle

@@ -1,7 +1,7 @@
 plugins {
  id 'java'
  id "org.sonarqube" version "4.0.0.2929"
- id 'org.springframework.boot' version "3.1.4"
+ id 'org.springframework.boot' version "3.2.1"
  id 'io.spring.dependency-management' version "1.1.3"
  id "jacoco"
 }
@@ -40,7 +40,7 @@ bootJar {
 dependencyManagement {
  applyMavenExclusions = false
  imports {
- mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+ mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
  }
 }
 
@@ -68,8 +68,8 @@ dependencies {
  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.2.0'
- implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
+ 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'
 

apps/amelding-service/build.gradle

@@ -1,7 +1,7 @@
 plugins {
  id 'java'
  id "org.sonarqube" version "4.0.0.2929"
- id 'org.springframework.boot' version "3.1.4"
+ id 'org.springframework.boot' version "3.2.1"
  id 'io.spring.dependency-management' version "1.1.3"
  id "jacoco"
 }
@@ -40,7 +40,7 @@ bootJar {
 dependencyManagement {
  applyMavenExclusions = false
  imports {
- mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+ mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
  }
 }
 
@@ -64,15 +64,15 @@ dependencies {
  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.0.4'
- implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
+ 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'

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

@@ -1,7 +1,7 @@
 plugins {
  id 'java'
  id "org.sonarqube" version "4.0.0.2929"
- id 'org.springframework.boot' version "3.1.4"
+ id 'org.springframework.boot' version "3.2.1"
  id 'io.spring.dependency-management' version "1.1.3"
  id "jacoco"
 }
@@ -39,7 +39,7 @@ bootJar {
 dependencyManagement {
  applyMavenExclusions = false
  imports {
- mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+ mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
  }
 }
 
@@ -69,8 +69,8 @@ dependencies {
  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.0.4'
- implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
+ 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'

apps/arbeidsforhold-service/build.gradle

@@ -1,7 +1,7 @@
 plugins {
  id 'java'
  id "org.sonarqube" version "4.0.0.2929"
- id 'org.springframework.boot' version "3.1.4"
+ id 'org.springframework.boot' version "3.2.1"
  id 'io.spring.dependency-management' version "1.1.3"
  id "jacoco"
 }
@@ -40,7 +40,7 @@ bootJar {
 dependencyManagement {
  applyMavenExclusions = false
  imports {
- mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+ mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
  }
 }
 
@@ -75,8 +75,8 @@ dependencies {
 
  implementation 'io.micrometer:micrometer-registry-prometheus'
  implementation 'javax.annotation:javax.annotation-api:1.3.2'
- implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
- implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
+ implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+ implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
 
  implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
 

apps/batch-bestilling-service/build.gradle

@@ -1,7 +1,7 @@
 plugins {
  id 'java'
  id "org.sonarqube" version "4.0.0.2929"
- id 'org.springframework.boot' version "3.1.4"
+ id 'org.springframework.boot' version "3.2.1"
  id 'io.spring.dependency-management' version "1.1.3"
  id "jacoco"
 }
@@ -38,7 +38,7 @@ bootJar {
 dependencyManagement {
  applyMavenExclusions = false
  imports {
- mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+ mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
  }
 }
 
@@ -67,8 +67,8 @@ dependencies {
  implementation 'org.springframework.boot:spring-boot-starter-actuator'
 
  implementation 'io.micrometer:micrometer-registry-prometheus'
- implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
- implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
+ implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+ implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
 
  implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
  implementation 'org.hibernate.validator:hibernate-validator'

apps/brreg-stub/build.gradle

@@ -2,7 +2,7 @@ plugins {
  id 'java'
  id "org.sonarqube" version "4.0.0.2929"
  id "uk.co.boothen.gradle.wsimport" version "0.21"
- id 'org.springframework.boot' version "3.1.4"
+ id 'org.springframework.boot' version "3.2.1"
  id 'io.spring.dependency-management' version "1.1.3"
  id "jacoco"
 }
@@ -37,7 +37,7 @@ sonarqube {
 dependencyManagement {
  applyMavenExclusions = false
  imports {
- mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+ mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
 
  }
 }
@@ -76,7 +76,6 @@ dependencies {
 
  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 'org.springframework.boot:spring-boot-starter-validation'
 
@@ -99,7 +98,8 @@ dependencies {
 
  implementation 'wsdl4j:wsdl4j'
  implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
- implementation 'org.springdoc:springdoc-openapi-ui:1.6.15'
+ implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+ implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
 
  implementation 'no.nav.common:auth'
  implementation 'no.nav.common:util'

apps/brreg-stub/src/main/resources/application.yaml

@@ -1,4 +1,23 @@
 spring:
+ cloud:
+ vault:
+ host: vault.adeo.no
+ port: 443
+ connection-timeout: 15000
+ read-timeout: 30000
+ application-name: preprod/fss/brreg-stub
+ authentication: TOKEN
+ kv:
+ enabled: false
+ backend: kv
+ application-name: preprod/fss/brreg-stub/default
+ default-context: preprod/fss/brreg-stub/default
+ database:
+ enabled: true
+ role: brreg-stub-admin
+ backend: postgresql/preprod-fss
+ username-property: spring.datasource.username
+ password-property: spring.datasource.password
  application:
  name: brreg-stub
 

apps/bruker-service/build.gradle

@@ -1,7 +1,7 @@
 plugins {
  id 'java'
  id "org.sonarqube" version "4.0.0.2929"
- id 'org.springframework.boot' version "3.1.4"
+ id 'org.springframework.boot' version "3.2.1"
  id 'io.spring.dependency-management' version "1.1.3"
  id "jacoco"
 }
@@ -48,7 +48,7 @@ bootJar {
 dependencyManagement {
  applyMavenExclusions = false
  imports {
- mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+ mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
  }
 }
 
@@ -75,8 +75,8 @@ dependencies {
  implementation 'org.springframework.boot:spring-boot-starter-actuator'
 
  implementation 'io.micrometer:micrometer-registry-prometheus'
- implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.0.4'
- implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
+ 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'
  implementation 'org.hibernate.validator:hibernate-validator'
 

apps/budpro-service/build.gradle

@@ -60,7 +60,7 @@ dependencies {
  implementation 'no.nav.testnav.libs:servlet-insecure-security'
  implementation 'no.nav.testnav.libs:servlet-security'
  implementation 'org.projectlombok:lombok'
- implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'
+ implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
  implementation 'org.springframework.boot:spring-boot-starter-actuator'
  implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
  implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'

apps/dolly-backend/build.gradle

@@ -1,7 +1,7 @@
 plugins {
  id 'java'
  id "org.sonarqube" version "4.0.0.2929"
- id 'org.springframework.boot' version "3.1.4"
+ id 'org.springframework.boot' version "3.2.1"
  id 'io.spring.dependency-management' version "1.1.3"
  id "jacoco"
 }
@@ -41,7 +41,7 @@ bootJar {
 dependencyManagement {
  applyMavenExclusions = false
  imports {
- mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+ mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
  }
 }
 
@@ -78,8 +78,8 @@ dependencies {
  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.2.0'
- implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.16'
+ implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
+ implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
 
  implementation 'org.springframework.boot:spring-boot-starter-web'
  implementation 'org.springframework.boot:spring-boot-starter-webflux'
@@ -88,12 +88,12 @@ dependencies {
  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:2.0.0'
+ implementation 'org.springframework.retry:spring-retry:2.0.5'
 
  implementation 'org.springframework.boot:spring-boot-starter-data-elasticsearch'
- implementation 'org.opensearch.client:spring-data-opensearch:1.2.0'
+ implementation 'org.opensearch.client:spring-data-opensearch:1.3.0'
 
- implementation 'org.apache.commons:commons-lang3:3.12.0'
+ implementation 'org.apache.commons:commons-lang3:3.14.0'
  implementation 'org.springframework.boot:spring-boot-starter-cache'
  implementation 'com.github.ben-manes.caffeine:caffeine'
 
@@ -104,16 +104,16 @@ dependencies {
  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.3'
- implementation 'org.apache.poi:poi-ooxml:5.2.3'
+ 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.0'
 
  testImplementation 'org.springframework.security:spring-security-test'
  testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
  testImplementation 'com.h2database:h2'
- testImplementation 'io.projectreactor:reactor-test:3.5.3'
+ testImplementation 'io.projectreactor:reactor-test:3.5.4'
  testImplementation 'org.testcontainers:junit-jupiter'
  testImplementation 'org.testcontainers:postgresql'
  testImplementation 'org.bitbucket.b_c:jose4j:0.9.3'

apps/dolly-frontend/build.gradle

@@ -1,7 +1,7 @@
 plugins {
  id "org.sonarqube" version "4.0.0.2929"
  id 'java'
- id 'org.springframework.boot' version "3.1.4"
+ id 'org.springframework.boot' version "3.2.1"
  id 'io.spring.dependency-management' version "1.1.3"
  id "jacoco"
 }
@@ -39,7 +39,7 @@ bootJar {
 dependencyManagement {
  applyMavenExclusions = false
  imports {
- mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+ mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
  mavenBom 'org.springframework.session:spring-session-bom:2021.2.3'
 
  }
@@ -72,7 +72,7 @@ dependencies {
  implementation 'no.nav.testnav.libs:data-transfer-objects'
 
  // Session
- implementation 'redis.clients:jedis:4.4.0-m2'
+ implementation 'redis.clients:jedis:5.1.0'
  implementation 'org.springframework.session:spring-session-core'
  implementation 'org.springframework.session:spring-session-data-redis'
 

apps/dollystatus/build.gradle

@@ -1,7 +1,7 @@
 plugins {
  id 'java'
  id "org.sonarqube" version "4.0.0.2929"
- id 'org.springframework.boot' version "3.1.4"
+ id 'org.springframework.boot' version "3.2.1"
  id 'io.spring.dependency-management' version "1.1.3"
  id "jacoco"
 }

apps/endringsmelding-frontend/build.gradle

@@ -1,7 +1,7 @@
 plugins {
  id 'java'
  id "org.sonarqube" version "4.0.0.2929"
- id 'org.springframework.boot' version "3.1.4"
+ id 'org.springframework.boot' version "3.2.1"
  id 'io.spring.dependency-management' version "1.1.3"
  id "jacoco"
 }
@@ -40,7 +40,7 @@ bootJar {
 dependencyManagement {
  applyMavenExclusions = false
  imports {
- mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2022.0.4'
+ mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
  }
 }