Skip to content

Commit bb72384

Browse files
Update with signed dependencies (#124)
1 parent 743cc44 commit bb72384

File tree

7 files changed

+19
-12
lines changed

7 files changed

+19
-12
lines changed

flex-checks/pom.xml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,11 @@
2626
<artifactId>sslr-xpath</artifactId>
2727
</dependency>
2828

29+
<dependency>
30+
<groupId>org.sonarsource.sonarqube</groupId>
31+
<artifactId>sonar-plugin-api</artifactId>
32+
<scope>provided</scope>
33+
</dependency>
2934
<dependency>
3035
<groupId>org.sonarsource.analyzer-commons</groupId>
3136
<artifactId>sonar-analyzer-test-commons</artifactId>
@@ -50,7 +55,7 @@
5055
<scope>test</scope>
5156
</dependency>
5257
<dependency>
53-
<groupId>org.apache.commons</groupId>
58+
<groupId>commons-io</groupId>
5459
<artifactId>commons-io</artifactId>
5560
<scope>test</scope>
5661
</dependency>

flex-checks/src/main/java/org/sonar/flex/checks/CheckList.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ public final class CheckList {
3232
private CheckList() {
3333
}
3434

35-
public static List<Class> getChecks() {
36-
return ImmutableList.<Class>of(
35+
public static List<Class<?>> getChecks() {
36+
return ImmutableList.of(
3737
CommentRegularExpressionCheck.class,
3838
LineLengthCheck.class,
3939
ControlFlowStmtDepthCheck.class,

flex-checks/src/test/java/org/sonar/flex/checks/CheckListTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public void count() {
5858
*/
5959
@Test
6060
public void test() throws IOException {
61-
List<Class> checks = CheckList.getChecks();
61+
List<Class<?>> checks = CheckList.getChecks();
6262

6363
for (Class cls : checks) {
6464
String testName = '/' + cls.getName().replace('.', '/') + "Test.class";

flex-checks/src/test/java/org/sonar/flex/checks/FlexVerifier.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
import com.google.common.io.Files;
2323
import com.sonar.sslr.api.RecognitionException;
2424
import com.sonar.sslr.impl.Parser;
25-
import com.sonarsource.checks.verifier.CommentParser;
26-
import com.sonarsource.checks.verifier.SingleFileVerifier;
2725
import java.io.File;
2826
import java.io.IOException;
2927
import java.util.List;
@@ -32,6 +30,8 @@
3230
import org.sonar.flex.Issue;
3331
import org.sonar.flex.parser.FlexParser;
3432
import org.sonar.sslr.parser.LexerlessGrammar;
33+
import org.sonarsource.analyzer.commons.checks.verifier.CommentParser;
34+
import org.sonarsource.analyzer.commons.checks.verifier.SingleFileVerifier;
3535

3636
import static java.nio.charset.StandardCharsets.UTF_8;
3737
import static org.assertj.core.api.Assertions.assertThat;

flex-squid/pom.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
<dependency>
1717
<groupId>org.sonarsource.sonarqube</groupId>
1818
<artifactId>sonar-plugin-api</artifactId>
19+
<scope>provided</scope>
1920
</dependency>
2021
<dependency>
2122
<groupId>org.sonarsource.sslr</groupId>

pom.xml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@
7575

7676
<sonar.version>7.9</sonar.version>
7777
<sslr.version>1.23</sslr.version>
78-
<version.sslr-squid-bridge>2.7.0.377</version.sslr-squid-bridge>
79-
<analyzerCommons.version>1.6.0.219</analyzerCommons.version>
78+
<version.sslr-squid-bridge>2.7.1.392</version.sslr-squid-bridge>
79+
<analyzerCommons.version>1.14.1.690</analyzerCommons.version>
8080
<logback.version>1.0.13</logback.version>
81-
<junit.version>4.12</junit.version>
81+
<junit.version>4.13.2</junit.version>
8282
<fest.version>1.4</fest.version>
8383
<orchestrator.version>3.35.0.2707</orchestrator.version>
8484

@@ -107,6 +107,7 @@
107107
<groupId>org.sonarsource.sonarqube</groupId>
108108
<artifactId>sonar-plugin-api</artifactId>
109109
<version>${sonar.version}</version>
110+
<scope>provided</scope>
110111
</dependency>
111112
<dependency>
112113
<groupId>org.sonarsource.sonarqube</groupId>
@@ -172,9 +173,9 @@
172173
<version>2.6</version>
173174
</dependency>
174175
<dependency>
175-
<groupId>org.apache.commons</groupId>
176+
<groupId>commons-io</groupId>
176177
<artifactId>commons-io</artifactId>
177-
<version>1.3.2</version>
178+
<version>2.8.0</version>
178179
</dependency>
179180
<dependency>
180181
<groupId>junit</groupId>

sslr-flex-toolkit/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
<configuration>
103103
<rules>
104104
<requireFilesSize>
105-
<maxsize>3300000</maxsize>
105+
<maxsize>3500000</maxsize>
106106
<minsize>2600000</minsize>
107107
<files>
108108
<file>${project.build.directory}/${project.build.finalName}.jar</file>

0 commit comments

Comments
 (0)