diff --git a/apps/adresse-service/build.gradle b/apps/adresse-service/build.gradle index a8929e82212..dec19de4988 100644 --- a/apps/adresse-service/build.gradle +++ b/apps/adresse-service/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/amelding-service/build.gradle b/apps/amelding-service/build.gradle index c6a6333888f..949b8be4cb8 100644 --- a/apps/amelding-service/build.gradle +++ b/apps/amelding-service/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/app-tilgang-analyse-service/build.gradle b/apps/app-tilgang-analyse-service/build.gradle index 4cc1ae3ea0a..8e2546f6d4a 100644 --- a/apps/app-tilgang-analyse-service/build.gradle +++ b/apps/app-tilgang-analyse-service/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/arbeidsforhold-service/build.gradle b/apps/arbeidsforhold-service/build.gradle index 3c492d415c2..de6e0e5551a 100644 --- a/apps/arbeidsforhold-service/build.gradle +++ b/apps/arbeidsforhold-service/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/batch-bestilling-service/build.gradle b/apps/batch-bestilling-service/build.gradle index f233aaa7e5f..24fc5f519a0 100644 --- a/apps/batch-bestilling-service/build.gradle +++ b/apps/batch-bestilling-service/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/brreg-stub/build.gradle b/apps/brreg-stub/build.gradle index 6d1875ebc4e..876c09983c4 100644 --- a/apps/brreg-stub/build.gradle +++ b/apps/brreg-stub/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + id "org.sonarqube" version "4.4.1.3373" 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" diff --git a/apps/bruker-service/build.gradle b/apps/bruker-service/build.gradle index fc669b6cd52..9f2f92c8ff6 100644 --- a/apps/bruker-service/build.gradle +++ b/apps/bruker-service/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/budpro-service/build.gradle b/apps/budpro-service/build.gradle index db7d862a3d2..d1cd1af2bb8 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.0.0.2929" + id "org.sonarqube" version "4.4.1.3373" id("org.openrewrite.rewrite") version("6.6.4") } diff --git a/apps/dolly-backend/build.gradle b/apps/dolly-backend/build.gradle index db7c67814de..84b4a303add 100644 --- a/apps/dolly-backend/build.gradle +++ b/apps/dolly-backend/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/SkjermingsRegisterClient.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/SkjermingsRegisterClient.java index 994fb30531a..5742cf7a679 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/SkjermingsRegisterClient.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/SkjermingsRegisterClient.java @@ -55,6 +55,13 @@ public Flux gjenopprett(RsDollyUtvidetBestilling bestilling, Dolly return Flux.empty(); } + @Override + public void release(List identer) { + + skjermingsRegisterConsumer.deleteSkjerming(identer) + .subscribe(response -> log.info("Slettet identer fra Skjermingsregisteret")); + } + private ClientFuture futurePersist(BestillingProgress progress, String status) { return () -> { @@ -63,13 +70,6 @@ private ClientFuture futurePersist(BestillingProgress progress, String status) { }; } - @Override - public void release(List identer) { - - skjermingsRegisterConsumer.deleteSkjerming(identer) - .subscribe(response -> log.info("Slettet identer fra Skjermingsregisteret")); - } - private String getStatus(SkjermingDataResponse resultat) { return isBlank(resultat.getError()) ? "OK" : diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/SkjermingsRegisterConsumer.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/SkjermingsRegisterConsumer.java index 7a2a7e4c9fc..0c7d38cf7ae 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/SkjermingsRegisterConsumer.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/SkjermingsRegisterConsumer.java @@ -3,7 +3,6 @@ import com.fasterxml.jackson.databind.ObjectMapper; import lombok.extern.slf4j.Slf4j; import no.nav.dolly.bestilling.ConsumerStatus; -import no.nav.dolly.bestilling.skjermingsregister.command.SkjermingsregisterDeleteCommand; import no.nav.dolly.bestilling.skjermingsregister.command.SkjermingsregisterGetCommand; import no.nav.dolly.bestilling.skjermingsregister.command.SkjermingsregisterPostCommand; import no.nav.dolly.bestilling.skjermingsregister.command.SkjermingsregisterPutCommand; @@ -19,6 +18,7 @@ import reactor.core.publisher.Mono; import java.time.Duration; +import java.time.LocalDateTime; import java.util.List; import static java.util.Objects.nonNull; @@ -47,19 +47,23 @@ public SkjermingsRegisterConsumer( .build(); } - @Timed(name = "providers", tags = {"operation", "skjermingsdata-slett"}) - public Mono> deleteSkjerming(List identer) { + @Timed(name = "providers", tags = { "operation", "skjermingsdata-slett" }) + public Mono> deleteSkjerming(List identer) { return tokenService.exchange(serverProperties) .flatMapMany(token -> Flux.range(0, identer.size()) .delayElements(Duration.ofMillis(100)) - .map(index -> new SkjermingsregisterDeleteCommand(webClient, - identer.get(index), token.getTokenValue()).call()) + .map(index -> new SkjermingsregisterPutCommand(webClient, + SkjermingDataRequest.builder() + .personident(identer.get(index)) + .skjermetTil(LocalDateTime.now()) + .build(), + token.getTokenValue()).call()) .flatMap(Flux::from)) .collectList(); } - @Timed(name = "providers", tags = {"operation", "skjermingsdata-oppdater"}) + @Timed(name = "providers", tags = { "operation", "skjermingsdata-oppdater" }) public Mono oppdaterPerson(SkjermingDataRequest skjerming) { return tokenService.exchange(serverProperties) @@ -67,24 +71,23 @@ public Mono oppdaterPerson(SkjermingDataRequest skjerming .flatMap(response -> { if (isBlank(response.getError())) { if (response.isEksistererIkke()) { - return new SkjermingsregisterPostCommand(webClient, List.of(skjerming), + return new SkjermingsregisterPostCommand(webClient, skjerming, token.getTokenValue()).call() .collectList() .map(status -> { log.info("Opprettet skjerming på ident {} fraDato {} tilDato {}", - status.get(0).getPersonident(), status.get(0).getSkjermetFra(), status.get(0).getSkjermetTil()); - return status.get(0); + status.getFirst().getPersonident(), status.getFirst().getSkjermetFra(), status.getFirst().getSkjermetTil()); + return status.getFirst(); }); } else { return nonNull(skjerming.getSkjermetTil()) ? - new SkjermingsregisterPutCommand(webClient, skjerming.getPersonident(), - skjerming.getSkjermetTil(), token.getTokenValue()).call() + new SkjermingsregisterPutCommand(webClient, skjerming, token.getTokenValue()) + .call() .map(status -> { log.info("Oppdatert skjerming for ident {}, ny tilDato {}", skjerming.getPersonident(), skjerming.getSkjermetTil()); return status; }) : - Mono.just(new SkjermingDataResponse()); } } else { diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/command/SkjermingsregisterDeleteCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/command/SkjermingsregisterDeleteCommand.java deleted file mode 100644 index 143ab2a0f8f..00000000000 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/command/SkjermingsregisterDeleteCommand.java +++ /dev/null @@ -1,45 +0,0 @@ -package no.nav.dolly.bestilling.skjermingsregister.command; - -import lombok.RequiredArgsConstructor; -import no.nav.dolly.util.CallIdUtil; -import no.nav.testnav.libs.reactivecore.utils.WebClientFilter; -import no.nav.testnav.libs.securitycore.config.UserConstant; -import org.springframework.web.reactive.function.client.WebClient; -import reactor.core.publisher.Flux; -import reactor.util.retry.Retry; - -import java.time.Duration; -import java.util.concurrent.Callable; - -import static no.nav.dolly.domain.CommonKeysAndUtils.CONSUMER; -import static no.nav.dolly.domain.CommonKeysAndUtils.HEADER_NAV_CALL_ID; -import static no.nav.dolly.domain.CommonKeysAndUtils.HEADER_NAV_CONSUMER_ID; -import static no.nav.dolly.util.TokenXUtil.getUserJwt; -import static org.springframework.http.HttpHeaders.AUTHORIZATION; - -@RequiredArgsConstructor -public class SkjermingsregisterDeleteCommand implements Callable> { - - private static final String SKJERMINGSREGISTER_URL = "/api/v1/skjermingdata"; - - private final WebClient webClient; - private final String ident; - private final String token; - - public Flux call() { - - return webClient.delete().uri(uriBuilder -> uriBuilder - .path(SKJERMINGSREGISTER_URL) - .pathSegment(ident) - .build()) - .header(AUTHORIZATION, "Bearer " + token) - .header(UserConstant.USER_HEADER_JWT, getUserJwt()) - .header(HEADER_NAV_CALL_ID, CallIdUtil.generateCallId()) - .header(HEADER_NAV_CONSUMER_ID, CONSUMER) - .retrieve() - .bodyToFlux(Void.class) - .doOnError(WebClientFilter::logErrorMessage) - .retryWhen(Retry.backoff(3, Duration.ofSeconds(5)) - .filter(WebClientFilter::is5xxException)); - } -} diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/command/SkjermingsregisterGetCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/command/SkjermingsregisterGetCommand.java index a8ab2517272..d909fc9a3e9 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/command/SkjermingsregisterGetCommand.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/command/SkjermingsregisterGetCommand.java @@ -16,7 +16,8 @@ @RequiredArgsConstructor public class SkjermingsregisterGetCommand implements Callable> { - private static final String SKJERMINGSREGISTER_URL = "/api/v1/skjermingdata"; + private static final String SKJERMINGSREGISTER_URL = "/api/v1/skjerming/dolly"; + private static final String PERSONIDENT_HEADER = "personident"; private final WebClient webClient; private final String ident; @@ -26,9 +27,9 @@ public class SkjermingsregisterGetCommand implements Callable call() { return webClient.get().uri(uriBuilder -> uriBuilder .path(SKJERMINGSREGISTER_URL) - .pathSegment(ident) .build()) .header(AUTHORIZATION, "Bearer " + token) + .header(PERSONIDENT_HEADER, ident) .retrieve() .bodyToMono(SkjermingDataResponse.class) .onErrorResume(WebClientResponseException.NotFound.class::isInstance, diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/command/SkjermingsregisterPostCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/command/SkjermingsregisterPostCommand.java index a1921ee8ba7..4279c806a8f 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/command/SkjermingsregisterPostCommand.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/command/SkjermingsregisterPostCommand.java @@ -9,7 +9,6 @@ import reactor.util.retry.Retry; import java.time.Duration; -import java.util.List; import java.util.concurrent.Callable; import static org.springframework.http.HttpHeaders.AUTHORIZATION; @@ -17,10 +16,10 @@ @RequiredArgsConstructor public class SkjermingsregisterPostCommand implements Callable> { - private static final String SKJERMINGSREGISTER_URL = "/api/v1/skjermingdata"; + private static final String SKJERMINGSREGISTER_URL = "/api/v1/skjerming/dolly"; private final WebClient webClient; - private final List skjermingsDataRequest; + private final SkjermingDataRequest skjermingDataRequest; private final String token; @Override @@ -30,7 +29,7 @@ public Flux call() { .path(SKJERMINGSREGISTER_URL) .build()) .header(AUTHORIZATION, "Bearer " + token) - .bodyValue(skjermingsDataRequest) + .bodyValue(skjermingDataRequest) .retrieve() .bodyToFlux(SkjermingDataResponse.class) .onErrorResume(error -> Flux.just(SkjermingDataResponse.builder() diff --git a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/command/SkjermingsregisterPutCommand.java b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/command/SkjermingsregisterPutCommand.java index ee55cfb6cce..9e20b592b08 100644 --- a/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/command/SkjermingsregisterPutCommand.java +++ b/apps/dolly-backend/src/main/java/no/nav/dolly/bestilling/skjermingsregister/command/SkjermingsregisterPutCommand.java @@ -1,6 +1,7 @@ package no.nav.dolly.bestilling.skjermingsregister.command; import lombok.RequiredArgsConstructor; +import no.nav.dolly.bestilling.skjermingsregister.domain.SkjermingDataRequest; import no.nav.dolly.bestilling.skjermingsregister.domain.SkjermingDataResponse; import no.nav.testnav.libs.reactivecore.utils.WebClientFilter; import org.springframework.web.reactive.function.client.WebClient; @@ -8,32 +9,26 @@ import reactor.util.retry.Retry; import java.time.Duration; -import java.time.LocalDateTime; import java.util.concurrent.Callable; -import static java.util.Objects.nonNull; import static org.springframework.http.HttpHeaders.AUTHORIZATION; @RequiredArgsConstructor public class SkjermingsregisterPutCommand implements Callable> { - private static final String SKJERMINGSREGISTER_URL = "/api/v1/skjermingdata"; - private static final String SKJERMINGOPPHOER_URL = SKJERMINGSREGISTER_URL + "/opphor"; - private static final String SKJERMING_TOM = "skjermetTil"; + private static final String SKJERMINGSREGISTER_URL = "/api/v1/skjerming/dolly"; private final WebClient webClient; - private final String ident; - private final LocalDateTime tilDato; + private final SkjermingDataRequest skjermingsDataRequest; private final String token; @Override public Mono call() { return webClient.put().uri(uriBuilder -> uriBuilder - .path(SKJERMINGOPPHOER_URL) - .pathSegment(ident) - .queryParam(SKJERMING_TOM, nonNull(tilDato) ? tilDato.toLocalDate() : null) + .path(SKJERMINGSREGISTER_URL) .build()) .header(AUTHORIZATION, "Bearer " + token) + .bodyValue(skjermingsDataRequest) .retrieve() .toBodilessEntity() .map(result -> SkjermingDataResponse.builder().build()) diff --git a/apps/dolly-frontend/build.gradle b/apps/dolly-frontend/build.gradle index e01bf2e59bd..710ea866e12 100644 --- a/apps/dolly-frontend/build.gradle +++ b/apps/dolly-frontend/build.gradle @@ -1,5 +1,5 @@ plugins { - id "org.sonarqube" version "4.0.0.2929" + id "org.sonarqube" version "4.4.1.3373" id 'java' id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version "1.1.4" diff --git a/apps/dolly-frontend/src/main/js/src/service/services/skjerming/SkjermingService.tsx b/apps/dolly-frontend/src/main/js/src/service/services/skjerming/SkjermingService.tsx index 824c0725699..aefe3757adb 100644 --- a/apps/dolly-frontend/src/main/js/src/service/services/skjerming/SkjermingService.tsx +++ b/apps/dolly-frontend/src/main/js/src/service/services/skjerming/SkjermingService.tsx @@ -1,13 +1,13 @@ import Request from '@/service/services/Request' -const skjermingUrl = '/testnav-skjermingsregister-proxy/api/v1/skjermingdata' +const skjermingUrl = '/testnav-skjermingsregister-proxy/api/v1/skjerming/dolly' export default { deleteSkjerming(ident: string) { - return Request.delete(`${skjermingUrl}/${ident}`) + return Request.put(skjermingUrl, { personident: ident, skjermetTil: new Date() }) }, getSkjerming(ident: string) { - return Request.get(`${skjermingUrl}/${ident}`) - } + return Request.get(skjermingUrl, { personident: ident }) + }, } diff --git a/apps/dollystatus/build.gradle b/apps/dollystatus/build.gradle index ebdfddbda27..3f49b0cbefd 100644 --- a/apps/dollystatus/build.gradle +++ b/apps/dollystatus/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/dollystatus/src/main/js/package-lock.json b/apps/dollystatus/src/main/js/package-lock.json index 79ebde590ee..a733f14eba6 100644 --- a/apps/dollystatus/src/main/js/package-lock.json +++ b/apps/dollystatus/src/main/js/package-lock.json @@ -28,7 +28,7 @@ "path-browserify": "^1.0.1", "prettier": "^3.0.1", "typescript": "^5.0.2", - "vite": "^5.0.8", + "vite": "^5.0.12", "vite-plugin-html": "^3.2.0", "vite-plugin-svgr": "^4.0.0", "vite-tsconfig-paths": "^4.0.5" @@ -3888,9 +3888,9 @@ } }, "node_modules/vite": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.8.tgz", - "integrity": "sha512-jYMALd8aeqR3yS9xlHd0OzQJndS9fH5ylVgWdB+pxTwxLKdO1pgC5Dlb398BUxpfaBxa4M9oT7j1g503Gaj5IQ==", + "version": "5.0.12", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.12.tgz", + "integrity": "sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==", "dev": true, "dependencies": { "esbuild": "^0.19.3", diff --git a/apps/dollystatus/src/main/js/package.json b/apps/dollystatus/src/main/js/package.json index ff0978570c3..b2e8b46ee2d 100644 --- a/apps/dollystatus/src/main/js/package.json +++ b/apps/dollystatus/src/main/js/package.json @@ -24,7 +24,7 @@ "path-browserify": "^1.0.1", "prettier": "^3.0.1", "typescript": "^5.0.2", - "vite": "^5.0.8", + "vite": "^5.0.12", "vite-plugin-html": "^3.2.0", "vite-plugin-svgr": "^4.0.0", "vite-tsconfig-paths": "^4.0.5" diff --git a/apps/endringsmelding-frontend/build.gradle b/apps/endringsmelding-frontend/build.gradle index c9a0bc7b1cc..c225fd5beb4 100644 --- a/apps/endringsmelding-frontend/build.gradle +++ b/apps/endringsmelding-frontend/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/endringsmelding-frontend/src/main/js/package-lock.json b/apps/endringsmelding-frontend/src/main/js/package-lock.json index 0aadda60c66..04de95a13d2 100644 --- a/apps/endringsmelding-frontend/src/main/js/package-lock.json +++ b/apps/endringsmelding-frontend/src/main/js/package-lock.json @@ -34,7 +34,7 @@ "prettier": "^3.0.1", "swr": "^2.0.0", "typescript": "^5.0.2", - "vite": "^5.0.8", + "vite": "^5.0.12", "vite-plugin-svgr": "^4.0.0", "vite-tsconfig-paths": "^4.0.0" } @@ -4130,9 +4130,9 @@ } }, "node_modules/vite": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.8.tgz", - "integrity": "sha512-jYMALd8aeqR3yS9xlHd0OzQJndS9fH5ylVgWdB+pxTwxLKdO1pgC5Dlb398BUxpfaBxa4M9oT7j1g503Gaj5IQ==", + "version": "5.0.12", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.12.tgz", + "integrity": "sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==", "dev": true, "dependencies": { "esbuild": "^0.19.3", diff --git a/apps/endringsmelding-frontend/src/main/js/package.json b/apps/endringsmelding-frontend/src/main/js/package.json index 65f0c42d93e..31a3b5c4da1 100644 --- a/apps/endringsmelding-frontend/src/main/js/package.json +++ b/apps/endringsmelding-frontend/src/main/js/package.json @@ -30,7 +30,7 @@ "prettier": "^3.0.1", "typescript": "^5.0.2", "@vitejs/plugin-react": "^4.0.0", - "vite": "^5.0.8", + "vite": "^5.0.12", "vite-plugin-svgr": "^4.0.0", "swr": "^2.0.0", "vite-tsconfig-paths": "^4.0.0" diff --git a/apps/endringsmelding-service/build.gradle b/apps/endringsmelding-service/build.gradle index d59d86f100b..2d04faab4b4 100644 --- a/apps/endringsmelding-service/build.gradle +++ b/apps/endringsmelding-service/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/ereg-batch-status-service/build.gradle b/apps/ereg-batch-status-service/build.gradle index 4f06619d738..82748072fa7 100644 --- a/apps/ereg-batch-status-service/build.gradle +++ b/apps/ereg-batch-status-service/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/faste-data-frontend/build.gradle b/apps/faste-data-frontend/build.gradle index 2cd58e65b88..c9d2e827bb7 100644 --- a/apps/faste-data-frontend/build.gradle +++ b/apps/faste-data-frontend/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/faste-data-frontend/src/main/js/package-lock.json b/apps/faste-data-frontend/src/main/js/package-lock.json index 5bbe85d879e..58df0110c14 100644 --- a/apps/faste-data-frontend/src/main/js/package-lock.json +++ b/apps/faste-data-frontend/src/main/js/package-lock.json @@ -35,7 +35,7 @@ "less": "^4.1.3", "prettier": "^3.0.1", "typescript": "^5.0.4", - "vite": "^5.0.8", + "vite": "^5.0.12", "vite-plugin-environment": "^1.1.3", "vite-plugin-svgr": "^4.0.0", "vite-tsconfig-paths": "^4.0.0" @@ -3823,9 +3823,9 @@ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" }, "node_modules/vite": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.8.tgz", - "integrity": "sha512-jYMALd8aeqR3yS9xlHd0OzQJndS9fH5ylVgWdB+pxTwxLKdO1pgC5Dlb398BUxpfaBxa4M9oT7j1g503Gaj5IQ==", + "version": "5.0.12", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.12.tgz", + "integrity": "sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==", "dev": true, "dependencies": { "esbuild": "^0.19.3", diff --git a/apps/faste-data-frontend/src/main/js/package.json b/apps/faste-data-frontend/src/main/js/package.json index 398c53e5c72..790b54f6099 100644 --- a/apps/faste-data-frontend/src/main/js/package.json +++ b/apps/faste-data-frontend/src/main/js/package.json @@ -30,7 +30,7 @@ "prettier": "^3.0.1", "typescript": "^5.0.4", "@vitejs/plugin-react": "^4.0.0", - "vite": "^5.0.8", + "vite": "^5.0.12", "vite-plugin-environment": "^1.1.3", "vite-plugin-svgr": "^4.0.0", "vite-tsconfig-paths": "^4.0.0" diff --git a/apps/generer-arbeidsforhold-populasjon-service/build.gradle b/apps/generer-arbeidsforhold-populasjon-service/build.gradle index 49e279bf82f..b31371ed56a 100644 --- a/apps/generer-arbeidsforhold-populasjon-service/build.gradle +++ b/apps/generer-arbeidsforhold-populasjon-service/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/generer-navn-service/build.gradle b/apps/generer-navn-service/build.gradle index 8c007fa4620..d1da6add3be 100644 --- a/apps/generer-navn-service/build.gradle +++ b/apps/generer-navn-service/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/generer-organisasjon-populasjon-service/build.gradle b/apps/generer-organisasjon-populasjon-service/build.gradle index 1aa54a4db33..92d472ee3f9 100644 --- a/apps/generer-organisasjon-populasjon-service/build.gradle +++ b/apps/generer-organisasjon-populasjon-service/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/generer-synt-amelding-service/build.gradle b/apps/generer-synt-amelding-service/build.gradle index cae306a5195..8de3db15b44 100644 --- a/apps/generer-synt-amelding-service/build.gradle +++ b/apps/generer-synt-amelding-service/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/geografiske-kodeverk-service/build.gradle b/apps/geografiske-kodeverk-service/build.gradle index 5b3a58e9043..4198be13b68 100644 --- a/apps/geografiske-kodeverk-service/build.gradle +++ b/apps/geografiske-kodeverk-service/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/helsepersonell-service/build.gradle b/apps/helsepersonell-service/build.gradle index 560d0faacb9..aee26706100 100644 --- a/apps/helsepersonell-service/build.gradle +++ b/apps/helsepersonell-service/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/inntektsmelding-generator-service/build.gradle b/apps/inntektsmelding-generator-service/build.gradle index ff4a81d1e6f..b1d1513c14f 100644 --- a/apps/inntektsmelding-generator-service/build.gradle +++ b/apps/inntektsmelding-generator-service/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/inntektsmelding-service/build.gradle b/apps/inntektsmelding-service/build.gradle index 014cac7910d..3e6a5a442af 100644 --- a/apps/inntektsmelding-service/build.gradle +++ b/apps/inntektsmelding-service/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/jenkins-batch-status-service/build.gradle b/apps/jenkins-batch-status-service/build.gradle index 2ef827a8666..1f44da920aa 100644 --- a/apps/jenkins-batch-status-service/build.gradle +++ b/apps/jenkins-batch-status-service/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/joark-dokument-service/build.gradle b/apps/joark-dokument-service/build.gradle index a5d649d94e2..e16d6e24b30 100644 --- a/apps/joark-dokument-service/build.gradle +++ b/apps/joark-dokument-service/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/miljoer-service/build.gradle b/apps/miljoer-service/build.gradle index 38127a0fa35..967ab1a2311 100644 --- a/apps/miljoer-service/build.gradle +++ b/apps/miljoer-service/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/oppsummeringsdokument-service/build.gradle b/apps/oppsummeringsdokument-service/build.gradle index 88eb8562a08..e4af7804de0 100644 --- a/apps/oppsummeringsdokument-service/build.gradle +++ b/apps/oppsummeringsdokument-service/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/organisasjon-bestilling-service/build.gradle b/apps/organisasjon-bestilling-service/build.gradle index f14b547f1c0..e1731360d18 100644 --- a/apps/organisasjon-bestilling-service/build.gradle +++ b/apps/organisasjon-bestilling-service/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/organisasjon-bestilling-service/src/main/java/no/nav/testnav/apps/organisasjonbestillingservice/service/v2/OrderServiceV2.java b/apps/organisasjon-bestilling-service/src/main/java/no/nav/testnav/apps/organisasjonbestillingservice/service/v2/OrderServiceV2.java index d05f99f986f..65b9e3dafdf 100644 --- a/apps/organisasjon-bestilling-service/src/main/java/no/nav/testnav/apps/organisasjonbestillingservice/service/v2/OrderServiceV2.java +++ b/apps/organisasjon-bestilling-service/src/main/java/no/nav/testnav/apps/organisasjonbestillingservice/service/v2/OrderServiceV2.java @@ -34,8 +34,8 @@ public Order save(Order order) { log.info("Finner build id for ordre {} med uuid {}...", saved.getId(), saved.getUuid()); var retryConfig = new RetryConfig.Builder() - .setRetryAttempts(60 * 5) - .setSleepSeconds(2) + .setRetryAttempts(5) + .setSleepSeconds(10) .build(); retryService.execute(retryConfig, () -> { var buildId = jenkinsConsumer.getBuildId(order.getQueueId()).block(); diff --git a/apps/organisasjon-faste-data-service/build.gradle b/apps/organisasjon-faste-data-service/build.gradle index f77e37fa54f..f03ab646ff2 100644 --- a/apps/organisasjon-faste-data-service/build.gradle +++ b/apps/organisasjon-faste-data-service/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/organisasjon-forvalter/build.gradle b/apps/organisasjon-forvalter/build.gradle index 1c3683435b6..df32eeb1ada 100644 --- a/apps/organisasjon-forvalter/build.gradle +++ b/apps/organisasjon-forvalter/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/organisasjon-mottak-service/build.gradle b/apps/organisasjon-mottak-service/build.gradle index 1d790581f2c..8029bfb52fc 100644 --- a/apps/organisasjon-mottak-service/build.gradle +++ b/apps/organisasjon-mottak-service/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/organisasjon-service/build.gradle b/apps/organisasjon-service/build.gradle index 5664b67bbe3..67bd8ebe2b2 100644 --- a/apps/organisasjon-service/build.gradle +++ b/apps/organisasjon-service/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/organisasjon-tilgang-frontend/build.gradle b/apps/organisasjon-tilgang-frontend/build.gradle index 4acac9fb5ed..ec24bb4d68f 100644 --- a/apps/organisasjon-tilgang-frontend/build.gradle +++ b/apps/organisasjon-tilgang-frontend/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/organisasjon-tilgang-frontend/src/main/js/package-lock.json b/apps/organisasjon-tilgang-frontend/src/main/js/package-lock.json index 9e0aac31c57..9a7e2f85cdb 100644 --- a/apps/organisasjon-tilgang-frontend/src/main/js/package-lock.json +++ b/apps/organisasjon-tilgang-frontend/src/main/js/package-lock.json @@ -38,7 +38,7 @@ "mini-css-extract-plugin": "^2.6.1", "prettier": "^3.0.1", "typescript": "^5.0.4", - "vite": "^5.0.8", + "vite": "^5.0.12", "vite-plugin-svgr": "^4.0.0", "vite-tsconfig-paths": "^4.2.0" } @@ -4352,9 +4352,9 @@ } }, "node_modules/vite": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.8.tgz", - "integrity": "sha512-jYMALd8aeqR3yS9xlHd0OzQJndS9fH5ylVgWdB+pxTwxLKdO1pgC5Dlb398BUxpfaBxa4M9oT7j1g503Gaj5IQ==", + "version": "5.0.12", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.12.tgz", + "integrity": "sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==", "dev": true, "dependencies": { "esbuild": "^0.19.3", diff --git a/apps/organisasjon-tilgang-frontend/src/main/js/package.json b/apps/organisasjon-tilgang-frontend/src/main/js/package.json index de407c068a2..d589f6a6869 100644 --- a/apps/organisasjon-tilgang-frontend/src/main/js/package.json +++ b/apps/organisasjon-tilgang-frontend/src/main/js/package.json @@ -35,7 +35,7 @@ "prettier": "^3.0.1", "typescript": "^5.0.4", "@vitejs/plugin-react": "^4.0.0", - "vite": "^5.0.8", + "vite": "^5.0.12", "vite-plugin-svgr": "^4.0.0", "vite-tsconfig-paths": "^4.2.0" }, diff --git a/apps/organisasjon-tilgang-service/build.gradle b/apps/organisasjon-tilgang-service/build.gradle index 363f15c34cc..484b243261d 100644 --- a/apps/organisasjon-tilgang-service/build.gradle +++ b/apps/organisasjon-tilgang-service/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/orgnummer-service/build.gradle b/apps/orgnummer-service/build.gradle index 0ca8ccf19aa..de7c8a0701c 100644 --- a/apps/orgnummer-service/build.gradle +++ b/apps/orgnummer-service/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/oversikt-frontend/build.gradle b/apps/oversikt-frontend/build.gradle index 5600c7a24df..78a1e547131 100644 --- a/apps/oversikt-frontend/build.gradle +++ b/apps/oversikt-frontend/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/oversikt-frontend/src/main/js/package-lock.json b/apps/oversikt-frontend/src/main/js/package-lock.json index 91ac933e96c..65c23a07960 100644 --- a/apps/oversikt-frontend/src/main/js/package-lock.json +++ b/apps/oversikt-frontend/src/main/js/package-lock.json @@ -35,7 +35,7 @@ "path-browserify": "^1.0.1", "prettier": "^3.0.1", "typescript": "^5.0.2", - "vite": "^5.0.8", + "vite": "^5.0.12", "vite-plugin-svgr": "^4.0.0", "vite-tsconfig-paths": "^4.0.0", "webpack-bundle-analyzer": "^4.8.0" @@ -3547,9 +3547,9 @@ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" }, "node_modules/vite": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.8.tgz", - "integrity": "sha512-jYMALd8aeqR3yS9xlHd0OzQJndS9fH5ylVgWdB+pxTwxLKdO1pgC5Dlb398BUxpfaBxa4M9oT7j1g503Gaj5IQ==", + "version": "5.0.12", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.12.tgz", + "integrity": "sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==", "dev": true, "dependencies": { "esbuild": "^0.19.3", diff --git a/apps/oversikt-frontend/src/main/js/package.json b/apps/oversikt-frontend/src/main/js/package.json index 8db39b1595a..e73fb19691a 100644 --- a/apps/oversikt-frontend/src/main/js/package.json +++ b/apps/oversikt-frontend/src/main/js/package.json @@ -30,7 +30,7 @@ "path-browserify": "^1.0.1", "prettier": "^3.0.1", "typescript": "^5.0.2", - "vite": "^5.0.8", + "vite": "^5.0.12", "vite-plugin-svgr": "^4.0.0", "vite-tsconfig-paths": "^4.0.0", "webpack-bundle-analyzer": "^4.8.0" diff --git a/apps/pdl-forvalter/build.gradle b/apps/pdl-forvalter/build.gradle index a18ece55d5d..0d7415c8edc 100644 --- a/apps/pdl-forvalter/build.gradle +++ b/apps/pdl-forvalter/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/person-faste-data-service/build.gradle b/apps/person-faste-data-service/build.gradle index e111c6541a1..ef925c5f87f 100644 --- a/apps/person-faste-data-service/build.gradle +++ b/apps/person-faste-data-service/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/person-organisasjon-tilgang-service/build.gradle b/apps/person-organisasjon-tilgang-service/build.gradle index fc0f8c48b91..19d0e6b8c9a 100644 --- a/apps/person-organisasjon-tilgang-service/build.gradle +++ b/apps/person-organisasjon-tilgang-service/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/person-search-service/build.gradle b/apps/person-search-service/build.gradle index 0c648749123..7a8a1a3ab26 100644 --- a/apps/person-search-service/build.gradle +++ b/apps/person-search-service/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/person-service/build.gradle b/apps/person-service/build.gradle index 9dca0dc1e16..a16642c3509 100644 --- a/apps/person-service/build.gradle +++ b/apps/person-service/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/profil-api/build.gradle b/apps/profil-api/build.gradle index 0a0acfc9442..2f16346dc7a 100644 --- a/apps/profil-api/build.gradle +++ b/apps/profil-api/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/sykemelding-api/build.gradle b/apps/sykemelding-api/build.gradle index fa5e3822483..b01558ada5a 100644 --- a/apps/sykemelding-api/build.gradle +++ b/apps/sykemelding-api/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/synt-sykemelding-api/build.gradle b/apps/synt-sykemelding-api/build.gradle index b79e402d8b1..3cf1ca8c9e5 100644 --- a/apps/synt-sykemelding-api/build.gradle +++ b/apps/synt-sykemelding-api/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/synt-vedtakshistorikk-service/build.gradle b/apps/synt-vedtakshistorikk-service/build.gradle index d043a0b6f48..8992d2aac37 100644 --- a/apps/synt-vedtakshistorikk-service/build.gradle +++ b/apps/synt-vedtakshistorikk-service/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/testnav-ident-pool/build.gradle b/apps/testnav-ident-pool/build.gradle index ad2da904b29..51147fc5e50 100644 --- a/apps/testnav-ident-pool/build.gradle +++ b/apps/testnav-ident-pool/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/testnorge-statisk-data-forvalter/build.gradle b/apps/testnorge-statisk-data-forvalter/build.gradle index e53c4ac8e8b..5feada3534d 100644 --- a/apps/testnorge-statisk-data-forvalter/build.gradle +++ b/apps/testnorge-statisk-data-forvalter/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/tilbakemelding-api/build.gradle b/apps/tilbakemelding-api/build.gradle index cf3fed405f8..7ab7a060c86 100644 --- a/apps/tilbakemelding-api/build.gradle +++ b/apps/tilbakemelding-api/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/tps-messaging-service/build.gradle b/apps/tps-messaging-service/build.gradle index a9751899f54..105780efca3 100644 --- a/apps/tps-messaging-service/build.gradle +++ b/apps/tps-messaging-service/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/apps/udi-stub/build.gradle b/apps/udi-stub/build.gradle index 4a372d58b91..37dd5dae595 100644 --- a/apps/udi-stub/build.gradle +++ b/apps/udi-stub/build.gradle @@ -1,5 +1,5 @@ plugins { - id "org.sonarqube" version "4.0.0.2929" + id "org.sonarqube" version "4.4.1.3373" id 'java' id "uk.co.boothen.gradle.wsimport" version "0.21" id 'org.springframework.boot' version "3.2.1" diff --git a/apps/varslinger-service/build.gradle b/apps/varslinger-service/build.gradle index 11d21292fda..fd914d5d157 100644 --- a/apps/varslinger-service/build.gradle +++ b/apps/varslinger-service/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/examples/reactive-rest-example/build.gradle b/examples/reactive-rest-example/build.gradle index 203fdca4846..a491cd0e734 100644 --- a/examples/reactive-rest-example/build.gradle +++ b/examples/reactive-rest-example/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/libs/avro-schema/build.gradle b/libs/avro-schema/build.gradle index f27a00dc5eb..be001c4a993 100644 --- a/libs/avro-schema/build.gradle +++ b/libs/avro-schema/build.gradle @@ -1,5 +1,5 @@ plugins { - id "org.sonarqube" version "4.0.0.2929" + id "org.sonarqube" version "4.4.1.3373" id 'java-library' id 'maven-publish' id 'com.github.davidmc24.gradle.plugin.avro' version '1.9.1' diff --git a/libs/commands/build.gradle b/libs/commands/build.gradle index 852e2cc0991..aae4cd207d5 100644 --- a/libs/commands/build.gradle +++ b/libs/commands/build.gradle @@ -1,5 +1,5 @@ plugins { - id "org.sonarqube" version "4.0.0.2929" + id "org.sonarqube" version "4.4.1.3373" id 'java-library' id 'io.spring.dependency-management' version "1.1.4" id "jacoco" diff --git a/libs/csv-converter/build.gradle b/libs/csv-converter/build.gradle index 901ec37084d..9dcca559493 100644 --- a/libs/csv-converter/build.gradle +++ b/libs/csv-converter/build.gradle @@ -1,5 +1,5 @@ plugins { - id "org.sonarqube" version "4.0.0.2929" + id "org.sonarqube" version "4.4.1.3373" id 'java-library' id 'io.spring.dependency-management' version "1.1.4" id "jacoco" diff --git a/libs/data-transfer-objects/build.gradle b/libs/data-transfer-objects/build.gradle index a8da8b09246..82d0916d53b 100644 --- a/libs/data-transfer-objects/build.gradle +++ b/libs/data-transfer-objects/build.gradle @@ -1,5 +1,5 @@ plugins { - id "org.sonarqube" version "4.0.0.2929" + id "org.sonarqube" version "4.4.1.3373" id 'java-library' id 'maven-publish' id 'io.spring.dependency-management' version "1.1.4" diff --git a/libs/data-transfer-search-objects/build.gradle b/libs/data-transfer-search-objects/build.gradle index 86feabb9e79..a1d90446323 100644 --- a/libs/data-transfer-search-objects/build.gradle +++ b/libs/data-transfer-search-objects/build.gradle @@ -1,5 +1,5 @@ plugins { - id "org.sonarqube" version "4.0.0.2929" + id "org.sonarqube" version "4.4.1.3373" id 'java-library' id 'maven-publish' id 'io.spring.dependency-management' version "1.1.4" diff --git a/libs/database/build.gradle b/libs/database/build.gradle index 64459ea99b8..23331ecf655 100644 --- a/libs/database/build.gradle +++ b/libs/database/build.gradle @@ -1,5 +1,5 @@ plugins { - id "org.sonarqube" version "4.0.0.2929" + id "org.sonarqube" version "4.4.1.3373" id 'java-library' id 'io.spring.dependency-management' version "1.1.4" id "jacoco" diff --git a/libs/domain/build.gradle b/libs/domain/build.gradle index 4f426e9e5bc..828fd8d0d12 100644 --- a/libs/domain/build.gradle +++ b/libs/domain/build.gradle @@ -1,5 +1,5 @@ plugins { - id "org.sonarqube" version "4.0.0.2929" + id "org.sonarqube" version "4.4.1.3373" id 'java-library' id 'io.spring.dependency-management' version "1.1.4" id "jacoco" diff --git a/libs/integration-test/build.gradle b/libs/integration-test/build.gradle index 831d79debb9..77fd838f1c7 100644 --- a/libs/integration-test/build.gradle +++ b/libs/integration-test/build.gradle @@ -1,5 +1,5 @@ plugins { - id "org.sonarqube" version "4.0.0.2929" + id "org.sonarqube" version "4.4.1.3373" id 'java-library' id 'io.spring.dependency-management' version "1.1.4" id "jacoco" diff --git a/libs/kafka-config/build.gradle b/libs/kafka-config/build.gradle index 55cd1b05ae4..a4ad2028083 100644 --- a/libs/kafka-config/build.gradle +++ b/libs/kafka-config/build.gradle @@ -1,5 +1,5 @@ plugins { - id "org.sonarqube" version "4.0.0.2929" + id "org.sonarqube" version "4.4.1.3373" id 'java-library' id 'io.spring.dependency-management' version "1.1.4" id "jacoco" diff --git a/libs/kafka-producers/build.gradle b/libs/kafka-producers/build.gradle index 628615e5635..5fc831d14a3 100644 --- a/libs/kafka-producers/build.gradle +++ b/libs/kafka-producers/build.gradle @@ -1,5 +1,5 @@ plugins { - id "org.sonarqube" version "4.0.0.2929" + id "org.sonarqube" version "4.4.1.3373" id 'java-library' id 'io.spring.dependency-management' version "1.1.4" id "jacoco" diff --git a/libs/reactive-core/build.gradle b/libs/reactive-core/build.gradle index 9eed16348f2..fef07c915bf 100644 --- a/libs/reactive-core/build.gradle +++ b/libs/reactive-core/build.gradle @@ -1,5 +1,5 @@ plugins { - id "org.sonarqube" version "4.0.0.2929" + id "org.sonarqube" version "4.4.1.3373" id 'java-library' id 'maven-publish' id 'io.spring.dependency-management' version "1.1.4" diff --git a/libs/reactive-frontend/build.gradle b/libs/reactive-frontend/build.gradle index d609c54295d..40d3be8c44e 100644 --- a/libs/reactive-frontend/build.gradle +++ b/libs/reactive-frontend/build.gradle @@ -1,5 +1,5 @@ plugins { - id "org.sonarqube" version "4.0.0.2929" + id "org.sonarqube" version "4.4.1.3373" id 'java-library' id 'maven-publish' id 'io.spring.dependency-management' version "1.1.4" diff --git a/libs/reactive-proxy/build.gradle b/libs/reactive-proxy/build.gradle index 90162b61359..491e147d573 100644 --- a/libs/reactive-proxy/build.gradle +++ b/libs/reactive-proxy/build.gradle @@ -1,5 +1,5 @@ plugins { - id "org.sonarqube" version "4.0.0.2929" + id "org.sonarqube" version "4.4.1.3373" id 'java-library' id 'maven-publish' id 'io.spring.dependency-management' version "1.1.4" diff --git a/libs/reactive-security/build.gradle b/libs/reactive-security/build.gradle index 1de3a85a582..014c507e35c 100644 --- a/libs/reactive-security/build.gradle +++ b/libs/reactive-security/build.gradle @@ -1,5 +1,5 @@ plugins { - id "org.sonarqube" version "4.0.0.2929" + id "org.sonarqube" version "4.4.1.3373" id 'java-library' id 'maven-publish' id 'io.spring.dependency-management' version "1.1.4" diff --git a/libs/reactive-session-security/build.gradle b/libs/reactive-session-security/build.gradle index 7390efc0eb9..584dfa31f23 100644 --- a/libs/reactive-session-security/build.gradle +++ b/libs/reactive-session-security/build.gradle @@ -1,5 +1,5 @@ plugins { - id "org.sonarqube" version "4.0.0.2929" + id "org.sonarqube" version "4.4.1.3373" id 'java-library' id 'io.spring.dependency-management' version "1.1.4" id "jacoco" diff --git a/libs/security-core/build.gradle b/libs/security-core/build.gradle index 12858881851..96758b46d52 100644 --- a/libs/security-core/build.gradle +++ b/libs/security-core/build.gradle @@ -1,5 +1,5 @@ plugins { - id "org.sonarqube" version "4.0.0.2929" + id "org.sonarqube" version "4.4.1.3373" id 'java-library' id 'io.spring.dependency-management' version "1.1.4" id "jacoco" diff --git a/libs/security-token-service/build.gradle b/libs/security-token-service/build.gradle index 6dfa10c4bd8..5e3a390c8f7 100644 --- a/libs/security-token-service/build.gradle +++ b/libs/security-token-service/build.gradle @@ -1,5 +1,5 @@ plugins { - id "org.sonarqube" version "4.0.0.2929" + id "org.sonarqube" version "4.4.1.3373" id 'java-library' id 'io.spring.dependency-management' version "1.1.4" id "jacoco" diff --git a/libs/servlet-core/build.gradle b/libs/servlet-core/build.gradle index c39716fb442..5e13b31a316 100644 --- a/libs/servlet-core/build.gradle +++ b/libs/servlet-core/build.gradle @@ -1,5 +1,5 @@ plugins { - id "org.sonarqube" version "4.0.0.2929" + id "org.sonarqube" version "4.4.1.3373" id 'java-library' id 'io.spring.dependency-management' version "1.1.4" id "jacoco" diff --git a/libs/servlet-insecure-security/build.gradle b/libs/servlet-insecure-security/build.gradle index d5b0cbb577e..133fea9f923 100644 --- a/libs/servlet-insecure-security/build.gradle +++ b/libs/servlet-insecure-security/build.gradle @@ -1,5 +1,5 @@ plugins { - id "org.sonarqube" version "4.0.0.2929" + id "org.sonarqube" version "4.4.1.3373" id 'java-library' id 'io.spring.dependency-management' version "1.1.4" id "jacoco" diff --git a/libs/servlet-security/build.gradle b/libs/servlet-security/build.gradle index cb78579d86a..8ed2b4007a5 100644 --- a/libs/servlet-security/build.gradle +++ b/libs/servlet-security/build.gradle @@ -1,5 +1,5 @@ plugins { - id "org.sonarqube" version "4.0.0.2929" + id "org.sonarqube" version "4.4.1.3373" id 'java-library' id 'io.spring.dependency-management' version "1.1.4" id "jacoco" diff --git a/libs/slack/build.gradle b/libs/slack/build.gradle index 88ed8d1bdb1..dfd824ab17b 100644 --- a/libs/slack/build.gradle +++ b/libs/slack/build.gradle @@ -1,5 +1,5 @@ plugins { - id "org.sonarqube" version "4.0.0.2929" + id "org.sonarqube" version "4.4.1.3373" id 'java-library' id 'io.spring.dependency-management' version "1.1.4" id "jacoco" diff --git a/libs/testing/build.gradle b/libs/testing/build.gradle index cb69862ba03..e145e2b28aa 100644 --- a/libs/testing/build.gradle +++ b/libs/testing/build.gradle @@ -1,5 +1,5 @@ plugins { - id "org.sonarqube" version "4.0.0.2929" + id "org.sonarqube" version "4.4.1.3373" id 'java-library' id 'io.spring.dependency-management' version "1.1.4" id "jacoco" diff --git a/navikt/dolly-assets/package-lock.json b/navikt/dolly-assets/package-lock.json index c91876fd156..1a17910daee 100644 --- a/navikt/dolly-assets/package-lock.json +++ b/navikt/dolly-assets/package-lock.json @@ -1933,9 +1933,9 @@ } }, "node_modules/vite": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.8.tgz", - "integrity": "sha512-jYMALd8aeqR3yS9xlHd0OzQJndS9fH5ylVgWdB+pxTwxLKdO1pgC5Dlb398BUxpfaBxa4M9oT7j1g503Gaj5IQ==", + "version": "5.0.12", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.12.tgz", + "integrity": "sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==", "dev": true, "dependencies": { "esbuild": "^0.19.3", diff --git a/navikt/dolly-komponenter/package-lock.json b/navikt/dolly-komponenter/package-lock.json index 79d5760079c..ace602c2c80 100644 --- a/navikt/dolly-komponenter/package-lock.json +++ b/navikt/dolly-komponenter/package-lock.json @@ -59,7 +59,7 @@ "rollup-plugin-svg": "^2.0.0", "storybook": "^7.4.6", "typescript": "^5.1.5", - "vite": "^5.0.8" + "vite": "^5.0.12" }, "peerDependencies": { "react": ">=18.0.0", @@ -15646,9 +15646,9 @@ } }, "node_modules/vite": { - "version": "5.0.8", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.8.tgz", - "integrity": "sha512-jYMALd8aeqR3yS9xlHd0OzQJndS9fH5ylVgWdB+pxTwxLKdO1pgC5Dlb398BUxpfaBxa4M9oT7j1g503Gaj5IQ==", + "version": "5.0.12", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.0.12.tgz", + "integrity": "sha512-4hsnEkG3q0N4Tzf1+t6NdN9dg/L3BM+q8SWgbSPnJvrgH2kgdyzfVJwbR1ic69/4uMJJ/3dqDZZE5/WwqW8U1w==", "dev": true, "dependencies": { "esbuild": "^0.19.3", diff --git a/navikt/dolly-komponenter/package.json b/navikt/dolly-komponenter/package.json index e690f63c9ca..f860668c667 100644 --- a/navikt/dolly-komponenter/package.json +++ b/navikt/dolly-komponenter/package.json @@ -74,7 +74,7 @@ "rollup-plugin-svg": "^2.0.0", "storybook": "^7.4.6", "typescript": "^5.1.5", - "vite": "^5.0.8" + "vite": "^5.0.12" }, "repository": "https://github.com/navikt/testnorge.git", "prettier": { diff --git a/proxies/aareg-proxy/build.gradle b/proxies/aareg-proxy/build.gradle index 55cc4c4e065..b69c373e4df 100644 --- a/proxies/aareg-proxy/build.gradle +++ b/proxies/aareg-proxy/build.gradle @@ -1,7 +1,7 @@ plugins { id 'io.spring.dependency-management' version "1.1.4" id 'java' - id "org.sonarqube" version "4.0.0.2929" + id "org.sonarqube" version "4.4.1.3373" id 'org.springframework.boot' version "3.2.1" id "jacoco" } diff --git a/proxies/aareg-synt-services-proxy/build.gradle b/proxies/aareg-synt-services-proxy/build.gradle index 18d47c3266e..4795d92f1e0 100644 --- a/proxies/aareg-synt-services-proxy/build.gradle +++ b/proxies/aareg-synt-services-proxy/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/proxies/arbeidsplassencv-proxy/build.gradle b/proxies/arbeidsplassencv-proxy/build.gradle index 988016700f8..2aa4801eb40 100644 --- a/proxies/arbeidsplassencv-proxy/build.gradle +++ b/proxies/arbeidsplassencv-proxy/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/proxies/arena-forvalteren-proxy/build.gradle b/proxies/arena-forvalteren-proxy/build.gradle index 91b495d668e..88cd1b74d17 100644 --- a/proxies/arena-forvalteren-proxy/build.gradle +++ b/proxies/arena-forvalteren-proxy/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/proxies/batch-adeo-proxy/build.gradle b/proxies/batch-adeo-proxy/build.gradle index d10d1ccb3ff..42f21702748 100644 --- a/proxies/batch-adeo-proxy/build.gradle +++ b/proxies/batch-adeo-proxy/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/proxies/brregstub-proxy/build.gradle b/proxies/brregstub-proxy/build.gradle index 53e31e2d6b5..45fe91852b7 100644 --- a/proxies/brregstub-proxy/build.gradle +++ b/proxies/brregstub-proxy/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/proxies/dokarkiv-proxy/build.gradle b/proxies/dokarkiv-proxy/build.gradle index a6140997c13..e3cac85e57d 100644 --- a/proxies/dokarkiv-proxy/build.gradle +++ b/proxies/dokarkiv-proxy/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + id "org.sonarqube" version "4.4.1.3373" id 'org.springframework.boot' version "3.2.1" id 'io.spring.dependency-management' version '1.0.11.RELEASE' id "jacoco" diff --git a/proxies/ereg-proxy/build.gradle b/proxies/ereg-proxy/build.gradle index c0d5e2e8f40..f099ff99afd 100644 --- a/proxies/ereg-proxy/build.gradle +++ b/proxies/ereg-proxy/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/proxies/histark-proxy/build.gradle b/proxies/histark-proxy/build.gradle index 8e9b32e226f..f7110211300 100644 --- a/proxies/histark-proxy/build.gradle +++ b/proxies/histark-proxy/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/proxies/inntektstub-proxy/build.gradle b/proxies/inntektstub-proxy/build.gradle index e99c6db6ab1..145829eb3f1 100644 --- a/proxies/inntektstub-proxy/build.gradle +++ b/proxies/inntektstub-proxy/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/proxies/inst-proxy/build.gradle b/proxies/inst-proxy/build.gradle index 749177e34f2..5ead66b7022 100644 --- a/proxies/inst-proxy/build.gradle +++ b/proxies/inst-proxy/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/proxies/kodeverk-proxy/build.gradle b/proxies/kodeverk-proxy/build.gradle index a1f05af0c5f..37bc27b9239 100644 --- a/proxies/kodeverk-proxy/build.gradle +++ b/proxies/kodeverk-proxy/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/proxies/kontoregister-person-proxy/build.gradle b/proxies/kontoregister-person-proxy/build.gradle index 50e5417494b..05dd251679b 100644 --- a/proxies/kontoregister-person-proxy/build.gradle +++ b/proxies/kontoregister-person-proxy/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/proxies/krrstub-proxy/build.gradle b/proxies/krrstub-proxy/build.gradle index 99a39e1684b..eed7e2de074 100644 --- a/proxies/krrstub-proxy/build.gradle +++ b/proxies/krrstub-proxy/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/proxies/medl-proxy/build.gradle b/proxies/medl-proxy/build.gradle index 9a0346a5c03..b05186d822d 100644 --- a/proxies/medl-proxy/build.gradle +++ b/proxies/medl-proxy/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/proxies/norg2-proxy/build.gradle b/proxies/norg2-proxy/build.gradle index 9b5f50620a1..d7d10acfae4 100644 --- a/proxies/norg2-proxy/build.gradle +++ b/proxies/norg2-proxy/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/proxies/pdl-proxy/build.gradle b/proxies/pdl-proxy/build.gradle index 0be0d98eac6..26dcd2b3dc5 100644 --- a/proxies/pdl-proxy/build.gradle +++ b/proxies/pdl-proxy/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/proxies/pensjon-testdata-facade-proxy/build.gradle b/proxies/pensjon-testdata-facade-proxy/build.gradle index b0b0bf1e70b..1b5b751a3cf 100644 --- a/proxies/pensjon-testdata-facade-proxy/build.gradle +++ b/proxies/pensjon-testdata-facade-proxy/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/proxies/saf-proxy/build.gradle b/proxies/saf-proxy/build.gradle index beb143e1f1d..083cac16fbc 100644 --- a/proxies/saf-proxy/build.gradle +++ b/proxies/saf-proxy/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/proxies/sigrunstub-proxy/build.gradle b/proxies/sigrunstub-proxy/build.gradle index f0229179a1f..852155d7368 100644 --- a/proxies/sigrunstub-proxy/build.gradle +++ b/proxies/sigrunstub-proxy/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/proxies/skjermingsregister-proxy/build.gradle b/proxies/skjermingsregister-proxy/build.gradle index 2e5be1ae2ab..cfc1d9540d6 100644 --- a/proxies/skjermingsregister-proxy/build.gradle +++ b/proxies/skjermingsregister-proxy/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" @@ -44,24 +44,23 @@ dependencyManagement { } repositories { - mavenCentral() mavenCentral() mavenLocal() } dependencies { - implementation 'no.nav.testnav.libs:data-transfer-objects' + + implementation 'no.nav.testnav.libs:security-core' implementation 'no.nav.testnav.libs:reactive-core' implementation 'no.nav.testnav.libs:reactive-proxy' implementation 'no.nav.testnav.libs:reactive-security' - implementation 'no.nav.testnav.libs:security-core' - implementation 'no.nav.testnav.libs:security-token-service' + implementation 'no.nav.testnav.libs:data-transfer-objects' implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server' implementation 'org.springframework.boot:spring-boot-starter-webflux' - implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap' // TODO remove legacy bootstrap config - implementation 'org.springframework.cloud:spring-cloud-starter-gateway' + implementation 'org.springframework.cloud:spring-cloud-starter-vault-config' + implementation 'org.springframework.cloud:spring-cloud-starter-gateway' implementation 'net.logstash.logback:logstash-logback-encoder:7.4' implementation 'org.hibernate.validator:hibernate-validator' diff --git a/proxies/skjermingsregister-proxy/src/main/resources/application.yml b/proxies/skjermingsregister-proxy/src/main/resources/application.yml index 8de7657e097..7ab17a5a1c7 100644 --- a/proxies/skjermingsregister-proxy/src/main/resources/application.yml +++ b/proxies/skjermingsregister-proxy/src/main/resources/application.yml @@ -16,6 +16,8 @@ spring: jwk-set-uri: ${TOKEN_X_JWKS_URI} accepted-audience: ${TOKEN_X_CLIENT_ID} cloud: + vault: + enabled: false gateway: httpclient: response-timeout: 30s diff --git a/proxies/skjermingsregister-proxy/src/main/resources/bootstrap.yml b/proxies/skjermingsregister-proxy/src/main/resources/bootstrap.yml deleted file mode 100644 index 0451449ca23..00000000000 --- a/proxies/skjermingsregister-proxy/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,4 +0,0 @@ -spring: - cloud: - vault: - enabled: false \ No newline at end of file diff --git a/proxies/skjermingsregister-proxy/src/test/resources/application-test.yml b/proxies/skjermingsregister-proxy/src/test/resources/application-test.yml index f77593af929..08e74d491a3 100644 --- a/proxies/skjermingsregister-proxy/src/test/resources/application-test.yml +++ b/proxies/skjermingsregister-proxy/src/test/resources/application-test.yml @@ -1,4 +1,8 @@ TOKEN_X_ISSUER: dummy proxy.url: http://localhost STS_TOKEN_PROVIDER_USERNAME: dummy -STS_TOKEN_PROVIDER_PASSWORD: dummy \ No newline at end of file +STS_TOKEN_PROVIDER_PASSWORD: dummy +spring: + cloud: + vault: + token: dummy \ No newline at end of file diff --git a/proxies/synthdata-meldekort-proxy/build.gradle b/proxies/synthdata-meldekort-proxy/build.gradle index aaa44c74964..6990b0a3202 100644 --- a/proxies/synthdata-meldekort-proxy/build.gradle +++ b/proxies/synthdata-meldekort-proxy/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/proxies/tps-forvalteren-proxy/build.gradle b/proxies/tps-forvalteren-proxy/build.gradle index 7e850f548b6..3561afaae3c 100644 --- a/proxies/tps-forvalteren-proxy/build.gradle +++ b/proxies/tps-forvalteren-proxy/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/proxies/udistub-proxy/build.gradle b/proxies/udistub-proxy/build.gradle index bd66f906918..a53eedbbcd1 100644 --- a/proxies/udistub-proxy/build.gradle +++ b/proxies/udistub-proxy/build.gradle @@ -1,6 +1,6 @@ plugins { id 'java' - id "org.sonarqube" version "4.0.0.2929" + 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 "jacoco" diff --git a/proxies/udistub-proxy/config.yml b/proxies/udistub-proxy/config.yml index 5f4537efe6e..7c353cb0220 100644 --- a/proxies/udistub-proxy/config.yml +++ b/proxies/udistub-proxy/config.yml @@ -9,6 +9,8 @@ spec: image: "{{image}}" port: 8080 webproxy: true + tokenx: + enabled: true azure: application: allowAllUsers: true @@ -54,4 +56,4 @@ spec: limits: memory: 2048Mi ingresses: - - "https://testnav-udistub-proxy.dev-fss-pub.nais.io" \ No newline at end of file + - "https://testnav-udistub-proxy.dev-fss-pub.nais.io" diff --git a/xsd/arbeidsforhold-xsd/build.gradle b/xsd/arbeidsforhold-xsd/build.gradle index 4329ba9891c..ae38ee81ac9 100644 --- a/xsd/arbeidsforhold-xsd/build.gradle +++ b/xsd/arbeidsforhold-xsd/build.gradle @@ -1,5 +1,5 @@ plugins { - id "org.sonarqube" version "4.0.0.2929" + id "org.sonarqube" version "4.4.1.3373" id 'java-library' id 'com.github.edeandrea.xjc-generation' version '1.6' }