Skip to content

Commit 2e595b0

Browse files
rashtaorashtao
authored
[DE-1024] Update test dependencies (#608)
* updated test dependencies versions * updated graalvm version * CI: added test with jdk 23 * fix test-non-functional * updated plugins versions
1 parent 6b9acf9 commit 2e595b0

File tree

10 files changed

+89
-47
lines changed

10 files changed

+89
-47
lines changed

‎.circleci/config.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,9 @@ executors:
124124
j21:
125125
docker:
126126
- image: 'cimg/openjdk:21.0'
127+
j23:
128+
docker:
129+
- image: 'cimg/openjdk:23.0'
127130

128131
jobs:
129132

@@ -524,6 +527,7 @@ workflows:
524527
jdk:
525528
- 'j17'
526529
- 'j21'
530+
- 'j23'
527531
filters:
528532
tags:
529533
only: /^v.*/
@@ -565,7 +569,6 @@ workflows:
565569
- 'true'
566570
- 'false'
567571
graalvm-version:
568-
- '22.0.1-graalce'
569572
- '21.0.2-graalce'
570573
filters:
571574
tags:
@@ -586,7 +589,6 @@ workflows:
586589
- 'true'
587590
- 'false'
588591
graalvm-version:
589-
- '22.0.1-graalce'
590592
- '21.0.2-graalce'
591593
filters:
592594
tags:

‎pom.xml‎

Lines changed: 71 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<sonar.organization>arangodb-1</sonar.organization>
4343
<sonar.java.spotbugs.reportPaths>target/spotbugsXml.xml</sonar.java.spotbugs.reportPaths>
4444
<sonar.coverage.jacoco.xmlReportPaths>site/jacoco/jacoco.xml</sonar.coverage.jacoco.xmlReportPaths>
45-
<graalvm.version>23.1.1</graalvm.version>
45+
<graalvm.version>24.2.1</graalvm.version>
4646
</properties>
4747

4848
<developers>
@@ -83,20 +83,20 @@
8383

8484
<dependencyManagement>
8585
<dependencies>
86-
<dependency>
87-
<groupId>io.vertx</groupId>
88-
<artifactId>vertx-stack-depchain</artifactId>
89-
<version>4.5.7</version>
90-
<type>pom</type>
91-
<scope>import</scope>
92-
</dependency>
9386
<dependency>
9487
<groupId>com.fasterxml.jackson</groupId>
9588
<artifactId>jackson-bom</artifactId>
9689
<version>2.19.0</version>
9790
<scope>import</scope>
9891
<type>pom</type>
9992
</dependency>
93+
<dependency>
94+
<groupId>io.vertx</groupId>
95+
<artifactId>vertx-stack-depchain</artifactId>
96+
<version>4.5.7</version>
97+
<type>pom</type>
98+
<scope>import</scope>
99+
</dependency>
100100
<dependency>
101101
<groupId>com.google.code.findbugs</groupId>
102102
<artifactId>jsr305</artifactId>
@@ -105,7 +105,7 @@
105105
<dependency>
106106
<groupId>org.slf4j</groupId>
107107
<artifactId>slf4j-api</artifactId>
108-
<version>2.0.9</version>
108+
<version>2.0.17</version>
109109
</dependency>
110110
<dependency>
111111
<groupId>jakarta.json</groupId>
@@ -178,7 +178,7 @@
178178
<plugin>
179179
<groupId>org.apache.maven.plugins</groupId>
180180
<artifactId>maven-enforcer-plugin</artifactId>
181-
<version>3.3.0</version>
181+
<version>3.5.0</version>
182182
<executions>
183183
<execution>
184184
<id>enforce</id>
@@ -199,7 +199,7 @@
199199
<requirePluginVersions/>
200200
<requireExplicitDependencyScope/>
201201
<requireMavenVersion>
202-
<version>3.6</version>
202+
<version>3.6.3</version>
203203
</requireMavenVersion>
204204
</rules>
205205
</configuration>
@@ -209,22 +209,59 @@
209209
<dependency>
210210
<groupId>org.codehaus.mojo</groupId>
211211
<artifactId>extra-enforcer-rules</artifactId>
212-
<version>1.8.0</version>
212+
<version>1.10.0</version>
213213
</dependency>
214214
</dependencies>
215215
</plugin>
216+
<plugin>
217+
<groupId>org.codehaus.mojo</groupId>
218+
<artifactId>versions-maven-plugin</artifactId>
219+
<version>2.18.0</version>
220+
<configuration>
221+
<ruleSet>
222+
<rules>
223+
<rule>
224+
<ignoreVersions>
225+
<ignoreVersion>
226+
<type>regex</type>
227+
<version>(?i).*(alpha|beta|m|rc).*(\d+)?</version>
228+
</ignoreVersion>
229+
</ignoreVersions>
230+
</rule>
231+
<rule>
232+
<groupId>io.vertx</groupId>
233+
<ignoreVersions>
234+
<ignoreVersion>
235+
<type>regex</type>
236+
<version>5..*</version>
237+
</ignoreVersion>
238+
</ignoreVersions>
239+
</rule>
240+
<rule>
241+
<groupId>io.netty</groupId>
242+
<ignoreVersions>
243+
<ignoreVersion>
244+
<type>regex</type>
245+
<version>.*</version>
246+
</ignoreVersion>
247+
</ignoreVersions>
248+
</rule>
249+
</rules>
250+
</ruleSet>
251+
</configuration>
252+
</plugin>
216253
<plugin>
217254
<groupId>org.apache.maven.plugins</groupId>
218255
<artifactId>maven-deploy-plugin</artifactId>
219-
<version>3.1.1</version>
256+
<version>3.1.4</version>
220257
<configuration>
221258
<retryFailedDeploymentCount>10</retryFailedDeploymentCount>
222259
</configuration>
223260
</plugin>
224261
<plugin>
225262
<groupId>org.sonatype.plugins</groupId>
226263
<artifactId>nexus-staging-maven-plugin</artifactId>
227-
<version>1.6.13</version>
264+
<version>1.7.0</version>
228265
<extensions>true</extensions>
229266
<configuration>
230267
<serverId>ossrh</serverId>
@@ -241,7 +278,7 @@
241278
<plugin>
242279
<groupId>org.apache.maven.plugins</groupId>
243280
<artifactId>maven-compiler-plugin</artifactId>
244-
<version>3.11.0</version>
281+
<version>3.14.0</version>
245282
<configuration>
246283
<compilerArgs>
247284
<arg>-Xlint:unchecked</arg>
@@ -261,35 +298,35 @@
261298
<plugin>
262299
<groupId>org.apache.maven.plugins</groupId>
263300
<artifactId>maven-clean-plugin</artifactId>
264-
<version>3.4.0</version>
301+
<version>3.5.0</version>
265302
</plugin>
266303
<plugin>
267304
<groupId>org.apache.maven.plugins</groupId>
268305
<artifactId>maven-install-plugin</artifactId>
269-
<version>3.1.2</version>
306+
<version>3.1.4</version>
270307
</plugin>
271308
<plugin>
272309
<groupId>org.apache.maven.plugins</groupId>
273310
<artifactId>maven-site-plugin</artifactId>
274-
<version>3.12.1</version>
311+
<version>3.21.0</version>
275312
</plugin>
276313
<plugin>
277314
<groupId>org.apache.maven.plugins</groupId>
278315
<artifactId>maven-surefire-plugin</artifactId>
279-
<version>3.0.0</version>
316+
<version>3.5.3</version>
280317
<configuration>
281318
<skip>true</skip>
282319
</configuration>
283320
</plugin>
284321
<plugin>
285322
<groupId>org.codehaus.mojo</groupId>
286323
<artifactId>build-helper-maven-plugin</artifactId>
287-
<version>3.3.0</version>
324+
<version>3.6.1</version>
288325
</plugin>
289326
<plugin>
290327
<groupId>org.jacoco</groupId>
291328
<artifactId>jacoco-maven-plugin</artifactId>
292-
<version>0.8.12</version>
329+
<version>0.8.13</version>
293330
</plugin>
294331
<plugin>
295332
<groupId>org.apache.maven.plugins</groupId>
@@ -299,12 +336,12 @@
299336
<plugin>
300337
<groupId>org.sonarsource.scanner.maven</groupId>
301338
<artifactId>sonar-maven-plugin</artifactId>
302-
<version>4.0.0.4121</version>
339+
<version>5.1.0.4751</version>
303340
</plugin>
304341
<plugin>
305342
<groupId>org.apache.maven.plugins</groupId>
306343
<artifactId>maven-shade-plugin</artifactId>
307-
<version>3.4.1</version>
344+
<version>3.6.0</version>
308345
</plugin>
309346
<plugin>
310347
<groupId>com.google.code.maven-replacer-plugin</groupId>
@@ -314,7 +351,17 @@
314351
<plugin>
315352
<groupId>org.apache.maven.plugins</groupId>
316353
<artifactId>maven-surefire-report-plugin</artifactId>
317-
<version>3.4.0</version>
354+
<version>3.5.3</version>
355+
</plugin>
356+
<plugin>
357+
<groupId>org.codehaus.mojo</groupId>
358+
<artifactId>flatten-maven-plugin</artifactId>
359+
<version>1.7.0</version>
360+
</plugin>
361+
<plugin>
362+
<groupId>org.apache.maven.plugins</groupId>
363+
<artifactId>maven-javadoc-plugin</artifactId>
364+
<version>3.11.2</version>
318365
</plugin>
319366
</plugins>
320367
</pluginManagement>

‎release-parent/pom.xml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<plugin>
2525
<groupId>org.apache.maven.plugins</groupId>
2626
<artifactId>maven-source-plugin</artifactId>
27-
<version>3.2.1</version>
27+
<version>3.3.1</version>
2828
<executions>
2929
<execution>
3030
<goals>
@@ -36,7 +36,6 @@
3636
<plugin>
3737
<groupId>org.apache.maven.plugins</groupId>
3838
<artifactId>maven-javadoc-plugin</artifactId>
39-
<version>3.8.0</version>
4039
<executions>
4140
<execution>
4241
<goals>
@@ -57,7 +56,7 @@
5756
<plugin>
5857
<groupId>org.apache.maven.plugins</groupId>
5958
<artifactId>maven-gpg-plugin</artifactId>
60-
<version>3.0.1</version>
59+
<version>3.2.7</version>
6160
<configuration>
6261
<gpgArguments>
6362
<arg>--pinentry-mode</arg>
@@ -77,7 +76,6 @@
7776
<plugin>
7877
<groupId>org.codehaus.mojo</groupId>
7978
<artifactId>flatten-maven-plugin</artifactId>
80-
<version>1.4.1</version>
8179
<configuration>
8280
<flattenMode>oss</flattenMode>
8381
</configuration>
@@ -139,7 +137,7 @@
139137
<plugin>
140138
<groupId>com.github.spotbugs</groupId>
141139
<artifactId>spotbugs-maven-plugin</artifactId>
142-
<version>4.7.3.4</version>
140+
<version>4.9.3.0</version>
143141
<configuration>
144142
<excludeFilterFile>spotbugs/spotbugs-exclude.xml</excludeFilterFile>
145143
</configuration>

‎shaded/src/main/java/graal/netty/graal/NettySubstitutions.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ final class Target_io_netty_handler_ssl_JdkSslClientContext {
166166

167167
}
168168
}
169-
170169
@TargetClass(className = "io.netty.handler.ssl.SslHandler$SslEngineType")
171170
final class Target_io_netty_handler_ssl_SslHandler$SslEngineType {
172171

@@ -237,7 +236,6 @@ static SslContext newClientContextInternal(SslProvider provider, Provider sslCon
237236
}
238237

239238
}
240-
241239
@TargetClass(className = "io.netty.handler.ssl.JdkDefaultApplicationProtocolNegotiator")
242240
final class Target_io_netty_handler_ssl_JdkDefaultApplicationProtocolNegotiator {
243241

‎test-functional/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@
151151
<plugin>
152152
<groupId>org.graalvm.buildtools</groupId>
153153
<artifactId>native-maven-plugin</artifactId>
154-
<version>0.10.2</version>
154+
<version>0.10.6</version>
155155
<extensions>true</extensions>
156156
<executions>
157157
<execution>

‎test-functional/src/test-default/java/graal/netty/graal/NettySubstitutions.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ final class Target_io_netty_handler_ssl_JdkSslClientContext {
166166

167167
}
168168
}
169-
170169
@TargetClass(className = "io.netty.handler.ssl.SslHandler$SslEngineType")
171170
final class Target_io_netty_handler_ssl_SslHandler$SslEngineType {
172171

@@ -237,7 +236,6 @@ static SslContext newClientContextInternal(SslProvider provider, Provider sslCon
237236
}
238237

239238
}
240-
241239
@TargetClass(className = "io.netty.handler.ssl.JdkDefaultApplicationProtocolNegotiator")
242240
final class Target_io_netty_handler_ssl_JdkDefaultApplicationProtocolNegotiator {
243241

‎test-non-functional/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959
<dependency>
6060
<groupId>io.smallrye.config</groupId>
6161
<artifactId>smallrye-config-core</artifactId>
62-
<version>2.13.3</version>
62+
<version>3.13.1</version>
6363
<scope>test</scope>
6464
</dependency>
6565
<dependency>

‎test-non-functional/src/test/java/mp/ConfigUtilsMP.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package mp;
22

33
import com.arangodb.config.ArangoConfigProperties;
4-
import io.smallrye.config.PropertiesConfigSourceProvider;
4+
import io.smallrye.config.PropertiesConfigSourceLoader;
55
import io.smallrye.config.SmallRyeConfig;
66
import io.smallrye.config.SmallRyeConfigBuilder;
77

@@ -17,7 +17,7 @@ public static ArangoConfigProperties loadConfigMP(final String location) {
1717

1818
public static ArangoConfigProperties loadConfigMP(final String location, final String prefix) {
1919
SmallRyeConfig cfg = new SmallRyeConfigBuilder()
20-
.withSources(new PropertiesConfigSourceProvider(location, ConfigUtilsMP.class.getClassLoader(), false))
20+
.withSources(PropertiesConfigSourceLoader.inClassPath(location, 0, ConfigUtilsMP.class.getClassLoader()))
2121
.withMapping(ArangoConfigPropertiesMPImpl.class, prefix)
2222
.build();
2323
return cfg.getConfigMapping(ArangoConfigPropertiesMPImpl.class, prefix);

0 commit comments

Comments
 (0)