diff --git a/src/main/docker/sonar.yml b/src/main/docker/sonar.yml index fcd18700e32..091d655930b 100644 --- a/src/main/docker/sonar.yml +++ b/src/main/docker/sonar.yml @@ -1,7 +1,7 @@ # This configuration is intended for development purpose, it's **your** responsibility to harden it for production services: sonar: - image: sonarqube:10.6.0-community + image: sonarqube:10.7.0-community container_name: sonar platform: linux/x86_64 # Authentication is turned off for out of the box experience while trying out SonarQube diff --git a/src/main/resources/generator/dependencies/Dockerfile b/src/main/resources/generator/dependencies/Dockerfile index eafa4fd6896..2e833b893ee 100644 --- a/src/main/resources/generator/dependencies/Dockerfile +++ b/src/main/resources/generator/dependencies/Dockerfile @@ -1,4 +1,4 @@ -FROM sonarqube:10.6.0-community +FROM sonarqube:10.7.0-community FROM consul:1.15.4 FROM jhipster/consul-config-loader:v0.4.1 FROM jhipster/jhipster-registry:v7.4.0 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 index 803641c2de5..9d0d743f135 100644 --- a/src/main/resources/generator/server/sonar/sonar-fullstack-project.properties.mustache +++ b/src/main/resources/generator/server/sonar/sonar-fullstack-project.properties.mustache @@ -24,8 +24,10 @@ sonar.exclusions=\ {{projectBuildDirectory}}/classes/static/**/*.*,\ src/main/webapp/app/index.tsx,\ src/main/webapp/main.ts +sonar.test.exclusions=\ + src/test/**/PackageSettings.java -sonar.issue.ignore.multicriteria=S117,S119,S125,S3437,S4502,S4684,S4032,S5778,S1133,S6206,S6437,S6564,UndocumentedApi +sonar.issue.ignore.multicriteria=S117,S119,S125,S3437,S4502,S4684,S4032,S5778,S1133,S6206,S6437,S6564,UndocumentedApi,S2301 # 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) @@ -79,3 +81,7 @@ sonar.issue.ignore.multicriteria.S125.ruleKey=xml:S125 # Rule: Remove this redundant type alias and replace its occurrences with "string" sonar.issue.ignore.multicriteria.S6564.resourceKey=src/main/webapp/**/* sonar.issue.ignore.multicriteria.S6564.ruleKey=typescript:S6564 + +# Rule: Methods should not contain selector parameters +sonar.issue.ignore.multicriteria.S2301.resourceKey=src/main/webapp/app/auth/oauth2-auth.service.ts +sonar.issue.ignore.multicriteria.S2301.ruleKey=typescript:S2301 diff --git a/src/main/resources/generator/server/sonar/sonar-project.properties.mustache b/src/main/resources/generator/server/sonar/sonar-project.properties.mustache index 9dcdc64e640..d2993820c06 100644 --- a/src/main/resources/generator/server/sonar/sonar-project.properties.mustache +++ b/src/main/resources/generator/server/sonar/sonar-project.properties.mustache @@ -20,8 +20,10 @@ sonar.exclusions=\ {{projectBuildDirectory}}/classes/static/**/*.*,\ src/main/webapp/app/index.tsx,\ src/main/webapp/main.ts +sonar.test.exclusions=\ + src/test/**/PackageSettings.java -sonar.issue.ignore.multicriteria=S117,S119,S125,S3437,S4502,S4684,S4032,S5778,S1133,S6206,S6548,S6437,S6471,UndocumentedApi +sonar.issue.ignore.multicriteria=S117,S119,S125,S3437,S4502,S4684,S4032,S5778,S1133,S6206,S6548,S6437,S6471,UndocumentedApi,S2301 # 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) @@ -79,3 +81,7 @@ sonar.issue.ignore.multicriteria.S6437.ruleKey=java:S6437 # Rule: Run container as default user sonar.issue.ignore.multicriteria.S6471.resourceKey=src/main/docker/cassandra/**/* sonar.issue.ignore.multicriteria.S6471.ruleKey=docker:S6471 + +# Rule: Methods should not contain selector parameters +sonar.issue.ignore.multicriteria.S2301.resourceKey=src/main/webapp/app/auth/oauth2-auth.service.ts +sonar.issue.ignore.multicriteria.S2301.ruleKey=typescript:S2301 diff --git a/src/main/resources/generator/server/springboot/database/redis/TestRedisManager.java.mustache b/src/main/resources/generator/server/springboot/database/redis/TestRedisManager.java.mustache index 9c0e79516d0..f8001ba9213 100644 --- a/src/main/resources/generator/server/springboot/database/redis/TestRedisManager.java.mustache +++ b/src/main/resources/generator/server/springboot/database/redis/TestRedisManager.java.mustache @@ -15,7 +15,7 @@ class TestRedisManager implements ApplicationListener, Ordered { private static final Logger log = LoggerFactory.getLogger(TestCassandraMigrationLoader.class); - private static final String cqlDir = "config/cql/changelog/"; - private static final String pattern = ".cql"; + private static final String CQL_DIR = "config/cql/changelog/"; + private static final String PATTERN = ".cql"; private static boolean migrationDone = false; @Override @@ -43,7 +43,7 @@ class TestCassandraMigrationLoader implements ApplicationListener stream = Files.list(Paths.get(dirUrl.toURI()))){ stream .map(Path::toString) - .filter(file -> file.endsWith(pattern)) + .filter(file -> file.endsWith(PATTERN)) .sorted() .map(file -> new FileCQLDataSet(file, false, false)) .forEach(dataLoader::load);