Skip to content

Commit ddd4665

Browse files
injectivesinjectives
committed
build(deps): Update dependencies
1 parent 7698a73 commit ddd4665

File tree

14 files changed

+59
-15
lines changed

14 files changed

+59
-15
lines changed

‎benchkit-backend/LICENSES.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,11 @@ Apache Software License, Version 2.0
1313
Neo4j Bolt Connection (Routed provider impl)
1414
Netty/Buffer
1515
Netty/Codec
16+
Netty/Codec/Base
17+
Netty/Codec/Compression
1618
Netty/Codec/HTTP
19+
Netty/Codec/Marshalling
20+
Netty/Codec/Protobuf
1721
Netty/Common
1822
Netty/Handler
1923
Netty/Resolver

‎benchkit-backend/NOTICE.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@ Apache Software License, Version 2.0
2828
Neo4j Bolt Connection (Routed provider impl)
2929
Netty/Buffer
3030
Netty/Codec
31+
Netty/Codec/Base
32+
Netty/Codec/Compression
3133
Netty/Codec/HTTP
34+
Netty/Codec/Marshalling
35+
Netty/Codec/Protobuf
3236
Netty/Common
3337
Netty/Handler
3438
Netty/Resolver

‎benchkit-backend/src/main/java/neo4j/org/testkit/backend/Runner.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
import io.netty.bootstrap.ServerBootstrap;
2020
import io.netty.channel.ChannelInitializer;
2121
import io.netty.channel.EventLoopGroup;
22-
import io.netty.channel.nio.NioEventLoopGroup;
22+
import io.netty.channel.MultiThreadIoEventLoopGroup;
23+
import io.netty.channel.nio.NioIoHandler;
2324
import io.netty.channel.socket.SocketChannel;
2425
import io.netty.channel.socket.nio.NioServerSocketChannel;
2526
import io.netty.handler.codec.http.HttpObjectAggregator;
@@ -38,7 +39,7 @@ public static void main(String[] args) throws InterruptedException {
3839
config.authToken(),
3940
org.neo4j.driver.Config.builder().withLogging(config.logging()).build());
4041

41-
EventLoopGroup group = new NioEventLoopGroup();
42+
EventLoopGroup group = new MultiThreadIoEventLoopGroup(NioIoHandler.newFactory());
4243
var logging = config.logging();
4344
var executor = Executors.newCachedThreadPool();
4445
var workloadHandler = new WorkloadHandler(driver, executor, logging);

‎bundle/LICENSES.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ Apache Software License, Version 2.0
1010
Neo4j Bolt Connection (Routed provider impl)
1111
Netty/Buffer
1212
Netty/Codec
13+
Netty/Codec/Base
14+
Netty/Codec/Compression
15+
Netty/Codec/Marshalling
16+
Netty/Codec/Protobuf
1317
Netty/Common
1418
Netty/Handler
1519
Netty/Resolver

‎bundle/NOTICE.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ Apache Software License, Version 2.0
2525
Neo4j Bolt Connection (Routed provider impl)
2626
Netty/Buffer
2727
Netty/Codec
28+
Netty/Codec/Base
29+
Netty/Codec/Compression
30+
Netty/Codec/Marshalling
31+
Netty/Codec/Protobuf
2832
Netty/Common
2933
Netty/Handler
3034
Netty/Resolver

‎driver/LICENSES.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ Apache Software License, Version 2.0
1010
Neo4j Bolt Connection (Routed provider impl)
1111
Netty/Buffer
1212
Netty/Codec
13+
Netty/Codec/Base
14+
Netty/Codec/Compression
15+
Netty/Codec/Marshalling
16+
Netty/Codec/Protobuf
1317
Netty/Common
1418
Netty/Handler
1519
Netty/Resolver

‎driver/NOTICE.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ Apache Software License, Version 2.0
2525
Neo4j Bolt Connection (Routed provider impl)
2626
Netty/Buffer
2727
Netty/Codec
28+
Netty/Codec/Base
29+
Netty/Codec/Compression
30+
Netty/Codec/Marshalling
31+
Netty/Codec/Protobuf
2832
Netty/Common
2933
Netty/Handler
3034
Netty/Resolver

‎driver/pom.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,9 @@
2020
<rootDir>${project.basedir}/..</rootDir>
2121
<api.classes.directory>${basedir}/target/classes-without-jpms</api.classes.directory>
2222
<maven.compiler.xlint.extras>,-try</maven.compiler.xlint.extras>
23-
<surefire.jpms.args>--add-opens org.neo4j.driver/org.neo4j.bolt.connection.netty.impl.util.messaging=ALL-UNNAMED</surefire.jpms.args>
24-
<failsafe.parallelizable.jpms.args>--add-opens org.neo4j.driver/org.neo4j.driver.internal.util=ALL-UNNAMED --add-opens org.neo4j.driver/org.neo4j.driver.internal.async=ALL-UNNAMED</failsafe.parallelizable.jpms.args>
23+
<surefire.jpms.args>--add-modules org.bouncycastle.provider --add-reads org.neo4j.driver=org.bouncycastle.provider --add-modules org.bouncycastle.pkix --add-reads org.neo4j.driver=org.bouncycastle.pkix</surefire.jpms.args>
24+
<failsafe.parallelizable.jpms.args>--add-opens org.neo4j.driver/org.neo4j.driver.internal.util=ALL-UNNAMED --add-opens org.neo4j.driver/org.neo4j.driver.internal.async=ALL-UNNAMED --add-modules org.bouncycastle.provider --add-reads org.neo4j.driver=org.bouncycastle.provider --add-modules org.bouncycastle.pkix --add-reads org.neo4j.driver=org.bouncycastle.pkix</failsafe.parallelizable.jpms.args>
25+
<failsafe.sequential.jpms.args>--add-modules org.bouncycastle.provider --add-reads org.neo4j.driver=org.bouncycastle.provider --add-modules org.bouncycastle.pkix --add-reads org.neo4j.driver=org.bouncycastle.pkix</failsafe.sequential.jpms.args>
2526
<blockhound.tag>blockHoundTest</blockhound.tag>
2627
<maven.deploy.skip>false</maven.deploy.skip>
2728
</properties>

‎examples/LICENSES.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@ Apache Software License, Version 2.0
1010
Neo4j Bolt Connection (Routed provider impl)
1111
Netty/Buffer
1212
Netty/Codec
13+
Netty/Codec/Base
14+
Netty/Codec/Compression
15+
Netty/Codec/Marshalling
16+
Netty/Codec/Protobuf
1317
Netty/Common
1418
Netty/Handler
1519
Netty/Resolver

‎examples/NOTICE.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ Apache Software License, Version 2.0
2525
Neo4j Bolt Connection (Routed provider impl)
2626
Netty/Buffer
2727
Netty/Codec
28+
Netty/Codec/Base
29+
Netty/Codec/Compression
30+
Netty/Codec/Marshalling
31+
Netty/Codec/Protobuf
2832
Netty/Common
2933
Netty/Handler
3034
Netty/Resolver

‎pom.xml

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,10 @@
2525
<parallelizable.it.forkCount>2</parallelizable.it.forkCount>
2626
<!-- All tests tagged are to be executed in parallel -->
2727
<parallelizable.it.tags>parallelizableIT</parallelizable.it.tags>
28-
<surefire.and.failsafe.version>3.1.2</surefire.and.failsafe.version>
28+
<surefire.and.failsafe.version>3.5.3</surefire.and.failsafe.version>
2929
<surefire.jpms.args/>
3030
<failsafe.parallelizable.jpms.args/>
31+
<failsafe.sequential.jpms.args/>
3132
<!-- Skip deployment by default for everything in this project. -->
3233
<maven.deploy.skip>true</maven.deploy.skip>
3334

@@ -37,15 +38,15 @@
3738
<!-- Please note that when updating this dependency -->
3839
<!-- (i.e. due to a security vulnerability or bug) that the -->
3940
<!-- corresponding server dependency also needs updating.-->
40-
<netty-bom.version>4.1.119.Final</netty-bom.version>
41+
<netty-bom.version>4.2.0.Final</netty-bom.version>
4142
<!-- Please note that when updating this dependency -->
4243
<!-- (i.e. due to a security vulnerability or bug) that the -->
4344
<!-- corresponding server dependency also needs updating.-->
44-
<reactor-bom.version>2023.0.16</reactor-bom.version>
45+
<reactor-bom.version>2023.0.17</reactor-bom.version>
4546
<slf4j-api.version>1.7.36</slf4j-api.version>
4647
<hamcrest.version>3.0</hamcrest.version>
47-
<mockito-core.version>5.16.1</mockito-core.version>
48-
<junit.version>5.11.4</junit.version>
48+
<mockito-core.version>5.17.0</mockito-core.version>
49+
<junit.version>5.12.2</junit.version>
4950
<!-- supply a newer version than the one supplied by the reactive-streams 1.0.4 -->
5051
<testng.version>7.11.0</testng.version>
5152
<jarchivelib.version>1.2.0</jarchivelib.version>
@@ -56,9 +57,9 @@
5657
<bouncycastle-jdk18on.version>1.80</bouncycastle-jdk18on.version>
5758
<logback-classic.version>1.2.13</logback-classic.version>
5859
<jackson.version>2.18.3</jackson.version>
59-
<lombok.version>1.18.36</lombok.version>
60-
<svm.version>24.1.2</svm.version>
61-
<micrometer.version>1.13.12</micrometer.version>
60+
<lombok.version>1.18.38</lombok.version>
61+
<svm.version>24.2.1</svm.version>
62+
<micrometer.version>1.14.6</micrometer.version>
6263
<blockhound.version>1.0.11.RELEASE</blockhound.version>
6364
<testcontainers.version>1.20.6</testcontainers.version>
6465
<build-resources.version>2024-12.1</build-resources.version>
@@ -353,7 +354,7 @@
353354
<goal>verify</goal>
354355
</goals>
355356
<configuration>
356-
<argLine>-Dfile.encoding=${project.build.sourceEncoding}</argLine>
357+
<argLine>-Dfile.encoding=${project.build.sourceEncoding} ${failsafe.sequential.jpms.args}</argLine>
357358
<trimStackTrace>false</trimStackTrace>
358359
<forkCount>1</forkCount>
359360
<reuseForks>true</reuseForks>

‎testkit-backend/LICENSES.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ Apache Software License, Version 2.0
1313
Neo4j Bolt Connection (Routed provider impl)
1414
Netty/Buffer
1515
Netty/Codec
16+
Netty/Codec/Base
17+
Netty/Codec/Compression
18+
Netty/Codec/Marshalling
19+
Netty/Codec/Protobuf
1620
Netty/Common
1721
Netty/Handler
1822
Netty/Resolver

‎testkit-backend/NOTICE.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ Apache Software License, Version 2.0
2828
Neo4j Bolt Connection (Routed provider impl)
2929
Netty/Buffer
3030
Netty/Codec
31+
Netty/Codec/Base
32+
Netty/Codec/Compression
33+
Netty/Codec/Marshalling
34+
Netty/Codec/Protobuf
3135
Netty/Common
3236
Netty/Handler
3337
Netty/Resolver

‎testkit-backend/src/main/java/neo4j/org/testkit/backend/Runner.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
import io.netty.bootstrap.ServerBootstrap;
2020
import io.netty.channel.ChannelInitializer;
2121
import io.netty.channel.EventLoopGroup;
22-
import io.netty.channel.nio.NioEventLoopGroup;
22+
import io.netty.channel.MultiThreadIoEventLoopGroup;
23+
import io.netty.channel.nio.NioIoHandler;
2324
import io.netty.channel.socket.SocketChannel;
2425
import io.netty.channel.socket.nio.NioServerSocketChannel;
2526
import java.util.logging.Level;
@@ -37,7 +38,7 @@ public static void main(String[] args) throws InterruptedException {
3738
? Logging.none()
3839
: Logging.console(Level.parse(levelString));
3940

40-
EventLoopGroup group = new NioEventLoopGroup();
41+
EventLoopGroup group = new MultiThreadIoEventLoopGroup(NioIoHandler.newFactory());
4142
try {
4243
var bootstrap = new ServerBootstrap();
4344
bootstrap

0 commit comments

Comments
 (0)