Skip to content

Commit e971c6f

Browse files
Daniel Muehlbachlerromani
authored andcommitted
Issue #299: update to CS 8.34
1 parent a5cde9d commit e971c6f

File tree

6 files changed

+41
-2
lines changed

6 files changed

+41
-2
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,3 +33,4 @@ Desktop.ini
3333

3434
# ---- Nondex
3535
.nondex
36+
metadata-gen/

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ Compatibility matrix from checkstyle team:
2121

2222
Checkstyle Plugin|Sonar min|Sonar max|Checkstyle|Jdk
2323
-----------------|---------|---------|----------|---
24+
4.34|7.9 |7.9+|8.34|1.8
2425
4.33|7.9 |7.9+|8.33|1.8
2526
4.32|7.9 |7.9+|8.32|1.8
2627
4.31|7.9 |7.9+|8.31|1.8

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
</ciManagement>
9494

9595
<properties>
96-
<checkstyle.version>8.33</checkstyle.version>
96+
<checkstyle.version>8.34</checkstyle.version>
9797
<sonar.version>7.9</sonar.version>
9898
<sonar-java.version>6.0.0.20538</sonar-java.version>
9999
<maven.checkstyle.plugin.version>3.1.0</maven.checkstyle.plugin.version>

src/main/resources/org/sonar/plugins/checkstyle/rules.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1528,7 +1528,7 @@
15281528
<param key="option" type="s[same,alone,alone_or_singleline]">
15291529
<defaultValue>same</defaultValue>
15301530
</param>
1531-
<param key="tokens" type="s[LITERAL_TRY,LITERAL_CATCH,LITERAL_FINALLY,LITERAL_IF,LITERAL_ELSE,CLASS_DEF,METHOD_DEF,CTOR_DEF,LITERAL_FOR,LITERAL_WHILE,LITERAL_DO,STATIC_INIT,INSTANCE_INIT,ANNOTATION_DEF,ENUM_DEF]">
1531+
<param key="tokens" type="s[LITERAL_TRY,LITERAL_CATCH,LITERAL_FINALLY,LITERAL_IF,LITERAL_ELSE,CLASS_DEF,METHOD_DEF,CTOR_DEF,LITERAL_FOR,LITERAL_WHILE,LITERAL_DO,STATIC_INIT,INSTANCE_INIT,ANNOTATION_DEF,ENUM_DEF,INTERFACE_DEF]">
15321532
<defaultValue>LITERAL_TRY,LITERAL_CATCH,LITERAL_FINALLY,LITERAL_IF,LITERAL_ELSE</defaultValue>
15331533
</param>
15341534
<status>READY</status>

test-resources/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
tmp/

test-resources/docker-compose.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
---
2+
version: "3"
3+
4+
services:
5+
sonarqube:
6+
image: sonarqube:7.9-community
7+
restart: unless-stopped
8+
depends_on:
9+
- db
10+
ports:
11+
- "9000:9000"
12+
environment:
13+
SONAR_JDBC_URL: jdbc:postgresql://db:5432/sonar
14+
SONAR_JDBC_USERNAME: sonar
15+
SONAR_JDBC_PASSWORD: sonar
16+
volumes:
17+
- sonarqube_data:/opt/sonarqube/data
18+
- ./tmp/extensions/:/opt/sonarqube/extensions
19+
- sonarqube_logs:/opt/sonarqube/logs
20+
- sonarqube_temp:/opt/sonarqube/temp
21+
db:
22+
image: postgres
23+
restart: unless-stopped
24+
environment:
25+
POSTGRES_USER: sonar
26+
POSTGRES_PASSWORD: sonar
27+
volumes:
28+
- postgresql:/var/lib/postgresql
29+
- postgresql_data:/var/lib/postgresql/data
30+
31+
volumes:
32+
sonarqube_data:
33+
sonarqube_logs:
34+
sonarqube_temp:
35+
postgresql:
36+
postgresql_data:

0 commit comments

Comments
 (0)