Skip to content

Commit 881e901

Browse files
injectivesinjectives
authored
build(deps): update dependencies (#1656)
This update brings dependency updates.
1 parent 8d5d601 commit 881e901

File tree

57 files changed

+745
-906
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+745
-906
lines changed

‎benchkit-backend/LICENSES.txt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@ Apache Software License, Version 2.0
77
Jackson-annotations
88
Jackson-core
99
jackson-databind
10-
Neo4j Bolt Connection (Netty reference impl)
11-
Neo4j Bolt Connection (Pooled provider impl)
10+
Neo4j Bolt Connection (Bolt Provider reference impl)
11+
Neo4j Bolt Connection (Pooled Source impl)
1212
Neo4j Bolt Connection (Provider SPI)
13-
Neo4j Bolt Connection (Routed provider impl)
13+
Neo4j Bolt Connection (Routed Source impl)
1414
Netty/Buffer
15-
Netty/Codec
15+
Netty/Codec/Base
16+
Netty/Codec/Compression
1617
Netty/Codec/HTTP
1718
Netty/Common
1819
Netty/Handler

‎benchkit-backend/NOTICE.txt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,13 @@ Apache Software License, Version 2.0
2222
Jackson-annotations
2323
Jackson-core
2424
jackson-databind
25-
Neo4j Bolt Connection (Netty reference impl)
26-
Neo4j Bolt Connection (Pooled provider impl)
25+
Neo4j Bolt Connection (Bolt Provider reference impl)
26+
Neo4j Bolt Connection (Pooled Source impl)
2727
Neo4j Bolt Connection (Provider SPI)
28-
Neo4j Bolt Connection (Routed provider impl)
28+
Neo4j Bolt Connection (Routed Source impl)
2929
Netty/Buffer
30-
Netty/Codec
30+
Netty/Codec/Base
31+
Netty/Codec/Compression
3132
Netty/Codec/HTTP
3233
Netty/Common
3334
Netty/Handler

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

Lines changed: 4 additions & 6 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;
@@ -33,12 +34,9 @@
3334
public class Runner {
3435
public static void main(String[] args) throws InterruptedException {
3536
var config = Config.load();
36-
var driver = GraphDatabase.driver(
37-
config.uri(),
38-
config.authToken(),
39-
org.neo4j.driver.Config.builder().withLogging(config.logging()).build());
37+
var driver = GraphDatabase.driver(config.uri(), config.authToken());
4038

41-
EventLoopGroup group = new NioEventLoopGroup();
39+
EventLoopGroup group = new MultiThreadIoEventLoopGroup(NioIoHandler.newFactory());
4240
var logging = config.logging();
4341
var executor = Executors.newCachedThreadPool();
4442
var workloadHandler = new WorkloadHandler(driver, executor, logging);

‎bundle/LICENSES.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ libraries. For an overview of the licenses see the NOTICE.txt file.
44

55
------------------------------------------------------------------------------
66
Apache Software License, Version 2.0
7-
Neo4j Bolt Connection (Netty reference impl)
8-
Neo4j Bolt Connection (Pooled provider impl)
7+
Neo4j Bolt Connection (Bolt Provider reference impl)
8+
Neo4j Bolt Connection (Pooled Source impl)
99
Neo4j Bolt Connection (Provider SPI)
10-
Neo4j Bolt Connection (Routed provider impl)
10+
Neo4j Bolt Connection (Routed Source impl)
1111
Netty/Buffer
12-
Netty/Codec
12+
Netty/Codec/Base
1313
Netty/Common
1414
Netty/Handler
1515
Netty/Resolver

‎bundle/NOTICE.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ Third-party licenses
1919
--------------------
2020

2121
Apache Software License, Version 2.0
22-
Neo4j Bolt Connection (Netty reference impl)
23-
Neo4j Bolt Connection (Pooled provider impl)
22+
Neo4j Bolt Connection (Bolt Provider reference impl)
23+
Neo4j Bolt Connection (Pooled Source impl)
2424
Neo4j Bolt Connection (Provider SPI)
25-
Neo4j Bolt Connection (Routed provider impl)
25+
Neo4j Bolt Connection (Routed Source impl)
2626
Netty/Buffer
27-
Netty/Codec
27+
Netty/Codec/Base
2828
Netty/Common
2929
Netty/Handler
3030
Netty/Resolver

‎driver/LICENSES.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ libraries. For an overview of the licenses see the NOTICE.txt file.
44

55
------------------------------------------------------------------------------
66
Apache Software License, Version 2.0
7-
Neo4j Bolt Connection (Netty reference impl)
8-
Neo4j Bolt Connection (Pooled provider impl)
7+
Neo4j Bolt Connection (Bolt Provider reference impl)
8+
Neo4j Bolt Connection (Pooled Source impl)
99
Neo4j Bolt Connection (Provider SPI)
10-
Neo4j Bolt Connection (Routed provider impl)
10+
Neo4j Bolt Connection (Routed Source impl)
1111
Netty/Buffer
12-
Netty/Codec
12+
Netty/Codec/Base
1313
Netty/Common
1414
Netty/Handler
1515
Netty/Resolver

‎driver/NOTICE.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ Third-party licenses
1919
--------------------
2020

2121
Apache Software License, Version 2.0
22-
Neo4j Bolt Connection (Netty reference impl)
23-
Neo4j Bolt Connection (Pooled provider impl)
22+
Neo4j Bolt Connection (Bolt Provider reference impl)
23+
Neo4j Bolt Connection (Pooled Source impl)
2424
Neo4j Bolt Connection (Provider SPI)
25-
Neo4j Bolt Connection (Routed provider impl)
25+
Neo4j Bolt Connection (Routed Source impl)
2626
Netty/Buffer
27-
Netty/Codec
27+
Netty/Codec/Base
2828
Netty/Common
2929
Netty/Handler
3030
Netty/Resolver

‎driver/pom.xml‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +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-
<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-reads org.neo4j.driver=io.netty.common --add-reads org.neo4j.driver=org.bouncycastle.provider --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-reads org.neo4j.driver=io.netty.common --add-reads org.neo4j.driver=org.bouncycastle.provider --add-reads org.neo4j.driver=org.bouncycastle.pkix</failsafe.parallelizable.jpms.args>
25+
<failsafe.sequential.jpms.args>--add-reads org.neo4j.driver=org.bouncycastle.provider --add-reads org.neo4j.driver=org.bouncycastle.pkix</failsafe.sequential.jpms.args>
2426
<blockhound.tag>blockHoundTest</blockhound.tag>
2527
<maven.deploy.skip>false</maven.deploy.skip>
2628
</properties>
@@ -264,6 +266,28 @@
264266
<groupId>org.apache.maven.surefire</groupId>
265267
<artifactId>surefire-junit-platform</artifactId>
266268
<version>${surefire.and.failsafe.version}</version>
269+
<exclusions>
270+
<exclusion>
271+
<groupId>org.junit.platform</groupId>
272+
<artifactId>junit-platform-engine</artifactId>
273+
</exclusion>
274+
<exclusion>
275+
<groupId>org.junit.platform</groupId>
276+
<artifactId>junit-platform-launcher</artifactId>
277+
</exclusion>
278+
<exclusion>
279+
<groupId>org.junit.jupiter</groupId>
280+
<artifactId>junit-jupiter-engine</artifactId>
281+
</exclusion>
282+
<exclusion>
283+
<groupId>org.junit.jupiter</groupId>
284+
<artifactId>junit-jupiter-api</artifactId>
285+
</exclusion>
286+
<exclusion>
287+
<groupId>org.junit.jupiter</groupId>
288+
<artifactId>junit-jupiter-params</artifactId>
289+
</exclusion>
290+
</exclusions>
267291
</dependency>
268292
<dependency>
269293
<groupId>org.apache.maven.surefire</groupId>

‎driver/src/main/java/module-info.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
requires org.neo4j.bolt.connection.pooled;
3737
requires org.neo4j.bolt.connection.routed;
3838
requires reactor.core;
39-
requires io.netty.common;
4039
requires transitive java.logging;
4140
requires transitive org.reactivestreams;
4241
requires static micrometer.core;

‎driver/src/main/java/org/neo4j/driver/Config.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import static org.neo4j.driver.internal.logging.DevNullLogging.DEV_NULL_LOGGING;
2121
import static org.neo4j.driver.internal.util.DriverInfoUtil.driverVersion;
2222

23-
import io.netty.channel.EventLoop;
2423
import java.io.File;
2524
import java.io.Serial;
2625
import java.io.Serializable;
@@ -349,7 +348,7 @@ public Set<NotificationClassification> disabledNotificationClassifications() {
349348
}
350349

351350
/**
352-
* Returns the number of {@link EventLoop} threads.
351+
* Returns the number of EventLoop threads.
353352
*
354353
* @return the number of threads
355354
*/

0 commit comments

Comments
 (0)