Skip to content

Commit a5551f3

Browse files
authored
SCANJLIB-275 Update dependencies
1 parent 9ed8241 commit a5551f3

File tree

4 files changed

+22
-31
lines changed

4 files changed

+22
-31
lines changed

its/it-tests/pom.xml

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
23
<modelVersion>4.0.0</modelVersion>
34
<parent>
45
<groupId>org.sonarsource.scanner.lib</groupId>
@@ -27,18 +28,8 @@
2728
<dependency>
2829
<groupId>org.sonarsource.orchestrator</groupId>
2930
<artifactId>sonar-orchestrator-junit4</artifactId>
30-
<version>5.1.0.2254</version>
31+
<version>5.6.2.2625</version>
3132
<scope>test</scope>
32-
<exclusions>
33-
<exclusion>
34-
<groupId>ch.qos.logback</groupId>
35-
<artifactId>logback-classic</artifactId>
36-
</exclusion>
37-
<exclusion>
38-
<groupId>ch.qos.logback</groupId>
39-
<artifactId>logback-core</artifactId>
40-
</exclusion>
41-
</exclusions>
4233
</dependency>
4334

4435
<dependency>
@@ -49,8 +40,8 @@
4940
<exclusions>
5041
<!-- Will be embedded in jar-with-dependency -->
5142
<exclusion>
52-
<groupId>${project.groupId}</groupId>
53-
<artifactId>sonar-scanner-java-library</artifactId>
43+
<groupId>*</groupId>
44+
<artifactId>*</artifactId>
5445
</exclusion>
5546
</exclusions>
5647
</dependency>
@@ -65,7 +56,7 @@
6556
<version>1.13.1</version>
6657
<scope>test</scope>
6758
</dependency>
68-
59+
6960
<!-- Logging -->
7061
<dependency>
7162
<groupId>ch.qos.logback</groupId>
@@ -79,7 +70,7 @@
7970
<version>${logback.version}</version>
8071
<scope>test</scope>
8172
</dependency>
82-
73+
8374
<!-- SSL tests -->
8475
<dependency>
8576
<groupId>org.eclipse.jetty</groupId>

its/it-tests/src/test/java/com/sonar/scanner/lib/it/SSLTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ public void simple_analysis_with_server_and_client_certificate() throws Exceptio
184184
BuildResult buildResult = scanner.executeSimpleProject(project("js-sample"), "https://localhost:" + httpsPort);
185185

186186
assertThat(buildResult.getLastStatus()).isNotZero();
187-
assertThat(buildResult.getLogs()).contains("None of the TrustManagers trust this certificate chain");
187+
assertThat(buildResult.getLogs()).contains("The certificate chain is not trusted");
188188

189189
Path clientTruststore = Paths.get(SSLTest.class.getResource(KEYSTORE_CLIENT_WITH_CA_KEYTOOL).toURI()).toAbsolutePath();
190190
assertThat(clientTruststore).exists();
@@ -210,7 +210,7 @@ public void simple_analysis_with_server_and_without_client_certificate_is_failin
210210
BuildResult buildResult = scanner.executeSimpleProject(project("js-sample"), "https://localhost:" + httpsPort);
211211

212212
assertThat(buildResult.getLastStatus()).isNotZero();
213-
assertThat(buildResult.getLogs()).contains("None of the TrustManagers trust this certificate chain");
213+
assertThat(buildResult.getLogs()).contains("The certificate chain is not trusted");
214214

215215
Path clientTruststore = Paths.get(SSLTest.class.getResource(KEYSTORE_CLIENT_WITH_CA_KEYTOOL).toURI()).toAbsolutePath();
216216
assertThat(clientTruststore).exists();
@@ -248,7 +248,7 @@ public void simple_analysis_with_server_certificate(String clientTrustStore, Str
248248

249249
BuildResult buildResult = scanner.executeSimpleProject(project("js-sample"), "https://localhost:" + httpsPort);
250250
assertThat(buildResult.getLastStatus()).isNotZero();
251-
assertThat(buildResult.getLogs()).contains("None of the TrustManagers trust this certificate chain");
251+
assertThat(buildResult.getLogs()).contains("The certificate chain is not trusted");
252252

253253
Path clientTruststore = Paths.get(SSLTest.class.getResource(clientTrustStore).toURI()).toAbsolutePath();
254254
assertThat(clientTruststore).exists();

lib/pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
</dependency>
2727
<dependency>
2828
<groupId>com.squareup.okhttp3</groupId>
29-
<artifactId>okhttp</artifactId>
29+
<artifactId>okhttp-jvm</artifactId>
3030
</dependency>
3131
<dependency>
3232
<groupId>com.squareup.okhttp3</groupId>
@@ -67,12 +67,12 @@
6767
<dependency>
6868
<groupId>io.github.hakky54</groupId>
6969
<artifactId>sslcontext-kickstart</artifactId>
70-
<version>8.3.6</version>
70+
<version>9.1.0</version>
7171
</dependency>
7272
<dependency>
7373
<groupId>org.bouncycastle</groupId>
7474
<artifactId>bcprov-jdk18on</artifactId>
75-
<version>1.78.1</version>
75+
<version>1.81</version>
7676
</dependency>
7777

7878
<!-- unit tests -->
@@ -105,7 +105,7 @@
105105
<dependency>
106106
<groupId>org.wiremock</groupId>
107107
<artifactId>wiremock-standalone</artifactId>
108-
<version>3.9.2</version>
108+
<version>3.13.1</version>
109109
<scope>test</scope>
110110
</dependency>
111111
<dependency>

pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353

5454
<!-- used for deployment to SonarSource Artifactory -->
5555
<gitRepositoryName>sonar-scanner-java-library</gitRepositoryName>
56-
<okhttp.version>4.12.0</okhttp.version>
57-
<mockito.version>5.14.2</mockito.version>
56+
<okhttp.version>5.1.0</okhttp.version>
57+
<mockito.version>5.18.0</mockito.version>
5858
</properties>
5959

6060
<dependencyManagement>
@@ -67,7 +67,7 @@
6767
<dependency>
6868
<groupId>commons-io</groupId>
6969
<artifactId>commons-io</artifactId>
70-
<version>2.16.1</version>
70+
<version>2.19.0</version>
7171
</dependency>
7272
<dependency>
7373
<groupId>org.apache.commons</groupId>
@@ -76,7 +76,7 @@
7676
</dependency>
7777
<dependency>
7878
<groupId>com.squareup.okhttp3</groupId>
79-
<artifactId>okhttp</artifactId>
79+
<artifactId>okhttp-jvm</artifactId>
8080
<version>${okhttp.version}</version>
8181
</dependency>
8282
<dependency>
@@ -92,7 +92,7 @@
9292
<dependency>
9393
<groupId>com.google.code.gson</groupId>
9494
<artifactId>gson</artifactId>
95-
<version>2.11.0</version>
95+
<version>2.13.1</version>
9696
</dependency>
9797
<dependency>
9898
<groupId>com.google.code.findbugs</groupId>
@@ -102,7 +102,7 @@
102102
<dependency>
103103
<groupId>org.junit</groupId>
104104
<artifactId>junit-bom</artifactId>
105-
<version>5.11.3</version>
105+
<version>5.13.3</version>
106106
<type>pom</type>
107107
<scope>import</scope>
108108
</dependency>
@@ -119,12 +119,12 @@
119119
<dependency>
120120
<groupId>org.assertj</groupId>
121121
<artifactId>assertj-core</artifactId>
122-
<version>3.26.3</version>
122+
<version>3.27.3</version>
123123
</dependency>
124124
<dependency>
125125
<groupId>commons-codec</groupId>
126126
<artifactId>commons-codec</artifactId>
127-
<version>1.17.1</version>
127+
<version>1.18.0</version>
128128
</dependency>
129129
</dependencies>
130130
</dependencyManagement>

0 commit comments

Comments
 (0)