- Oppdatert diverse spring dependencies og gradle byggescript

#deploy-test-dolly-backend #deploy-test-frontend #deploy-udi-stub
navikt · May 24, 2024 · 3212ac4 · 3212ac4
1 parent 71dee9f
commit 3212ac4
Show file tree

Hide file tree

Showing 180 changed files with 492 additions and 491 deletions.
diff --git a/apps/adresse-service/build.gradle b/apps/adresse-service/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java'
     id "org.sonarqube" version "5.0.0.4638"
-    id 'org.springframework.boot' version "3.2.5"
+    id 'org.springframework.boot' version "3.2.6"
     id 'io.spring.dependency-management' version "1.1.5"
     id "jacoco"
 }

diff --git a/apps/adresse-service/settings.gradle b/apps/adresse-service/settings.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "com.gradle.enterprise" version "3.17.4"
+    id "com.gradle.develocity" version "3.17.4"
 }
 
 rootProject.name = 'adresse-service'
@@ -10,9 +10,9 @@ includeBuild '../../libs/servlet-security'
 includeBuild '../../libs/data-transfer-objects'
 
 
-gradleEnterprise {
+develocity {
     buildScan {
-        termsOfServiceUrl = "https://gradle.com/terms-of-service"
-        termsOfServiceAgree = "yes"
+        termsOfUseUrl = "https://gradle.com/terms-of-service"
+        termsOfUseAgree = "yes"
     }
 }
diff --git a/apps/amelding-service/build.gradle b/apps/amelding-service/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java'
     id "org.sonarqube" version "5.0.0.4638"
-    id 'org.springframework.boot' version "3.2.5"
+    id 'org.springframework.boot' version "3.2.6"
     id 'io.spring.dependency-management' version "1.1.5"
     id "jacoco"
 }

diff --git a/apps/amelding-service/settings.gradle b/apps/amelding-service/settings.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "com.gradle.enterprise" version "3.17.4"
+    id "com.gradle.develocity" version "3.17.4"
 }
 
 rootProject.name = 'amelding-service'
@@ -11,9 +11,9 @@ includeBuild '../../libs/commands'
 includeBuild '../../libs/avro-schema'
 includeBuild '../../libs/data-transfer-objects'
 
-gradleEnterprise {
+develocity {
     buildScan {
-        termsOfServiceUrl = "https://gradle.com/terms-of-service"
-        termsOfServiceAgree = "yes"
+        termsOfUseUrl = "https://gradle.com/terms-of-service"
+        termsOfUseAgree = "yes"
     }
 }
diff --git a/apps/app-tilgang-analyse-service/build.gradle b/apps/app-tilgang-analyse-service/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java'
     id "org.sonarqube" version "5.0.0.4638"
-    id 'org.springframework.boot' version "3.2.5"
+    id 'org.springframework.boot' version "3.2.6"
     id 'io.spring.dependency-management' version "1.1.5"
     id "jacoco"
 }

diff --git a/apps/app-tilgang-analyse-service/settings.gradle b/apps/app-tilgang-analyse-service/settings.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "com.gradle.enterprise" version "3.17.4"
+    id "com.gradle.develocity" version "3.17.4"
 }
 
 rootProject.name = 'app-tilgang-analyse-service'
@@ -8,9 +8,9 @@ includeBuild '../../libs/reactive-core'
 includeBuild '../../libs/reactive-security'
 includeBuild '../../libs/data-transfer-objects'
 
-gradleEnterprise {
+develocity {
     buildScan {
-        termsOfServiceUrl = "https://gradle.com/terms-of-service"
-        termsOfServiceAgree = "yes"
+        termsOfUseUrl = "https://gradle.com/terms-of-service"
+        termsOfUseAgree = "yes"
     }
 }
diff --git a/apps/arbeidsforhold-service/build.gradle b/apps/arbeidsforhold-service/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java'
     id "org.sonarqube" version "5.0.0.4638"
-    id 'org.springframework.boot' version "3.2.5"
+    id 'org.springframework.boot' version "3.2.6"
     id 'io.spring.dependency-management' version "1.1.5"
     id "jacoco"
 }

diff --git a/apps/arbeidsforhold-service/settings.gradle b/apps/arbeidsforhold-service/settings.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "com.gradle.enterprise" version "3.17.4"
+    id "com.gradle.develocity" version "3.17.4"
 }
 
 rootProject.name = 'arbeidsforhold-service'
@@ -11,9 +11,9 @@ includeBuild '../../libs/security-core'
 includeBuild '../../libs/servlet-core'
 includeBuild '../../libs/servlet-security'
 
-gradleEnterprise {
+develocity {
     buildScan {
-        termsOfServiceUrl = "https://gradle.com/terms-of-service"
-        termsOfServiceAgree = "yes"
+        termsOfUseUrl = "https://gradle.com/terms-of-service"
+        termsOfUseAgree = "yes"
     }
 }
diff --git a/apps/batch-bestilling-service/build.gradle b/apps/batch-bestilling-service/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java'
     id "org.sonarqube" version "5.0.0.4638"
-    id 'org.springframework.boot' version "3.2.5"
+    id 'org.springframework.boot' version "3.2.6"
     id 'io.spring.dependency-management' version "1.1.5"
     id "jacoco"
 }

diff --git a/apps/batch-bestilling-service/settings.gradle b/apps/batch-bestilling-service/settings.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "com.gradle.enterprise" version "3.17.4"
+    id "com.gradle.develocity" version "3.17.4"
 }
 
 rootProject.name = 'batch-bestilling-service'
@@ -12,9 +12,9 @@ includeBuild '../../libs/servlet-security'
 includeBuild '../../libs/servlet-insecure-security'
 includeBuild '../../libs/commands'
 
-gradleEnterprise {
+develocity {
     buildScan {
-        termsOfServiceUrl = "https://gradle.com/terms-of-service"
-        termsOfServiceAgree = "yes"
+        termsOfUseUrl = "https://gradle.com/terms-of-service"
+        termsOfUseAgree = "yes"
     }
 }
diff --git a/apps/brreg-stub/build.gradle b/apps/brreg-stub/build.gradle
@@ -2,7 +2,7 @@ plugins {
     id 'java'
     id "org.sonarqube" version "5.0.0.4638"
     id "uk.co.boothen.gradle.wsimport" version "0.21"
-    id 'org.springframework.boot' version "3.2.5"
+    id 'org.springframework.boot' version "3.2.6"
     id 'io.spring.dependency-management' version "1.1.5"
     id "jacoco"
     id("org.openrewrite.rewrite") version("6.6.4")

diff --git a/apps/brreg-stub/settings.gradle b/apps/brreg-stub/settings.gradle
@@ -1,15 +1,15 @@
 plugins {
-    id "com.gradle.enterprise" version "3.17.4"
+    id "com.gradle.develocity" version "3.17.4"
 }
 
 rootProject.name = 'brreg-stub'
 
 includeBuild '../../libs/database'
 includeBuild '../../libs/servlet-core'
 
-gradleEnterprise {
+develocity {
     buildScan {
-        termsOfServiceUrl = "https://gradle.com/terms-of-service"
-        termsOfServiceAgree = "yes"
+        termsOfUseUrl = "https://gradle.com/terms-of-service"
+        termsOfUseAgree = "yes"
     }
 }
diff --git a/apps/bruker-service/build.gradle b/apps/bruker-service/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java'
     id "org.sonarqube" version "5.0.0.4638"
-    id 'org.springframework.boot' version "3.2.5"
+    id 'org.springframework.boot' version "3.2.6"
     id 'io.spring.dependency-management' version "1.1.5"
     id "jacoco"
 }

diff --git a/apps/bruker-service/settings.gradle b/apps/bruker-service/settings.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "com.gradle.enterprise" version "3.17.4"
+    id "com.gradle.develocity" version "3.17.4"
 }
 
 rootProject.name = 'bruker-service'
@@ -10,9 +10,9 @@ includeBuild '../../libs/security-core'
 includeBuild '../../libs/data-transfer-objects'
 includeBuild '../../libs/integration-test'
 
-gradleEnterprise {
+develocity {
     buildScan {
-        termsOfServiceUrl = "https://gradle.com/terms-of-service"
-        termsOfServiceAgree = "yes"
+        termsOfUseUrl = "https://gradle.com/terms-of-service"
+        termsOfUseAgree = "yes"
     }
 }
diff --git a/apps/budpro-service/settings.gradle b/apps/budpro-service/settings.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "com.gradle.enterprise" version "3.17.4"
+    id "com.gradle.develocity" version "3.17.4"
 }
 
 rootProject.name = 'budpro-service'
@@ -12,9 +12,9 @@ includeBuild '../../libs/servlet-core'
 includeBuild '../../libs/servlet-insecure-security'
 includeBuild '../../libs/servlet-security'
 
-gradleEnterprise {
+develocity {
     buildScan {
-        termsOfServiceUrl = "https://gradle.com/terms-of-service"
-        termsOfServiceAgree = "yes"
+        termsOfUseUrl = "https://gradle.com/terms-of-service"
+        termsOfUseAgree = "yes"
     }
 }
diff --git a/apps/dolly-backend/build.gradle b/apps/dolly-backend/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java'
     id "org.sonarqube" version "5.0.0.4638"
-    id 'org.springframework.boot' version "3.2.5"
+    id 'org.springframework.boot' version "3.2.6"
     id 'io.spring.dependency-management' version "1.1.5"
     id "jacoco"
 }
@@ -91,7 +91,9 @@ dependencies {
     implementation 'com.github.ben-manes.caffeine:caffeine'
 
     implementation 'org.ehcache:ehcache:3.10.8'
-    implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.2'
+    implementation 'com.fasterxml.jackson.core:jackson-core:2.17.1'
+
+//    implementation 'com.fasterxml.jackson.datatype:jackson-core:2.17.1'
     implementation 'org.postgresql:postgresql'
     implementation 'org.flywaydb:flyway-core'
     implementation 'io.micrometer:micrometer-registry-prometheus'

diff --git a/apps/dolly-backend/settings.gradle b/apps/dolly-backend/settings.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "com.gradle.enterprise" version "3.17.4"
+    id "com.gradle.develocity" version "3.17.4"
 }
 
 rootProject.name = 'dolly-backend'
@@ -14,9 +14,9 @@ includeBuild '../../libs/data-transfer-objects'
 includeBuild '../../libs/data-transfer-search-objects'
 includeBuild '../../.github/workflows'
 
-gradleEnterprise {
+develocity {
     buildScan {
-        termsOfServiceUrl = "https://gradle.com/terms-of-service"
-        termsOfServiceAgree = "yes"
+        termsOfUseUrl = "https://gradle.com/terms-of-service"
+        termsOfUseAgree = "yes"
     }
 }
diff --git a/apps/dolly-frontend/build.gradle b/apps/dolly-frontend/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id "org.sonarqube" version "5.0.0.4638"
     id 'java'
-    id 'org.springframework.boot' version "3.2.5"
+    id 'org.springframework.boot' version "3.2.6"
     id 'io.spring.dependency-management' version "1.1.5"
     id "jacoco"
 }

diff --git a/apps/dolly-frontend/settings.gradle b/apps/dolly-frontend/settings.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "com.gradle.enterprise" version "3.17.4"
+    id "com.gradle.develocity" version "3.17.4"
 }
 
 rootProject.name = 'dolly-frontend'
@@ -14,9 +14,9 @@ includeBuild '../../libs/data-transfer-objects'
 includeBuild '../../libs/security-core'
 includeBuild '../../.github/workflows'
 
-gradleEnterprise {
+develocity {
     buildScan {
-        termsOfServiceUrl = "https://gradle.com/terms-of-service"
-        termsOfServiceAgree = "yes"
+        termsOfUseUrl = "https://gradle.com/terms-of-service"
+        termsOfUseAgree = "yes"
     }
 }
diff --git a/apps/dollystatus/build.gradle b/apps/dollystatus/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java'
     id "org.sonarqube" version "5.0.0.4638"
-    id 'org.springframework.boot' version "3.2.5"
+    id 'org.springframework.boot' version "3.2.6"
     id 'io.spring.dependency-management' version "1.1.5"
     id "jacoco"
 }

diff --git a/apps/dollystatus/settings.gradle b/apps/dollystatus/settings.gradle
@@ -1,12 +1,12 @@
 plugins {
-    id "com.gradle.enterprise" version "3.17.4"
+    id "com.gradle.develocity" version "3.17.4"
 }
 
 rootProject.name = 'dollystatus'
 
-gradleEnterprise {
+develocity {
     buildScan {
-        termsOfServiceUrl = "https://gradle.com/terms-of-service"
-        termsOfServiceAgree = "yes"
+        termsOfUseUrl = "https://gradle.com/terms-of-service"
+        termsOfUseAgree = "yes"
     }
 }
diff --git a/apps/endringsmelding-frontend/build.gradle b/apps/endringsmelding-frontend/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java'
     id "org.sonarqube" version "5.0.0.4638"
-    id 'org.springframework.boot' version "3.2.5"
+    id 'org.springframework.boot' version "3.2.6"
     id 'io.spring.dependency-management' version "1.1.5"
     id "jacoco"
 }

diff --git a/apps/endringsmelding-frontend/settings.gradle b/apps/endringsmelding-frontend/settings.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "com.gradle.enterprise" version "3.17.4"
+    id "com.gradle.develocity" version "3.17.4"
 }
 
 rootProject.name = 'endringsmelding-frontend'
@@ -10,9 +10,9 @@ includeBuild '../../libs/security-core'
 includeBuild '../../libs/reactive-session-security'
 includeBuild '../../libs/reactive-frontend'
 
-gradleEnterprise {
+develocity {
     buildScan {
-        termsOfServiceUrl = "https://gradle.com/terms-of-service"
-        termsOfServiceAgree = "yes"
+        termsOfUseUrl = "https://gradle.com/terms-of-service"
+        termsOfUseAgree = "yes"
     }
 }
diff --git a/apps/endringsmelding-service/build.gradle b/apps/endringsmelding-service/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java'
     id "org.sonarqube" version "5.0.0.4638"
-    id 'org.springframework.boot' version "3.2.5"
+    id 'org.springframework.boot' version "3.2.6"
     id 'io.spring.dependency-management' version "1.1.5"
     id "jacoco"
 }

diff --git a/apps/endringsmelding-service/settings.gradle b/apps/endringsmelding-service/settings.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "com.gradle.enterprise" version "3.17.4"
+    id "com.gradle.develocity" version "3.17.4"
 }
 
 rootProject.name = 'endringsmelding-service'
@@ -10,9 +10,9 @@ includeBuild '../../libs/reactive-security'
 includeBuild '../../libs/data-transfer-objects'
 includeBuild '../../libs/data-transfer-search-objects'
 
-gradleEnterprise {
+develocity {
     buildScan {
-        termsOfServiceUrl = "https://gradle.com/terms-of-service"
-        termsOfServiceAgree = "yes"
+        termsOfUseUrl = "https://gradle.com/terms-of-service"
+        termsOfUseAgree = "yes"
     }
 }
diff --git a/apps/ereg-batch-status-service/build.gradle b/apps/ereg-batch-status-service/build.gradle
@@ -1,7 +1,7 @@
 plugins {
     id 'java'
     id "org.sonarqube" version "5.0.0.4638"
-    id 'org.springframework.boot' version "3.2.5"
+    id 'org.springframework.boot' version "3.2.6"
     id 'io.spring.dependency-management' version "1.1.5"
     id "jacoco"
 }