Skip to content

Commit 9c3c31e

Browse files
committed
Configuring plugins for analyzer loading optimization
Changed configuration key to match language key. Without this, it breaks on 10.4 and up.
1 parent 18aaadf commit 9c3c31e

File tree

3 files changed

+14
-10
lines changed

3 files changed

+14
-10
lines changed

BUILDING.md

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,12 @@ mvn clean package
4242
- password: admin
4343

4444
```shell
45-
docker run -d --name sonarqube -e SONAR_ES_BOOTSTRAP_CHECKS_DISABLE=true -p 9000:9000 sonarqube:lts-community
46-
docker cp target/sonar-postgres-plugin-1.0-SNAPSHOT.jar sonarqube:/opt/sonarqube/extensions/plugins/
47-
docker restart sonarqube
45+
docker run -d \
46+
--name sonarqube \
47+
-e SONAR_ES_BOOTSTRAP_CHECKS_DISABLE=true \
48+
-p 9000:9000 \
49+
-v $(pwd)/target/sonar-postgres-plugin-1.2-SNAPSHOT.jar:/opt/sonarqube/extensions/plugins/sonar-postgres-plugin-1.2-SNAPSHOT.jar \
50+
sonarqube:lts-community
4851
xdg-open http://localhost:9000/
4952
docker logs -f sonarqube
5053
```
@@ -61,9 +64,9 @@ mvn sonar:sonar \
6164
### SonarScanner
6265

6366
```shell
64-
wget https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.7.0.2747-linux.zip
65-
unzip sonar-scanner-cli-4.7.0.2747-linux.zip
66-
cd sonar-scanner-4.7.0.2747-linux
67+
wget https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-5.0.1.3006-linux.zip
68+
unzip sonar-scanner-cli-5.0.1.3006-linux.zip
69+
cd sonar-scanner-5.0.1.3006-linux
6770
bin/sonar-scanner \
6871
-Dsonar.login=admin \
6972
-Dsonar.password=admin1 \

pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@
6262
<configuration>
6363
<pluginKey>communitypostgres</pluginKey>
6464
<pluginClass>com.premiumminds.sonar.postgres.PostgresSQLExtension</pluginClass>
65+
<requiredForLanguages>postgres-language</requiredForLanguages>
6566
</configuration>
6667
</plugin>
6768
<plugin>

src/main/java/com/premiumminds/sonar/postgres/PostgresSqlLanguage.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55

66
public class PostgresSqlLanguage extends AbstractLanguage {
77

8-
public static final String FILE_SUFFIXES_KEY = "sonar.postgres.file.suffixes";
9-
public static final String FILE_EXCLUSIONS_KEY = "sonar.postgres.exclusions";
10-
public static final String FILE_SUFFIXES_DEFAULT_VALUE = ".sql";
11-
128
public static final String NAME = "PostgreSQL";
139
public static final String KEY = "postgres-language";
10+
public static final String FILE_SUFFIXES_KEY = "sonar." + KEY + ".file.suffixes";
11+
public static final String FILE_EXCLUSIONS_KEY = "sonar." + KEY + ".exclusions";
12+
public static final String FILE_SUFFIXES_DEFAULT_VALUE = "sql";
13+
1414

1515
private final Configuration config;
1616

0 commit comments

Comments
 (0)