Merge pull request #11236 from qmonmert/sonar271024

Sonar: ignore Sections of code should not be commented out
jhipster · Oct 30, 2024 · cc02775 · cc02775
2 parents 3017da6 + 180a023
commit cc02775
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 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
@@ -25,7 +25,7 @@ sonar.exclusions=\
   src/main/webapp/app/index.tsx,\
   src/main/webapp/main.ts
 
-sonar.issue.ignore.multicriteria=S117,S119,S125,S3437,S4502,S4684,S4032,S5778,S1133,S6206,S6437,S6564,UndocumentedApi,S2301,S7027
+sonar.issue.ignore.multicriteria=S117,S119,S125_1,S125_2,S3437,S4502,S4684,S4032,S5778,S1133,S6206,S6437,S6564,UndocumentedApi,S2301,S7027
 
 # Rule: Local variable and method parameter names should comply with a naming convention
 # Handled with checkstyle. Should be revisited with java 25 once Unnamed Patterns and Variables are available (JEP 443)
@@ -72,9 +72,11 @@ sonar.issue.ignore.multicriteria.S6206.ruleKey=java:S6206
 sonar.issue.ignore.multicriteria.S6437.resourceKey=src/main/resources/config/application.yml
 sonar.issue.ignore.multicriteria.S6437.ruleKey=java:S6437
 
-# Rule: Delete commented out code in liquibase example
-sonar.issue.ignore.multicriteria.S125.resourceKey=src/main/resources/config/liquibase/master.xml
-sonar.issue.ignore.multicriteria.S125.ruleKey=xml:S125
+# Rule: Sections of code should not be commented out
+sonar.issue.ignore.multicriteria.S125_1.ruleKey=xml:S125
+sonar.issue.ignore.multicriteria.S125_1.resourceKey=**/logback-spring.xml
+sonar.issue.ignore.multicriteria.S125_2.ruleKey=xml:S125
+sonar.issue.ignore.multicriteria.S125_2.resourceKey=**/config/liquibase/master.xml
 
 # Rule: Remove this redundant type alias and replace its occurrences with "string"
 sonar.issue.ignore.multicriteria.S6564.resourceKey=src/main/webapp/**/*

diff --git a/src/main/resources/generator/server/sonar/sonar-project.properties.mustache b/src/main/resources/generator/server/sonar/sonar-project.properties.mustache
@@ -21,7 +21,7 @@ sonar.exclusions=\
   src/main/webapp/app/index.tsx,\
   src/main/webapp/main.ts
 
-sonar.issue.ignore.multicriteria=S117,S119,S125,S3437,S4502,S4684,S4032,S5778,S1133,S6206,S6548,S6437,S6471,UndocumentedApi,S2301,S7027
+sonar.issue.ignore.multicriteria=S117,S119,S125_1,S125_2,S3437,S4502,S4684,S4032,S5778,S1133,S6206,S6548,S6437,S6471,UndocumentedApi,S2301,S7027
 
 # Rule: Local variable and method parameter names should comply with a naming convention
 # Handled with checkstyle. Should be revisited with java 25 once Unnamed Patterns and Variables are available (JEP 443)
@@ -64,9 +64,11 @@ sonar.issue.ignore.multicriteria.S1133.ruleKey=java:S1133
 sonar.issue.ignore.multicriteria.S6206.resourceKey=src/main/java/**/infrastructure/primary/**/*
 sonar.issue.ignore.multicriteria.S6206.ruleKey=java:S6206
 
-# Rule: Delete commented out code in liquibase example
-sonar.issue.ignore.multicriteria.S125.resourceKey=src/main/resources/config/liquibase/master.xml
-sonar.issue.ignore.multicriteria.S125.ruleKey=xml:S125
+# Rule: Sections of code should not be commented out
+sonar.issue.ignore.multicriteria.S125_1.ruleKey=xml:S125
+sonar.issue.ignore.multicriteria.S125_1.resourceKey=**/logback-spring.xml
+sonar.issue.ignore.multicriteria.S125_2.ruleKey=xml:S125
+sonar.issue.ignore.multicriteria.S125_2.resourceKey=**/config/liquibase/master.xml
 
 # Rule: Use Singleton pattern with care
 sonar.issue.ignore.multicriteria.S6548.resourceKey=src/main/java/**/*