Merge pull request #10475 from qmonmert/sonari18n

Sonar: clean exlusions files
jhipster · Aug 1, 2024 · 35cbefe · 35cbefe
2 parents 225e0e4 + f10aa2d
commit 35cbefe
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/src/main/resources/generator/server/sonar/sonar-fullstack-project.properties.mustache b/src/main/resources/generator/server/sonar/sonar-fullstack-project.properties.mustache
@@ -17,7 +17,7 @@ sonar.testExecutionReportPaths={{projectBuildDirectory}}/test-results/TESTS-resu
 sonar.javascript.lcov.reportPaths={{projectBuildDirectory}}/test-results/lcov.info
 
 sonar.sourceEncoding=UTF-8
-sonar.exclusions=src/main/webapp/main.ts, src/main/webapp/app/main.ts, src/main/webapp/content/**/*.*, src/main/webapp/i18n/*.js, {{projectBuildDirectory}}/classes/static/**/*.*, src/main/webapp/app/index.tsx, src/main/webapp/routes/+page.svelte
+sonar.exclusions=src/main/webapp/main.ts, src/main/webapp/app/main.ts, src/main/webapp/content/**/*.*, {{projectBuildDirectory}}/classes/static/**/*.*, src/main/webapp/app/index.tsx, src/main/webapp/routes/+page.svelte
 
 sonar.issue.ignore.multicriteria=S117,S119,S125,S3437,S4502,S4684,S4032,S5778,S1133,S6206,S6437,S6564,UndocumentedApi
 

diff --git a/src/main/resources/generator/server/sonar/sonar-project.properties.mustache b/src/main/resources/generator/server/sonar/sonar-project.properties.mustache
@@ -14,7 +14,7 @@ sonar.java.codeCoveragePlugin=jacoco
 sonar.junit.reportPaths={{projectBuildDirectory}}/surefire-reports,{{projectBuildDirectory}}/failsafe-reports
 
 sonar.sourceEncoding=UTF-8
-sonar.exclusions=src/main/webapp/main.ts, src/main/webapp/app/main.ts, src/main/webapp/content/**/*.*, src/main/webapp/i18n/*.js, {{projectBuildDirectory}}/classes/static/**/*.*, src/main/webapp/app/index.tsx
+sonar.exclusions=src/main/webapp/main.ts, src/main/webapp/app/main.ts, src/main/webapp/content/**/*.*, {{projectBuildDirectory}}/classes/static/**/*.*, src/main/webapp/app/index.tsx
 
 sonar.issue.ignore.multicriteria=S117,S119,S125,S3437,S4502,S4684,S4032,S5778,S1133,S6206,S6548,S6437,S6471,UndocumentedApi
 

diff --git a/...ava/tech/jhipster/lite/generator/server/sonarqube/domain/SonarQubeModulesFactoryTest.java b/...ava/tech/jhipster/lite/generator/server/sonarqube/domain/SonarQubeModulesFactoryTest.java
@@ -41,7 +41,7 @@ void shouldBuildBackendModule() {
         .containing("sonar.coverage.jacoco.xmlReportPaths=target/jacoco/jacoco.xml")
         .containing("sonar.junit.reportPaths=target/surefire-reports,target/failsafe-reports")
         .containing(
-          "sonar.exclusions=src/main/webapp/main.ts, src/main/webapp/app/main.ts, src/main/webapp/content/**/*.*, src/main/webapp/i18n/*.js, target/classes/static/**/*.*, src/main/webapp/app/index.tsx"
+          "sonar.exclusions=src/main/webapp/main.ts, src/main/webapp/app/main.ts, src/main/webapp/content/**/*.*, target/classes/static/**/*.*, src/main/webapp/app/index.tsx"
         )
         .notContaining("sonar.testExecutionReportPaths=target/test-results/TESTS-results-sonar.xml");
     }
@@ -55,7 +55,7 @@ void shouldBuildBackendFrontendModule() {
       assertCommonModule(module)
         .hasFile("sonar-project.properties")
         .containing(
-          "sonar.exclusions=src/main/webapp/main.ts, src/main/webapp/app/main.ts, src/main/webapp/content/**/*.*, src/main/webapp/i18n/*.js, target/classes/static/**/*.*, src/main/webapp/app/index.tsx, src/main/webapp/routes/+page.svelte"
+          "sonar.exclusions=src/main/webapp/main.ts, src/main/webapp/app/main.ts, src/main/webapp/content/**/*.*, target/classes/static/**/*.*, src/main/webapp/app/index.tsx, src/main/webapp/routes/+page.svelte"
         )
         .containing("sonar.testExecutionReportPaths=target/test-results/TESTS-results-sonar.xml")
         .containing("sonar.javascript.lcov.reportPaths=target/test-results/lcov.info");
@@ -132,7 +132,7 @@ void shouldBuildBackendModule() {
       assertCommonModule(module)
         .hasFile("sonar-project.properties")
         .containing(
-          "sonar.exclusions=src/main/webapp/main.ts, src/main/webapp/app/main.ts, src/main/webapp/content/**/*.*, src/main/webapp/i18n/*.js, build/classes/static/**/*.*, src/main/webapp/app/index.tsx"
+          "sonar.exclusions=src/main/webapp/main.ts, src/main/webapp/app/main.ts, src/main/webapp/content/**/*.*, build/classes/static/**/*.*, src/main/webapp/app/index.tsx"
         )
         .notContaining("sonar.testExecutionReportPaths=build/test-results/TESTS-results-sonar.xml");
     }
@@ -146,7 +146,7 @@ void shouldBuildBackendFrontendModule() {
       assertCommonModule(module)
         .hasFile("sonar-project.properties")
         .containing(
-          "sonar.exclusions=src/main/webapp/main.ts, src/main/webapp/app/main.ts, src/main/webapp/content/**/*.*, src/main/webapp/i18n/*.js, build/classes/static/**/*.*, src/main/webapp/app/index.tsx, src/main/webapp/routes/+page.svelte"
+          "sonar.exclusions=src/main/webapp/main.ts, src/main/webapp/app/main.ts, src/main/webapp/content/**/*.*, build/classes/static/**/*.*, src/main/webapp/app/index.tsx, src/main/webapp/routes/+page.svelte"
         )
         .containing("sonar.testExecutionReportPaths=build/test-results/TESTS-results-sonar.xml")
         .containing("sonar.javascript.lcov.reportPaths=build/test-results/lcov.info");