diff --git a/.github/workflows/common.integration-test.yml b/.github/workflows/common.integration-test.yml index 4f79adf29ae..1e60dd7682d 100644 --- a/.github/workflows/common.integration-test.yml +++ b/.github/workflows/common.integration-test.yml @@ -26,14 +26,15 @@ jobs: java-version: 21 distribution: 'temurin' - name: "Gradle" + uses: gradle/actions/setup-gradle@v3 + with: + cache-read-only: false + - name: "Build" env: NAV_TOKEN: ${{ secrets.NAV_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_USERNAME: ${{ secrets.GITHUB_USERNAME }} - uses: gradle/gradle-build-action@v2 - with: - arguments: assemble --scan - cache-read-only: false + run: ./gradlew assemble --scan - name: "Start docker containers" run: | JWK=$(cat ./mocks/jwk.json) docker-compose up -d --build @@ -43,11 +44,12 @@ 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 cache-read-only: false + - name: "Build" + working-directory: ${{ inputs.working-directory }} + run: ./gradlew iTest --scan - name: "Stop docker containers" run: | docker-compose down -v --remove-orphans \ No newline at end of file diff --git a/.github/workflows/common.workflow.backend.yml b/.github/workflows/common.workflow.backend.yml index ec73d478b6a..ed4dcb3536a 100644 --- a/.github/workflows/common.workflow.backend.yml +++ b/.github/workflows/common.workflow.backend.yml @@ -83,11 +83,12 @@ 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 cache-read-only: false + - name: "Build" + working-directory: ${{ inputs.working-directory }} + run: ./gradlew build ${{ inputs.sonar-enabled && 'jacocoTestReport sonar -Dsonar.gradle.skipCompile=true' || ''}} --scan env: NAV_TOKEN: ${{ secrets.NAV_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} @@ -115,7 +116,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 +131,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 index 6b5396592a2..4dc4e688ee2 100644 --- a/.github/workflows/common.workflow.frontend.yml +++ b/.github/workflows/common.workflow.frontend.yml @@ -115,14 +115,18 @@ 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 cache-read-only: false env: NAV_TOKEN: ${{ secrets.NAV_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + - name: "Build" + working-directory: ${{ inputs.working-directory }} + run: ./gradlew build ${{ inputs.sonar-enabled && 'jacocoTestReport sonar -Dsonar.gradle.skipCompile=true' || '' }} --scan + env: + NAV_TOKEN: ${{ secrets.NAV_TOKEN }} + SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} - name: "Reporting" if: failure() && steps.gradle.outcome == 'failure' uses: actions/upload-artifact@v4 @@ -149,7 +153,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 +168,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 +184,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 +200,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 index 56e6d190f51..fc39c8ee9fd 100644 --- a/.github/workflows/common.workflow.libs.backend.yml +++ b/.github/workflows/common.workflow.libs.backend.yml @@ -46,11 +46,12 @@ 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 cache-read-only: false + - name: "Build" + working-directory: ${{ inputs.working-directory }} + run: ./gradlew build ${{ inputs.sonar-enabled && 'jacocoTestReport sonar -Dsonar.gradle.skipCompile=true' || '' }} --scan env: NAV_TOKEN: ${{ secrets.NAV_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 98810bf15c3..2ac9a9248bc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -32,6 +32,8 @@ jobs: git remote set-url origin https://$GITHUB_ACTOR:$GITHUB_TOKEN@github.com/$GITHUB_REPOSITORY.git git config --global user.email "dolly@nav.no" git config --global user.name "$GITHUB_ACTOR" + - name: "Gradle" + uses: gradle/actions/setup-gradle@v3 - name: "Create version" env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -45,44 +47,32 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_ACTOR: ${{ secrets.GITHUB_ACTOR }} - uses: gradle/gradle-build-action@v2 - with: - arguments: :avro-schema:publish -PreleaseVersion=${{ env.VERSION }} + run: ./gradlew :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 - with: - arguments: :data-transfer-objects:publish -PreleaseVersion=${{ env.VERSION }} + run: ./gradlew :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 - with: - arguments: :reactive-core:publish -PreleaseVersion=${{ env.VERSION }} + run: ./gradlew :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 - with: - arguments: :reactive-proxy:publish -PreleaseVersion=${{ env.VERSION }} + run: ./gradlew :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 - with: - arguments: :reactive-security:publish -PreleaseVersion=${{ env.VERSION }} + run: ./gradlew :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 - with: - arguments: :reactive-frontend:publish -PreleaseVersion=${{ env.VERSION }} + run: ./gradlew :reactive-frontend:publish -PreleaseVersion=${{ env.VERSION }} - name: "Git tag og push" env: NAV_TOKEN: ${{ secrets.NAV_TOKEN }} diff --git a/apps/adresse-service/build.gradle b/apps/adresse-service/build.gradle index 9405764db30..92af5f5116b 100644 --- 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.6" + 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/gradle/wrapper/gradle-wrapper.properties b/apps/adresse-service/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/adresse-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/adresse-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/adresse-service/settings.gradle b/apps/adresse-service/settings.gradle index d38bdcfcb04..53ed006ac5e 100644 --- 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.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 index 3ca53da0b9e..ce6f4eac045 100644 --- 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.6" + 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/gradle/wrapper/gradle-wrapper.properties b/apps/amelding-service/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/amelding-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/amelding-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/amelding-service/settings.gradle b/apps/amelding-service/settings.gradle index f400bfb242b..f895b524d00 100644 --- 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.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 index c84b89b9bfb..868286dcb51 100644 --- 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.6" + 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/gradle/wrapper/gradle-wrapper.properties b/apps/app-tilgang-analyse-service/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/app-tilgang-analyse-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/app-tilgang-analyse-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/app-tilgang-analyse-service/settings.gradle b/apps/app-tilgang-analyse-service/settings.gradle index 3b5b054c1bb..acb9fa44e3c 100644 --- 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.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 index bb99298797d..57c2b724379 100644 --- 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.6" + 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' } } @@ -44,8 +44,8 @@ repositories { dependencies { - implementation 'com.google.guava:guava:31.1-jre' - implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0' + implementation 'com.google.guava:guava:33.2.0-jre' + 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/gradle/wrapper/gradle-wrapper.properties b/apps/arbeidsforhold-service/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/arbeidsforhold-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/arbeidsforhold-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/arbeidsforhold-service/settings.gradle b/apps/arbeidsforhold-service/settings.gradle index 8a99cf863d5..645d8dbf9a0 100644 --- 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.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" } } \ No newline at end of file diff --git a/apps/batch-bestilling-service/build.gradle b/apps/batch-bestilling-service/build.gradle index d6768efab63..d2244bf707e 100644 --- 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.6" + 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/gradle/wrapper/gradle-wrapper.properties b/apps/batch-bestilling-service/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/batch-bestilling-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/batch-bestilling-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/batch-bestilling-service/settings.gradle b/apps/batch-bestilling-service/settings.gradle index 2a26911c197..83c20b8635b 100644 --- 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.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" } } \ No newline at end of file diff --git a/apps/brreg-stub/build.gradle b/apps/brreg-stub/build.gradle index 1ea986398be..d3a672cb909 100644 --- 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.6" + 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' } } @@ -61,9 +61,9 @@ repositories { dependencies { - rewrite("org.openrewrite.recipe:rewrite-spring:5.2.0") + rewrite('org.openrewrite.recipe:rewrite-spring:5.10.0') - implementation("io.dropwizard:dropwizard-jackson:4.0.2") { + implementation('io.dropwizard:dropwizard-jackson:4.0.7') { exclude group: "com.google.code.findbugs" } @@ -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' @@ -118,7 +118,7 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' - testImplementation "org.junit.jupiter:junit-jupiter:5.10.1" + testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2' } java { toolchain { diff --git a/apps/brreg-stub/gradle/wrapper/gradle-wrapper.properties b/apps/brreg-stub/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/brreg-stub/gradle/wrapper/gradle-wrapper.properties +++ b/apps/brreg-stub/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/brreg-stub/settings.gradle b/apps/brreg-stub/settings.gradle index 75d84a3c1dd..ceb67c0a896 100644 --- 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.develocity" version "3.17.4" } rootProject.name = 'brreg-stub' @@ -7,9 +7,9 @@ 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" } } \ No newline at end of file diff --git a/apps/bruker-service/build.gradle b/apps/bruker-service/build.gradle index 976d28a3dfd..5dec71beac0 100644 --- 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.6" + 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' } } @@ -51,7 +51,7 @@ repositories { } dependencies { - implementation 'com.auth0:java-jwt:4.3.0' + implementation 'com.auth0:java-jwt:4.4.0' implementation 'no.nav.testnav.libs:security-core' implementation 'no.nav.testnav.libs:reactive-core' @@ -68,8 +68,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.3.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' + implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0' + 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' @@ -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.26.0' 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/gradle/wrapper/gradle-wrapper.properties b/apps/bruker-service/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/bruker-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/bruker-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/bruker-service/settings.gradle b/apps/bruker-service/settings.gradle index f870abc83dc..7612ac852e7 100644 --- 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.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" } } \ No newline at end of file diff --git a/apps/budpro-service/build.gradle b/apps/budpro-service/build.gradle index 3b7387e4ab2..d69af7c9477 100644 --- a/apps/budpro-service/build.gradle +++ b/apps/budpro-service/build.gradle @@ -3,7 +3,7 @@ plugins { id 'org.springframework.boot' version '3.2.1' id 'io.spring.dependency-management' version '1.1.4' id "jacoco" - id "org.sonarqube" version "4.4.1.3373" + id "org.sonarqube" version "5.0.0.4638" id("org.openrewrite.rewrite") version("6.6.4") } @@ -49,7 +49,7 @@ dependencyManagement { } dependencies { - rewrite("org.openrewrite.recipe:rewrite-spring:5.2.0") + rewrite('org.openrewrite.recipe:rewrite-spring:5.10.0') annotationProcessor 'org.projectlombok:lombok' annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor' diff --git a/apps/budpro-service/gradle/wrapper/gradle-wrapper.properties b/apps/budpro-service/gradle/wrapper/gradle-wrapper.properties index 3499ded5c11..20db9ad5c95 100644 --- a/apps/budpro-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/budpro-service/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/budpro-service/settings.gradle b/apps/budpro-service/settings.gradle index 2c1565dfe40..2220309e5e0 100644 --- a/apps/budpro-service/settings.gradle +++ b/apps/budpro-service/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + 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" } } \ No newline at end of file diff --git a/apps/dolly-backend/build.gradle b/apps/dolly-backend/build.gradle index aea42eec757..26e015243b7 100644 --- a/apps/dolly-backend/build.gradle +++ b/apps/dolly-backend/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.6" + id 'io.spring.dependency-management' version "1.1.5" id "jacoco" } @@ -34,7 +34,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' } } @@ -72,7 +72,7 @@ dependencies { 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 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-webflux' @@ -81,17 +81,19 @@ 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.5' + implementation 'org.springframework.retry:spring-retry:2.0.6' implementation 'org.springframework.boot:spring-boot-starter-data-elasticsearch' - implementation 'org.opensearch.client:spring-data-opensearch:1.3.0' + implementation 'org.opensearch.client:spring-data-opensearch:1.4.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' 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' @@ -101,17 +103,17 @@ dependencies { 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.opensearch:opensearch-testcontainers:2.0.1' 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.4' + testImplementation 'io.projectreactor:reactor-test:3.6.5' testImplementation 'org.testcontainers:junit-jupiter' testImplementation 'org.testcontainers:postgresql' - testImplementation 'org.bitbucket.b_c:jose4j:0.9.3' + testImplementation 'org.bitbucket.b_c:jose4j:0.9.6' - implementation 'net.java.dev.jna:jna:5.13.0' + implementation 'net.java.dev.jna:jna:5.14.0' annotationProcessor 'org.projectlombok:lombok' implementation 'org.projectlombok:lombok' diff --git a/apps/dolly-backend/gradle/wrapper/gradle-wrapper.properties b/apps/dolly-backend/gradle/wrapper/gradle-wrapper.properties index 3499ded5c11..20db9ad5c95 100644 --- a/apps/dolly-backend/gradle/wrapper/gradle-wrapper.properties +++ b/apps/dolly-backend/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/dolly-backend/settings.gradle b/apps/dolly-backend/settings.gradle index c1551aa80b4..7799b717abe 100644 --- a/apps/dolly-backend/settings.gradle +++ b/apps/dolly-backend/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.6" + 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 index eeb674d8321..18c9cfef1b8 100644 --- a/apps/dolly-frontend/build.gradle +++ b/apps/dolly-frontend/build.gradle @@ -1,7 +1,7 @@ plugins { - id "org.sonarqube" version "4.4.1.3373" + 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" } @@ -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' mavenBom 'org.springframework.session:spring-session-bom:2021.2.3' } diff --git a/apps/dolly-frontend/gradle/wrapper/gradle-wrapper.properties b/apps/dolly-frontend/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/dolly-frontend/gradle/wrapper/gradle-wrapper.properties +++ b/apps/dolly-frontend/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/dolly-frontend/settings.gradle b/apps/dolly-frontend/settings.gradle index 552c47b8a8f..a9afc681dd0 100644 --- a/apps/dolly-frontend/settings.gradle +++ b/apps/dolly-frontend/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + 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" } } \ No newline at end of file diff --git a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java index 06c00ec7121..1250d63cceb 100644 --- a/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java +++ b/apps/dolly-frontend/src/main/java/no/nav/dolly/web/DollyFrontendApplicationStarter.java @@ -131,4 +131,4 @@ private Function> createRoute(String segment, St .filters(filter, addUserJwtHeaderFilter()) ).uri(host); } -} \ No newline at end of file +} diff --git a/apps/dolly-frontend/src/main/js/package-lock.json b/apps/dolly-frontend/src/main/js/package-lock.json index e50b9a53153..9bb39170d80 100644 --- a/apps/dolly-frontend/src/main/js/package-lock.json +++ b/apps/dolly-frontend/src/main/js/package-lock.json @@ -1,12 +1,12 @@ { "name": "dolly", - "version": "3.0.12", + "version": "3.0.13", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "dolly", - "version": "3.0.12", + "version": "3.0.13", "license": "ISC", "dependencies": { "@babel/preset-flow": "^7.18.6", @@ -76,7 +76,7 @@ "@types/react": "^18.2.22", "@types/react-datepicker": "^6.0.0", "@types/react-dom": "^18.0.6", - "@types/react-highlight-words": "^0.16.4", + "@types/react-highlight-words": "^0.20.0", "@types/react-redux": "^7.1.33", "@types/react-router-dom": "^5.3.3", "@types/react-syntax-highlighter": "^15.5.4", @@ -101,7 +101,7 @@ "node-forge": "^1.3.1", "prettier": "^3.0.0", "react-dropzone": "^14.2.3", - "react-pdf": "^8.0.2", + "react-pdf": "^9.0.0", "react-redux": "^9.1.0", "react-router-dom": "^6.3.0", "resq": "^1.10.2", @@ -1235,9 +1235,9 @@ } }, "node_modules/@eslint-community/regexpp": { - "version": "4.10.0", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", - "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", + "version": "4.10.1", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.1.tgz", + "integrity": "sha512-Zm2NGpWELsQAD1xsJzGQpYfvICSsFkEpU0jxBjfdC6uNEWXcHnfs9hScFWtXVDVl+rBQJGrl4g1vcKIejpH9dA==", "license": "MIT", "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" @@ -1730,16 +1730,16 @@ } }, "node_modules/@navikt/aksel-icons": { - "version": "6.8.0", - "resolved": "https://npm.pkg.github.com/download/@navikt/aksel-icons/6.8.0/2644182b35d898d068d9978cf1620a0405770a70", - "integrity": "sha512-XiEr0Xb0BDaStrpGCuEPvNgvHalbL4dPh6HAA7jGV7cHnW6Zsb54Hsaq6dLMXIDYEpPQv2T27j25UvoRxVuk8g==", + "version": "6.10.0", + "resolved": "https://npm.pkg.github.com/download/@navikt/aksel-icons/6.10.0/d832911d79939b408fddfa1b4da7bac3527f6fe4", + "integrity": "sha512-MNjjpNc+wahqQBD4oSj/iIKJQCKZn5rGVh3RmKi95tX/Ta/MRskb807LTVZvq4S1+sOKK4VPgFONf8OertJz9g==", "dev": true, "license": "MIT" }, "node_modules/@navikt/ds-css": { - "version": "6.8.0", - "resolved": "https://npm.pkg.github.com/download/@navikt/ds-css/6.8.0/017d4c13ef3140df2509b0c4a6b1e25ad40ee20d", - "integrity": "sha512-qHXpJL2TZTv3MELLTY+o16X+iqPsrKzZhVwI2obnDJUIYTMvZfwR7BQCofL7nj9pDm5Y/jvUeTxdvIxzDHnUtg==", + "version": "6.10.0", + "resolved": "https://npm.pkg.github.com/download/@navikt/ds-css/6.10.0/cd03b719d06e7993980699c2f6cb31795fa91535", + "integrity": "sha512-hpuoPzOVT23oDjZlq1NH9f8K9R/n/j3RhTJwiuT5lkpx8xkB/enZ7uc4A3eeyZszontxktZRTQN2KXNN0vhvBg==", "dev": true, "license": "MIT" }, @@ -1761,16 +1761,16 @@ } }, "node_modules/@navikt/ds-react": { - "version": "6.8.0", - "resolved": "https://npm.pkg.github.com/download/@navikt/ds-react/6.8.0/86f903a76ac9f7ee9c3e2aa0c339932fc6dbb063", - "integrity": "sha512-FW2NndVzdVUTBselUzRa1vrkqpJDmHF6cG5A9bg5Y3Y4Aq2uQ07KvDUBzLP+rZz0i4bJ/gkrtoFF74nQRtmKkg==", + "version": "6.10.0", + "resolved": "https://npm.pkg.github.com/download/@navikt/ds-react/6.10.0/43abd526e58f1641effd0aa76a255a064068b5dd", + "integrity": "sha512-o+/MqUQMX++tp3mXe5Vlnu97CmDd+mdxcr8sT8jeLm9Jf3ms52O1hSdKK6NlJFYVBkOtZMH0Rr306n5n7X+VGA==", "dev": true, "license": "MIT", "dependencies": { "@floating-ui/react": "0.25.4", "@floating-ui/react-dom": "^2.0.9", - "@navikt/aksel-icons": "^6.8.0", - "@navikt/ds-tokens": "^6.8.0", + "@navikt/aksel-icons": "^6.10.0", + "@navikt/ds-tokens": "^6.10.0", "clsx": "^2.1.0", "date-fns": "^3.0.0", "react-day-picker": "8.10.0" @@ -1909,9 +1909,9 @@ } }, "node_modules/@navikt/ds-tokens": { - "version": "6.8.0", - "resolved": "https://npm.pkg.github.com/download/@navikt/ds-tokens/6.8.0/01e24b0e8ed89349aeb5d4482dec14b5fb1a5df9", - "integrity": "sha512-KK2RMX5yCnw8NdwmX5ZSA5LoFX0hQlkpba9CopUGOPxHdC0vOz0CfYwNqJgUhP/HPy2E2GHN37HOWkonqv7BCw==", + "version": "6.10.0", + "resolved": "https://npm.pkg.github.com/download/@navikt/ds-tokens/6.10.0/56ae8412d9973f5a844b7a15d95c2ac3e008b171", + "integrity": "sha512-wnTS4mirTcTFoptobIp6PfmO8eEHDmt3FNxWAB+AORLOuwVF7Qrfb/zDnAEKBwN381ySSPuFZuQTudJU7hIcfQ==", "dev": true, "license": "MIT" }, @@ -3351,9 +3351,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "20.12.13", - "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.13.tgz", - "integrity": "sha512-gBGeanV41c1L171rR7wjbMiEpEI/l5XFQdLLfhr/REwpgDy/4U8y89+i8kRiLzDyZdOkXh+cRaTetUnCYutoXA==", + "version": "20.14.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.1.tgz", + "integrity": "sha512-T2MzSGEu+ysB/FkWfqmhV3PLyQlowdptmmgD20C6QxsS8Fmv5SjpZ1ayXaEC0S21/h5UJ9iA6W/5vSNU5l00OA==", "dev": true, "license": "MIT", "dependencies": { @@ -3438,9 +3438,9 @@ } }, "node_modules/@types/react-highlight-words": { - "version": "0.16.7", - "resolved": "https://registry.npmjs.org/@types/react-highlight-words/-/react-highlight-words-0.16.7.tgz", - "integrity": "sha512-+upXTIaRd3rGvh1aDQSs9z5X+sV3UM6Jrmjk03GN2GXl4v/+iOJKQj2LZHo6Vp2IoTvMdtxgME26feqo12xXLg==", + "version": "0.20.0", + "resolved": "https://registry.npmjs.org/@types/react-highlight-words/-/react-highlight-words-0.20.0.tgz", + "integrity": "sha512-Qm512TiOakvtNzHJ2+TNVHnLn5cJ2wLQV0+LrhuispVth6dRf5b8ydjq3Kc0thpZ7bz4s6RnG6meboAXHWRK+Q==", "dev": true, "license": "MIT", "dependencies": { @@ -3580,17 +3580,17 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.11.0.tgz", - "integrity": "sha512-P+qEahbgeHW4JQ/87FuItjBj8O3MYv5gELDzr8QaQ7fsll1gSMTYb6j87MYyxwf3DtD7uGFB9ShwgmCJB5KmaQ==", + "version": "7.12.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-7.12.0.tgz", + "integrity": "sha512-7F91fcbuDf/d3S8o21+r3ZncGIke/+eWk0EpO21LXhDfLahriZF9CGj4fbAetEjlaBdjdSm9a6VeXbpbT6Z40Q==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "7.11.0", - "@typescript-eslint/type-utils": "7.11.0", - "@typescript-eslint/utils": "7.11.0", - "@typescript-eslint/visitor-keys": "7.11.0", + "@typescript-eslint/scope-manager": "7.12.0", + "@typescript-eslint/type-utils": "7.12.0", + "@typescript-eslint/utils": "7.12.0", + "@typescript-eslint/visitor-keys": "7.12.0", "graphemer": "^1.4.0", "ignore": "^5.3.1", "natural-compare": "^1.4.0", @@ -3614,16 +3614,16 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.11.0.tgz", - "integrity": "sha512-yimw99teuaXVWsBcPO1Ais02kwJ1jmNA1KxE7ng0aT7ndr1pT1wqj0OJnsYVGKKlc4QJai86l/025L6z8CljOg==", + "version": "7.12.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-7.12.0.tgz", + "integrity": "sha512-dm/J2UDY3oV3TKius2OUZIFHsomQmpHtsV0FTh1WO8EKgHLQ1QCADUqscPgTpU+ih1e21FQSRjXckHn3txn6kQ==", "dev": true, "license": "BSD-2-Clause", "dependencies": { - "@typescript-eslint/scope-manager": "7.11.0", - "@typescript-eslint/types": "7.11.0", - "@typescript-eslint/typescript-estree": "7.11.0", - "@typescript-eslint/visitor-keys": "7.11.0", + "@typescript-eslint/scope-manager": "7.12.0", + "@typescript-eslint/types": "7.12.0", + "@typescript-eslint/typescript-estree": "7.12.0", + "@typescript-eslint/visitor-keys": "7.12.0", "debug": "^4.3.4" }, "engines": { @@ -3643,14 +3643,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.11.0.tgz", - "integrity": "sha512-27tGdVEiutD4POirLZX4YzT180vevUURJl4wJGmm6TrQoiYwuxTIY98PBp6L2oN+JQxzE0URvYlzJaBHIekXAw==", + "version": "7.12.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.12.0.tgz", + "integrity": "sha512-itF1pTnN6F3unPak+kutH9raIkL3lhH1YRPGgt7QQOh43DQKVJXmWkpb+vpc/TiDHs6RSd9CTbDsc/Y+Ygq7kg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "7.11.0", - "@typescript-eslint/visitor-keys": "7.11.0" + "@typescript-eslint/types": "7.12.0", + "@typescript-eslint/visitor-keys": "7.12.0" }, "engines": { "node": "^18.18.0 || >=20.0.0" @@ -3661,14 +3661,14 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.11.0.tgz", - "integrity": "sha512-WmppUEgYy+y1NTseNMJ6mCFxt03/7jTOy08bcg7bxJJdsM4nuhnchyBbE8vryveaJUf62noH7LodPSo5Z0WUCg==", + "version": "7.12.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-7.12.0.tgz", + "integrity": "sha512-lib96tyRtMhLxwauDWUp/uW3FMhLA6D0rJ8T7HmH7x23Gk1Gwwu8UZ94NMXBvOELn6flSPiBrCKlehkiXyaqwA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/typescript-estree": "7.11.0", - "@typescript-eslint/utils": "7.11.0", + "@typescript-eslint/typescript-estree": "7.12.0", + "@typescript-eslint/utils": "7.12.0", "debug": "^4.3.4", "ts-api-utils": "^1.3.0" }, @@ -3689,9 +3689,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.11.0.tgz", - "integrity": "sha512-MPEsDRZTyCiXkD4vd3zywDCifi7tatc4K37KqTprCvaXptP7Xlpdw0NR2hRJTetG5TxbWDB79Ys4kLmHliEo/w==", + "version": "7.12.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.12.0.tgz", + "integrity": "sha512-o+0Te6eWp2ppKY3mLCU+YA9pVJxhUJE15FV7kxuD9jgwIAa+w/ycGJBMrYDTpVGUM/tgpa9SeMOugSabWFq7bg==", "dev": true, "license": "MIT", "engines": { @@ -3703,14 +3703,14 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.11.0.tgz", - "integrity": "sha512-cxkhZ2C/iyi3/6U9EPc5y+a6csqHItndvN/CzbNXTNrsC3/ASoYQZEt9uMaEp+xFNjasqQyszp5TumAVKKvJeQ==", + "version": "7.12.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.12.0.tgz", + "integrity": "sha512-5bwqLsWBULv1h6pn7cMW5dXX/Y2amRqLaKqsASVwbBHMZSnHqE/HN4vT4fE0aFsiwxYvr98kqOWh1a8ZKXalCQ==", "dev": true, "license": "BSD-2-Clause", "dependencies": { - "@typescript-eslint/types": "7.11.0", - "@typescript-eslint/visitor-keys": "7.11.0", + "@typescript-eslint/types": "7.12.0", + "@typescript-eslint/visitor-keys": "7.12.0", "debug": "^4.3.4", "globby": "^11.1.0", "is-glob": "^4.0.3", @@ -3745,16 +3745,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.11.0.tgz", - "integrity": "sha512-xlAWwPleNRHwF37AhrZurOxA1wyXowW4PqVXZVUNCLjB48CqdPJoJWkrpH2nij9Q3Lb7rtWindtoXwxjxlKKCA==", + "version": "7.12.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.12.0.tgz", + "integrity": "sha512-Y6hhwxwDx41HNpjuYswYp6gDbkiZ8Hin9Bf5aJQn1bpTs3afYY4GX+MPYxma8jtoIV2GRwTM/UJm/2uGCVv+DQ==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "7.11.0", - "@typescript-eslint/types": "7.11.0", - "@typescript-eslint/typescript-estree": "7.11.0" + "@typescript-eslint/scope-manager": "7.12.0", + "@typescript-eslint/types": "7.12.0", + "@typescript-eslint/typescript-estree": "7.12.0" }, "engines": { "node": "^18.18.0 || >=20.0.0" @@ -3768,13 +3768,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "7.11.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.11.0.tgz", - "integrity": "sha512-7syYk4MzjxTEk0g/w3iqtgxnFQspDJfn6QKD36xMuuhTzjcxY7F8EmBLnALjVyaOF1/bVocu3bS/2/F7rXrveQ==", + "version": "7.12.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.12.0.tgz", + "integrity": "sha512-uZk7DevrQLL3vSnfFl5bj4sL75qC9D6EdjemIdbtkuUmIheWpuiiylSY01JxJE7+zGrOWDZrp1WxOuDntvKrHQ==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "7.11.0", + "@typescript-eslint/types": "7.12.0", "eslint-visitor-keys": "^3.4.3" }, "engines": { @@ -4199,17 +4199,20 @@ } }, "node_modules/array.prototype.tosorted": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.3.tgz", - "integrity": "sha512-/DdH4TiTmOKzyQbp/eadcCVexiCb36xJg7HshYOYJnNZFDj33GEv0P7GxsynpShhq4OLYJzbGcBDkLsDt7MnNg==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/array.prototype.tosorted/-/array.prototype.tosorted-1.1.4.tgz", + "integrity": "sha512-p6Fx8B7b7ZhL/gmUsAy0D15WhvDccw3mnGNbZpi3pmeJdxtWsj2jEaI4Y6oo3XiHfzuSgPwKc04MYt6KgvC/wA==", "dev": true, "license": "MIT", "dependencies": { - "call-bind": "^1.0.5", + "call-bind": "^1.0.7", "define-properties": "^1.2.1", - "es-abstract": "^1.22.3", - "es-errors": "^1.1.0", + "es-abstract": "^1.23.3", + "es-errors": "^1.3.0", "es-shim-unscopables": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" } }, "node_modules/arraybuffer.prototype.slice": { @@ -4604,9 +4607,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001625", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001625.tgz", - "integrity": "sha512-4KE9N2gcRH+HQhpeiRZXd+1niLB/XNLAhSy4z7fI8EzcbcPoAqjNInxVHTiTwWfTIV4w096XG8OtCOCQQKPv3w==", + "version": "1.0.30001627", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001627.tgz", + "integrity": "sha512-4zgNiB8nTyV/tHhwZrFs88ryjls/lHiqFhrxCW4qSTeuRByBVnPYpDInchOIySWknznucaf31Z4KYqjfbrecVw==", "funding": [ { "type": "opencollective", @@ -5526,9 +5529,9 @@ } }, "node_modules/debug": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", - "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "version": "4.3.5", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.5.tgz", + "integrity": "sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg==", "license": "MIT", "dependencies": { "ms": "2.1.2" @@ -5730,9 +5733,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.4.786", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.786.tgz", - "integrity": "sha512-i/A2UB0sxYViMN0M2zIotQFRIOt1jLuVXudACHBDiJ5gGuAUzf/crZxwlBTdA0O52Hy4CNtTzS7AKRAacs/08Q==", + "version": "1.4.789", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.789.tgz", + "integrity": "sha512-0VbyiaXoT++Fi2vHGo2ThOeS6X3vgRCWrjPeO2FeIAWL6ItiSJ9BqlH8LfCXe3X1IdcG+S0iLoNaxQWhfZoGzQ==", "license": "ISC" }, "node_modules/emoji-regex": { @@ -8369,9 +8372,9 @@ } }, "node_modules/jackspeak": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.1.2.tgz", - "integrity": "sha512-kWmLKn2tRtfYMF/BakihVVRzBKOxz4gJMiL2Rj91WnAB5TPZumSH99R/Yf1qE1u4uRimvCSJfm6hnxohXeEXjQ==", + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.2.3.tgz", + "integrity": "sha512-htOzIMPbpLid/Gq9/zaz9SfExABxqRe1sSCdxntlO/aMD6u0issZQiY25n2GKQUtJ02j7z5sfptlAOMpWWOmvw==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { @@ -9964,15 +9967,15 @@ "node": ">=8" } }, - "node_modules/path2d-polyfill": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path2d-polyfill/-/path2d-polyfill-2.0.1.tgz", - "integrity": "sha512-ad/3bsalbbWhmBo0D6FZ4RNMwsLsPpL6gnvhuSaU5Vm7b06Kr5ubSltQQ0T7YKsiJQO+g22zJ4dJKNTXIyOXtA==", + "node_modules/path2d": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/path2d/-/path2d-0.2.0.tgz", + "integrity": "sha512-KdPAykQX6kmLSOO6Jpu2KNcCED7CKjmaBNGGNuctOsG0hgYO1OdYQaan6cYXJiG0WmXOwZZPILPBimu5QAIw3A==", "dev": true, "license": "MIT", "optional": true, "engines": { - "node": ">=8" + "node": ">=6" } }, "node_modules/pause-stream": { @@ -9989,9 +9992,9 @@ } }, "node_modules/pdfjs-dist": { - "version": "3.11.174", - "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-3.11.174.tgz", - "integrity": "sha512-TdTZPf1trZ8/UFu5Cx/GXB7GZM30LT+wWUNfsi6Bq8ePLnb+woNKtDymI2mxZYBpMbonNFqKmiz684DIfnd8dA==", + "version": "4.3.136", + "resolved": "https://registry.npmjs.org/pdfjs-dist/-/pdfjs-dist-4.3.136.tgz", + "integrity": "sha512-gzfnt1qc4yA+U46golPGYtU4WM2ssqP2MvFjKga8GEKOrEnzRPrA/9jogLLPYHiA3sGBPJ+p7BdAq+ytmw3jEg==", "dev": true, "license": "Apache-2.0", "engines": { @@ -9999,7 +10002,7 @@ }, "optionalDependencies": { "canvas": "^2.11.2", - "path2d-polyfill": "^2.0.1" + "path2d": "^0.2.0" } }, "node_modules/pend": { @@ -10097,9 +10100,9 @@ } }, "node_modules/prettier": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.2.5.tgz", - "integrity": "sha512-3/GWa9aOC0YeD7LUfvOG2NiDyhOWRvt1k+rcKhOuYnMY24iiCphgneUfJDyFXd6rZCAnuLBv6UeAULtrhT/F4A==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.3.0.tgz", + "integrity": "sha512-J9odKxERhCQ10OC2yb93583f6UnYutOeiV5i0zEDS7UGTdUt0u+y8erxl3lBKvwo/JHyyoEdXjwp4dke9oyZ/g==", "dev": true, "license": "MIT", "bin": { @@ -10638,9 +10641,9 @@ } }, "node_modules/react-pdf": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/react-pdf/-/react-pdf-8.0.2.tgz", - "integrity": "sha512-C0PFC+j9vmEIZ82Iq0c85xUWkgsZTUS05syqOk8NC+7PAanyWlVi/ImYkGQe27zYAlBA6IidRYEt1DAAXKq1Ow==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/react-pdf/-/react-pdf-9.0.0.tgz", + "integrity": "sha512-J+pza8R2p9oNEOJOHIQJI4o5rFK7ji7bBl2IvsHvz1OOyphvuzVDo5tOJwWAFAbxYauCH3Kt8jOvcMJUOpxYZQ==", "dev": true, "license": "MIT", "dependencies": { @@ -10649,7 +10652,7 @@ "make-cancellable-promise": "^1.3.1", "make-event-props": "^1.6.0", "merge-refs": "^1.3.0", - "pdfjs-dist": "3.11.174", + "pdfjs-dist": "4.3.136", "tiny-invariant": "^1.0.0", "warning": "^4.0.0" }, @@ -11061,9 +11064,9 @@ "license": "MIT" }, "node_modules/reselect": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/reselect/-/reselect-5.1.0.tgz", - "integrity": "sha512-aw7jcGLDpSgNDyWBQLv2cedml85qd95/iszJjN988zX1t7AVRJi19d9kto5+W7oCfQ94gyo40dVbT6g2k4/kXg==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/reselect/-/reselect-5.1.1.tgz", + "integrity": "sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w==", "license": "MIT" }, "node_modules/resize-observer-polyfill": { @@ -11406,9 +11409,9 @@ "license": "MIT" }, "node_modules/sass": { - "version": "1.77.3", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.3.tgz", - "integrity": "sha512-WJHo+jmFp0dwRuymPmIovuxHaBntcCyja5hCB0yYY9wWrViEp4kF5Cdai98P72v6FzroPuABqu+ddLMbQWmwzA==", + "version": "1.77.4", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.4.tgz", + "integrity": "sha512-vcF3Ckow6g939GMA4PeU7b2K/9FALXk2KF9J87txdHzXbUF9XRQRwSxcAs/fGaTnJeBFd7UoV22j3lzMLdM0Pw==", "dev": true, "license": "MIT", "dependencies": { @@ -11859,6 +11862,24 @@ "node": ">=16" } }, + "node_modules/start-server-and-test/node_modules/debug": { + "version": "4.3.4", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz", + "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ms": "2.1.2" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, "node_modules/start-server-and-test/node_modules/execa": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", diff --git a/apps/dolly-frontend/src/main/js/package.json b/apps/dolly-frontend/src/main/js/package.json index 0e679483051..f7789f1901a 100644 --- a/apps/dolly-frontend/src/main/js/package.json +++ b/apps/dolly-frontend/src/main/js/package.json @@ -1,6 +1,6 @@ { "name": "dolly", - "version": "3.0.12", + "version": "3.0.13", "type": "module", "description": "", "main": "index.js", @@ -84,7 +84,7 @@ "@types/react": "^18.2.22", "@types/react-datepicker": "^6.0.0", "@types/react-dom": "^18.0.6", - "@types/react-highlight-words": "^0.16.4", + "@types/react-highlight-words": "^0.20.0", "@types/react-redux": "^7.1.33", "@types/react-router-dom": "^5.3.3", "@types/react-syntax-highlighter": "^15.5.4", @@ -109,7 +109,7 @@ "node-forge": "^1.3.1", "prettier": "^3.0.0", "react-dropzone": "^14.2.3", - "react-pdf": "^8.0.2", + "react-pdf": "^9.0.0", "react-redux": "^9.1.0", "react-router-dom": "^6.3.0", "resq": "^1.10.2", diff --git a/apps/dolly-frontend/src/main/js/src/components/fagsystem/dokarkiv/modal/DokumentInfoListe.tsx b/apps/dolly-frontend/src/main/js/src/components/fagsystem/dokarkiv/modal/DokumentInfoListe.tsx index 94c966af6d9..1505585fbfe 100644 --- a/apps/dolly-frontend/src/main/js/src/components/fagsystem/dokarkiv/modal/DokumentInfoListe.tsx +++ b/apps/dolly-frontend/src/main/js/src/components/fagsystem/dokarkiv/modal/DokumentInfoListe.tsx @@ -9,7 +9,7 @@ import 'react-pdf/dist/esm/Page/TextLayer.css' import styled from 'styled-components' import Button from '@/components/ui/button/Button' -pdfjs.GlobalWorkerOptions.workerSrc = `//unpkg.com/pdfjs-dist@${pdfjs.version}/build/pdf.worker.min.js` +pdfjs.GlobalWorkerOptions.workerSrc = `//unpkg.com/pdfjs-dist@${pdfjs.version}/build/pdf.worker.min.mjs` type Data = { filer: Vedlegg[] diff --git a/apps/dollystatus/build.gradle b/apps/dollystatus/build.gradle index 754a736741c..162014f21f7 100644 --- a/apps/dollystatus/build.gradle +++ b/apps/dollystatus/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.6" + id 'io.spring.dependency-management' version "1.1.5" id "jacoco" } diff --git a/apps/dollystatus/gradle/wrapper/gradle-wrapper.properties b/apps/dollystatus/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/dollystatus/gradle/wrapper/gradle-wrapper.properties +++ b/apps/dollystatus/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/dollystatus/settings.gradle b/apps/dollystatus/settings.gradle index 92ff1e5cc4f..f864b6f87f4 100644 --- a/apps/dollystatus/settings.gradle +++ b/apps/dollystatus/settings.gradle @@ -1,12 +1,12 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + 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 index a9479ada5ed..f0f0c61c7e8 100644 --- a/apps/endringsmelding-frontend/build.gradle +++ b/apps/endringsmelding-frontend/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.6" + id 'io.spring.dependency-management' version "1.1.5" id "jacoco" } diff --git a/apps/endringsmelding-frontend/gradle/wrapper/gradle-wrapper.properties b/apps/endringsmelding-frontend/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/endringsmelding-frontend/gradle/wrapper/gradle-wrapper.properties +++ b/apps/endringsmelding-frontend/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/endringsmelding-frontend/settings.gradle b/apps/endringsmelding-frontend/settings.gradle index b79cbe2e77c..bb1e3ed5b09 100644 --- a/apps/endringsmelding-frontend/settings.gradle +++ b/apps/endringsmelding-frontend/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + 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" } } \ No newline at end of file diff --git a/apps/endringsmelding-service/build.gradle b/apps/endringsmelding-service/build.gradle index da25a0f83be..b7545bf7e07 100644 --- a/apps/endringsmelding-service/build.gradle +++ b/apps/endringsmelding-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.6" + id 'io.spring.dependency-management' version "1.1.5" id "jacoco" } @@ -57,8 +57,8 @@ dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'org.hibernate.validator:hibernate-validator' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' + implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' testImplementation 'org.springframework.boot:spring-boot-starter-test' diff --git a/apps/endringsmelding-service/gradle/wrapper/gradle-wrapper.properties b/apps/endringsmelding-service/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/endringsmelding-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/endringsmelding-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/endringsmelding-service/settings.gradle b/apps/endringsmelding-service/settings.gradle index 8cc0ba8d46d..195644bd8c1 100644 --- a/apps/endringsmelding-service/settings.gradle +++ b/apps/endringsmelding-service/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + 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" } } \ No newline at end of file diff --git a/apps/ereg-batch-status-service/build.gradle b/apps/ereg-batch-status-service/build.gradle index c5aa01d3aaa..f1770bf46e8 100644 --- a/apps/ereg-batch-status-service/build.gradle +++ b/apps/ereg-batch-status-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.6" + 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' } } @@ -58,8 +58,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.3.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' + implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0' + 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/ereg-batch-status-service/gradle/wrapper/gradle-wrapper.properties b/apps/ereg-batch-status-service/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/ereg-batch-status-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/ereg-batch-status-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/ereg-batch-status-service/settings.gradle b/apps/ereg-batch-status-service/settings.gradle index 8c37d66ba90..eb73708e812 100644 --- a/apps/ereg-batch-status-service/settings.gradle +++ b/apps/ereg-batch-status-service/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'ereg-batch-status-service' @@ -9,9 +9,9 @@ includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-security' includeBuild '../../libs/security-core' -gradleEnterprise { +develocity { buildScan { - termsOfServiceUrl = "https://gradle.com/terms-of-service" - termsOfServiceAgree = "yes" + termsOfUseUrl = "https://gradle.com/terms-of-service" + termsOfUseAgree = "yes" } } \ No newline at end of file diff --git a/apps/faste-data-frontend/build.gradle b/apps/faste-data-frontend/build.gradle index 498d6799d18..f5e99c74ca0 100644 --- a/apps/faste-data-frontend/build.gradle +++ b/apps/faste-data-frontend/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.6" + 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/faste-data-frontend/gradle/wrapper/gradle-wrapper.properties b/apps/faste-data-frontend/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/faste-data-frontend/gradle/wrapper/gradle-wrapper.properties +++ b/apps/faste-data-frontend/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/faste-data-frontend/settings.gradle b/apps/faste-data-frontend/settings.gradle index 3c74d5ca3d6..e6abb754462 100644 --- a/apps/faste-data-frontend/settings.gradle +++ b/apps/faste-data-frontend/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'faste-data-frontend' @@ -9,9 +9,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/generer-arbeidsforhold-populasjon-service/build.gradle b/apps/generer-arbeidsforhold-populasjon-service/build.gradle index 05e61361ef8..504d1eb7244 100644 --- a/apps/generer-arbeidsforhold-populasjon-service/build.gradle +++ b/apps/generer-arbeidsforhold-populasjon-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.6" + 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' } } @@ -60,7 +60,7 @@ dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' 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 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' diff --git a/apps/generer-arbeidsforhold-populasjon-service/gradle/wrapper/gradle-wrapper.properties b/apps/generer-arbeidsforhold-populasjon-service/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/generer-arbeidsforhold-populasjon-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/generer-arbeidsforhold-populasjon-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/generer-arbeidsforhold-populasjon-service/settings.gradle b/apps/generer-arbeidsforhold-populasjon-service/settings.gradle index adadfc7b503..ea5cee3eeb2 100644 --- a/apps/generer-arbeidsforhold-populasjon-service/settings.gradle +++ b/apps/generer-arbeidsforhold-populasjon-service/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'generer-arbeidsforhold-populasjon-service' @@ -11,9 +11,9 @@ includeBuild '../../libs/servlet-insecure-security' includeBuild '../../libs/commands' 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/generer-navn-service/build.gradle b/apps/generer-navn-service/build.gradle index 814592350b1..7d0da904ed8 100644 --- a/apps/generer-navn-service/build.gradle +++ b/apps/generer-navn-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.6" + 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' } } @@ -57,7 +57,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/generer-navn-service/gradle/wrapper/gradle-wrapper.properties b/apps/generer-navn-service/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/generer-navn-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/generer-navn-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/generer-navn-service/settings.gradle b/apps/generer-navn-service/settings.gradle index 5edfd4359db..6b1c7e0c795 100644 --- a/apps/generer-navn-service/settings.gradle +++ b/apps/generer-navn-service/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'generer-navn-service' @@ -11,9 +11,9 @@ includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/servlet-security' includeBuild '../../libs/testing' -gradleEnterprise { +develocity { buildScan { - termsOfServiceUrl = "https://gradle.com/terms-of-service" - termsOfServiceAgree = "yes" + termsOfUseUrl = "https://gradle.com/terms-of-service" + termsOfUseAgree = "yes" } } \ No newline at end of file diff --git a/apps/generer-organisasjon-populasjon-service/build.gradle b/apps/generer-organisasjon-populasjon-service/build.gradle index 0ce9ad47742..04fc5fbc162 100644 --- a/apps/generer-organisasjon-populasjon-service/build.gradle +++ b/apps/generer-organisasjon-populasjon-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.6" + 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' } } @@ -71,14 +71,14 @@ dependencies { implementation 'org.springframework.kafka:spring-kafka' implementation 'io.confluent:kafka-avro-serializer:7.5.1' - implementation 'jakarta.validation:jakarta.validation-api:3.0.2' + implementation 'jakarta.validation:jakarta.validation-api:3.1.0' implementation 'org.flywaydb:flyway-core' implementation 'com.h2database:h2' implementation 'com.zaxxer:HikariCP' 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 'org.projectreactor:reactor-spring:1.0.1.RELEASE' implementation 'org.hibernate.validator:hibernate-validator' implementation 'org.postgresql:postgresql' diff --git a/apps/generer-organisasjon-populasjon-service/gradle/wrapper/gradle-wrapper.properties b/apps/generer-organisasjon-populasjon-service/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/generer-organisasjon-populasjon-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/generer-organisasjon-populasjon-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/generer-organisasjon-populasjon-service/settings.gradle b/apps/generer-organisasjon-populasjon-service/settings.gradle index 21bfcd27e2b..059701787b3 100644 --- a/apps/generer-organisasjon-populasjon-service/settings.gradle +++ b/apps/generer-organisasjon-populasjon-service/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'generer-organisasjon-populasjon-service' @@ -15,9 +15,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" } } \ No newline at end of file diff --git a/apps/generer-synt-amelding-service/build.gradle b/apps/generer-synt-amelding-service/build.gradle index 24569462d6f..0f8e7ecafcd 100644 --- a/apps/generer-synt-amelding-service/build.gradle +++ b/apps/generer-synt-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.6" + 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' } } @@ -59,7 +59,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/generer-synt-amelding-service/gradle/wrapper/gradle-wrapper.properties b/apps/generer-synt-amelding-service/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/generer-synt-amelding-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/generer-synt-amelding-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/generer-synt-amelding-service/settings.gradle b/apps/generer-synt-amelding-service/settings.gradle index bc94809205a..94ab8321af6 100644 --- a/apps/generer-synt-amelding-service/settings.gradle +++ b/apps/generer-synt-amelding-service/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'generer-synt-amelding-service' @@ -10,9 +10,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" } } \ No newline at end of file diff --git a/apps/helsepersonell-service/build.gradle b/apps/helsepersonell-service/build.gradle index f964f67f3af..5b3300c58b7 100644 --- a/apps/helsepersonell-service/build.gradle +++ b/apps/helsepersonell-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.6" + 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' } } @@ -57,7 +57,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/helsepersonell-service/gradle/wrapper/gradle-wrapper.properties b/apps/helsepersonell-service/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/helsepersonell-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/helsepersonell-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/helsepersonell-service/settings.gradle b/apps/helsepersonell-service/settings.gradle index 32c7a54cbbc..034fd5b9ce8 100644 --- a/apps/helsepersonell-service/settings.gradle +++ b/apps/helsepersonell-service/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'helsepersonell-service' @@ -11,9 +11,9 @@ includeBuild '../../libs/servlet-core' includeBuild '../../libs/servlet-security' includeBuild '../../libs/testing' -gradleEnterprise { +develocity { buildScan { - termsOfServiceUrl = "https://gradle.com/terms-of-service" - termsOfServiceAgree = "yes" + termsOfUseUrl = "https://gradle.com/terms-of-service" + termsOfUseAgree = "yes" } } \ No newline at end of file diff --git a/apps/inntektsmelding-generator-service/build.gradle b/apps/inntektsmelding-generator-service/build.gradle index 618f6feb897..cb2bb86ecde 100644 --- a/apps/inntektsmelding-generator-service/build.gradle +++ b/apps/inntektsmelding-generator-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.6" + 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' } } @@ -53,19 +53,18 @@ dependencies { implementation 'org.hibernate.validator:hibernate-validator' 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 'org.aspectj:aspectjweaver:1.9.7' + implementation 'org.aspectj:aspectjweaver:1.9.22' - implementation 'javax.xml.bind:jaxb-api:2.3.1' + implementation 'javax.xml.bind:jaxb-api:2.4.0-b180830.0359' implementation 'javax.json.bind:javax.json.bind-api:1.0' implementation 'javax.activation:activation:1.1.1' - implementation 'org.glassfish.jaxb:jaxb-runtime:2.3.8' - implementation 'com.sun.xml.bind:jaxb-core:2.3.0.1' + implementation 'org.glassfish.jaxb:jaxb-runtime:4.0.5' implementation 'ma.glasnost.orika:orika-core:1.5.4' implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml' - implementation 'org.apache.commons:commons-text:1.10.0' + implementation 'org.apache.commons:commons-text:1.11.0' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'no.nav.tjenestespesifikasjoner:nav-altinn-inntektsmelding:1.2019.09.25-00.21-49b69f0625e0' diff --git a/apps/inntektsmelding-generator-service/gradle/wrapper/gradle-wrapper.properties b/apps/inntektsmelding-generator-service/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/inntektsmelding-generator-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/inntektsmelding-generator-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/inntektsmelding-generator-service/settings.gradle b/apps/inntektsmelding-generator-service/settings.gradle index 8dac567607f..97d6a6db0cc 100644 --- a/apps/inntektsmelding-generator-service/settings.gradle +++ b/apps/inntektsmelding-generator-service/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'inntektsmelding-generator-service' @@ -8,9 +8,9 @@ includeBuild '../../libs/servlet-core' includeBuild '../../libs/data-transfer-objects' 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" } } \ No newline at end of file diff --git a/apps/inntektsmelding-service/build.gradle b/apps/inntektsmelding-service/build.gradle index 3060873a840..b761765be6a 100644 --- a/apps/inntektsmelding-service/build.gradle +++ b/apps/inntektsmelding-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.3" - id 'io.spring.dependency-management' version "1.1.4" + id "org.sonarqube" version "5.0.0.4638" + id 'org.springframework.boot' version "3.2.6" + 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' } } @@ -55,7 +55,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-actuator' 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 'org.hibernate.validator:hibernate-validator' implementation 'io.micrometer:micrometer-registry-prometheus' diff --git a/apps/inntektsmelding-service/gradle/wrapper/gradle-wrapper.properties b/apps/inntektsmelding-service/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/inntektsmelding-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/inntektsmelding-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/inntektsmelding-service/settings.gradle b/apps/inntektsmelding-service/settings.gradle index 80f188ccc86..8067b84e6da 100644 --- a/apps/inntektsmelding-service/settings.gradle +++ b/apps/inntektsmelding-service/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'inntektsmelding-service' @@ -9,9 +9,9 @@ includeBuild '../../libs/security-core' includeBuild '../../libs/data-transfer-objects' 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" } } \ No newline at end of file diff --git a/apps/jenkins-batch-status-service/build.gradle b/apps/jenkins-batch-status-service/build.gradle index 6091940da07..3602d672715 100644 --- a/apps/jenkins-batch-status-service/build.gradle +++ b/apps/jenkins-batch-status-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.6" + 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/jenkins-batch-status-service/gradle/wrapper/gradle-wrapper.properties b/apps/jenkins-batch-status-service/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/jenkins-batch-status-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/jenkins-batch-status-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/jenkins-batch-status-service/settings.gradle b/apps/jenkins-batch-status-service/settings.gradle index 1ee852e0a89..ea6d3d34ebc 100644 --- a/apps/jenkins-batch-status-service/settings.gradle +++ b/apps/jenkins-batch-status-service/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'jenkins-batch-status-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" } } \ No newline at end of file diff --git a/apps/joark-dokument-service/build.gradle b/apps/joark-dokument-service/build.gradle index 54335f5ab54..36736059766 100644 --- a/apps/joark-dokument-service/build.gradle +++ b/apps/joark-dokument-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.6" + 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' } } @@ -58,7 +58,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/joark-dokument-service/gradle/wrapper/gradle-wrapper.properties b/apps/joark-dokument-service/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/joark-dokument-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/joark-dokument-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/joark-dokument-service/settings.gradle b/apps/joark-dokument-service/settings.gradle index 94651cec8a0..528397d2541 100644 --- a/apps/joark-dokument-service/settings.gradle +++ b/apps/joark-dokument-service/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'joark-dokument-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" } } \ No newline at end of file diff --git a/apps/kodeverk-service/build.gradle b/apps/kodeverk-service/build.gradle index f28e4776163..9b21f20210f 100644 --- a/apps/kodeverk-service/build.gradle +++ b/apps/kodeverk-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.6" + 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' } } @@ -54,8 +54,8 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-cache' implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' + implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0' + 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/kodeverk-service/gradle/wrapper/gradle-wrapper.properties b/apps/kodeverk-service/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/kodeverk-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/kodeverk-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/kodeverk-service/settings.gradle b/apps/kodeverk-service/settings.gradle index 941cf03865b..2d8d1f9732e 100644 --- a/apps/kodeverk-service/settings.gradle +++ b/apps/kodeverk-service/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'kodeverk-service' @@ -9,9 +9,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" } } \ No newline at end of file diff --git a/apps/miljoer-service/build.gradle b/apps/miljoer-service/build.gradle index ab61f59e17b..2268a8ded03 100644 --- a/apps/miljoer-service/build.gradle +++ b/apps/miljoer-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.6" + 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' } } @@ -59,7 +59,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/miljoer-service/gradle/wrapper/gradle-wrapper.properties b/apps/miljoer-service/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/miljoer-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/miljoer-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/miljoer-service/settings.gradle b/apps/miljoer-service/settings.gradle index 9724ef82858..b47213c8199 100644 --- a/apps/miljoer-service/settings.gradle +++ b/apps/miljoer-service/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'miljoer-service' @@ -10,9 +10,9 @@ includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/servlet-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" } } \ No newline at end of file diff --git a/apps/oppsummeringsdokument-service/build.gradle b/apps/oppsummeringsdokument-service/build.gradle index 755081bf23b..966479ebb08 100644 --- a/apps/oppsummeringsdokument-service/build.gradle +++ b/apps/oppsummeringsdokument-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.6" + 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' } } @@ -52,7 +52,7 @@ repositories { } dependencies { - 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' @@ -62,15 +62,15 @@ dependencies { implementation 'no.nav.testnav.libs:servlet-security' implementation 'no.nav.testnav.xsd:arbeidsforhold-xsd' - implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.15.3' + implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.17.1' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' - implementation 'org.opensearch.client:spring-data-opensearch:1.3.0' + implementation 'org.opensearch.client:spring-data-opensearch:1.4.0' implementation 'org.springframework.boot:spring-boot-starter-data-elasticsearch' - implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2' + implementation 'com.fasterxml.jackson.core:jackson-core:2.17.1' implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' implementation 'org.springframework.boot:spring-boot-starter-actuator' @@ -79,10 +79,10 @@ dependencies { implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.springframework.kafka:spring-kafka' - implementation 'org.apache.kafka:kafka-clients:3.6.1' + implementation 'org.apache.kafka:kafka-clients:3.7.0' 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 'org.hibernate.validator:hibernate-validator' testImplementation 'org.springframework.boot:spring-boot-starter-test' diff --git a/apps/oppsummeringsdokument-service/gradle/wrapper/gradle-wrapper.properties b/apps/oppsummeringsdokument-service/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/oppsummeringsdokument-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/oppsummeringsdokument-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/oppsummeringsdokument-service/settings.gradle b/apps/oppsummeringsdokument-service/settings.gradle index 0d32013ebbb..8a131f075be 100644 --- a/apps/oppsummeringsdokument-service/settings.gradle +++ b/apps/oppsummeringsdokument-service/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'oppsummeringsdokument-service' @@ -11,9 +11,9 @@ includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/servlet-security' includeBuild '../../xsd/arbeidsforhold-xsd' -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/organisasjon-bestilling-service/build.gradle b/apps/organisasjon-bestilling-service/build.gradle index 9d74ea16f3f..3e83640c871 100644 --- a/apps/organisasjon-bestilling-service/build.gradle +++ b/apps/organisasjon-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.6" + 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' } } @@ -69,7 +69,7 @@ dependencies { 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' testImplementation 'org.springframework.boot:spring-boot-starter-test' diff --git a/apps/organisasjon-bestilling-service/gradle/wrapper/gradle-wrapper.properties b/apps/organisasjon-bestilling-service/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/organisasjon-bestilling-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/organisasjon-bestilling-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/organisasjon-bestilling-service/settings.gradle b/apps/organisasjon-bestilling-service/settings.gradle index b919b5b8050..9be29dd957e 100644 --- a/apps/organisasjon-bestilling-service/settings.gradle +++ b/apps/organisasjon-bestilling-service/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'organisasjon-bestilling-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" } } \ No newline at end of file diff --git a/apps/organisasjon-faste-data-service/build.gradle b/apps/organisasjon-faste-data-service/build.gradle index 14fc5ef662f..1fe73c4c4b4 100644 --- a/apps/organisasjon-faste-data-service/build.gradle +++ b/apps/organisasjon-faste-data-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.6" + 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' } } @@ -67,7 +67,7 @@ dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'jakarta.validation:jakarta.validation-api:3.0.2' + implementation 'jakarta.validation:jakarta.validation-api:3.1.0' implementation 'io.confluent:kafka-avro-serializer:7.5.1' implementation 'org.flywaydb:flyway-core' @@ -77,7 +77,7 @@ dependencies { 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 'org.projectreactor:reactor-spring:1.0.1.RELEASE' implementation 'org.hibernate.validator:hibernate-validator' diff --git a/apps/organisasjon-faste-data-service/gradle/wrapper/gradle-wrapper.properties b/apps/organisasjon-faste-data-service/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/organisasjon-faste-data-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/organisasjon-faste-data-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/organisasjon-faste-data-service/settings.gradle b/apps/organisasjon-faste-data-service/settings.gradle index d07c5a32e9d..3ebd1db7e45 100644 --- a/apps/organisasjon-faste-data-service/settings.gradle +++ b/apps/organisasjon-faste-data-service/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'organisasjon-faste-data-service' @@ -15,9 +15,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" } } \ No newline at end of file diff --git a/apps/organisasjon-forvalter/build.gradle b/apps/organisasjon-forvalter/build.gradle index d28f60aee62..d50c5463ff5 100644 --- a/apps/organisasjon-forvalter/build.gradle +++ b/apps/organisasjon-forvalter/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.6" + 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' } } @@ -77,7 +77,7 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' implementation 'org.springframework.cloud:spring-cloud-vault-config-databases' - implementation 'org.apache.avro:avro:1.11.0' + implementation 'org.apache.avro:avro:1.11.3' implementation 'org.flywaydb:flyway-core' implementation 'org.postgresql:postgresql' diff --git a/apps/organisasjon-forvalter/gradle/wrapper/gradle-wrapper.properties b/apps/organisasjon-forvalter/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/organisasjon-forvalter/gradle/wrapper/gradle-wrapper.properties +++ b/apps/organisasjon-forvalter/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/organisasjon-forvalter/settings.gradle b/apps/organisasjon-forvalter/settings.gradle index e40faa0410a..cad79edd348 100644 --- a/apps/organisasjon-forvalter/settings.gradle +++ b/apps/organisasjon-forvalter/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'organisasjon-forvalter' @@ -16,9 +16,9 @@ includeBuild '../../libs/kafka-producers' includeBuild '../../libs/avro-schema' includeBuild '../../libs/testing' -gradleEnterprise { +develocity { buildScan { - termsOfServiceUrl = "https://gradle.com/terms-of-service" - termsOfServiceAgree = "yes" + termsOfUseUrl = "https://gradle.com/terms-of-service" + termsOfUseAgree = "yes" } } \ No newline at end of file diff --git a/apps/organisasjon-mottak-service/build.gradle b/apps/organisasjon-mottak-service/build.gradle index e6e39823368..c2bbd7c2a80 100644 --- a/apps/organisasjon-mottak-service/build.gradle +++ b/apps/organisasjon-mottak-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.6" + 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' } } @@ -69,7 +69,7 @@ dependencies { implementation 'org.hibernate.validator:hibernate-validator' implementation 'org.springframework.kafka:spring-kafka' - implementation 'org.apache.kafka:kafka-clients:3.6.1' + implementation 'org.apache.kafka:kafka-clients:3.7.0' implementation 'io.confluent:kafka-avro-serializer:7.5.1' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' diff --git a/apps/organisasjon-mottak-service/gradle/wrapper/gradle-wrapper.properties b/apps/organisasjon-mottak-service/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/organisasjon-mottak-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/organisasjon-mottak-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/organisasjon-mottak-service/settings.gradle b/apps/organisasjon-mottak-service/settings.gradle index 26cbd3fbbc5..38065f51b2f 100644 --- a/apps/organisasjon-mottak-service/settings.gradle +++ b/apps/organisasjon-mottak-service/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'organisasjon-mottak-service' @@ -14,9 +14,9 @@ includeBuild '../../libs/security-core' includeBuild '../../libs/servlet-core' includeBuild '../../libs/servlet-insecure-security' -gradleEnterprise { +develocity { buildScan { - termsOfServiceUrl = "https://gradle.com/terms-of-service" - termsOfServiceAgree = "yes" + termsOfUseUrl = "https://gradle.com/terms-of-service" + termsOfUseAgree = "yes" } } \ No newline at end of file diff --git a/apps/organisasjon-service/build.gradle b/apps/organisasjon-service/build.gradle index d50ddbecb25..d350a163b7f 100644 --- a/apps/organisasjon-service/build.gradle +++ b/apps/organisasjon-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.6" + 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' } } @@ -67,7 +67,7 @@ dependencies { testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' testImplementation 'no.nav.testnav.libs:testing' - testImplementation 'org.assertj:assertj-core:3.24.2' + testImplementation 'org.assertj:assertj-core:3.26.0' implementation 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' diff --git a/apps/organisasjon-service/gradle/wrapper/gradle-wrapper.properties b/apps/organisasjon-service/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/organisasjon-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/organisasjon-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/organisasjon-service/settings.gradle b/apps/organisasjon-service/settings.gradle index 1e461f14a6f..03965dbd46a 100644 --- a/apps/organisasjon-service/settings.gradle +++ b/apps/organisasjon-service/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'organisasjon-service' @@ -12,9 +12,9 @@ includeBuild '../../libs/servlet-core' includeBuild '../../libs/servlet-security' includeBuild '../../libs/testing' -gradleEnterprise { +develocity { buildScan { - termsOfServiceUrl = "https://gradle.com/terms-of-service" - termsOfServiceAgree = "yes" + termsOfUseUrl = "https://gradle.com/terms-of-service" + termsOfUseAgree = "yes" } } \ No newline at end of file diff --git a/apps/organisasjon-tilgang-frontend/build.gradle b/apps/organisasjon-tilgang-frontend/build.gradle index 7e094757b5a..7d6cdc16fa0 100644 --- a/apps/organisasjon-tilgang-frontend/build.gradle +++ b/apps/organisasjon-tilgang-frontend/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.6" + id 'io.spring.dependency-management' version "1.1.5" id "jacoco" } diff --git a/apps/organisasjon-tilgang-frontend/gradle/wrapper/gradle-wrapper.properties b/apps/organisasjon-tilgang-frontend/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/organisasjon-tilgang-frontend/gradle/wrapper/gradle-wrapper.properties +++ b/apps/organisasjon-tilgang-frontend/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/organisasjon-tilgang-frontend/settings.gradle b/apps/organisasjon-tilgang-frontend/settings.gradle index 333a60801b5..9cc55b92a41 100644 --- a/apps/organisasjon-tilgang-frontend/settings.gradle +++ b/apps/organisasjon-tilgang-frontend/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'organisasjon-tilgang-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" } } \ No newline at end of file diff --git a/apps/organisasjon-tilgang-service/build.gradle b/apps/organisasjon-tilgang-service/build.gradle index b3bbdd85fa0..c3a6e793975 100644 --- a/apps/organisasjon-tilgang-service/build.gradle +++ b/apps/organisasjon-tilgang-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.6" + id 'io.spring.dependency-management' version "1.1.5" id "jacoco" } @@ -37,7 +37,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' } } @@ -65,8 +65,8 @@ dependencies { implementation 'ma.glasnost.orika:orika-core:1.5.4' implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' + implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' testImplementation 'org.springframework.boot:spring-boot-starter-test' diff --git a/apps/organisasjon-tilgang-service/gradle/wrapper/gradle-wrapper.properties b/apps/organisasjon-tilgang-service/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/organisasjon-tilgang-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/organisasjon-tilgang-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/organisasjon-tilgang-service/settings.gradle b/apps/organisasjon-tilgang-service/settings.gradle index 7956ebc876f..421605989a6 100644 --- a/apps/organisasjon-tilgang-service/settings.gradle +++ b/apps/organisasjon-tilgang-service/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'organisasjon-tilgang-service' @@ -8,9 +8,9 @@ rootProject.name = 'organisasjon-tilgang-service' includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-security' -gradleEnterprise { +develocity { buildScan { - termsOfServiceUrl = "https://gradle.com/terms-of-service" - termsOfServiceAgree = "yes" + termsOfUseUrl = "https://gradle.com/terms-of-service" + termsOfUseAgree = "yes" } } \ No newline at end of file diff --git a/apps/orgnummer-service/build.gradle b/apps/orgnummer-service/build.gradle index 44277508f20..b8ce1940989 100644 --- a/apps/orgnummer-service/build.gradle +++ b/apps/orgnummer-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.6" + 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' } } @@ -63,14 +63,14 @@ dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'jakarta.validation:jakarta.validation-api:3.0.2' + implementation 'jakarta.validation:jakarta.validation-api:3.1.0' implementation 'org.flywaydb:flyway-core' implementation 'com.h2database:h2' implementation 'com.zaxxer:HikariCP' 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 'org.hibernate.validator:hibernate-validator' implementation 'org.postgresql:postgresql' diff --git a/apps/orgnummer-service/gradle/wrapper/gradle-wrapper.properties b/apps/orgnummer-service/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/orgnummer-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/orgnummer-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/orgnummer-service/settings.gradle b/apps/orgnummer-service/settings.gradle index 8f82599af85..0dd87b3ba6a 100644 --- a/apps/orgnummer-service/settings.gradle +++ b/apps/orgnummer-service/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'orgnummer-service' @@ -12,9 +12,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" } } \ No newline at end of file diff --git a/apps/oversikt-frontend/build.gradle b/apps/oversikt-frontend/build.gradle index b979dff8117..78420dc18cb 100644 --- a/apps/oversikt-frontend/build.gradle +++ b/apps/oversikt-frontend/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.6" + 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' mavenBom 'org.springframework.session:spring-session-bom:2021.2.0' } } @@ -63,7 +63,7 @@ dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0' + implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' diff --git a/apps/oversikt-frontend/gradle/wrapper/gradle-wrapper.properties b/apps/oversikt-frontend/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/oversikt-frontend/gradle/wrapper/gradle-wrapper.properties +++ b/apps/oversikt-frontend/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/oversikt-frontend/settings.gradle b/apps/oversikt-frontend/settings.gradle index da81531ae8a..4f6bf9fcd12 100644 --- a/apps/oversikt-frontend/settings.gradle +++ b/apps/oversikt-frontend/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'oversikt-frontend' @@ -10,9 +10,9 @@ includeBuild '../../libs/security-core' includeBuild '../../libs/reactive-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" } } \ No newline at end of file diff --git a/apps/pdl-forvalter/build.gradle b/apps/pdl-forvalter/build.gradle index b71a2fb929f..a89fdc91dca 100644 --- a/apps/pdl-forvalter/build.gradle +++ b/apps/pdl-forvalter/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.6" + 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' } } @@ -80,12 +80,12 @@ dependencies { 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 'org.postgresql:postgresql' implementation 'org.flywaydb:flyway-core' - implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310' + implementation 'com.fasterxml.jackson.core:jackson-core:2.17.1' implementation 'org.projectlombok:lombok' diff --git a/apps/pdl-forvalter/gradle/wrapper/gradle-wrapper.properties b/apps/pdl-forvalter/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/pdl-forvalter/gradle/wrapper/gradle-wrapper.properties +++ b/apps/pdl-forvalter/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/pdl-forvalter/settings.gradle b/apps/pdl-forvalter/settings.gradle index 9ae64aa72dc..431ebeb9844 100644 --- a/apps/pdl-forvalter/settings.gradle +++ b/apps/pdl-forvalter/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'pdl-forvalter' @@ -14,9 +14,9 @@ includeBuild '../../libs/servlet-security' includeBuild '../../libs/servlet-insecure-security' includeBuild '../../libs/testing' -gradleEnterprise { +develocity { buildScan { - termsOfServiceUrl = "https://gradle.com/terms-of-service" - termsOfServiceAgree = "yes" + termsOfUseUrl = "https://gradle.com/terms-of-service" + termsOfUseAgree = "yes" } } \ No newline at end of file diff --git a/apps/person-faste-data-service/build.gradle b/apps/person-faste-data-service/build.gradle index e5d892d76f6..80db0b91523 100644 --- a/apps/person-faste-data-service/build.gradle +++ b/apps/person-faste-data-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.6" + 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' } } @@ -62,9 +62,9 @@ dependencies { implementation 'com.zaxxer:HikariCP' implementation 'org.postgresql:postgresql' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0' + implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.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/person-faste-data-service/gradle/wrapper/gradle-wrapper.properties b/apps/person-faste-data-service/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/person-faste-data-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/person-faste-data-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/person-faste-data-service/settings.gradle b/apps/person-faste-data-service/settings.gradle index 2456c7e7b8c..a6ad03e9358 100644 --- a/apps/person-faste-data-service/settings.gradle +++ b/apps/person-faste-data-service/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'person-faste-data-service' @@ -9,9 +9,9 @@ includeBuild '../../libs/reactive-security' includeBuild '../../libs/reactive-core' 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" } } \ No newline at end of file diff --git a/apps/person-organisasjon-tilgang-service/build.gradle b/apps/person-organisasjon-tilgang-service/build.gradle index 3b253764f18..4c4d50f53a0 100644 --- a/apps/person-organisasjon-tilgang-service/build.gradle +++ b/apps/person-organisasjon-tilgang-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.6" + id 'io.spring.dependency-management' version "1.1.5" id "jacoco" } @@ -48,7 +48,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' } } @@ -69,10 +69,10 @@ dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0' + implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.2' + implementation 'com.fasterxml.jackson.core:jackson-core:2.17.1' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' diff --git a/apps/person-organisasjon-tilgang-service/gradle/wrapper/gradle-wrapper.properties b/apps/person-organisasjon-tilgang-service/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/person-organisasjon-tilgang-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/person-organisasjon-tilgang-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/person-organisasjon-tilgang-service/settings.gradle b/apps/person-organisasjon-tilgang-service/settings.gradle index cb514e354cc..dc0c7088c66 100644 --- a/apps/person-organisasjon-tilgang-service/settings.gradle +++ b/apps/person-organisasjon-tilgang-service/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'person-organisasjon-tilgang-service' @@ -10,9 +10,9 @@ includeBuild '../../libs/reactive-security' includeBuild '../../libs/security-core' 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" } } \ No newline at end of file diff --git a/apps/person-search-service/build.gradle b/apps/person-search-service/build.gradle index 82636cf5f24..3c31ec89cba 100644 --- a/apps/person-search-service/build.gradle +++ b/apps/person-search-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.6" + 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' } } @@ -57,7 +57,7 @@ dependencies { implementation 'no.nav.testnav.libs:servlet-security' 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.4.0' implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-webflux' diff --git a/apps/person-search-service/gradle/wrapper/gradle-wrapper.properties b/apps/person-search-service/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/person-search-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/person-search-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/person-search-service/settings.gradle b/apps/person-search-service/settings.gradle index dad32e230ab..e645f4baec8 100644 --- a/apps/person-search-service/settings.gradle +++ b/apps/person-search-service/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'person-search-service' @@ -10,9 +10,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" } } \ No newline at end of file diff --git a/apps/person-service/build.gradle b/apps/person-service/build.gradle index d83df9bb73c..f0050f6a288 100644 --- a/apps/person-service/build.gradle +++ b/apps/person-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.6" + 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' } } diff --git a/apps/person-service/gradle/wrapper/gradle-wrapper.properties b/apps/person-service/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/person-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/person-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/person-service/settings.gradle b/apps/person-service/settings.gradle index 9ef1cc9e167..19d12c5be56 100644 --- a/apps/person-service/settings.gradle +++ b/apps/person-service/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'person-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" } } \ No newline at end of file diff --git a/apps/profil-api/build.gradle b/apps/profil-api/build.gradle index d2313c3c5f4..b5322d86cc7 100644 --- a/apps/profil-api/build.gradle +++ b/apps/profil-api/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.6" + 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' } } diff --git a/apps/profil-api/gradle/wrapper/gradle-wrapper.properties b/apps/profil-api/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/profil-api/gradle/wrapper/gradle-wrapper.properties +++ b/apps/profil-api/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/profil-api/settings.gradle b/apps/profil-api/settings.gradle index 69066f22665..7855b77d9af 100644 --- a/apps/profil-api/settings.gradle +++ b/apps/profil-api/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'profil-api' @@ -10,9 +10,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" } } \ No newline at end of file diff --git a/apps/sykemelding-api/build.gradle b/apps/sykemelding-api/build.gradle index de16db977c3..edb750227a3 100644 --- a/apps/sykemelding-api/build.gradle +++ b/apps/sykemelding-api/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.6" + 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' } } @@ -68,18 +68,18 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-actuator' implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' + implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' - implementation 'com.ibm.mq:mq-jms-spring-boot-starter:3.0.3' + implementation 'com.ibm.mq:mq-jms-spring-boot-starter:3.2.3' implementation 'org.springframework.kafka:spring-kafka' - implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0' - implementation 'jakarta.activation:jakarta.activation-api:2.1.2' + implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2' + implementation 'jakarta.activation:jakarta.activation-api:2.1.3' implementation 'org.glassfish.jaxb:jaxb-runtime' implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml' - implementation 'org.apache.kafka:kafka-clients:3.6.1' + implementation 'org.apache.kafka:kafka-clients:3.7.0' implementation 'io.confluent:kafka-avro-serializer:7.5.1' testImplementation 'no.nav.testnav.libs:testing' diff --git a/apps/sykemelding-api/gradle/wrapper/gradle-wrapper.properties b/apps/sykemelding-api/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/sykemelding-api/gradle/wrapper/gradle-wrapper.properties +++ b/apps/sykemelding-api/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/sykemelding-api/settings.gradle b/apps/sykemelding-api/settings.gradle index 7d2ba0ac2a4..90a4a4ede91 100644 --- a/apps/sykemelding-api/settings.gradle +++ b/apps/sykemelding-api/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'sykemelding-api' @@ -14,9 +14,9 @@ includeBuild '../../libs/security-core' 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" } } \ No newline at end of file diff --git a/apps/synt-sykemelding-api/build.gradle b/apps/synt-sykemelding-api/build.gradle index 006337b3b32..9636e654fcb 100644 --- a/apps/synt-sykemelding-api/build.gradle +++ b/apps/synt-sykemelding-api/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.6" + 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' } } diff --git a/apps/synt-sykemelding-api/gradle/wrapper/gradle-wrapper.properties b/apps/synt-sykemelding-api/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/synt-sykemelding-api/gradle/wrapper/gradle-wrapper.properties +++ b/apps/synt-sykemelding-api/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/synt-sykemelding-api/settings.gradle b/apps/synt-sykemelding-api/settings.gradle index 34ea2f8d2e2..8d59ae02b01 100644 --- a/apps/synt-sykemelding-api/settings.gradle +++ b/apps/synt-sykemelding-api/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'synt-sykemelding-api' @@ -11,9 +11,9 @@ includeBuild '../../libs/servlet-core' includeBuild '../../libs/servlet-security' includeBuild '../../libs/testing' -gradleEnterprise { +develocity { buildScan { - termsOfServiceUrl = "https://gradle.com/terms-of-service" - termsOfServiceAgree = "yes" + termsOfUseUrl = "https://gradle.com/terms-of-service" + termsOfUseAgree = "yes" } } \ No newline at end of file diff --git a/apps/synt-vedtakshistorikk-service/build.gradle b/apps/synt-vedtakshistorikk-service/build.gradle index 685f4ee6e00..18a6d2776a5 100644 --- a/apps/synt-vedtakshistorikk-service/build.gradle +++ b/apps/synt-vedtakshistorikk-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.6" + 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' } } @@ -68,7 +68,7 @@ dependencies { implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' - implementation 'com.google.guava:guava:31.1-jre' + implementation 'com.google.guava:guava:33.2.0-jre' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' diff --git a/apps/synt-vedtakshistorikk-service/gradle/wrapper/gradle-wrapper.properties b/apps/synt-vedtakshistorikk-service/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/synt-vedtakshistorikk-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/synt-vedtakshistorikk-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/synt-vedtakshistorikk-service/settings.gradle b/apps/synt-vedtakshistorikk-service/settings.gradle index f7c1342a683..f2760d46c25 100644 --- a/apps/synt-vedtakshistorikk-service/settings.gradle +++ b/apps/synt-vedtakshistorikk-service/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'synt-vedtakshistorikk-service' @@ -12,9 +12,9 @@ includeBuild '../../libs/domain' includeBuild '../../libs/security-core' 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" } } \ No newline at end of file diff --git a/apps/tenor-search-service/build.gradle b/apps/tenor-search-service/build.gradle index 7d02f934f4c..434768f421d 100644 --- a/apps/tenor-search-service/build.gradle +++ b/apps/tenor-search-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.6" + id 'io.spring.dependency-management' version "1.1.5" id "jacoco" } @@ -37,7 +37,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' } } @@ -59,7 +59,7 @@ dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0' + implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' testImplementation 'org.springframework.boot:spring-boot-starter-test' diff --git a/apps/tenor-search-service/gradle/wrapper/gradle-wrapper.properties b/apps/tenor-search-service/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/tenor-search-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/tenor-search-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/tenor-search-service/settings.gradle b/apps/tenor-search-service/settings.gradle index 981cdf3d5ca..3a378b442ac 100644 --- a/apps/tenor-search-service/settings.gradle +++ b/apps/tenor-search-service/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'tenor-search-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" } } \ No newline at end of file diff --git a/apps/testnav-ident-pool/build.gradle b/apps/testnav-ident-pool/build.gradle index b31c77d024c..bcf2dd726f8 100644 --- a/apps/testnav-ident-pool/build.gradle +++ b/apps/testnav-ident-pool/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.6" + 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/testnav-ident-pool/gradle/wrapper/gradle-wrapper.properties b/apps/testnav-ident-pool/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/testnav-ident-pool/gradle/wrapper/gradle-wrapper.properties +++ b/apps/testnav-ident-pool/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/testnav-ident-pool/settings.gradle b/apps/testnav-ident-pool/settings.gradle index b4bad24206e..9ac11a4b4d1 100644 --- a/apps/testnav-ident-pool/settings.gradle +++ b/apps/testnav-ident-pool/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'testnav-ident-pool' @@ -12,9 +12,9 @@ includeBuild '../../libs/servlet-insecure-security' includeBuild '../../libs/testing' -gradleEnterprise { +develocity { buildScan { - termsOfServiceUrl = "https://gradle.com/terms-of-service" - termsOfServiceAgree = "yes" + termsOfUseUrl = "https://gradle.com/terms-of-service" + termsOfUseAgree = "yes" } } \ No newline at end of file diff --git a/apps/testnorge-statisk-data-forvalter/build.gradle b/apps/testnorge-statisk-data-forvalter/build.gradle index 3563a89262b..e46776446da 100644 --- a/apps/testnorge-statisk-data-forvalter/build.gradle +++ b/apps/testnorge-statisk-data-forvalter/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.6" + id 'io.spring.dependency-management' version "1.1.5" id "jacoco" } @@ -28,7 +28,7 @@ sonarqube { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } @@ -46,7 +46,7 @@ repositories { } dependencies { - implementation 'com.google.guava:guava:31.1-jre' + implementation 'com.google.guava:guava:33.2.0-jre' implementation 'no.nav.testnav.libs:security-core' implementation 'no.nav.testnav.libs:servlet-security' @@ -73,7 +73,7 @@ dependencies { implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' - implementation 'org.aspectj:aspectjweaver:1.9.19' + implementation 'org.aspectj:aspectjweaver:1.9.22' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.postgresql:postgresql' implementation 'com.zaxxer:HikariCP' @@ -83,9 +83,9 @@ dependencies { implementation 'com.h2database:h2' implementation 'org.hibernate.validator:hibernate-validator' - implementation 'org.apache.httpcomponents.client5:httpclient5:5.2.1' + implementation 'org.apache.httpcomponents.client5:httpclient5:5.3.1' 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 'com.squareup.okhttp3:okhttp:4.9.3' implementation 'org.projectlombok:lombok' diff --git a/apps/testnorge-statisk-data-forvalter/gradle/wrapper/gradle-wrapper.properties b/apps/testnorge-statisk-data-forvalter/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/testnorge-statisk-data-forvalter/gradle/wrapper/gradle-wrapper.properties +++ b/apps/testnorge-statisk-data-forvalter/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/testnorge-statisk-data-forvalter/settings.gradle b/apps/testnorge-statisk-data-forvalter/settings.gradle index f7d61d9efdd..cb0d8c6d113 100644 --- a/apps/testnorge-statisk-data-forvalter/settings.gradle +++ b/apps/testnorge-statisk-data-forvalter/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'testnorge-statisk-data-forvalter' @@ -17,9 +17,9 @@ includeBuild '../../libs/commands' includeBuild '../../libs/csv-converter' includeBuild '../../libs/testing' -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/tilbakemelding-api/build.gradle b/apps/tilbakemelding-api/build.gradle index 28f5cac7f19..96522c96b3e 100644 --- a/apps/tilbakemelding-api/build.gradle +++ b/apps/tilbakemelding-api/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.6" + 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' } } diff --git a/apps/tilbakemelding-api/gradle/wrapper/gradle-wrapper.properties b/apps/tilbakemelding-api/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/tilbakemelding-api/gradle/wrapper/gradle-wrapper.properties +++ b/apps/tilbakemelding-api/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/tilbakemelding-api/settings.gradle b/apps/tilbakemelding-api/settings.gradle index fb24b608d1a..bd17a86d3fb 100644 --- a/apps/tilbakemelding-api/settings.gradle +++ b/apps/tilbakemelding-api/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'tilbakemelding-api' @@ -11,9 +11,9 @@ includeBuild '../../libs/servlet-core' includeBuild '../../libs/servlet-security' includeBuild '../../libs/slack' -gradleEnterprise { +develocity { buildScan { - termsOfServiceUrl = "https://gradle.com/terms-of-service" - termsOfServiceAgree = "yes" + termsOfUseUrl = "https://gradle.com/terms-of-service" + termsOfUseAgree = "yes" } } \ No newline at end of file diff --git a/apps/tps-messaging-service/build.gradle b/apps/tps-messaging-service/build.gradle index 88d48546719..3f03080c01f 100644 --- a/apps/tps-messaging-service/build.gradle +++ b/apps/tps-messaging-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.6" + id 'io.spring.dependency-management' version "1.1.5" id "jacoco" id("org.openrewrite.rewrite") version("6.6.4") } @@ -39,7 +39,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' } } @@ -68,7 +68,7 @@ configurations.implementation { } dependencies { - rewrite("org.openrewrite.recipe:rewrite-spring:5.2.0") + rewrite('org.openrewrite.recipe:rewrite-spring:5.10.0') implementation 'no.nav.testnav.libs:security-core' implementation 'no.nav.testnav.libs:servlet-core' implementation 'no.nav.testnav.libs:servlet-security' @@ -83,7 +83,7 @@ dependencies { implementation 'com.fasterxml.jackson.core:jackson-annotations' implementation 'com.fasterxml.jackson.core:jackson-databind' - implementation 'com.ibm.mq:mq-jms-spring-boot-starter:3.2.1' + implementation 'com.ibm.mq:mq-jms-spring-boot-starter:3.2.3' implementation 'com.ibm.icu:icu4j:74.2' implementation 'jakarta.xml.bind:jakarta.xml.bind-api' @@ -100,7 +100,7 @@ dependencies { implementation 'io.micrometer:micrometer-registry-prometheus' implementation 'ma.glasnost.orika:orika-core:1.5.4' implementation 'org.hibernate.validator:hibernate-validator' - implementation 'org.aspectj:aspectjweaver:1.9.19' + implementation 'org.aspectj:aspectjweaver:1.9.22' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' @@ -111,5 +111,5 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' - testImplementation "org.junit.jupiter:junit-jupiter:5.10.1" + testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2' } \ No newline at end of file diff --git a/apps/tps-messaging-service/gradle/wrapper/gradle-wrapper.properties b/apps/tps-messaging-service/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/tps-messaging-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/tps-messaging-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/tps-messaging-service/settings.gradle b/apps/tps-messaging-service/settings.gradle index 02c667cb74b..db135da9e41 100644 --- a/apps/tps-messaging-service/settings.gradle +++ b/apps/tps-messaging-service/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'tps-messaging-service' @@ -10,9 +10,9 @@ includeBuild '../../libs/servlet-security' 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/udi-stub/build.gradle b/apps/udi-stub/build.gradle index 1e2b45ec954..f821bc5598d 100644 --- a/apps/udi-stub/build.gradle +++ b/apps/udi-stub/build.gradle @@ -1,9 +1,9 @@ plugins { - id "org.sonarqube" version "4.4.1.3373" + id "org.sonarqube" version "5.0.0.4638" id 'java' 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.6" + id 'io.spring.dependency-management' version "1.1.5" id("org.openrewrite.rewrite") version("6.6.4") id "jacoco" } @@ -35,7 +35,7 @@ sonarqube { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } @@ -73,9 +73,9 @@ repositories { } dependencies { - rewrite("org.openrewrite.recipe:rewrite-spring:5.2.0") + rewrite('org.openrewrite.recipe:rewrite-spring:5.10.0') - implementation platform('org.testcontainers:testcontainers-bom:1.19.1') + implementation platform('org.testcontainers:testcontainers-bom:1.19.8') implementation "com.sun.xml.ws:jaxws-rt:4.0.2" implementation 'no.nav.testnav.libs:servlet-core' @@ -107,13 +107,13 @@ dependencies { implementation 'org.hibernate.validator:hibernate-validator' testImplementation 'com.h2database:h2' - testImplementation "org.junit.jupiter:junit-jupiter:5.10.1" + testImplementation 'org.junit.jupiter:junit-jupiter:5.10.2' testImplementation 'org.testcontainers:junit-jupiter' testImplementation 'org.testcontainers:postgresql' testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'org.springframework.cloud:spring-cloud-contract-wiremock' //TODO upgrade to JUnit5 - testImplementation "org.mockito:mockito-junit-jupiter:4.11.0" + testImplementation 'org.mockito:mockito-junit-jupiter:5.12.0' implementation 'org.projectlombok:lombok' annotationProcessor 'org.projectlombok:lombok' testAnnotationProcessor 'org.projectlombok:lombok' diff --git a/apps/udi-stub/gradle/wrapper/gradle-wrapper.properties b/apps/udi-stub/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/udi-stub/gradle/wrapper/gradle-wrapper.properties +++ b/apps/udi-stub/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/udi-stub/settings.gradle b/apps/udi-stub/settings.gradle index 93ff2dfb8f7..4aa740b5b88 100644 --- a/apps/udi-stub/settings.gradle +++ b/apps/udi-stub/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'udi-stub' @@ -9,9 +9,9 @@ includeBuild '../../libs/servlet-security' includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/database' -gradleEnterprise { +develocity { buildScan { - termsOfServiceUrl = "https://gradle.com/terms-of-service" - termsOfServiceAgree = "yes" + termsOfUseUrl = "https://gradle.com/terms-of-service" + termsOfUseAgree = "yes" } } \ No newline at end of file diff --git a/apps/udi-stub/src/main/java/no/nav/udistub/UdiStubApplicationStarter.java b/apps/udi-stub/src/main/java/no/nav/udistub/UdiStubApplicationStarter.java index d8870907b9a..b6eb3a1b723 100644 --- a/apps/udi-stub/src/main/java/no/nav/udistub/UdiStubApplicationStarter.java +++ b/apps/udi-stub/src/main/java/no/nav/udistub/UdiStubApplicationStarter.java @@ -15,4 +15,4 @@ public static void main(String[] args) { SpringApplication.run(UdiStubApplicationStarter.class, args); } -} \ No newline at end of file +} diff --git a/apps/varslinger-service/build.gradle b/apps/varslinger-service/build.gradle index ea4d537d450..b78e4c2bbdf 100644 --- a/apps/varslinger-service/build.gradle +++ b/apps/varslinger-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.6" + 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' } } @@ -45,7 +45,7 @@ repositories { dependencies { - implementation 'com.google.guava:guava:31.1-jre' + implementation 'com.google.guava:guava:33.2.0-jre' implementation 'no.nav.testnav.libs:security-core' implementation 'no.nav.testnav.libs:servlet-core' implementation 'no.nav.testnav.libs:database' diff --git a/apps/varslinger-service/gradle/wrapper/gradle-wrapper.properties b/apps/varslinger-service/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/apps/varslinger-service/gradle/wrapper/gradle-wrapper.properties +++ b/apps/varslinger-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/apps/varslinger-service/settings.gradle b/apps/varslinger-service/settings.gradle index 7cc9d27ab23..8dd27df6ad2 100644 --- a/apps/varslinger-service/settings.gradle +++ b/apps/varslinger-service/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'varslinger-service' @@ -10,9 +10,9 @@ includeBuild '../../libs/database' includeBuild '../../libs/data-transfer-objects' 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" } } \ No newline at end of file diff --git a/examples/reactive-rest-example/build.gradle b/examples/reactive-rest-example/build.gradle index 52fcc630ceb..a798212b517 100644 --- a/examples/reactive-rest-example/build.gradle +++ b/examples/reactive-rest-example/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.6" + 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' } } @@ -59,7 +59,7 @@ dependencies { runtimeOnly 'org.postgresql:postgresql' runtimeOnly 'com.h2database:h2' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0' + implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' diff --git a/examples/reactive-rest-example/gradle/wrapper/gradle-wrapper.properties b/examples/reactive-rest-example/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/examples/reactive-rest-example/gradle/wrapper/gradle-wrapper.properties +++ b/examples/reactive-rest-example/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/examples/reactive-rest-example/settings.gradle b/examples/reactive-rest-example/settings.gradle index e6bb8e63790..ae015c2baee 100644 --- a/examples/reactive-rest-example/settings.gradle +++ b/examples/reactive-rest-example/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'reactive-rest-example' @@ -8,9 +8,9 @@ rootProject.name = 'reactive-rest-example' includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-security' -gradleEnterprise { +develocity { buildScan { - termsOfServiceUrl = "https://gradle.com/terms-of-service" - termsOfServiceAgree = "yes" + termsOfUseUrl = "https://gradle.com/terms-of-service" + termsOfUseAgree = "yes" } } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3499ded5c11..20db9ad5c95 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/avro-schema/build.gradle b/libs/avro-schema/build.gradle index be001c4a993..17e85c91f90 100644 --- a/libs/avro-schema/build.gradle +++ b/libs/avro-schema/build.gradle @@ -1,5 +1,5 @@ plugins { - id "org.sonarqube" version "4.4.1.3373" + id "org.sonarqube" version "5.0.0.4638" id 'java-library' id 'maven-publish' id 'com.github.davidmc24.gradle.plugin.avro' version '1.9.1' diff --git a/libs/avro-schema/gradle/wrapper/gradle-wrapper.properties b/libs/avro-schema/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/libs/avro-schema/gradle/wrapper/gradle-wrapper.properties +++ b/libs/avro-schema/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/avro-schema/settings.gradle b/libs/avro-schema/settings.gradle index 7997c8754cb..aa4f4f9140f 100644 --- a/libs/avro-schema/settings.gradle +++ b/libs/avro-schema/settings.gradle @@ -1,13 +1,13 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'avro-schema' -gradleEnterprise { +develocity { buildScan { - termsOfServiceUrl = "https://gradle.com/terms-of-service" - termsOfServiceAgree = "yes" + termsOfUseUrl = "https://gradle.com/terms-of-service" + termsOfUseAgree = "yes" } } diff --git a/libs/commands/build.gradle b/libs/commands/build.gradle index f78cb1f819d..dd3d2127ac8 100644 --- a/libs/commands/build.gradle +++ b/libs/commands/build.gradle @@ -1,7 +1,7 @@ plugins { - id "org.sonarqube" version "4.4.1.3373" + id "org.sonarqube" version "5.0.0.4638" id 'java-library' - id 'io.spring.dependency-management' version "1.1.4" + id 'io.spring.dependency-management' version "1.1.5" id "jacoco" } diff --git a/libs/commands/gradle/wrapper/gradle-wrapper.properties b/libs/commands/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/libs/commands/gradle/wrapper/gradle-wrapper.properties +++ b/libs/commands/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/commands/settings.gradle b/libs/commands/settings.gradle index 22aeadc99c4..de45dffd1d7 100644 --- a/libs/commands/settings.gradle +++ b/libs/commands/settings.gradle @@ -1,14 +1,14 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'commands' includeBuild '../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/libs/csv-converter/build.gradle b/libs/csv-converter/build.gradle index be8378a8d38..6d30d766506 100644 --- a/libs/csv-converter/build.gradle +++ b/libs/csv-converter/build.gradle @@ -1,7 +1,7 @@ plugins { - id "org.sonarqube" version "4.4.1.3373" + id "org.sonarqube" version "5.0.0.4638" id 'java-library' - id 'io.spring.dependency-management' version "1.1.4" + id 'io.spring.dependency-management' version "1.1.5" id "jacoco" } diff --git a/libs/csv-converter/gradle/wrapper/gradle-wrapper.properties b/libs/csv-converter/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/libs/csv-converter/gradle/wrapper/gradle-wrapper.properties +++ b/libs/csv-converter/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/csv-converter/settings.gradle b/libs/csv-converter/settings.gradle index 5d085d17c51..8d2def7c322 100644 --- a/libs/csv-converter/settings.gradle +++ b/libs/csv-converter/settings.gradle @@ -1,13 +1,13 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'csv-converter' -gradleEnterprise { +develocity { buildScan { - termsOfServiceUrl = "https://gradle.com/terms-of-service" - termsOfServiceAgree = "yes" + termsOfUseUrl = "https://gradle.com/terms-of-service" + termsOfUseAgree = "yes" } } diff --git a/libs/data-transfer-objects/build.gradle b/libs/data-transfer-objects/build.gradle index c6658481be5..402f61a77d7 100644 --- a/libs/data-transfer-objects/build.gradle +++ b/libs/data-transfer-objects/build.gradle @@ -1,8 +1,8 @@ plugins { - id "org.sonarqube" version "4.4.1.3373" + id "org.sonarqube" version "5.0.0.4638" id 'java-library' id 'maven-publish' - id 'io.spring.dependency-management' version "1.1.4" + id 'io.spring.dependency-management' version "1.1.5" id "jacoco" } @@ -47,10 +47,10 @@ dependencies { implementation 'com.fasterxml.jackson.core:jackson-annotations' implementation 'com.fasterxml.jackson.core:jackson-databind' implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' implementation 'jakarta.validation:jakarta.validation-api' implementation 'jakarta.xml.bind:jakarta.xml.bind-api' - implementation 'javax.xml.bind:jaxb-api:2.3.1' + implementation 'javax.xml.bind:jaxb-api:2.4.0-b180830.0359' implementation 'org.apache.commons:commons-lang3' implementation 'org.springframework:spring-web' diff --git a/libs/data-transfer-objects/gradle/wrapper/gradle-wrapper.properties b/libs/data-transfer-objects/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/libs/data-transfer-objects/gradle/wrapper/gradle-wrapper.properties +++ b/libs/data-transfer-objects/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/data-transfer-objects/settings.gradle b/libs/data-transfer-objects/settings.gradle index 57cd869a067..edc5eea9c79 100644 --- a/libs/data-transfer-objects/settings.gradle +++ b/libs/data-transfer-objects/settings.gradle @@ -1,13 +1,13 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = '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/libs/data-transfer-search-objects/build.gradle b/libs/data-transfer-search-objects/build.gradle index c4e9e1b1f63..bccd8a03396 100644 --- a/libs/data-transfer-search-objects/build.gradle +++ b/libs/data-transfer-search-objects/build.gradle @@ -1,8 +1,8 @@ plugins { - id "org.sonarqube" version "4.4.1.3373" + id "org.sonarqube" version "5.0.0.4638" id 'java-library' id 'maven-publish' - id 'io.spring.dependency-management' version "1.1.4" + id 'io.spring.dependency-management' version "1.1.5" id "jacoco" } @@ -47,10 +47,10 @@ dependencies { implementation 'com.fasterxml.jackson.core:jackson-annotations' implementation 'com.fasterxml.jackson.core:jackson-databind' implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml' - implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.20' + implementation 'io.swagger.core.v3:swagger-annotations-jakarta:2.2.21' implementation 'jakarta.validation:jakarta.validation-api' implementation 'jakarta.xml.bind:jakarta.xml.bind-api' - implementation 'javax.xml.bind:jaxb-api:2.3.1' + implementation 'javax.xml.bind:jaxb-api:2.4.0-b180830.0359' implementation 'org.apache.commons:commons-lang3' implementation 'org.springframework:spring-web' diff --git a/libs/data-transfer-search-objects/gradle/wrapper/gradle-wrapper.properties b/libs/data-transfer-search-objects/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/libs/data-transfer-search-objects/gradle/wrapper/gradle-wrapper.properties +++ b/libs/data-transfer-search-objects/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/data-transfer-search-objects/settings.gradle b/libs/data-transfer-search-objects/settings.gradle index 75801b776d7..270d27385d6 100644 --- a/libs/data-transfer-search-objects/settings.gradle +++ b/libs/data-transfer-search-objects/settings.gradle @@ -1,13 +1,13 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = '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/libs/database/build.gradle b/libs/database/build.gradle index 254c1372596..cf83f9abf8e 100644 --- a/libs/database/build.gradle +++ b/libs/database/build.gradle @@ -1,7 +1,7 @@ plugins { - id "org.sonarqube" version "4.4.1.3373" + id "org.sonarqube" version "5.0.0.4638" id 'java-library' - id 'io.spring.dependency-management' version "1.1.4" + id 'io.spring.dependency-management' version "1.1.5" id "jacoco" } @@ -23,7 +23,7 @@ dependencyManagement { applyMavenExclusions = false imports { mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' } } diff --git a/libs/database/gradle/wrapper/gradle-wrapper.properties b/libs/database/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/libs/database/gradle/wrapper/gradle-wrapper.properties +++ b/libs/database/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/database/settings.gradle b/libs/database/settings.gradle index e666c721fcd..be91471dc1b 100644 --- a/libs/database/settings.gradle +++ b/libs/database/settings.gradle @@ -1,13 +1,13 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'database' -gradleEnterprise { +develocity { buildScan { - termsOfServiceUrl = "https://gradle.com/terms-of-service" - termsOfServiceAgree = "yes" + termsOfUseUrl = "https://gradle.com/terms-of-service" + termsOfUseAgree = "yes" } } diff --git a/libs/domain/build.gradle b/libs/domain/build.gradle index abe88268897..1908e3f3b4f 100644 --- a/libs/domain/build.gradle +++ b/libs/domain/build.gradle @@ -1,7 +1,7 @@ plugins { - id "org.sonarqube" version "4.4.1.3373" + id "org.sonarqube" version "5.0.0.4638" id 'java-library' - id 'io.spring.dependency-management' version "1.1.4" + id 'io.spring.dependency-management' version "1.1.5" id "jacoco" } @@ -44,9 +44,9 @@ java { dependencies { implementation 'com.fasterxml.jackson.core:jackson-annotations' implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-xml' - implementation 'com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.2' + implementation 'com.fasterxml.jackson.core:jackson-core:2.17.1' - implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0' + implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2' implementation 'io.springfox:springfox-swagger2:3.0.0' implementation 'org.projectlombok:lombok' diff --git a/libs/domain/gradle/wrapper/gradle-wrapper.properties b/libs/domain/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/libs/domain/gradle/wrapper/gradle-wrapper.properties +++ b/libs/domain/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/domain/settings.gradle b/libs/domain/settings.gradle index b7f8fbdfbd0..97962625795 100644 --- a/libs/domain/settings.gradle +++ b/libs/domain/settings.gradle @@ -1,13 +1,13 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'domain' -gradleEnterprise { +develocity { buildScan { - termsOfServiceUrl = "https://gradle.com/terms-of-service" - termsOfServiceAgree = "yes" + termsOfUseUrl = "https://gradle.com/terms-of-service" + termsOfUseAgree = "yes" } } diff --git a/libs/integration-test/build.gradle b/libs/integration-test/build.gradle index 0600f896813..df1149e1c4b 100644 --- a/libs/integration-test/build.gradle +++ b/libs/integration-test/build.gradle @@ -1,7 +1,7 @@ plugins { - id "org.sonarqube" version "4.4.1.3373" + id "org.sonarqube" version "5.0.0.4638" id 'java-library' - id 'io.spring.dependency-management' version "1.1.4" + id 'io.spring.dependency-management' version "1.1.5" id "jacoco" } diff --git a/libs/integration-test/gradle/wrapper/gradle-wrapper.properties b/libs/integration-test/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/libs/integration-test/gradle/wrapper/gradle-wrapper.properties +++ b/libs/integration-test/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/integration-test/settings.gradle b/libs/integration-test/settings.gradle index 300d2419620..6c51a2805e4 100644 --- a/libs/integration-test/settings.gradle +++ b/libs/integration-test/settings.gradle @@ -1,14 +1,14 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'integration-test' includeBuild '../security-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/libs/kafka-config/build.gradle b/libs/kafka-config/build.gradle index c9fad4e7d52..20b402a233d 100644 --- a/libs/kafka-config/build.gradle +++ b/libs/kafka-config/build.gradle @@ -1,7 +1,7 @@ plugins { - id "org.sonarqube" version "4.4.1.3373" + id "org.sonarqube" version "5.0.0.4638" id 'java-library' - id 'io.spring.dependency-management' version "1.1.4" + id 'io.spring.dependency-management' version "1.1.5" id "jacoco" } diff --git a/libs/kafka-config/gradle/wrapper/gradle-wrapper.properties b/libs/kafka-config/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/libs/kafka-config/gradle/wrapper/gradle-wrapper.properties +++ b/libs/kafka-config/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/kafka-config/settings.gradle b/libs/kafka-config/settings.gradle index 809a4e89842..4f066b14ee1 100644 --- a/libs/kafka-config/settings.gradle +++ b/libs/kafka-config/settings.gradle @@ -1,12 +1,12 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'kafka-config' -gradleEnterprise { +develocity { buildScan { - termsOfServiceUrl = "https://gradle.com/terms-of-service" - termsOfServiceAgree = "yes" + termsOfUseUrl = "https://gradle.com/terms-of-service" + termsOfUseAgree = "yes" } } diff --git a/libs/kafka-producers/build.gradle b/libs/kafka-producers/build.gradle index d69494ad4f2..59251c883e4 100644 --- a/libs/kafka-producers/build.gradle +++ b/libs/kafka-producers/build.gradle @@ -1,7 +1,7 @@ plugins { - id "org.sonarqube" version "4.4.1.3373" + id "org.sonarqube" version "5.0.0.4638" id 'java-library' - id 'io.spring.dependency-management' version "1.1.4" + id 'io.spring.dependency-management' version "1.1.5" id "jacoco" } diff --git a/libs/kafka-producers/gradle/wrapper/gradle-wrapper.properties b/libs/kafka-producers/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/libs/kafka-producers/gradle/wrapper/gradle-wrapper.properties +++ b/libs/kafka-producers/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/kafka-producers/settings.gradle b/libs/kafka-producers/settings.gradle index e8a234f04e5..3b611ba488d 100644 --- a/libs/kafka-producers/settings.gradle +++ b/libs/kafka-producers/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'kafka-producers' @@ -7,9 +7,9 @@ rootProject.name = 'kafka-producers' includeBuild '../kafka-config' includeBuild '../avro-schema' -gradleEnterprise { +develocity { buildScan { - termsOfServiceUrl = "https://gradle.com/terms-of-service" - termsOfServiceAgree = "yes" + termsOfUseUrl = "https://gradle.com/terms-of-service" + termsOfUseAgree = "yes" } } diff --git a/libs/reactive-core/build.gradle b/libs/reactive-core/build.gradle index 53affab269f..f574020d41d 100644 --- a/libs/reactive-core/build.gradle +++ b/libs/reactive-core/build.gradle @@ -1,8 +1,8 @@ plugins { - id "org.sonarqube" version "4.4.1.3373" + id "org.sonarqube" version "5.0.0.4638" id 'java-library' id 'maven-publish' - id 'io.spring.dependency-management' version "1.1.4" + id 'io.spring.dependency-management' version "1.1.5" id "jacoco" } @@ -87,5 +87,5 @@ dependencies { implementation 'net.logstash.logback:logstash-logback-encoder:7.4' testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'io.projectreactor:reactor-test:3.5.4' + testImplementation 'io.projectreactor:reactor-test:3.6.5' } \ No newline at end of file diff --git a/libs/reactive-core/gradle/wrapper/gradle-wrapper.properties b/libs/reactive-core/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/libs/reactive-core/gradle/wrapper/gradle-wrapper.properties +++ b/libs/reactive-core/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/reactive-core/settings.gradle b/libs/reactive-core/settings.gradle index 18f903fe18f..410e2bff48f 100644 --- a/libs/reactive-core/settings.gradle +++ b/libs/reactive-core/settings.gradle @@ -1,12 +1,12 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'reactive-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/libs/reactive-frontend/build.gradle b/libs/reactive-frontend/build.gradle index 8d99f0e21ad..eee5df3257a 100644 --- a/libs/reactive-frontend/build.gradle +++ b/libs/reactive-frontend/build.gradle @@ -1,8 +1,8 @@ plugins { - id "org.sonarqube" version "4.4.1.3373" + id "org.sonarqube" version "5.0.0.4638" id 'java-library' id 'maven-publish' - id 'io.spring.dependency-management' version "1.1.4" + id 'io.spring.dependency-management' version "1.1.5" id "jacoco" } @@ -32,7 +32,7 @@ repositories { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' } } diff --git a/libs/reactive-frontend/gradle/wrapper/gradle-wrapper.properties b/libs/reactive-frontend/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/libs/reactive-frontend/gradle/wrapper/gradle-wrapper.properties +++ b/libs/reactive-frontend/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/reactive-frontend/settings.gradle b/libs/reactive-frontend/settings.gradle index 4cc39cf4ef5..cf279db27a9 100644 --- a/libs/reactive-frontend/settings.gradle +++ b/libs/reactive-frontend/settings.gradle @@ -1,14 +1,14 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'reactive-frontend' includeBuild '../security-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/libs/reactive-proxy/build.gradle b/libs/reactive-proxy/build.gradle index f9a90ff5a3d..d08bcb4e6b5 100644 --- a/libs/reactive-proxy/build.gradle +++ b/libs/reactive-proxy/build.gradle @@ -1,8 +1,8 @@ plugins { - id "org.sonarqube" version "4.4.1.3373" + id "org.sonarqube" version "5.0.0.4638" id 'java-library' id 'maven-publish' - id 'io.spring.dependency-management' version "1.1.4" + id 'io.spring.dependency-management' version "1.1.5" id "jacoco" } @@ -31,7 +31,7 @@ repositories { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' } } diff --git a/libs/reactive-proxy/gradle/wrapper/gradle-wrapper.properties b/libs/reactive-proxy/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/libs/reactive-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/libs/reactive-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/reactive-proxy/settings.gradle b/libs/reactive-proxy/settings.gradle index be17fc0d1cd..88b8c3de9c9 100644 --- a/libs/reactive-proxy/settings.gradle +++ b/libs/reactive-proxy/settings.gradle @@ -1,14 +1,14 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'reactive-proxy' includeBuild '../reactive-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/libs/reactive-security/build.gradle b/libs/reactive-security/build.gradle index 46bc6cba4fb..57a0a0c7f00 100644 --- a/libs/reactive-security/build.gradle +++ b/libs/reactive-security/build.gradle @@ -1,8 +1,8 @@ plugins { - id "org.sonarqube" version "4.4.1.3373" + id "org.sonarqube" version "5.0.0.4638" id 'java-library' id 'maven-publish' - id 'io.spring.dependency-management' version "1.1.4" + id 'io.spring.dependency-management' version "1.1.5" id "jacoco" } diff --git a/libs/reactive-security/gradle/wrapper/gradle-wrapper.properties b/libs/reactive-security/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/libs/reactive-security/gradle/wrapper/gradle-wrapper.properties +++ b/libs/reactive-security/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/reactive-security/settings.gradle b/libs/reactive-security/settings.gradle index c8dceee706c..ff147ef435f 100644 --- a/libs/reactive-security/settings.gradle +++ b/libs/reactive-security/settings.gradle @@ -1,14 +1,14 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'reactive-security' includeBuild '../security-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/libs/reactive-session-security/build.gradle b/libs/reactive-session-security/build.gradle index 0ba85bd0624..8f4c127d702 100644 --- a/libs/reactive-session-security/build.gradle +++ b/libs/reactive-session-security/build.gradle @@ -1,7 +1,7 @@ plugins { - id "org.sonarqube" version "4.4.1.3373" + id "org.sonarqube" version "5.0.0.4638" id 'java-library' - id 'io.spring.dependency-management' version "1.1.4" + id 'io.spring.dependency-management' version "1.1.5" id "jacoco" } @@ -42,7 +42,7 @@ java { } dependencies { - implementation 'com.auth0:java-jwt:4.3.0' + implementation 'com.auth0:java-jwt:4.4.0' implementation 'no.nav.testnav.libs:security-core' implementation "org.springframework.session:spring-session-core" diff --git a/libs/reactive-session-security/gradle/wrapper/gradle-wrapper.properties b/libs/reactive-session-security/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/libs/reactive-session-security/gradle/wrapper/gradle-wrapper.properties +++ b/libs/reactive-session-security/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/reactive-session-security/settings.gradle b/libs/reactive-session-security/settings.gradle index 26fd6775c8e..40cc147e68e 100644 --- a/libs/reactive-session-security/settings.gradle +++ b/libs/reactive-session-security/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'reactive-session-security' @@ -7,9 +7,9 @@ rootProject.name = 'reactive-session-security' includeBuild '../security-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/libs/security-core/build.gradle b/libs/security-core/build.gradle index 8cf242e95a4..62ff874fa90 100644 --- a/libs/security-core/build.gradle +++ b/libs/security-core/build.gradle @@ -1,7 +1,7 @@ plugins { - id "org.sonarqube" version "4.4.1.3373" + id "org.sonarqube" version "5.0.0.4638" id 'java-library' - id 'io.spring.dependency-management' version "1.1.4" + id 'io.spring.dependency-management' version "1.1.5" id "jacoco" } @@ -45,7 +45,7 @@ tasks.named('compileJava') { } dependencies { - implementation 'com.auth0:java-jwt:4.3.0' + implementation 'com.auth0:java-jwt:4.4.0' annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor' implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' diff --git a/libs/security-core/gradle/wrapper/gradle-wrapper.properties b/libs/security-core/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/libs/security-core/gradle/wrapper/gradle-wrapper.properties +++ b/libs/security-core/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/security-core/settings.gradle b/libs/security-core/settings.gradle index 95fb1a3e3ae..bf49db8ddb4 100644 --- a/libs/security-core/settings.gradle +++ b/libs/security-core/settings.gradle @@ -1,12 +1,12 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'security-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/libs/security-token-service/build.gradle b/libs/security-token-service/build.gradle index d9849c51830..93fa5d5bedb 100644 --- a/libs/security-token-service/build.gradle +++ b/libs/security-token-service/build.gradle @@ -1,7 +1,7 @@ plugins { - id "org.sonarqube" version "4.4.1.3373" + id "org.sonarqube" version "5.0.0.4638" id 'java-library' - id 'io.spring.dependency-management' version "1.1.4" + id 'io.spring.dependency-management' version "1.1.5" id "jacoco" } diff --git a/libs/security-token-service/gradle/wrapper/gradle-wrapper.properties b/libs/security-token-service/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/libs/security-token-service/gradle/wrapper/gradle-wrapper.properties +++ b/libs/security-token-service/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/security-token-service/settings.gradle b/libs/security-token-service/settings.gradle index 72c54cdd83d..393aeb31201 100644 --- a/libs/security-token-service/settings.gradle +++ b/libs/security-token-service/settings.gradle @@ -1,13 +1,13 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'security-token-service' -gradleEnterprise { +develocity { buildScan { - termsOfServiceUrl = "https://gradle.com/terms-of-service" - termsOfServiceAgree = "yes" + termsOfUseUrl = "https://gradle.com/terms-of-service" + termsOfUseAgree = "yes" } } diff --git a/libs/servlet-core/build.gradle b/libs/servlet-core/build.gradle index 18e1c1b92e3..d24eea9bd0b 100644 --- a/libs/servlet-core/build.gradle +++ b/libs/servlet-core/build.gradle @@ -1,7 +1,7 @@ plugins { - id "org.sonarqube" version "4.4.1.3373" + id "org.sonarqube" version "5.0.0.4638" id 'java-library' - id 'io.spring.dependency-management' version "1.1.4" + id 'io.spring.dependency-management' version "1.1.5" id "jacoco" } @@ -46,7 +46,7 @@ java { dependencies { - 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/libs/servlet-core/gradle/wrapper/gradle-wrapper.properties b/libs/servlet-core/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/libs/servlet-core/gradle/wrapper/gradle-wrapper.properties +++ b/libs/servlet-core/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/servlet-core/settings.gradle b/libs/servlet-core/settings.gradle index 33a7aee883b..cfb84c7c17e 100644 --- a/libs/servlet-core/settings.gradle +++ b/libs/servlet-core/settings.gradle @@ -1,13 +1,13 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = '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/libs/servlet-insecure-security/build.gradle b/libs/servlet-insecure-security/build.gradle index 5ce3c32243c..bf8f98918fa 100644 --- a/libs/servlet-insecure-security/build.gradle +++ b/libs/servlet-insecure-security/build.gradle @@ -1,7 +1,7 @@ plugins { - id "org.sonarqube" version "4.4.1.3373" + id "org.sonarqube" version "5.0.0.4638" id 'java-library' - id 'io.spring.dependency-management' version "1.1.4" + id 'io.spring.dependency-management' version "1.1.5" id "jacoco" } diff --git a/libs/servlet-insecure-security/gradle/wrapper/gradle-wrapper.properties b/libs/servlet-insecure-security/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/libs/servlet-insecure-security/gradle/wrapper/gradle-wrapper.properties +++ b/libs/servlet-insecure-security/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/servlet-insecure-security/settings.gradle b/libs/servlet-insecure-security/settings.gradle index b6ce72380a4..53ea95bc271 100644 --- a/libs/servlet-insecure-security/settings.gradle +++ b/libs/servlet-insecure-security/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'servlet-insecure-security' @@ -7,9 +7,9 @@ rootProject.name = 'servlet-insecure-security' includeBuild '../security-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/libs/servlet-security/build.gradle b/libs/servlet-security/build.gradle index 8205f387181..6c8170e03c2 100644 --- a/libs/servlet-security/build.gradle +++ b/libs/servlet-security/build.gradle @@ -1,7 +1,7 @@ plugins { - id "org.sonarqube" version "4.4.1.3373" + id "org.sonarqube" version "5.0.0.4638" id 'java-library' - id 'io.spring.dependency-management' version "1.1.4" + id 'io.spring.dependency-management' version "1.1.5" id "jacoco" } @@ -44,7 +44,7 @@ java { dependencies { implementation 'no.nav.testnav.libs:security-core' - implementation 'com.auth0:java-jwt:4.3.0' + implementation 'com.auth0:java-jwt:4.4.0' implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' implementation 'org.springframework.boot:spring-boot-starter-actuator' diff --git a/libs/servlet-security/gradle/wrapper/gradle-wrapper.properties b/libs/servlet-security/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/libs/servlet-security/gradle/wrapper/gradle-wrapper.properties +++ b/libs/servlet-security/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/servlet-security/settings.gradle b/libs/servlet-security/settings.gradle index 7fae77e2a1f..6d44ec692cb 100644 --- a/libs/servlet-security/settings.gradle +++ b/libs/servlet-security/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'servlet-security' @@ -7,9 +7,9 @@ rootProject.name = 'servlet-security' includeBuild '../security-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/libs/slack/build.gradle b/libs/slack/build.gradle index a57b0e7f2cf..e0dd48d67c9 100644 --- a/libs/slack/build.gradle +++ b/libs/slack/build.gradle @@ -1,7 +1,7 @@ plugins { - id "org.sonarqube" version "4.4.1.3373" + id "org.sonarqube" version "5.0.0.4638" id 'java-library' - id 'io.spring.dependency-management' version "1.1.4" + id 'io.spring.dependency-management' version "1.1.5" id "jacoco" } diff --git a/libs/slack/gradle/wrapper/gradle-wrapper.properties b/libs/slack/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/libs/slack/gradle/wrapper/gradle-wrapper.properties +++ b/libs/slack/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/slack/settings.gradle b/libs/slack/settings.gradle index d1e11bb491f..378a320c9b7 100644 --- a/libs/slack/settings.gradle +++ b/libs/slack/settings.gradle @@ -1,13 +1,13 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'slack' -gradleEnterprise { +develocity { buildScan { - termsOfServiceUrl = "https://gradle.com/terms-of-service" - termsOfServiceAgree = "yes" + termsOfUseUrl = "https://gradle.com/terms-of-service" + termsOfUseAgree = "yes" } } diff --git a/libs/testing/build.gradle b/libs/testing/build.gradle index 396c933c212..b8b683be3e5 100644 --- a/libs/testing/build.gradle +++ b/libs/testing/build.gradle @@ -1,7 +1,7 @@ plugins { - id "org.sonarqube" version "4.4.1.3373" + id "org.sonarqube" version "5.0.0.4638" id 'java-library' - id 'io.spring.dependency-management' version "1.1.4" + id 'io.spring.dependency-management' version "1.1.5" id "jacoco" } @@ -30,7 +30,7 @@ repositories { dependencyManagement { applyMavenExclusions = false imports { - mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.0' + mavenBom 'org.springframework.cloud:spring-cloud-dependencies:2023.0.1' mavenBom 'org.springframework.boot:spring-boot-dependencies:3.2.1' } } diff --git a/libs/testing/gradle/wrapper/gradle-wrapper.properties b/libs/testing/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/libs/testing/gradle/wrapper/gradle-wrapper.properties +++ b/libs/testing/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/libs/testing/settings.gradle b/libs/testing/settings.gradle index 57c79cf948c..f47f547a9de 100644 --- a/libs/testing/settings.gradle +++ b/libs/testing/settings.gradle @@ -1,12 +1,12 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'testing' -gradleEnterprise { +develocity { buildScan { - termsOfServiceUrl = "https://gradle.com/terms-of-service" - termsOfServiceAgree = "yes" + termsOfUseUrl = "https://gradle.com/terms-of-service" + termsOfUseAgree = "yes" } } diff --git a/mocks/maskinporten-mock/build.gradle b/mocks/maskinporten-mock/build.gradle index 7487f6dab72..b8a94843de2 100644 --- a/mocks/maskinporten-mock/build.gradle +++ b/mocks/maskinporten-mock/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' - id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.4" + id 'org.springframework.boot' version "3.2.6" + id 'io.spring.dependency-management' version "1.1.5" } bootJar { @@ -11,7 +11,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' } } @@ -25,7 +25,7 @@ repositories { } dependencies { - implementation 'com.auth0:java-jwt:4.3.0' + implementation 'com.auth0:java-jwt:4.4.0' implementation 'no.nav.testnav.libs:security-core' implementation 'no.nav.testnav.libs:reactive-core' @@ -33,7 +33,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0' + implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0' compileOnly 'jakarta.servlet:jakarta.servlet-api:6.0.0' diff --git a/mocks/maskinporten-mock/gradle/wrapper/gradle-wrapper.properties b/mocks/maskinporten-mock/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/mocks/maskinporten-mock/gradle/wrapper/gradle-wrapper.properties +++ b/mocks/maskinporten-mock/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/mocks/maskinporten-mock/settings.gradle b/mocks/maskinporten-mock/settings.gradle index 5a313f75ca1..898f175ed43 100644 --- a/mocks/maskinporten-mock/settings.gradle +++ b/mocks/maskinporten-mock/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'maskinporten-mock' @@ -7,9 +7,9 @@ rootProject.name = 'maskinporten-mock' includeBuild '../../libs/security-core' includeBuild '../../libs/reactive-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/mocks/tokendings-mock/build.gradle b/mocks/tokendings-mock/build.gradle index ac535e04b82..c31677834d6 100644 --- a/mocks/tokendings-mock/build.gradle +++ b/mocks/tokendings-mock/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' - id 'org.springframework.boot' version "3.2.1" - id 'io.spring.dependency-management' version "1.1.4" + id 'org.springframework.boot' version "3.2.6" + id 'io.spring.dependency-management' version "1.1.5" } bootJar { @@ -11,7 +11,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' } } @@ -25,7 +25,7 @@ repositories { } dependencies { - implementation 'com.auth0:java-jwt:4.3.0' + implementation 'com.auth0:java-jwt:4.4.0' implementation 'no.nav.testnav.libs:security-core' implementation 'no.nav.testnav.libs:reactive-core' @@ -34,7 +34,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-webflux' implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' - implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.3.0' + implementation 'org.springdoc:springdoc-openapi-starter-webflux-ui:2.5.0' compileOnly 'jakarta.servlet:jakarta.servlet-api:6.0.0' implementation 'org.projectlombok:lombok' diff --git a/mocks/tokendings-mock/gradle/wrapper/gradle-wrapper.properties b/mocks/tokendings-mock/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/mocks/tokendings-mock/gradle/wrapper/gradle-wrapper.properties +++ b/mocks/tokendings-mock/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/mocks/tokendings-mock/settings.gradle b/mocks/tokendings-mock/settings.gradle index dec32294504..121f6831265 100644 --- a/mocks/tokendings-mock/settings.gradle +++ b/mocks/tokendings-mock/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'tokendings-mock' @@ -7,9 +7,9 @@ rootProject.name = 'tokendings-mock' includeBuild '../../libs/security-core' includeBuild '../../libs/reactive-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/proxies/aareg-proxy/build.gradle b/proxies/aareg-proxy/build.gradle index 8c413003d70..10f5e78eb73 100644 --- a/proxies/aareg-proxy/build.gradle +++ b/proxies/aareg-proxy/build.gradle @@ -1,8 +1,8 @@ plugins { - id 'io.spring.dependency-management' version "1.1.4" + id 'io.spring.dependency-management' version "1.1.5" id 'java' - id "org.sonarqube" version "4.4.1.3373" - id 'org.springframework.boot' version "3.2.1" + id "org.sonarqube" version "5.0.0.4638" + id 'org.springframework.boot' version "3.2.6" 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' } } diff --git a/proxies/aareg-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/aareg-proxy/gradle/wrapper/gradle-wrapper.properties index 3499ded5c11..20db9ad5c95 100644 --- a/proxies/aareg-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/aareg-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/aareg-proxy/settings.gradle b/proxies/aareg-proxy/settings.gradle index 2aa0847b824..99ed0360802 100644 --- a/proxies/aareg-proxy/settings.gradle +++ b/proxies/aareg-proxy/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'aareg-proxy' @@ -9,9 +9,9 @@ includeBuild '../../libs/reactive-proxy' includeBuild '../../libs/security-core' includeBuild '../../libs/reactive-security' -gradleEnterprise { +develocity { buildScan { - termsOfServiceUrl = "https://gradle.com/terms-of-service" - termsOfServiceAgree = "yes" + termsOfUseUrl = "https://gradle.com/terms-of-service" + termsOfUseAgree = "yes" } } \ No newline at end of file diff --git a/proxies/aareg-synt-services-proxy/build.gradle b/proxies/aareg-synt-services-proxy/build.gradle index f508a7e0dc8..d32ca22ddbd 100644 --- a/proxies/aareg-synt-services-proxy/build.gradle +++ b/proxies/aareg-synt-services-proxy/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.6" + 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' } } diff --git a/proxies/aareg-synt-services-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/aareg-synt-services-proxy/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/proxies/aareg-synt-services-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/aareg-synt-services-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/aareg-synt-services-proxy/settings.gradle b/proxies/aareg-synt-services-proxy/settings.gradle index e15250fbe36..3526329c16a 100644 --- a/proxies/aareg-synt-services-proxy/settings.gradle +++ b/proxies/aareg-synt-services-proxy/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'aareg-synt-services-proxy' @@ -8,9 +8,9 @@ rootProject.name = 'aareg-synt-services-proxy' includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-proxy' -gradleEnterprise { +develocity { buildScan { - termsOfServiceUrl = "https://gradle.com/terms-of-service" - termsOfServiceAgree = "yes" + termsOfUseUrl = "https://gradle.com/terms-of-service" + termsOfUseAgree = "yes" } } diff --git a/proxies/arbeidsplassencv-proxy/build.gradle b/proxies/arbeidsplassencv-proxy/build.gradle index 64ccb1b4add..738744f1b9d 100644 --- a/proxies/arbeidsplassencv-proxy/build.gradle +++ b/proxies/arbeidsplassencv-proxy/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.6" + 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/proxies/arbeidsplassencv-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/arbeidsplassencv-proxy/gradle/wrapper/gradle-wrapper.properties index c64ee91b762..9b25a4cc0f2 100644 --- a/proxies/arbeidsplassencv-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/arbeidsplassencv-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/arbeidsplassencv-proxy/settings.gradle b/proxies/arbeidsplassencv-proxy/settings.gradle index 059cdbbe64d..77a3c02d1c1 100644 --- a/proxies/arbeidsplassencv-proxy/settings.gradle +++ b/proxies/arbeidsplassencv-proxy/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'arbeidsplassencv-proxy' @@ -9,9 +9,9 @@ includeBuild '../../libs/reactive-proxy' includeBuild '../../libs/security-core' includeBuild '../../libs/reactive-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/proxies/arena-forvalteren-proxy/build.gradle b/proxies/arena-forvalteren-proxy/build.gradle index 045445f2c47..24103d0b473 100644 --- a/proxies/arena-forvalteren-proxy/build.gradle +++ b/proxies/arena-forvalteren-proxy/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.6" + 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/proxies/arena-forvalteren-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/arena-forvalteren-proxy/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/proxies/arena-forvalteren-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/arena-forvalteren-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/arena-forvalteren-proxy/settings.gradle b/proxies/arena-forvalteren-proxy/settings.gradle index c6c8e896db9..c8a340ea0db 100644 --- a/proxies/arena-forvalteren-proxy/settings.gradle +++ b/proxies/arena-forvalteren-proxy/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'arena-forvalteren-proxy' @@ -10,9 +10,9 @@ includeBuild '../../libs/reactive-proxy' includeBuild '../../libs/security-core' 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/proxies/batch-adeo-proxy/build.gradle b/proxies/batch-adeo-proxy/build.gradle index b0c1137c16a..118492dccb3 100644 --- a/proxies/batch-adeo-proxy/build.gradle +++ b/proxies/batch-adeo-proxy/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.6" + 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' } } diff --git a/proxies/batch-adeo-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/batch-adeo-proxy/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/proxies/batch-adeo-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/batch-adeo-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/batch-adeo-proxy/settings.gradle b/proxies/batch-adeo-proxy/settings.gradle index 698b086355d..f6d53c5bbe2 100644 --- a/proxies/batch-adeo-proxy/settings.gradle +++ b/proxies/batch-adeo-proxy/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'batch-adeo-proxy' @@ -8,9 +8,9 @@ rootProject.name = 'batch-adeo-proxy' includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-proxy' -gradleEnterprise { +develocity { buildScan { - termsOfServiceUrl = "https://gradle.com/terms-of-service" - termsOfServiceAgree = "yes" + termsOfUseUrl = "https://gradle.com/terms-of-service" + termsOfUseAgree = "yes" } } diff --git a/proxies/brregstub-proxy/build.gradle b/proxies/brregstub-proxy/build.gradle index e005cc17153..aeb3b502796 100644 --- a/proxies/brregstub-proxy/build.gradle +++ b/proxies/brregstub-proxy/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.6" + 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/proxies/brregstub-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/brregstub-proxy/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/proxies/brregstub-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/brregstub-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/brregstub-proxy/settings.gradle b/proxies/brregstub-proxy/settings.gradle index 64944f7f93b..e4d8f5a1350 100644 --- a/proxies/brregstub-proxy/settings.gradle +++ b/proxies/brregstub-proxy/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'brregstub-proxy' @@ -9,9 +9,9 @@ includeBuild '../../libs/reactive-core' includeBuild '../../libs/data-transfer-objects' includeBuild '../../libs/reactive-proxy' -gradleEnterprise { +develocity { buildScan { - termsOfServiceUrl = "https://gradle.com/terms-of-service" - termsOfServiceAgree = "yes" + termsOfUseUrl = "https://gradle.com/terms-of-service" + termsOfUseAgree = "yes" } } diff --git a/proxies/dokarkiv-proxy/build.gradle b/proxies/dokarkiv-proxy/build.gradle index 5f3dfb158b2..9a4b6390331 100644 --- a/proxies/dokarkiv-proxy/build.gradle +++ b/proxies/dokarkiv-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' - id "org.sonarqube" version "4.4.1.3373" - id 'org.springframework.boot' version "3.2.1" + id "org.sonarqube" version "5.0.0.4638" + id 'org.springframework.boot' version "3.2.6" id 'io.spring.dependency-management' version '1.0.11.RELEASE' 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/proxies/dokarkiv-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/dokarkiv-proxy/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/proxies/dokarkiv-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/dokarkiv-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/dokarkiv-proxy/settings.gradle b/proxies/dokarkiv-proxy/settings.gradle index 5e3b302a99e..42e8c0c238d 100644 --- a/proxies/dokarkiv-proxy/settings.gradle +++ b/proxies/dokarkiv-proxy/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'dokarkiv-proxy' @@ -10,9 +10,9 @@ includeBuild '../../libs/security-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/proxies/ereg-proxy/build.gradle b/proxies/ereg-proxy/build.gradle index 1a9696f90d7..5dddd389be2 100644 --- a/proxies/ereg-proxy/build.gradle +++ b/proxies/ereg-proxy/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.6" + 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/proxies/ereg-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/ereg-proxy/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/proxies/ereg-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/ereg-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/ereg-proxy/settings.gradle b/proxies/ereg-proxy/settings.gradle index acb3744f303..e2dbc9336c0 100644 --- a/proxies/ereg-proxy/settings.gradle +++ b/proxies/ereg-proxy/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'ereg-proxy' @@ -8,9 +8,9 @@ rootProject.name = 'ereg-proxy' includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-proxy' -gradleEnterprise { +develocity { buildScan { - termsOfServiceUrl = "https://gradle.com/terms-of-service" - termsOfServiceAgree = "yes" + termsOfUseUrl = "https://gradle.com/terms-of-service" + termsOfUseAgree = "yes" } } diff --git a/proxies/histark-proxy/build.gradle b/proxies/histark-proxy/build.gradle index 98645b7466b..1ad1986ef3e 100644 --- a/proxies/histark-proxy/build.gradle +++ b/proxies/histark-proxy/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.6" + 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' } } diff --git a/proxies/histark-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/histark-proxy/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/proxies/histark-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/histark-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/histark-proxy/settings.gradle b/proxies/histark-proxy/settings.gradle index 9dcebfc21b4..3bf954de439 100644 --- a/proxies/histark-proxy/settings.gradle +++ b/proxies/histark-proxy/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'histark-proxy' @@ -9,9 +9,9 @@ includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-proxy' 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/proxies/inntektstub-proxy/build.gradle b/proxies/inntektstub-proxy/build.gradle index ae134b30946..0022ee70a81 100644 --- a/proxies/inntektstub-proxy/build.gradle +++ b/proxies/inntektstub-proxy/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.6" + 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' } } diff --git a/proxies/inntektstub-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/inntektstub-proxy/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/proxies/inntektstub-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/inntektstub-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/inntektstub-proxy/settings.gradle b/proxies/inntektstub-proxy/settings.gradle index 78faa0e7780..4876362e467 100644 --- a/proxies/inntektstub-proxy/settings.gradle +++ b/proxies/inntektstub-proxy/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'inntektstub-proxy' @@ -9,9 +9,9 @@ includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-proxy' 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/proxies/inst-proxy/build.gradle b/proxies/inst-proxy/build.gradle index 31bbf6af02b..f09ffa9d631 100644 --- a/proxies/inst-proxy/build.gradle +++ b/proxies/inst-proxy/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.6" + 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/proxies/inst-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/inst-proxy/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/proxies/inst-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/inst-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/inst-proxy/settings.gradle b/proxies/inst-proxy/settings.gradle index edc24388518..1d831e8cc34 100644 --- a/proxies/inst-proxy/settings.gradle +++ b/proxies/inst-proxy/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'inst-proxy' @@ -11,9 +11,9 @@ includeBuild '../../libs/reactive-proxy' 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/proxies/kontoregister-person-proxy/build.gradle b/proxies/kontoregister-person-proxy/build.gradle index 46570c3c293..9d82da61997 100644 --- a/proxies/kontoregister-person-proxy/build.gradle +++ b/proxies/kontoregister-person-proxy/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.6" + 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' } } diff --git a/proxies/kontoregister-person-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/kontoregister-person-proxy/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/proxies/kontoregister-person-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/kontoregister-person-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/kontoregister-person-proxy/settings.gradle b/proxies/kontoregister-person-proxy/settings.gradle index d983d007c8d..858370e65a0 100644 --- a/proxies/kontoregister-person-proxy/settings.gradle +++ b/proxies/kontoregister-person-proxy/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'kontoregister-person-proxy' @@ -11,9 +11,9 @@ includeBuild '../../libs/security-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/proxies/krrstub-proxy/build.gradle b/proxies/krrstub-proxy/build.gradle index 9464be5fd53..aa0ceba8adb 100644 --- a/proxies/krrstub-proxy/build.gradle +++ b/proxies/krrstub-proxy/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.6" + 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' } } diff --git a/proxies/krrstub-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/krrstub-proxy/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/proxies/krrstub-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/krrstub-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/krrstub-proxy/settings.gradle b/proxies/krrstub-proxy/settings.gradle index 6a7a8dc7150..f85d04c3a5e 100644 --- a/proxies/krrstub-proxy/settings.gradle +++ b/proxies/krrstub-proxy/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'krrstub-proxy' @@ -10,9 +10,9 @@ includeBuild '../../libs/reactive-proxy' includeBuild '../../libs/security-core' includeBuild '../../libs/reactive-security' -gradleEnterprise { +develocity { buildScan { - termsOfServiceUrl = "https://gradle.com/terms-of-service" - termsOfServiceAgree = "yes" + termsOfUseUrl = "https://gradle.com/terms-of-service" + termsOfUseAgree = "yes" } } \ No newline at end of file diff --git a/proxies/medl-proxy/build.gradle b/proxies/medl-proxy/build.gradle index 91607c775f4..20046c06ab6 100644 --- a/proxies/medl-proxy/build.gradle +++ b/proxies/medl-proxy/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.6" + 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' } } diff --git a/proxies/medl-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/medl-proxy/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/proxies/medl-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/medl-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/medl-proxy/settings.gradle b/proxies/medl-proxy/settings.gradle index 81aa0c896ee..bb438579e70 100644 --- a/proxies/medl-proxy/settings.gradle +++ b/proxies/medl-proxy/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'medl-proxy' @@ -10,9 +10,9 @@ includeBuild '../../libs/reactive-proxy' includeBuild '../../libs/security-core' includeBuild '../../libs/reactive-security' -gradleEnterprise { +develocity { buildScan { - termsOfServiceUrl = "https://gradle.com/terms-of-service" - termsOfServiceAgree = "yes" + termsOfUseUrl = "https://gradle.com/terms-of-service" + termsOfUseAgree = "yes" } } \ No newline at end of file diff --git a/proxies/modapp-ereg-proxy/build.gradle b/proxies/modapp-ereg-proxy/build.gradle index 5f8425ba179..095366f635b 100644 --- a/proxies/modapp-ereg-proxy/build.gradle +++ b/proxies/modapp-ereg-proxy/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.6" + 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' } } diff --git a/proxies/modapp-ereg-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/modapp-ereg-proxy/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/proxies/modapp-ereg-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/modapp-ereg-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/modapp-ereg-proxy/settings.gradle b/proxies/modapp-ereg-proxy/settings.gradle index ef5b8a957cb..6e1b87dfcf5 100644 --- a/proxies/modapp-ereg-proxy/settings.gradle +++ b/proxies/modapp-ereg-proxy/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'modapp-ereg-proxy' @@ -10,9 +10,9 @@ includeBuild '../../libs/reactive-proxy' includeBuild '../../libs/security-core' includeBuild '../../libs/reactive-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/proxies/norg2-proxy/build.gradle b/proxies/norg2-proxy/build.gradle index b9bdb838e38..d49d5278547 100644 --- a/proxies/norg2-proxy/build.gradle +++ b/proxies/norg2-proxy/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.6" + 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' } } diff --git a/proxies/norg2-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/norg2-proxy/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/proxies/norg2-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/norg2-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/norg2-proxy/settings.gradle b/proxies/norg2-proxy/settings.gradle index d1a2e4e66ff..c7c427ab008 100644 --- a/proxies/norg2-proxy/settings.gradle +++ b/proxies/norg2-proxy/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'norg2-proxy' @@ -9,9 +9,9 @@ includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-proxy' 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/proxies/pdl-proxy/build.gradle b/proxies/pdl-proxy/build.gradle index 2767b561151..0ac8c44103f 100644 --- a/proxies/pdl-proxy/build.gradle +++ b/proxies/pdl-proxy/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.6" + 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' } } diff --git a/proxies/pdl-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/pdl-proxy/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/proxies/pdl-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/pdl-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/pdl-proxy/settings.gradle b/proxies/pdl-proxy/settings.gradle index 983b60cb6fa..6b78346bf9f 100644 --- a/proxies/pdl-proxy/settings.gradle +++ b/proxies/pdl-proxy/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'pdl-proxy' @@ -10,9 +10,9 @@ includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-proxy' includeBuild '../../libs/reactive-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/proxies/pensjon-testdata-facade-proxy/build.gradle b/proxies/pensjon-testdata-facade-proxy/build.gradle index 8791bf74c1a..dba4d691a91 100644 --- a/proxies/pensjon-testdata-facade-proxy/build.gradle +++ b/proxies/pensjon-testdata-facade-proxy/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.6" + 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' } } diff --git a/proxies/pensjon-testdata-facade-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/pensjon-testdata-facade-proxy/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/proxies/pensjon-testdata-facade-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/pensjon-testdata-facade-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/pensjon-testdata-facade-proxy/settings.gradle b/proxies/pensjon-testdata-facade-proxy/settings.gradle index 15bcb0c695a..7ef3a7a29fc 100644 --- a/proxies/pensjon-testdata-facade-proxy/settings.gradle +++ b/proxies/pensjon-testdata-facade-proxy/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'pensjon-testdata-facade-proxy' @@ -11,9 +11,9 @@ includeBuild '../../libs/security-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/proxies/saf-proxy/build.gradle b/proxies/saf-proxy/build.gradle index 64a365989b8..a778eaa8c7d 100644 --- a/proxies/saf-proxy/build.gradle +++ b/proxies/saf-proxy/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.6" + 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' } } diff --git a/proxies/saf-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/saf-proxy/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/proxies/saf-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/saf-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/saf-proxy/settings.gradle b/proxies/saf-proxy/settings.gradle index 046cc5fc40e..62d62463c5f 100644 --- a/proxies/saf-proxy/settings.gradle +++ b/proxies/saf-proxy/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'saf-proxy' @@ -11,9 +11,9 @@ includeBuild '../../libs/security-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/proxies/sigrunstub-proxy/build.gradle b/proxies/sigrunstub-proxy/build.gradle index 7081143efe8..cba116b6582 100644 --- a/proxies/sigrunstub-proxy/build.gradle +++ b/proxies/sigrunstub-proxy/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.6" + 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' } } diff --git a/proxies/sigrunstub-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/sigrunstub-proxy/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/proxies/sigrunstub-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/sigrunstub-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/sigrunstub-proxy/settings.gradle b/proxies/sigrunstub-proxy/settings.gradle index f575987ded5..a5b701b492f 100644 --- a/proxies/sigrunstub-proxy/settings.gradle +++ b/proxies/sigrunstub-proxy/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'sigrunstub-proxy' @@ -9,9 +9,9 @@ includeBuild '../../libs/reactive-core' includeBuild '../../libs/reactive-proxy' 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/proxies/skjermingsregister-proxy/build.gradle b/proxies/skjermingsregister-proxy/build.gradle index bb3fe6e3b50..1ba2ac69875 100644 --- a/proxies/skjermingsregister-proxy/build.gradle +++ b/proxies/skjermingsregister-proxy/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.6" + 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/proxies/skjermingsregister-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/skjermingsregister-proxy/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/proxies/skjermingsregister-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/skjermingsregister-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/skjermingsregister-proxy/settings.gradle b/proxies/skjermingsregister-proxy/settings.gradle index 6a11731d7c1..46db687b832 100644 --- a/proxies/skjermingsregister-proxy/settings.gradle +++ b/proxies/skjermingsregister-proxy/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'skjermingsregister-proxy' @@ -10,9 +10,9 @@ includeBuild '../../libs/reactive-proxy' includeBuild '../../libs/security-token-service' 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/proxies/synthdata-meldekort-proxy/build.gradle b/proxies/synthdata-meldekort-proxy/build.gradle index 4321b5cd82f..0d86e0ece22 100644 --- a/proxies/synthdata-meldekort-proxy/build.gradle +++ b/proxies/synthdata-meldekort-proxy/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.6" + 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' } } diff --git a/proxies/synthdata-meldekort-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/synthdata-meldekort-proxy/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/proxies/synthdata-meldekort-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/synthdata-meldekort-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/synthdata-meldekort-proxy/settings.gradle b/proxies/synthdata-meldekort-proxy/settings.gradle index 2dfd6fc6538..137c4a11356 100644 --- a/proxies/synthdata-meldekort-proxy/settings.gradle +++ b/proxies/synthdata-meldekort-proxy/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'synthdata-meldekort-proxy' @@ -11,9 +11,9 @@ includeBuild '../../libs/security-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" } } \ No newline at end of file diff --git a/proxies/udistub-proxy/build.gradle b/proxies/udistub-proxy/build.gradle index 1b105c0da11..3daffc90326 100644 --- a/proxies/udistub-proxy/build.gradle +++ b/proxies/udistub-proxy/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.6" + 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/proxies/udistub-proxy/gradle/wrapper/gradle-wrapper.properties b/proxies/udistub-proxy/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/proxies/udistub-proxy/gradle/wrapper/gradle-wrapper.properties +++ b/proxies/udistub-proxy/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/proxies/udistub-proxy/settings.gradle b/proxies/udistub-proxy/settings.gradle index 37bbb98f5f7..9a60f8f83c5 100644 --- a/proxies/udistub-proxy/settings.gradle +++ b/proxies/udistub-proxy/settings.gradle @@ -1,5 +1,5 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'udistub-proxy' @@ -11,9 +11,9 @@ includeBuild '../../libs/security-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/settings.gradle b/settings.gradle index 0dac4aa7256..50dbd51a797 100644 --- a/settings.gradle +++ b/settings.gradle @@ -9,15 +9,15 @@ pluginManagement { } plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'testnav' -gradleEnterprise { +develocity { buildScan { - termsOfServiceUrl = "https://gradle.com/terms-of-service" - termsOfServiceAgree = "yes" + termsOfUseUrl = "https://gradle.com/terms-of-service" + termsOfUseAgree = "yes" } } diff --git a/xsd/arbeidsforhold-xsd/build.gradle b/xsd/arbeidsforhold-xsd/build.gradle index ae38ee81ac9..8f5ae356516 100644 --- a/xsd/arbeidsforhold-xsd/build.gradle +++ b/xsd/arbeidsforhold-xsd/build.gradle @@ -1,5 +1,5 @@ plugins { - id "org.sonarqube" version "4.4.1.3373" + id "org.sonarqube" version "5.0.0.4638" id 'java-library' id 'com.github.edeandrea.xjc-generation' version '1.6' } @@ -22,12 +22,12 @@ java { } dependencies { - implementation 'jakarta.activation:jakarta.activation-api:2.1.2' - implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0' + implementation 'jakarta.activation:jakarta.activation-api:2.1.3' + implementation 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2' - xjc 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.0' - xjc 'org.glassfish.jaxb:jaxb-xjc:4.0.2' - xjc 'com.sun.xml.bind:jaxb-impl:4.0.2' + xjc 'jakarta.xml.bind:jakarta.xml.bind-api:4.0.2' + xjc 'org.glassfish.jaxb:jaxb-xjc:4.0.5' + xjc 'com.sun.xml.bind:jaxb-impl:4.0.5' xjc 'com.sun.istack:istack-commons-runtime:4.2.0' } diff --git a/xsd/arbeidsforhold-xsd/gradle/wrapper/gradle-wrapper.properties b/xsd/arbeidsforhold-xsd/gradle/wrapper/gradle-wrapper.properties index a5952066425..48c0a02ca41 100644 --- a/xsd/arbeidsforhold-xsd/gradle/wrapper/gradle-wrapper.properties +++ b/xsd/arbeidsforhold-xsd/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/xsd/arbeidsforhold-xsd/settings.gradle b/xsd/arbeidsforhold-xsd/settings.gradle index de5fe77de69..0a345fb24f3 100644 --- a/xsd/arbeidsforhold-xsd/settings.gradle +++ b/xsd/arbeidsforhold-xsd/settings.gradle @@ -1,13 +1,13 @@ plugins { - id "com.gradle.enterprise" version "3.12.3" + id "com.gradle.develocity" version "3.17.4" } rootProject.name = 'arbeidsforhold-xsd' -gradleEnterprise { +develocity { buildScan { - termsOfServiceUrl = "https://gradle.com/terms-of-service" - termsOfServiceAgree = "yes" + termsOfUseUrl = "https://gradle.com/terms-of-service" + termsOfUseAgree = "yes" } }