Skip to content

Commit 5c084c0

Browse files
Bump analyzer-commons and orchestrator versions; cleanup pom.xml (#1052)
1 parent dde453c commit 5c084c0

File tree

4 files changed

+32
-24
lines changed

4 files changed

+32
-24
lines changed

check-license-compliance.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,5 @@ set -euo pipefail
33

44
# See https://xtranet.sonarsource.com/display/DEV/Open+Source+Licenses
55

6-
mvn org.codehaus.mojo:license-maven-plugin:aggregate-add-third-party
6+
mvn org.codehaus.mojo:license-maven-plugin:aggregate-add-third-party \
7+
-Dlicense.overrideUrl=file://$(pwd)/override-dep-licenses.properties

override-dep-licenses.properties

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Override license defined in parent POM
2+
# See check-license-compatibility.sh
3+
4+
com.google.code.gson--gson--2.8.9=apache_v2

pom.xml

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,12 @@
9090
<maven.project.version>2.2.1</maven.project.version>
9191
<mockito.version>3.9.0</mockito.version>
9292
<sonar.version>8.9.0.43852</sonar.version>
93-
<sonar.orchestrator.version>3.35.1.2719</sonar.orchestrator.version>
94-
<sonar-analyzer-commons.version>1.21.0.829</sonar-analyzer-commons.version>
93+
<sonar.orchestrator.version>3.36.0.63</sonar.orchestrator.version>
94+
<sonar-analyzer-commons.version>1.22.0.848</sonar-analyzer-commons.version>
9595
<sonarlint-core.version>6.0.0.32513</sonarlint-core.version>
9696
<sslr.version>1.23</sslr.version>
9797
<protobuf.version>3.17.3</protobuf.version>
98+
<woodstox.version>6.2.7</woodstox.version>
9899
</properties>
99100

100101
<dependencyManagement>
@@ -136,16 +137,12 @@
136137
<artifactId>sonar-regex-parsing</artifactId>
137138
<version>${sonar-analyzer-commons.version}</version>
138139
</dependency>
140+
<!-- used by StaxParser, CoberturaParser and TestSuiteParser -->
139141
<dependency>
140142
<groupId>org.codehaus.staxmate</groupId>
141143
<artifactId>staxmate</artifactId>
142144
<version>2.0.1</version>
143145
</dependency>
144-
<dependency>
145-
<groupId>org.sonarsource.orchestrator</groupId>
146-
<artifactId>sonar-orchestrator</artifactId>
147-
<version>${sonar.orchestrator.version}</version>
148-
</dependency>
149146
<dependency>
150147
<groupId>commons-lang</groupId>
151148
<artifactId>commons-lang</artifactId>
@@ -156,18 +153,25 @@
156153
<artifactId>commons-io</artifactId>
157154
<version>${commons.io.version}</version>
158155
</dependency>
156+
<!-- used by StaxParser and CoberturaParser -->
159157
<dependency>
160158
<groupId>org.codehaus.woodstox</groupId>
161159
<artifactId>woodstox-core-lgpl</artifactId>
162160
<version>${woodstox.version}</version>
163161
</dependency>
164162
<dependency>
165-
<groupId>ch.qos.logback</groupId>
166-
<artifactId>logback-classic</artifactId>
167-
<version>${logback.version}</version>
163+
<groupId>com.google.guava</groupId>
164+
<artifactId>guava</artifactId>
165+
<version>30.1.1-jre</version>
168166
</dependency>
169167

170168
<!-- test dependencies -->
169+
<dependency>
170+
<groupId>org.sonarsource.orchestrator</groupId>
171+
<artifactId>sonar-orchestrator</artifactId>
172+
<version>${sonar.orchestrator.version}</version>
173+
<scope>test</scope>
174+
</dependency>
171175
<dependency>
172176
<groupId>org.sonarsource.sonarqube</groupId>
173177
<artifactId>sonar-testing-harness</artifactId>
@@ -211,26 +215,25 @@
211215
<scope>provided</scope>
212216
</dependency>
213217
<dependency>
214-
<groupId>com.google.guava</groupId>
215-
<artifactId>guava</artifactId>
216-
<version>30.1.1-jre</version>
218+
<groupId>ch.qos.logback</groupId>
219+
<artifactId>logback-classic</artifactId>
220+
<version>${logback.version}</version>
221+
<scope>test</scope>
217222
</dependency>
218-
219-
220-
<!-- provided dependencies -->
221223
<dependency>
222224
<groupId>org.sonarsource.sonarqube</groupId>
223-
<artifactId>sonar-plugin-api</artifactId>
225+
<artifactId>sonar-plugin-api-impl</artifactId>
224226
<version>${sonar.version}</version>
225-
<scope>provided</scope>
227+
<scope>test</scope>
226228
</dependency>
229+
230+
<!-- provided dependencies -->
227231
<dependency>
228232
<groupId>org.sonarsource.sonarqube</groupId>
229-
<artifactId>sonar-plugin-api-impl</artifactId>
233+
<artifactId>sonar-plugin-api</artifactId>
230234
<version>${sonar.version}</version>
231-
<scope>test</scope>
235+
<scope>provided</scope>
232236
</dependency>
233-
234237
</dependencies>
235238
</dependencyManagement>
236239

python-checks/src/test/resources/checks/regex/duplicatesInCharacterClassCheck.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ def compliant(input):
8181
re.match(r"[aa", input) # Check should not run on syntactically invalid regexen
8282
re.match(r"(?U)[\wä]", input) # False negative because we don't support Unicode characters in \w and \W
8383
re.match(r"[[a-z&&b-e]c]", input) # FN because we don't support intersections
84-
re.match(r"(?i)[A-_d-{]", input) # FN because we ignore case insensitivity unless both ends of the ranges are letters
85-
re.match(r"(?i)[A-z_]", input) # FN because A-z gets misinterpreted as A-Za-z due to the way we handle case insensitivity
84+
re.match(r"(?i)[A-_d-{]", input) # Noncompliant
85+
re.match(r"(?i)[A-z_]", input) # Noncompliant
8686
re.match(r"[\abc]", input)
8787
re.match(r'[\s\'"\:\{\}\[\],&\*\#\?]', input)
8888
re.match(r"[0-9\\d]", input) # Compliant

0 commit comments

Comments
 (0)