- Oppdatert diverse spring dependencies og gradle byggescript

#deploy-test-dolly-backend #deploy-test-frontend
navikt · May 23, 2024 · 71dee9f · 71dee9f
1 parent ccc446d
commit 71dee9f
Show file tree

Hide file tree

Showing 208 changed files with 566 additions and 566 deletions.
diff --git a/.github/workflows/common.integration-test.yml b/.github/workflows/common.integration-test.yml
@@ -30,7 +30,7 @@ jobs:
           NAV_TOKEN: ${{ secrets.NAV_TOKEN }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_USERNAME: ${{ secrets.GITHUB_USERNAME }}
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
         with:
           arguments: assemble --scan
           cache-read-only: false
@@ -43,7 +43,7 @@ jobs:
           echo Wait on service...
           bash -c 'while [[ "$(curl --connect-timeout 2 -s -o /dev/null -w ''%{http_code}'' ${{ inputs.healthcheck }})" != "200" ]]; do echo ...; sleep 5; done; echo Service is up;'
       - name: "Run integration tests"
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
         with:
           build-root-directory: ${{ inputs.working-directory }}
           arguments: iTest --scan

diff --git a/.github/workflows/common.workflow.backend.yml b/.github/workflows/common.workflow.backend.yml
@@ -83,7 +83,7 @@ jobs:
           java-version: 21
       - name: "Gradle"
         id: gradle
-        uses: gradle/gradle-build-action@v3
+        uses: gradle/actions/setup-gradle@v3
         with:
           build-root-directory: ${{ inputs.working-directory }}
           arguments: build ${{ inputs.sonar-enabled && 'jacocoTestReport sonar -Dsonar.gradle.skipCompile=true' || ''}} --scan
@@ -115,7 +115,7 @@ jobs:
       image: ${{ steps.docker-build-push.outputs.image }}
 
   deploy:
-    needs: [start, build]
+    needs: [ start, build ]
     if: needs.start.outputs.do-deploy == 'true'
     concurrency: ${{ inputs.image-suffix }}
     runs-on: ubuntu-latest
@@ -130,7 +130,7 @@ jobs:
           VAR: image=${{ needs.build.outputs.image }}
 
   deploy-test:
-    needs: [start, build]
+    needs: [ start, build ]
     if: needs.start.outputs.do-deploy-test == 'true'
     concurrency: ${{ inputs.image-suffix }}-test
     runs-on: ubuntu-latest

diff --git a/.github/workflows/common.workflow.frontend.yml b/.github/workflows/common.workflow.frontend.yml
@@ -115,7 +115,7 @@ jobs:
           java-version: 21
       - name: "Gradle"
         id: gradle
-        uses: gradle/gradle-build-action@v3
+        uses: gradle/actions/setup-gradle@v3
         with:
           build-root-directory: ${{ inputs.working-directory }}
           arguments: build ${{ inputs.sonar-enabled && 'jacocoTestReport sonar -Dsonar.gradle.skipCompile=true' || '' }} --scan
@@ -149,7 +149,7 @@ jobs:
       image: ${{ steps.docker-build-push.outputs.image }}
 
   deploy:
-    needs: [start, build]
+    needs: [ start, build ]
     if: needs.start.outputs.do-deploy == 'true'
     concurrency: ${{ inputs.image-suffix }}
     runs-on: ubuntu-latest
@@ -164,7 +164,7 @@ jobs:
           VAR: image=${{ needs.build.outputs.image }}
 
   deploy-test:
-    needs: [start, build]
+    needs: [ start, build ]
     if: needs.start.outputs.do-deploy-test == 'true'
     concurrency: ${{ inputs.image-suffix }}-test
     runs-on: ubuntu-latest
@@ -180,7 +180,7 @@ jobs:
 
   # Only used by dolly-frontend.
   deploy-idporten:
-    needs: [start, build]
+    needs: [ start, build ]
     if: needs.start.outputs.do-deploy-idporten == 'true'
     concurrency: ${{ inputs.image-suffix }}-idporten
     runs-on: ubuntu-latest
@@ -196,7 +196,7 @@ jobs:
 
   # Only used by dolly-frontend.
   deploy-unstable:
-    needs: [start, build]
+    needs: [ start, build ]
     if: needs.start.outputs.do-deploy-unstable == 'true'
     concurrency: ${{ inputs.image-suffix }}-unstable
     runs-on: ubuntu-latest

diff --git a/.github/workflows/common.workflow.libs.backend.yml b/.github/workflows/common.workflow.libs.backend.yml
@@ -46,7 +46,7 @@ jobs:
           java-version: 21
       - name: "Gradle"
         id: gradle
-        uses: gradle/gradle-build-action@v3
+        uses: gradle/actions/setup-gradle@v3
         with:
           build-root-directory: ${{ inputs.working-directory }}
           arguments: build ${{ inputs.sonar-enabled && 'jacocoTestReport sonar -Dsonar.gradle.skipCompile=true' || '' }} --scan

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -45,42 +45,42 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }}
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
         with:
           arguments: :avro-schema:publish -PreleaseVersion=${{ env.VERSION }}
       - name: "Release data-transfer-objects"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }}
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
         with:
           arguments: :data-transfer-objects:publish -PreleaseVersion=${{ env.VERSION }}
       - name: "Release reactive-core"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }}
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
         with:
           arguments: :reactive-core:publish -PreleaseVersion=${{ env.VERSION }}
       - name: "Release reactive-proxy"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }}
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
         with:
           arguments: :reactive-proxy:publish -PreleaseVersion=${{ env.VERSION }}
       - name: "Release reactive-security"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }}
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
         with:
           arguments: :reactive-security:publish -PreleaseVersion=${{ env.VERSION }}
       - name: "Release reactive-frontend"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }}
-        uses: gradle/gradle-build-action@v2
+        uses: gradle/actions/setup-gradle@v3
         with:
           arguments: :reactive-frontend:publish -PreleaseVersion=${{ env.VERSION }}
       - name: "Git tag og push"

diff --git a/apps/adresse-service/build.gradle b/apps/adresse-service/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.4.1.3373"
-    id 'org.springframework.boot' version "3.2.1"
-    id 'io.spring.dependency-management' version "1.1.4"
+    id "org.sonarqube" version "5.0.0.4638"
+    id 'org.springframework.boot' version "3.2.5"
+    id 'io.spring.dependency-management' version "1.1.5"
     id "jacoco"
 }
 
@@ -33,7 +33,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1'
     }
 }
 

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.12.3"
+    id "com.gradle.enterprise" version "3.17.4"
 }
 
 rootProject.name = 'adresse-service'

diff --git a/apps/amelding-service/build.gradle b/apps/amelding-service/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.4.1.3373"
-    id 'org.springframework.boot' version "3.2.1"
-    id 'io.spring.dependency-management' version "1.1.4"
+    id "org.sonarqube" version "5.0.0.4638"
+    id 'org.springframework.boot' version "3.2.5"
+    id 'io.spring.dependency-management' version "1.1.5"
     id "jacoco"
 }
 
@@ -33,7 +33,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1'
     }
 }
 

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.12.3"
+    id "com.gradle.enterprise" version "3.17.4"
 }
 
 rootProject.name = 'amelding-service'

diff --git a/apps/app-tilgang-analyse-service/build.gradle b/apps/app-tilgang-analyse-service/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.4.1.3373"
-    id 'org.springframework.boot' version "3.2.1"
-    id 'io.spring.dependency-management' version "1.1.4"
+    id "org.sonarqube" version "5.0.0.4638"
+    id 'org.springframework.boot' version "3.2.5"
+    id 'io.spring.dependency-management' version "1.1.5"
     id "jacoco"
 }
 
@@ -32,7 +32,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1'
     }
 }
 

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.12.3"
+    id "com.gradle.enterprise" version "3.17.4"
 }
 
 rootProject.name = 'app-tilgang-analyse-service'

diff --git a/apps/arbeidsforhold-service/build.gradle b/apps/arbeidsforhold-service/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.4.1.3373"
-    id 'org.springframework.boot' version "3.2.1"
-    id 'io.spring.dependency-management' version "1.1.4"
+    id "org.sonarqube" version "5.0.0.4638"
+    id 'org.springframework.boot' version "3.2.5"
+    id 'io.spring.dependency-management' version "1.1.5"
     id "jacoco"
 }
 
@@ -33,7 +33,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1'
     }
 }
 
@@ -45,7 +45,7 @@ repositories {
 dependencies {
 
     implementation 'com.google.guava:guava:31.1-jre'
-    implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0'
+    implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2'
     implementation 'javax.activation:activation:1.1.1'
     implementation 'org.glassfish.jaxb:jaxb-runtime'
     implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml'
@@ -69,7 +69,7 @@ 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.3.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
+    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21'
 
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
 

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.12.3"
+    id "com.gradle.enterprise" version "3.17.4"
 }
 
 rootProject.name = 'arbeidsforhold-service'

diff --git a/apps/batch-bestilling-service/build.gradle b/apps/batch-bestilling-service/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.4.1.3373"
-    id 'org.springframework.boot' version "3.2.1"
-    id 'io.spring.dependency-management' version "1.1.4"
+    id "org.sonarqube" version "5.0.0.4638"
+    id 'org.springframework.boot' version "3.2.5"
+    id 'io.spring.dependency-management' version "1.1.5"
     id "jacoco"
 }
 
@@ -31,7 +31,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1'
     }
 }
 
@@ -61,7 +61,7 @@ dependencies {
 
     implementation 'io.micrometer:micrometer-registry-prometheus'
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
+    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21'
 
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
     implementation 'org.hibernate.validator:hibernate-validator'

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.12.3"
+    id "com.gradle.enterprise" version "3.17.4"
 }
 
 rootProject.name = 'batch-bestilling-service'

diff --git a/apps/brreg-stub/build.gradle b/apps/brreg-stub/build.gradle
@@ -1,9 +1,9 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.4.1.3373"
+    id "org.sonarqube" version "5.0.0.4638"
     id "uk.co.boothen.gradle.wsimport" version "0.21"
-    id 'org.springframework.boot' version "3.2.1"
-    id 'io.spring.dependency-management' version "1.1.4"
+    id 'org.springframework.boot' version "3.2.5"
+    id 'io.spring.dependency-management' version "1.1.5"
     id "jacoco"
     id("org.openrewrite.rewrite") version("6.6.4")
 }
@@ -35,7 +35,7 @@ rewrite {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1'
 
     }
 }
@@ -100,7 +100,7 @@ dependencies {
     implementation 'wsdl4j:wsdl4j'
     implementation 'net.logstash.logback:logstash-logback-encoder:7.4'
     implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0'
-    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20'
+    implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21'
 
     implementation 'no.nav.common:auth'
     implementation 'no.nav.common:util'

diff --git a/apps/brreg-stub/settings.gradle b/apps/brreg-stub/settings.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "com.gradle.enterprise" version "3.12.3"
+    id "com.gradle.enterprise" version "3.17.4"
 }
 
 rootProject.name = 'brreg-stub'

diff --git a/apps/bruker-service/build.gradle b/apps/bruker-service/build.gradle
@@ -1,8 +1,8 @@
 plugins {
     id 'java'
-    id "org.sonarqube" version "4.4.1.3373"
-    id 'org.springframework.boot' version "3.2.1"
-    id 'io.spring.dependency-management' version "1.1.4"
+    id "org.sonarqube" version "5.0.0.4638"
+    id 'org.springframework.boot' version "3.2.5"
+    id 'io.spring.dependency-management' version "1.1.5"
     id "jacoco"
 }
 
@@ -41,7 +41,7 @@ bootJar {
 dependencyManagement {
     applyMavenExclusions = false
     imports {
-        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0'
+        mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1'
     }
 }
 
@@ -83,7 +83,7 @@ dependencies {
     testImplementation 'io.projectreactor:reactor-test'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock'
-    testImplementation 'org.assertj:assertj-core:3.24.2'
+    testImplementation 'org.assertj:assertj-core:3.25.3'
     testImplementation 'no.nav.testnav.libs:integration-test'
     testImplementation 'com.squareup.okhttp3:okhttp:4.10.0'
     testImplementation 'com.squareup.okhttp3:mockwebserver:4.10.0'

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.12.3"
+    id "com.gradle.enterprise" version "3.17.4"
 }
 
 rootProject.name = 'bruker-service'