diff --git a/apps/adresse-service/build.gradle b/apps/adresse-service/build.gradle index e3bb51bc8f7..ff7439fd68e 100644 --- a/apps/adresse-service/build.gradle +++ b/apps/adresse-service/build.gradle @@ -19,12 +19,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "navit_testnorge_adresse_service" diff --git a/apps/adresse-service/config.yml b/apps/adresse-service/config.yml index 1a038415db5..813d46c00e5 100644 --- a/apps/adresse-service/config.yml +++ b/apps/adresse-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" webproxy: true tokenx: enabled: true diff --git a/apps/amelding-service/build.gradle b/apps/amelding-service/build.gradle index 7b56e28fc31..9ee08fb9224 100644 --- a/apps/amelding-service/build.gradle +++ b/apps/amelding-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "navit_testnorge_amelding_service" diff --git a/apps/amelding-service/config.yml b/apps/amelding-service/config.yml index 1034e721f82..f3054d3c12a 100644 --- a/apps/amelding-service/config.yml +++ b/apps/amelding-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 accessPolicy: inbound: diff --git a/apps/app-tilgang-analyse-service/build.gradle b/apps/app-tilgang-analyse-service/build.gradle index 6f4c6ea8d32..562d0a2d3f6 100644 --- a/apps/app-tilgang-analyse-service/build.gradle +++ b/apps/app-tilgang-analyse-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "navit_testnorge_app_tilgang_analyse_service" diff --git a/apps/app-tilgang-analyse-service/config.yml b/apps/app-tilgang-analyse-service/config.yml index 2d8517b9f3d..19edc95c9ab 100644 --- a/apps/app-tilgang-analyse-service/config.yml +++ b/apps/app-tilgang-analyse-service/config.yml @@ -13,7 +13,7 @@ spec: allowAllUsers: true enabled: true tenant: nav.no - image: {{image}} + image: "{{image}}" port: 8080 accessPolicy: inbound: diff --git a/apps/arbeidsforhold-service/build.gradle b/apps/arbeidsforhold-service/build.gradle index 79ca648e2b3..15f4cf7f78c 100644 --- a/apps/arbeidsforhold-service/build.gradle +++ b/apps/arbeidsforhold-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-arbeidsforhold-service" diff --git a/apps/arbeidsforhold-service/config.yml b/apps/arbeidsforhold-service/config.yml index 966d96ba4f9..821f7365101 100644 --- a/apps/arbeidsforhold-service/config.yml +++ b/apps/arbeidsforhold-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 tokenx: enabled: true diff --git a/apps/batch-bestilling-service/build.gradle b/apps/batch-bestilling-service/build.gradle index 263a06d8ce3..bceca753034 100644 --- a/apps/batch-bestilling-service/build.gradle +++ b/apps/batch-bestilling-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-batch-bestilling-service" diff --git a/apps/batch-bestilling-service/config.yml b/apps/batch-bestilling-service/config.yml index cdde7aeaa38..7232b106207 100644 --- a/apps/batch-bestilling-service/config.yml +++ b/apps/batch-bestilling-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/apps/brreg-stub/build.gradle b/apps/brreg-stub/build.gradle index f29676bad04..f00997f210d 100644 --- a/apps/brreg-stub/build.gradle +++ b/apps/brreg-stub/build.gradle @@ -19,12 +19,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "brreg-stub" diff --git a/apps/brreg-stub/config.yml b/apps/brreg-stub/config.yml index e2a1d8ff6aa..b338409a52e 100644 --- a/apps/brreg-stub/config.yml +++ b/apps/brreg-stub/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 liveness: path: /isAlive diff --git a/apps/bruker-service/build.gradle b/apps/bruker-service/build.gradle index 4bd5369ea5c..0171386fb3b 100644 --- a/apps/bruker-service/build.gradle +++ b/apps/bruker-service/build.gradle @@ -27,12 +27,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-bruker-service" diff --git a/apps/bruker-service/config.test.yml b/apps/bruker-service/config.test.yml index 4a35b00af7e..6d176a1af71 100644 --- a/apps/bruker-service/config.test.yml +++ b/apps/bruker-service/config.test.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 tokenx: enabled: true diff --git a/apps/bruker-service/config.yml b/apps/bruker-service/config.yml index c3f69896772..6e551c4b8e0 100644 --- a/apps/bruker-service/config.yml +++ b/apps/bruker-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 tokenx: enabled: true diff --git a/apps/budpro-service/build.gradle b/apps/budpro-service/build.gradle index d0adf882a0a..80da396b83b 100644 --- a/apps/budpro-service/build.gradle +++ b/apps/budpro-service/build.gradle @@ -90,7 +90,7 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" diff --git a/apps/budpro-service/config.yml b/apps/budpro-service/config.yml index 27a4a5449bc..c5014890c89 100644 --- a/apps/budpro-service/config.yml +++ b/apps/budpro-service/config.yml @@ -19,7 +19,7 @@ spec: allowAllUsers: true enabled: true tenant: nav.no - image: {{image}} + image: "{{image}}" ingresses: - "https://testnav-budpro-service.intern.dev.nav.no" liveness: diff --git a/apps/dolly-frontend/build.gradle b/apps/dolly-frontend/build.gradle index 3e53b0c7eae..c4ba6e9f53f 100644 --- a/apps/dolly-frontend/build.gradle +++ b/apps/dolly-frontend/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "dolly-frontend" diff --git a/apps/dollystatus/build.gradle b/apps/dollystatus/build.gradle index a143f42624f..f4ce7b69aa9 100644 --- a/apps/dollystatus/build.gradle +++ b/apps/dollystatus/build.gradle @@ -12,12 +12,12 @@ test { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-dollystatus" diff --git a/apps/dollystatus/config.yml b/apps/dollystatus/config.yml index c0c66031764..a6fceedea5e 100644 --- a/apps/dollystatus/config.yml +++ b/apps/dollystatus/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 accessPolicy: outbound: diff --git a/apps/endringsmelding-frontend/build.gradle b/apps/endringsmelding-frontend/build.gradle index 49b19b632eb..99ae52f135d 100644 --- a/apps/endringsmelding-frontend/build.gradle +++ b/apps/endringsmelding-frontend/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-endringsmelding-frontend" diff --git a/apps/endringsmelding-frontend/config.yml b/apps/endringsmelding-frontend/config.yml index 800935c0f7d..5cc19a8b63e 100644 --- a/apps/endringsmelding-frontend/config.yml +++ b/apps/endringsmelding-frontend/config.yml @@ -41,6 +41,6 @@ spec: requests: cpu: 300m memory: 1024Mi - image: {{ image }} + image: "{{image}}" ingresses: - "https://testnav-endringsmelding.intern.dev.nav.no" diff --git a/apps/endringsmelding-service/build.gradle b/apps/endringsmelding-service/build.gradle index b44f0c2ff04..210652ba98e 100644 --- a/apps/endringsmelding-service/build.gradle +++ b/apps/endringsmelding-service/build.gradle @@ -12,12 +12,12 @@ test { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-endringsmelding-service" diff --git a/apps/endringsmelding-service/config.yml b/apps/endringsmelding-service/config.yml index 2be00e3280a..0eb96c908cb 100644 --- a/apps/endringsmelding-service/config.yml +++ b/apps/endringsmelding-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/apps/ereg-batch-status-service/build.gradle b/apps/ereg-batch-status-service/build.gradle index 3a1be419c17..3e7fff65598 100644 --- a/apps/ereg-batch-status-service/build.gradle +++ b/apps/ereg-batch-status-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-ereg-batch-status-service" diff --git a/apps/ereg-batch-status-service/config.yml b/apps/ereg-batch-status-service/config.yml index ee491117a1c..23f5416dc3e 100644 --- a/apps/ereg-batch-status-service/config.yml +++ b/apps/ereg-batch-status-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true accessPolicy: diff --git a/apps/faste-data-frontend/build.gradle b/apps/faste-data-frontend/build.gradle index 4e01c3b67bf..0e76f343985 100644 --- a/apps/faste-data-frontend/build.gradle +++ b/apps/faste-data-frontend/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-faste-data-frontend" diff --git a/apps/faste-data-frontend/config.yml b/apps/faste-data-frontend/config.yml index 32de941c128..4823e90b564 100644 --- a/apps/faste-data-frontend/config.yml +++ b/apps/faste-data-frontend/config.yml @@ -44,6 +44,6 @@ spec: requests: cpu: 300m memory: 1024Mi - image: {{ image }} + image: "{{image}}" ingresses: - "https://testnav-faste-data.intern.dev.nav.no" \ No newline at end of file diff --git a/apps/generer-arbeidsforhold-populasjon-service/build.gradle b/apps/generer-arbeidsforhold-populasjon-service/build.gradle index cd7af023009..acff03c789e 100644 --- a/apps/generer-arbeidsforhold-populasjon-service/build.gradle +++ b/apps/generer-arbeidsforhold-populasjon-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-generer-arbeidsforhold-populasjon-service" diff --git a/apps/generer-arbeidsforhold-populasjon-service/config.yml b/apps/generer-arbeidsforhold-populasjon-service/config.yml index bc883aaa2c1..652323b02bf 100644 --- a/apps/generer-arbeidsforhold-populasjon-service/config.yml +++ b/apps/generer-arbeidsforhold-populasjon-service/config.yml @@ -8,7 +8,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 tokenx: enabled: true diff --git a/apps/generer-navn-service/build.gradle b/apps/generer-navn-service/build.gradle index b7f284be411..c1efbd5e8ac 100644 --- a/apps/generer-navn-service/build.gradle +++ b/apps/generer-navn-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-generer-navn-service" diff --git a/apps/generer-navn-service/config.yml b/apps/generer-navn-service/config.yml index 103356f2a3b..b1e23da4e0c 100644 --- a/apps/generer-navn-service/config.yml +++ b/apps/generer-navn-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 tracing: enabled: true diff --git a/apps/generer-organisasjon-populasjon-service/build.gradle b/apps/generer-organisasjon-populasjon-service/build.gradle index 031b4f63a63..184e7ecc035 100644 --- a/apps/generer-organisasjon-populasjon-service/build.gradle +++ b/apps/generer-organisasjon-populasjon-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-generer-organisasjon-populasjon-service" diff --git a/apps/generer-organisasjon-populasjon-service/config.yml b/apps/generer-organisasjon-populasjon-service/config.yml index 71a8838132d..8f2ba32678e 100644 --- a/apps/generer-organisasjon-populasjon-service/config.yml +++ b/apps/generer-organisasjon-populasjon-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 tokenx: enabled: true diff --git a/apps/generer-synt-amelding-service/build.gradle b/apps/generer-synt-amelding-service/build.gradle index b790e8ddd0e..96535cbf724 100644 --- a/apps/generer-synt-amelding-service/build.gradle +++ b/apps/generer-synt-amelding-service/build.gradle @@ -12,12 +12,12 @@ test { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-generer-synt-amelding-service" diff --git a/apps/generer-synt-amelding-service/config.yml b/apps/generer-synt-amelding-service/config.yml index 8ade8692ed0..3d937750474 100644 --- a/apps/generer-synt-amelding-service/config.yml +++ b/apps/generer-synt-amelding-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true tracing: diff --git a/apps/geografiske-kodeverk-service/build.gradle b/apps/geografiske-kodeverk-service/build.gradle index 73b7e394fc1..f60b47b5d26 100644 --- a/apps/geografiske-kodeverk-service/build.gradle +++ b/apps/geografiske-kodeverk-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-geografiske-kodeverk-service" diff --git a/apps/geografiske-kodeverk-service/config.yml b/apps/geografiske-kodeverk-service/config.yml index 921d49cc90f..7e4b2a015ac 100644 --- a/apps/geografiske-kodeverk-service/config.yml +++ b/apps/geografiske-kodeverk-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 tracing: enabled: true diff --git a/apps/helsepersonell-service/build.gradle b/apps/helsepersonell-service/build.gradle index c0d63451a3d..fbafef94927 100644 --- a/apps/helsepersonell-service/build.gradle +++ b/apps/helsepersonell-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-helsepersonell-service" diff --git a/apps/helsepersonell-service/config.yml b/apps/helsepersonell-service/config.yml index 5431b605555..d028995f654 100644 --- a/apps/helsepersonell-service/config.yml +++ b/apps/helsepersonell-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/apps/hodejegeren/build.gradle b/apps/hodejegeren/build.gradle index 3aaa58f08ed..95cda1b2dbd 100644 --- a/apps/hodejegeren/build.gradle +++ b/apps/hodejegeren/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnorge-hodejegeren" diff --git a/apps/hodejegeren/config.yml b/apps/hodejegeren/config.yml index f987eab4b81..a983e80fa5c 100644 --- a/apps/hodejegeren/config.yml +++ b/apps/hodejegeren/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true liveness: diff --git a/apps/inntektsmelding-generator-service/build.gradle b/apps/inntektsmelding-generator-service/build.gradle index 5467e18022e..4313ba82af5 100644 --- a/apps/inntektsmelding-generator-service/build.gradle +++ b/apps/inntektsmelding-generator-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-inntektsmelding-generator-service" diff --git a/apps/inntektsmelding-generator-service/config.yml b/apps/inntektsmelding-generator-service/config.yml index 7b64d584f3c..039d04ab087 100644 --- a/apps/inntektsmelding-generator-service/config.yml +++ b/apps/inntektsmelding-generator-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 tokenx: enabled: true diff --git a/apps/inntektsmelding-service/build.gradle b/apps/inntektsmelding-service/build.gradle index 800a23e507d..661fe50f7aa 100644 --- a/apps/inntektsmelding-service/build.gradle +++ b/apps/inntektsmelding-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-inntektsmelding-service" diff --git a/apps/inntektsmelding-service/config.yml b/apps/inntektsmelding-service/config.yml index 401a7d2955f..fd15925e7dd 100644 --- a/apps/inntektsmelding-service/config.yml +++ b/apps/inntektsmelding-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 tokenx: enabled: true diff --git a/apps/jenkins-batch-status-service/build.gradle b/apps/jenkins-batch-status-service/build.gradle index 3492add236c..edd717a67cf 100644 --- a/apps/jenkins-batch-status-service/build.gradle +++ b/apps/jenkins-batch-status-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-jenkins-batch-status-service" diff --git a/apps/jenkins-batch-status-service/config.yml b/apps/jenkins-batch-status-service/config.yml index 24a995c0648..a184d50dff7 100644 --- a/apps/jenkins-batch-status-service/config.yml +++ b/apps/jenkins-batch-status-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true accessPolicy: diff --git a/apps/joark-dokument-service/build.gradle b/apps/joark-dokument-service/build.gradle index 48a30b6d2b6..d6b89056646 100644 --- a/apps/joark-dokument-service/build.gradle +++ b/apps/joark-dokument-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-joark-dokument-service" diff --git a/apps/joark-dokument-service/config.yml b/apps/joark-dokument-service/config.yml index 011330687c2..2e64de12fc3 100644 --- a/apps/joark-dokument-service/config.yml +++ b/apps/joark-dokument-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 tracing: enabled: true diff --git a/apps/miljoer-service/build.gradle b/apps/miljoer-service/build.gradle index 6fe3cff5003..3ffded68927 100644 --- a/apps/miljoer-service/build.gradle +++ b/apps/miljoer-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-miljoer-service" diff --git a/apps/miljoer-service/config.yml b/apps/miljoer-service/config.yml index 002a004d8c2..6bc3aa92739 100644 --- a/apps/miljoer-service/config.yml +++ b/apps/miljoer-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true tracing: diff --git a/apps/mn-synt-arbeidsforhold-service/build.gradle b/apps/mn-synt-arbeidsforhold-service/build.gradle index 1e44dcfcb22..434e11c8934 100644 --- a/apps/mn-synt-arbeidsforhold-service/build.gradle +++ b/apps/mn-synt-arbeidsforhold-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "mn-synt-arbeidsforhold-service" diff --git a/apps/mn-synt-arbeidsforhold-service/config.yml b/apps/mn-synt-arbeidsforhold-service/config.yml index 00d72e51b2e..35059bbd84d 100644 --- a/apps/mn-synt-arbeidsforhold-service/config.yml +++ b/apps/mn-synt-arbeidsforhold-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true accessPolicy: diff --git a/apps/oppsummeringsdokument-service/build.gradle b/apps/oppsummeringsdokument-service/build.gradle index 79ef0a07ef1..ebb31fff341 100644 --- a/apps/oppsummeringsdokument-service/build.gradle +++ b/apps/oppsummeringsdokument-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "oppsummeringsdokument-service" diff --git a/apps/oppsummeringsdokument-service/config.yml b/apps/oppsummeringsdokument-service/config.yml index 4ba7921c11f..42c2a6c82e7 100644 --- a/apps/oppsummeringsdokument-service/config.yml +++ b/apps/oppsummeringsdokument-service/config.yml @@ -8,7 +8,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 accessPolicy: inbound: diff --git a/apps/organisasjon-bestilling-service/build.gradle b/apps/organisasjon-bestilling-service/build.gradle index e99d498f3c3..88fab1f912d 100644 --- a/apps/organisasjon-bestilling-service/build.gradle +++ b/apps/organisasjon-bestilling-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "organisasjon-bestilling-service" diff --git a/apps/organisasjon-bestilling-service/config.yml b/apps/organisasjon-bestilling-service/config.yml index 15128fab474..aac16e21e70 100644 --- a/apps/organisasjon-bestilling-service/config.yml +++ b/apps/organisasjon-bestilling-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 tokenx: enabled: true diff --git a/apps/organisasjon-faste-data-service/build.gradle b/apps/organisasjon-faste-data-service/build.gradle index e240141cb3e..2b03afe2473 100644 --- a/apps/organisasjon-faste-data-service/build.gradle +++ b/apps/organisasjon-faste-data-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-organisasjon-faste-data-service" diff --git a/apps/organisasjon-faste-data-service/config.yml b/apps/organisasjon-faste-data-service/config.yml index b1bd0fc41bf..05aa99e61b8 100644 --- a/apps/organisasjon-faste-data-service/config.yml +++ b/apps/organisasjon-faste-data-service/config.yml @@ -10,7 +10,7 @@ metadata: nginx.ingress.kubernetes.io/proxy-send-timeout: "300" nginx.ingress.kubernetes.io/proxy-body-size: "50m" spec: - image: {{image}} + image: "{{image}}" port: 8080 tokenx: enabled: true diff --git a/apps/organisasjon-forvalter/build.gradle b/apps/organisasjon-forvalter/build.gradle index 3fd67aed5d1..b8ca81d542c 100644 --- a/apps/organisasjon-forvalter/build.gradle +++ b/apps/organisasjon-forvalter/build.gradle @@ -19,12 +19,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-organisasjon-forvalter" diff --git a/apps/organisasjon-forvalter/config.yml b/apps/organisasjon-forvalter/config.yml index 3b01496a5d5..ba768822533 100644 --- a/apps/organisasjon-forvalter/config.yml +++ b/apps/organisasjon-forvalter/config.yml @@ -9,7 +9,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/apps/organisasjon-mottak-service/build.gradle b/apps/organisasjon-mottak-service/build.gradle index 4721739e7b6..cf995d9059e 100644 --- a/apps/organisasjon-mottak-service/build.gradle +++ b/apps/organisasjon-mottak-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-organisasjon-mottak-service" diff --git a/apps/organisasjon-mottak-service/config.yml b/apps/organisasjon-mottak-service/config.yml index 47f5992ff92..67ad8f7b904 100644 --- a/apps/organisasjon-mottak-service/config.yml +++ b/apps/organisasjon-mottak-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 tokenx: enabled: true diff --git a/apps/organisasjon-service/build.gradle b/apps/organisasjon-service/build.gradle index 6daae6b29fa..e6282160c18 100644 --- a/apps/organisasjon-service/build.gradle +++ b/apps/organisasjon-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-organisasjon-service" diff --git a/apps/organisasjon-service/config.yml b/apps/organisasjon-service/config.yml index 5f514749d28..768b6451974 100644 --- a/apps/organisasjon-service/config.yml +++ b/apps/organisasjon-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 tokenx: enabled: true diff --git a/apps/organisasjon-tilgang-frontend/build.gradle b/apps/organisasjon-tilgang-frontend/build.gradle index 16cf949b27a..b6f0936ab52 100644 --- a/apps/organisasjon-tilgang-frontend/build.gradle +++ b/apps/organisasjon-tilgang-frontend/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-organisasjon-tilgang-frontend" diff --git a/apps/organisasjon-tilgang-frontend/config.yml b/apps/organisasjon-tilgang-frontend/config.yml index e9d49884be7..e1854d58e04 100644 --- a/apps/organisasjon-tilgang-frontend/config.yml +++ b/apps/organisasjon-tilgang-frontend/config.yml @@ -47,6 +47,6 @@ spec: requests: cpu: 300m memory: 512Mi - image: {{ image }} + image: "{{image}}" ingresses: - "https://testnav-organisasjon-tilgang.intern.dev.nav.no" \ No newline at end of file diff --git a/apps/organisasjon-tilgang-service/build.gradle b/apps/organisasjon-tilgang-service/build.gradle index a24115e95ec..26d56417738 100644 --- a/apps/organisasjon-tilgang-service/build.gradle +++ b/apps/organisasjon-tilgang-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-organisasjon-tilgang-service" diff --git a/apps/organisasjon-tilgang-service/config.yml b/apps/organisasjon-tilgang-service/config.yml index 27b65107ced..c2668b76ef2 100644 --- a/apps/organisasjon-tilgang-service/config.yml +++ b/apps/organisasjon-tilgang-service/config.yml @@ -8,7 +8,7 @@ metadata: spec: tokenx: enabled: true - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true azure: diff --git a/apps/orgnummer-service/build.gradle b/apps/orgnummer-service/build.gradle index 5c5d9999502..f9ce74141ed 100644 --- a/apps/orgnummer-service/build.gradle +++ b/apps/orgnummer-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "orgnummer-service" diff --git a/apps/orgnummer-service/config.yml b/apps/orgnummer-service/config.yml index daf135b99fd..4923ebe32a0 100644 --- a/apps/orgnummer-service/config.yml +++ b/apps/orgnummer-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/apps/oversikt-frontend/build.gradle b/apps/oversikt-frontend/build.gradle index de827f2c32b..56f05744c9a 100644 --- a/apps/oversikt-frontend/build.gradle +++ b/apps/oversikt-frontend/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-oversikt-frontend" diff --git a/apps/oversikt-frontend/config.yml b/apps/oversikt-frontend/config.yml index 33641d2f8c6..ccca707cfe0 100644 --- a/apps/oversikt-frontend/config.yml +++ b/apps/oversikt-frontend/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 tokenx: enabled: true diff --git a/apps/pdl-forvalter/build.gradle b/apps/pdl-forvalter/build.gradle index 6745e8695c6..e65a5293da6 100644 --- a/apps/pdl-forvalter/build.gradle +++ b/apps/pdl-forvalter/build.gradle @@ -19,12 +19,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-pdl-forvalter" diff --git a/apps/pdl-forvalter/config.test.yml b/apps/pdl-forvalter/config.test.yml index 543116cd702..b2ad098c034 100644 --- a/apps/pdl-forvalter/config.test.yml +++ b/apps/pdl-forvalter/config.test.yml @@ -13,7 +13,7 @@ spec: env: - name: SPRING_PROFILES_ACTIVE value: dev - image: {{image}} + image: "{{image}}" webproxy: true tokenx: enabled: true diff --git a/apps/pdl-forvalter/config.yml b/apps/pdl-forvalter/config.yml index dacd2849b47..0c2c84cabf1 100644 --- a/apps/pdl-forvalter/config.yml +++ b/apps/pdl-forvalter/config.yml @@ -13,7 +13,7 @@ spec: env: - name: SPRING_PROFILES_ACTIVE value: prod - image: {{image}} + image: "{{image}}" webproxy: true tokenx: enabled: true diff --git a/apps/person-faste-data-service/build.gradle b/apps/person-faste-data-service/build.gradle index 79e39ba95d7..5973026c17e 100644 --- a/apps/person-faste-data-service/build.gradle +++ b/apps/person-faste-data-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-person-faste-data-service" diff --git a/apps/person-faste-data-service/config.yml b/apps/person-faste-data-service/config.yml index 496aba1e134..9d35ba92904 100644 --- a/apps/person-faste-data-service/config.yml +++ b/apps/person-faste-data-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 tokenx: enabled: true diff --git a/apps/person-organisasjon-tilgang-service/build.gradle b/apps/person-organisasjon-tilgang-service/build.gradle index 89857dcdce9..9c53fedc230 100644 --- a/apps/person-organisasjon-tilgang-service/build.gradle +++ b/apps/person-organisasjon-tilgang-service/build.gradle @@ -29,12 +29,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-person-organisasjon-tilgang-service" diff --git a/apps/person-search-service/build.gradle b/apps/person-search-service/build.gradle index b355dd0b46f..d0d305b3ea6 100644 --- a/apps/person-search-service/build.gradle +++ b/apps/person-search-service/build.gradle @@ -19,12 +19,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "person-search-service" diff --git a/apps/person-search-service/config.yml b/apps/person-search-service/config.yml index 7fffda1f9d5..340eb328cf5 100644 --- a/apps/person-search-service/config.yml +++ b/apps/person-search-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/apps/person-service/build.gradle b/apps/person-service/build.gradle index ed874b4c1b4..44b1f6f19c8 100644 --- a/apps/person-service/build.gradle +++ b/apps/person-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-person-service" diff --git a/apps/person-service/config.yml b/apps/person-service/config.yml index 7d55fe137e8..63ceb65750a 100644 --- a/apps/person-service/config.yml +++ b/apps/person-service/config.yml @@ -9,7 +9,7 @@ metadata: nginx.ingress.kubernetes.io/proxy-read-timeout: "900" nginx.ingress.kubernetes.io/proxy-send-timeout: "900" spec: - image: {{image}} + image: "{{image}}" port: 8080 tokenx: enabled: true diff --git a/apps/profil-api/build.gradle b/apps/profil-api/build.gradle index 34ca325cef8..8dfa7e3a4b2 100644 --- a/apps/profil-api/build.gradle +++ b/apps/profil-api/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnorge-profil-api" diff --git a/apps/profil-api/config.test.yml b/apps/profil-api/config.test.yml index 0799d0cadeb..677bc45707f 100644 --- a/apps/profil-api/config.test.yml +++ b/apps/profil-api/config.test.yml @@ -11,7 +11,7 @@ spec: value: testnav-person-organisasjon-tilgang-service-dev - name: PERSON_ORG_TILGANG_URL value: http://testnav-person-organisasjon-tilgang-service-dev.dolly.svc.cluster.local - image: {{ image }} + image: "{{image}}" tokenx: enabled: true azure: diff --git a/apps/profil-api/config.yml b/apps/profil-api/config.yml index 7446c7d8834..5621a7aefdb 100644 --- a/apps/profil-api/config.yml +++ b/apps/profil-api/config.yml @@ -11,7 +11,7 @@ spec: value: testnav-person-organisasjon-tilgang-service - name: PERSON_ORG_TILGANG_URL value: http://testnav-person-organisasjon-tilgang-service.dolly.svc.cluster.local - image: {{image}} + image: "{{image}}" tokenx: enabled: true azure: diff --git a/apps/sykemelding-api/build.gradle b/apps/sykemelding-api/build.gradle index 31deb5ce600..96bac84696a 100644 --- a/apps/sykemelding-api/build.gradle +++ b/apps/sykemelding-api/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnorge-sykemelding-api" diff --git a/apps/sykemelding-api/config.yml b/apps/sykemelding-api/config.yml index 866b0109b2c..eea56030bb8 100644 --- a/apps/sykemelding-api/config.yml +++ b/apps/sykemelding-api/config.yml @@ -18,7 +18,7 @@ spec: allowAllUsers: true enabled: true tenant: nav.no - image: {{image}} + image: "{{image}}" port: 8080 liveness: path: /internal/isAlive diff --git a/apps/synt-sykemelding-api/build.gradle b/apps/synt-sykemelding-api/build.gradle index f73cd9fc465..d815abbe06f 100644 --- a/apps/synt-sykemelding-api/build.gradle +++ b/apps/synt-sykemelding-api/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnorge-synt-sykemelding-api" diff --git a/apps/synt-sykemelding-api/config.yml b/apps/synt-sykemelding-api/config.yml index 5cfa4cf2cf6..ab3bbb2983b 100644 --- a/apps/synt-sykemelding-api/config.yml +++ b/apps/synt-sykemelding-api/config.yml @@ -9,7 +9,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/apps/synt-vedtakshistorikk-service/build.gradle b/apps/synt-vedtakshistorikk-service/build.gradle index 3173bd9f44e..743cdcb7409 100644 --- a/apps/synt-vedtakshistorikk-service/build.gradle +++ b/apps/synt-vedtakshistorikk-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-synt-vedtakshistorikk-service" diff --git a/apps/synt-vedtakshistorikk-service/config.yml b/apps/synt-vedtakshistorikk-service/config.yml index dfa06603617..17aabdb1d55 100644 --- a/apps/synt-vedtakshistorikk-service/config.yml +++ b/apps/synt-vedtakshistorikk-service/config.yml @@ -33,7 +33,7 @@ spec: memory: 1024Mi limits: memory: 2048Mi - image: {{ image }} + image: "{{image}}" accessPolicy: inbound: rules: diff --git a/apps/testnav-ident-pool/build.gradle b/apps/testnav-ident-pool/build.gradle index 30ddcbdda9b..f7a80aba2bd 100644 --- a/apps/testnav-ident-pool/build.gradle +++ b/apps/testnav-ident-pool/build.gradle @@ -19,12 +19,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-ident-pool" diff --git a/apps/testnav-ident-pool/config.yml b/apps/testnav-ident-pool/config.yml index 234482f3407..518b26819ac 100644 --- a/apps/testnav-ident-pool/config.yml +++ b/apps/testnav-ident-pool/config.yml @@ -13,7 +13,7 @@ spec: env: - name: SPRING_PROFILES_ACTIVE value: prod - image: {{ image }} + image: "{{image}}" webproxy: true azure: application: diff --git a/apps/testnorge-statisk-data-forvalter/build.gradle b/apps/testnorge-statisk-data-forvalter/build.gradle index 5d8dcc6efd9..ba8aad72aa0 100644 --- a/apps/testnorge-statisk-data-forvalter/build.gradle +++ b/apps/testnorge-statisk-data-forvalter/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnorge-statisk-data-forvalter" diff --git a/apps/testnorge-statisk-data-forvalter/config.yml b/apps/testnorge-statisk-data-forvalter/config.yml index 5b0c22890ba..f0175829f11 100644 --- a/apps/testnorge-statisk-data-forvalter/config.yml +++ b/apps/testnorge-statisk-data-forvalter/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 tokenx: enabled: true diff --git a/apps/tilbakemelding-api/build.gradle b/apps/tilbakemelding-api/build.gradle index 4a2e5d87e65..8b94d1455ae 100644 --- a/apps/tilbakemelding-api/build.gradle +++ b/apps/tilbakemelding-api/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnorge-tilbakemelding-api" diff --git a/apps/tilbakemelding-api/config.yml b/apps/tilbakemelding-api/config.yml index 635c987e7d0..72c2f5fba89 100644 --- a/apps/tilbakemelding-api/config.yml +++ b/apps/tilbakemelding-api/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 tracing: enabled: true diff --git a/apps/tps-messaging-service/build.gradle b/apps/tps-messaging-service/build.gradle index 7602ff02437..56993ecbac9 100644 --- a/apps/tps-messaging-service/build.gradle +++ b/apps/tps-messaging-service/build.gradle @@ -19,12 +19,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "tps-messaging-service" diff --git a/apps/tps-messaging-service/config.yml b/apps/tps-messaging-service/config.yml index 09e02532b76..ceaf793c812 100644 --- a/apps/tps-messaging-service/config.yml +++ b/apps/tps-messaging-service/config.yml @@ -9,7 +9,7 @@ spec: env: - name: SPRING_PROFILES_ACTIVE value: prod - image: {{image}} + image: "{{image}}" webproxy: true tokenx: enabled: true diff --git a/apps/udi-stub/build.gradle b/apps/udi-stub/build.gradle index e8574181e22..0e96a301760 100644 --- a/apps/udi-stub/build.gradle +++ b/apps/udi-stub/build.gradle @@ -20,12 +20,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "udi-stub" diff --git a/apps/udi-stub/config.yml b/apps/udi-stub/config.yml index b380f527c4e..4d896ddfba2 100644 --- a/apps/udi-stub/config.yml +++ b/apps/udi-stub/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/apps/varslinger-service/build.gradle b/apps/varslinger-service/build.gradle index 87ccfe70427..b5d7fb05948 100644 --- a/apps/varslinger-service/build.gradle +++ b/apps/varslinger-service/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-varslinger-service" diff --git a/apps/varslinger-service/config.test.yml b/apps/varslinger-service/config.test.yml index 40161f30864..24259bbed3a 100644 --- a/apps/varslinger-service/config.test.yml +++ b/apps/varslinger-service/config.test.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true accessPolicy: diff --git a/apps/varslinger-service/config.yml b/apps/varslinger-service/config.yml index 8d139e0fb7a..684cd750dfe 100644 --- a/apps/varslinger-service/config.yml +++ b/apps/varslinger-service/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true accessPolicy: diff --git a/examples/reactive-rest-example/build.gradle b/examples/reactive-rest-example/build.gradle index d1eee8636ef..7690696c88d 100644 --- a/examples/reactive-rest-example/build.gradle +++ b/examples/reactive-rest-example/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-reactive-rest-example" diff --git a/libs/commands/build.gradle b/libs/commands/build.gradle index 8ba162028e3..146c350740c 100644 --- a/libs/commands/build.gradle +++ b/libs/commands/build.gradle @@ -13,12 +13,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-commands" diff --git a/libs/csv-converter/build.gradle b/libs/csv-converter/build.gradle index 1dc3aaf14ea..b3bf815ce1d 100644 --- a/libs/csv-converter/build.gradle +++ b/libs/csv-converter/build.gradle @@ -13,12 +13,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-csv-converter" diff --git a/libs/data-transfer-objects/build.gradle b/libs/data-transfer-objects/build.gradle index 07e5a3003ae..c951fe168e5 100644 --- a/libs/data-transfer-objects/build.gradle +++ b/libs/data-transfer-objects/build.gradle @@ -14,12 +14,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-data-transfer-objects" diff --git a/libs/data-transfer-search-objects/build.gradle b/libs/data-transfer-search-objects/build.gradle index c8efdca1868..9810aaba515 100644 --- a/libs/data-transfer-search-objects/build.gradle +++ b/libs/data-transfer-search-objects/build.gradle @@ -14,12 +14,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-data-transfer-search-objects" diff --git a/libs/database/build.gradle b/libs/database/build.gradle index 236987b4332..1183d6d9700 100644 --- a/libs/database/build.gradle +++ b/libs/database/build.gradle @@ -13,12 +13,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-database" diff --git a/libs/domain/build.gradle b/libs/domain/build.gradle index 328005948b5..c5cf6dd5e00 100644 --- a/libs/domain/build.gradle +++ b/libs/domain/build.gradle @@ -13,12 +13,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-domain" diff --git a/libs/integration-test/build.gradle b/libs/integration-test/build.gradle index 1281b0ddec8..fb6b34bd21b 100644 --- a/libs/integration-test/build.gradle +++ b/libs/integration-test/build.gradle @@ -17,12 +17,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-integration-test" diff --git a/libs/kafka-config/build.gradle b/libs/kafka-config/build.gradle index fba140f4eae..317acb22b43 100644 --- a/libs/kafka-config/build.gradle +++ b/libs/kafka-config/build.gradle @@ -13,12 +13,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-kafka-config" diff --git a/libs/kafka-producers/build.gradle b/libs/kafka-producers/build.gradle index 71a0365e950..901a9dfe412 100644 --- a/libs/kafka-producers/build.gradle +++ b/libs/kafka-producers/build.gradle @@ -13,12 +13,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-kafka-producers" diff --git a/libs/reactive-core/build.gradle b/libs/reactive-core/build.gradle index f5bf489c694..61415c833b4 100644 --- a/libs/reactive-core/build.gradle +++ b/libs/reactive-core/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-reactive-core" diff --git a/libs/reactive-frontend/build.gradle b/libs/reactive-frontend/build.gradle index 2e82aa9ae67..2797d91860c 100644 --- a/libs/reactive-frontend/build.gradle +++ b/libs/reactive-frontend/build.gradle @@ -14,12 +14,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-reactive-frontend" diff --git a/libs/reactive-proxy/build.gradle b/libs/reactive-proxy/build.gradle index 48be5157b36..449a20ba5c8 100644 --- a/libs/reactive-proxy/build.gradle +++ b/libs/reactive-proxy/build.gradle @@ -14,12 +14,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-reactive-proxy" diff --git a/libs/reactive-security/build.gradle b/libs/reactive-security/build.gradle index 60e5d105815..a4005a8861b 100644 --- a/libs/reactive-security/build.gradle +++ b/libs/reactive-security/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-reactive-security" diff --git a/libs/reactive-session-security/build.gradle b/libs/reactive-session-security/build.gradle index 3afc0d51173..a1c8f0a023f 100644 --- a/libs/reactive-session-security/build.gradle +++ b/libs/reactive-session-security/build.gradle @@ -13,12 +13,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-reactive-session-security" diff --git a/libs/security-core/build.gradle b/libs/security-core/build.gradle index 29d6140ff87..be95e8dd1ca 100644 --- a/libs/security-core/build.gradle +++ b/libs/security-core/build.gradle @@ -13,12 +13,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-security-core" diff --git a/libs/security-token-service/build.gradle b/libs/security-token-service/build.gradle index 8a74c343c24..2ec98ef8949 100644 --- a/libs/security-token-service/build.gradle +++ b/libs/security-token-service/build.gradle @@ -13,12 +13,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-security-token-service" diff --git a/libs/servlet-core/build.gradle b/libs/servlet-core/build.gradle index d309134ed24..6c48d7c5b2e 100644 --- a/libs/servlet-core/build.gradle +++ b/libs/servlet-core/build.gradle @@ -17,12 +17,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-servlet-core" diff --git a/libs/servlet-insecure-security/build.gradle b/libs/servlet-insecure-security/build.gradle index f18fc4e1f0e..14015ae5f5b 100644 --- a/libs/servlet-insecure-security/build.gradle +++ b/libs/servlet-insecure-security/build.gradle @@ -13,12 +13,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-servlet-insecure-security" diff --git a/libs/servlet-security/build.gradle b/libs/servlet-security/build.gradle index 7dd67f607ea..8abd3e1b81c 100644 --- a/libs/servlet-security/build.gradle +++ b/libs/servlet-security/build.gradle @@ -13,12 +13,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-servlet-security" diff --git a/libs/slack/build.gradle b/libs/slack/build.gradle index 53d6657b294..e18e9f283a4 100644 --- a/libs/slack/build.gradle +++ b/libs/slack/build.gradle @@ -13,12 +13,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-slack" diff --git a/libs/testing/build.gradle b/libs/testing/build.gradle index d6d91efdf37..0291fd18bc1 100644 --- a/libs/testing/build.gradle +++ b/libs/testing/build.gradle @@ -13,12 +13,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-testing" diff --git a/proxies/aareg-proxy/build.gradle b/proxies/aareg-proxy/build.gradle index c282f9f5f54..562ead1f4be 100644 --- a/proxies/aareg-proxy/build.gradle +++ b/proxies/aareg-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-aareg-proxy" diff --git a/proxies/aareg-proxy/config.yml b/proxies/aareg-proxy/config.yml index d79c7631c7a..0efc40334a8 100644 --- a/proxies/aareg-proxy/config.yml +++ b/proxies/aareg-proxy/config.yml @@ -19,7 +19,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/aareg-synt-services-proxy/build.gradle b/proxies/aareg-synt-services-proxy/build.gradle index 5901ec36a18..d5bc875f65a 100644 --- a/proxies/aareg-synt-services-proxy/build.gradle +++ b/proxies/aareg-synt-services-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "aareg-synt-services-proxy" diff --git a/proxies/aareg-synt-services-proxy/config.yml b/proxies/aareg-synt-services-proxy/config.yml index e41beeda65e..f7a3dde867f 100644 --- a/proxies/aareg-synt-services-proxy/config.yml +++ b/proxies/aareg-synt-services-proxy/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/arbeidsplassencv-proxy/build.gradle b/proxies/arbeidsplassencv-proxy/build.gradle index 4216c45427b..a65de00fba6 100644 --- a/proxies/arbeidsplassencv-proxy/build.gradle +++ b/proxies/arbeidsplassencv-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-arbeidsplassencv-proxy" diff --git a/proxies/arbeidsplassencv-proxy/config.yml b/proxies/arbeidsplassencv-proxy/config.yml index c89c93f13ee..44f4683531d 100644 --- a/proxies/arbeidsplassencv-proxy/config.yml +++ b/proxies/arbeidsplassencv-proxy/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/arena-forvalteren-proxy/build.gradle b/proxies/arena-forvalteren-proxy/build.gradle index 2005fc1e50b..4a6df72441c 100644 --- a/proxies/arena-forvalteren-proxy/build.gradle +++ b/proxies/arena-forvalteren-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-arena-forvalteren-proxy" diff --git a/proxies/arena-forvalteren-proxy/config.yml b/proxies/arena-forvalteren-proxy/config.yml index 8e847821723..38ebaf76bf4 100644 --- a/proxies/arena-forvalteren-proxy/config.yml +++ b/proxies/arena-forvalteren-proxy/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/batch-adeo-proxy/build.gradle b/proxies/batch-adeo-proxy/build.gradle index 280a6725cc7..19cfcbd172a 100644 --- a/proxies/batch-adeo-proxy/build.gradle +++ b/proxies/batch-adeo-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnorge-batch-adeo-proxy" diff --git a/proxies/batch-adeo-proxy/config.yml b/proxies/batch-adeo-proxy/config.yml index e2bdf494ef3..361a91ba51d 100644 --- a/proxies/batch-adeo-proxy/config.yml +++ b/proxies/batch-adeo-proxy/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/brregstub-proxy/build.gradle b/proxies/brregstub-proxy/build.gradle index 7a1f8d002c3..f5fc098e409 100644 --- a/proxies/brregstub-proxy/build.gradle +++ b/proxies/brregstub-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-brregstub-proxy" diff --git a/proxies/brregstub-proxy/config.yml b/proxies/brregstub-proxy/config.yml index 0a94c4074ea..77dc4f303cb 100644 --- a/proxies/brregstub-proxy/config.yml +++ b/proxies/brregstub-proxy/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/dokarkiv-proxy/build.gradle b/proxies/dokarkiv-proxy/build.gradle index a9c6c440ee9..7ff998bb680 100644 --- a/proxies/dokarkiv-proxy/build.gradle +++ b/proxies/dokarkiv-proxy/build.gradle @@ -12,12 +12,12 @@ test { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-dokarkiv-proxy" diff --git a/proxies/dokarkiv-proxy/config.yml b/proxies/dokarkiv-proxy/config.yml index 661ec516273..13d29e6c989 100644 --- a/proxies/dokarkiv-proxy/config.yml +++ b/proxies/dokarkiv-proxy/config.yml @@ -22,7 +22,7 @@ metadata: nginx.ingress.kubernetes.io/proxy-body-size: "512m" nginx.ingress.kubernetes.io/proxy-read-timeout: "300" spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/ereg-proxy/build.gradle b/proxies/ereg-proxy/build.gradle index 72b1b082259..758415a786b 100644 --- a/proxies/ereg-proxy/build.gradle +++ b/proxies/ereg-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-ereg-proxy" diff --git a/proxies/ereg-proxy/config.yml b/proxies/ereg-proxy/config.yml index 061c382fa94..64719a9a3e5 100644 --- a/proxies/ereg-proxy/config.yml +++ b/proxies/ereg-proxy/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/histark-proxy/build.gradle b/proxies/histark-proxy/build.gradle index 1d5af9ca7f7..f092aeb2e13 100644 --- a/proxies/histark-proxy/build.gradle +++ b/proxies/histark-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-histark-proxy" diff --git a/proxies/histark-proxy/config.yml b/proxies/histark-proxy/config.yml index d50613a72a4..b097bf96213 100644 --- a/proxies/histark-proxy/config.yml +++ b/proxies/histark-proxy/config.yml @@ -9,7 +9,7 @@ metadata: nginx.ingress.kubernetes.io/proxy-body-size: "512m" nginx.ingress.kubernetes.io/proxy-read-timeout: "300" spec: - image: {{image}} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/hodejegeren-proxy/build.gradle b/proxies/hodejegeren-proxy/build.gradle index 3057829a68d..4d77d0aee12 100644 --- a/proxies/hodejegeren-proxy/build.gradle +++ b/proxies/hodejegeren-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-hodejegeren-proxy" diff --git a/proxies/hodejegeren-proxy/config.yml b/proxies/hodejegeren-proxy/config.yml index d975e7d1d6c..b5c2463c3ae 100644 --- a/proxies/hodejegeren-proxy/config.yml +++ b/proxies/hodejegeren-proxy/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/inntektstub-proxy/build.gradle b/proxies/inntektstub-proxy/build.gradle index 6662fd56e8b..787c19d21e6 100644 --- a/proxies/inntektstub-proxy/build.gradle +++ b/proxies/inntektstub-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-inntektstub-proxy" diff --git a/proxies/inntektstub-proxy/config.yml b/proxies/inntektstub-proxy/config.yml index 1af530a5f67..e29b313f2ee 100644 --- a/proxies/inntektstub-proxy/config.yml +++ b/proxies/inntektstub-proxy/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/inst-proxy/build.gradle b/proxies/inst-proxy/build.gradle index ddbcad4fd85..ff5c166e8c1 100644 --- a/proxies/inst-proxy/build.gradle +++ b/proxies/inst-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-inst-proxy" diff --git a/proxies/inst-proxy/config.yml b/proxies/inst-proxy/config.yml index 56546597a3d..fe854b4023b 100644 --- a/proxies/inst-proxy/config.yml +++ b/proxies/inst-proxy/config.yml @@ -19,7 +19,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/kodeverk-proxy/build.gradle b/proxies/kodeverk-proxy/build.gradle index 71fdc1210c7..a4a936e3fb4 100644 --- a/proxies/kodeverk-proxy/build.gradle +++ b/proxies/kodeverk-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-kodeverk-proxy" diff --git a/proxies/kodeverk-proxy/config.yml b/proxies/kodeverk-proxy/config.yml index 68586f77a9c..5e97803ef68 100644 --- a/proxies/kodeverk-proxy/config.yml +++ b/proxies/kodeverk-proxy/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/kontoregister-person-proxy/build.gradle b/proxies/kontoregister-person-proxy/build.gradle index aed9ead16aa..23d60690e26 100644 --- a/proxies/kontoregister-person-proxy/build.gradle +++ b/proxies/kontoregister-person-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-kontoregister-person-proxy" diff --git a/proxies/kontoregister-person-proxy/config.yml b/proxies/kontoregister-person-proxy/config.yml index 57c3da3eb58..f81254a9480 100644 --- a/proxies/kontoregister-person-proxy/config.yml +++ b/proxies/kontoregister-person-proxy/config.yml @@ -19,7 +19,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/krrstub-proxy/build.gradle b/proxies/krrstub-proxy/build.gradle index 0e9d73bd9e2..26793591028 100644 --- a/proxies/krrstub-proxy/build.gradle +++ b/proxies/krrstub-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-krrstub-proxy" diff --git a/proxies/krrstub-proxy/config.yml b/proxies/krrstub-proxy/config.yml index e42c8032586..f729a19f778 100644 --- a/proxies/krrstub-proxy/config.yml +++ b/proxies/krrstub-proxy/config.yml @@ -19,7 +19,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/medl-proxy/build.gradle b/proxies/medl-proxy/build.gradle index 726d6f91832..98f419a895e 100644 --- a/proxies/medl-proxy/build.gradle +++ b/proxies/medl-proxy/build.gradle @@ -22,12 +22,12 @@ sonarqube { property "sonar.projectKey", "testnav-medl-proxy" property "sonar.projectName", "testnav-medl-proxy" property "sonar.organization", "navikt" - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.project.monorepo.enabled", true } } diff --git a/proxies/medl-proxy/config.yml b/proxies/medl-proxy/config.yml index 8a36fc50640..61d02c935b6 100644 --- a/proxies/medl-proxy/config.yml +++ b/proxies/medl-proxy/config.yml @@ -19,7 +19,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/norg2-proxy/build.gradle b/proxies/norg2-proxy/build.gradle index 68b9fac5db6..e46b9090715 100644 --- a/proxies/norg2-proxy/build.gradle +++ b/proxies/norg2-proxy/build.gradle @@ -12,12 +12,12 @@ test { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-norg2-proxy" diff --git a/proxies/norg2-proxy/config.yml b/proxies/norg2-proxy/config.yml index a2e92392888..0bf3e3ac3f7 100644 --- a/proxies/norg2-proxy/config.yml +++ b/proxies/norg2-proxy/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/pdl-proxy/build.gradle b/proxies/pdl-proxy/build.gradle index a54d1392209..fb5edf6f87e 100644 --- a/proxies/pdl-proxy/build.gradle +++ b/proxies/pdl-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-pdl-proxy" diff --git a/proxies/pdl-proxy/config.yml b/proxies/pdl-proxy/config.yml index a40bdb9e0be..58d2e2c8b38 100644 --- a/proxies/pdl-proxy/config.yml +++ b/proxies/pdl-proxy/config.yml @@ -19,7 +19,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/pensjon-testdata-facade-proxy/build.gradle b/proxies/pensjon-testdata-facade-proxy/build.gradle index 7cd76a85cfb..aba01e473d2 100644 --- a/proxies/pensjon-testdata-facade-proxy/build.gradle +++ b/proxies/pensjon-testdata-facade-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-pensjon-testdata-facade-proxy" diff --git a/proxies/pensjon-testdata-facade-proxy/config.yml b/proxies/pensjon-testdata-facade-proxy/config.yml index 4273489cd35..c48bfae6e4b 100644 --- a/proxies/pensjon-testdata-facade-proxy/config.yml +++ b/proxies/pensjon-testdata-facade-proxy/config.yml @@ -19,7 +19,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/saf-proxy/build.gradle b/proxies/saf-proxy/build.gradle index 54cac54afda..b429e7fe74f 100644 --- a/proxies/saf-proxy/build.gradle +++ b/proxies/saf-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-saf-proxy" diff --git a/proxies/saf-proxy/config.yml b/proxies/saf-proxy/config.yml index afcaa73b9e7..43bbe175fdc 100644 --- a/proxies/saf-proxy/config.yml +++ b/proxies/saf-proxy/config.yml @@ -19,7 +19,7 @@ metadata: labels: team: dolly spec: - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/sigrunstub-proxy/build.gradle b/proxies/sigrunstub-proxy/build.gradle index 8961bf348d4..b5b93f70080 100644 --- a/proxies/sigrunstub-proxy/build.gradle +++ b/proxies/sigrunstub-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-sigrunstub-proxy" diff --git a/proxies/sigrunstub-proxy/config.yml b/proxies/sigrunstub-proxy/config.yml index 46b8424c3b8..82fe4e78e6c 100644 --- a/proxies/sigrunstub-proxy/config.yml +++ b/proxies/sigrunstub-proxy/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/skjermingsregister-proxy/build.gradle b/proxies/skjermingsregister-proxy/build.gradle index b4e2d4f8539..a711ce5a38a 100644 --- a/proxies/skjermingsregister-proxy/build.gradle +++ b/proxies/skjermingsregister-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-skjermingsregister-proxy" diff --git a/proxies/skjermingsregister-proxy/config.yml b/proxies/skjermingsregister-proxy/config.yml index 4b236e21ff7..5b935a86541 100644 --- a/proxies/skjermingsregister-proxy/config.yml +++ b/proxies/skjermingsregister-proxy/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 webproxy: true azure: diff --git a/proxies/synthdata-meldekort-proxy/build.gradle b/proxies/synthdata-meldekort-proxy/build.gradle index adf546b2ceb..ecbc8796587 100644 --- a/proxies/synthdata-meldekort-proxy/build.gradle +++ b/proxies/synthdata-meldekort-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-synthdata-meldekort-proxy" diff --git a/proxies/synthdata-meldekort-proxy/config.yml b/proxies/synthdata-meldekort-proxy/config.yml index 1449416d40e..6f3c6b37886 100644 --- a/proxies/synthdata-meldekort-proxy/config.yml +++ b/proxies/synthdata-meldekort-proxy/config.yml @@ -27,7 +27,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 webproxy: true azure: diff --git a/proxies/tps-forvalteren-proxy/build.gradle b/proxies/tps-forvalteren-proxy/build.gradle index aea79ee5f51..711e8077cf6 100644 --- a/proxies/tps-forvalteren-proxy/build.gradle +++ b/proxies/tps-forvalteren-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "tps-forvalteren-proxy" diff --git a/proxies/tps-forvalteren-proxy/config.test.yml b/proxies/tps-forvalteren-proxy/config.test.yml index e0010f44a34..50abdede2b7 100644 --- a/proxies/tps-forvalteren-proxy/config.test.yml +++ b/proxies/tps-forvalteren-proxy/config.test.yml @@ -9,7 +9,7 @@ spec: env: - name: PROXY_URL value: https://tps-forvalteren-dev.dev.adeo.no - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/tps-forvalteren-proxy/config.yml b/proxies/tps-forvalteren-proxy/config.yml index fe5c16c953e..8bec76b4ee6 100644 --- a/proxies/tps-forvalteren-proxy/config.yml +++ b/proxies/tps-forvalteren-proxy/config.yml @@ -9,7 +9,7 @@ spec: env: - name: PROXY_URL value: https://tps-forvalteren.dev.adeo.no - image: {{ image }} + image: "{{image}}" port: 8080 webproxy: true tokenx: diff --git a/proxies/udistub-proxy/build.gradle b/proxies/udistub-proxy/build.gradle index a882ec7bada..670fcab1e6a 100644 --- a/proxies/udistub-proxy/build.gradle +++ b/proxies/udistub-proxy/build.gradle @@ -18,12 +18,12 @@ jacocoTestReport { sonarqube { properties { - property "sonar.coverage.jacoco.xmlReportPaths", "${project.buildDir}/reports/jacoco/test/jacocoTestReport.xml" + property "sonar.coverage.jacoco.xmlReportPaths", "${project.layout.buildDirectory}/reports/jacoco/test/jacocoTestReport.xml" property "sonar.dynamicAnalysis", "reuseReports" property "sonar.host.url", "https://sonarcloud.io" property "sonar.java.coveragePlugin", "jacoco" property "sonar.language", "java" - property "sonar.login", System.getenv("SONAR_TOKEN") + property "sonar.token", System.getenv("SONAR_TOKEN") property "sonar.organization", "navikt" property "sonar.project.monorepo.enabled", true property "sonar.projectKey", "testnav-udistub-proxy" diff --git a/proxies/udistub-proxy/config.yml b/proxies/udistub-proxy/config.yml index a96b640f29f..5f4537efe6e 100644 --- a/proxies/udistub-proxy/config.yml +++ b/proxies/udistub-proxy/config.yml @@ -6,7 +6,7 @@ metadata: labels: team: dolly spec: - image: {{image}} + image: "{{image}}" port: 8080 webproxy: true azure: