Skip to content

Commit 7045ae7

Browse files
committed
build(deps): Update dependencies
1 parent 521c77b commit 7045ae7

File tree

5 files changed

+20
-4
lines changed

5 files changed

+20
-4
lines changed

neo4j-bolt-connection-netty/LICENSES.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ Apache Software License, Version 2.0
77
Neo4j Bolt Connection (Provider SPI)
88
Netty/Buffer
99
Netty/Codec
10+
Netty/Codec/Base
11+
Netty/Codec/Compression
12+
Netty/Codec/Marshalling
13+
Netty/Codec/Protobuf
1014
Netty/Common
1115
Netty/Handler
1216
Netty/Resolver

neo4j-bolt-connection-netty/NOTICE.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ Apache Software License, Version 2.0
2222
Neo4j Bolt Connection (Provider SPI)
2323
Netty/Buffer
2424
Netty/Codec
25+
Netty/Codec/Base
26+
Netty/Codec/Compression
27+
Netty/Codec/Marshalling
28+
Netty/Codec/Protobuf
2529
Netty/Common
2630
Netty/Handler
2731
Netty/Resolver

neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/async/connection/EventLoopGroupFactory.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@ public static boolean isEventLoopThread(Thread thread) {
8787
* Same as {@link NioEventLoopGroup} but uses a different {@link ThreadFactory} that produces threads of
8888
* {@link EventLoopThread} class. Such threads can be recognized by {@link #assertNotInEventLoopThread()}.
8989
*/
90+
// use NioEventLoopGroup for now to be compatible with Netty 4.1
91+
@SuppressWarnings("deprecation")
9092
private static class DriverEventLoopGroup extends NioEventLoopGroup {
9193
DriverEventLoopGroup(int nThreads) {
9294
super(nThreads);
@@ -102,6 +104,8 @@ protected ThreadFactory newDefaultThreadFactory() {
102104
* Same as {@link DefaultThreadFactory} created by {@link NioEventLoopGroup} by default, except produces threads of
103105
* {@link DriverThread} class. Such threads can be recognized by {@link #assertNotInEventLoopThread()}.
104106
*/
107+
// use NioEventLoopGroup for now to be compatible with Netty 4.1
108+
@SuppressWarnings("deprecation")
105109
private static class DriverThreadFactory extends DefaultThreadFactory {
106110
DriverThreadFactory() {
107111
super(THREAD_NAME_PREFIX, THREAD_IS_DAEMON, THREAD_PRIORITY);

neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/async/connection/EventLoopGroupFactoryTest.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ void shouldReturnCorrectChannelClass() {
4444
assertEquals(NioSocketChannel.class, EventLoopGroupFactory.channelClass());
4545
}
4646

47+
// use NioEventLoopGroup for now to be compatible with Netty 4.1
48+
@SuppressWarnings("deprecation")
4749
@Test
4850
void shouldCreateEventLoopGroupWithSpecifiedThreadCount() {
4951
var threadCount = 2;
@@ -85,6 +87,8 @@ void shouldCheckIfEventLoopThread() throws Exception {
8587
* Test verifies that our event loop group uses same kind of thread as Netty does by default.
8688
* It's needed because default Netty setup has good performance.
8789
*/
90+
// use NioEventLoopGroup for now to be compatible with Netty 4.1
91+
@SuppressWarnings("deprecation")
8892
@Test
8993
void shouldUseSameThreadClassAsNioEventLoopGroupDoesByDefault() throws Exception {
9094
var nioEventLoopGroup = new NioEventLoopGroup(1);

pom.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,21 +46,21 @@
4646
<properties>
4747
<bouncycastle-jdk18on.version>1.80</bouncycastle-jdk18on.version>
4848
<build-resources.version>2024-12.1</build-resources.version>
49-
<junit.version>5.11.4</junit.version>
49+
<junit.version>5.12.2</junit.version>
5050
<maven.build.timestamp.format>'v'yyyyMMdd-HHmm</maven.build.timestamp.format>
5151
<maven.compiler.release>17</maven.compiler.release>
5252
<maven.compiler.xlint.extras />
5353
<!-- Skip deployment by default for everything in this project. -->
5454
<maven.deploy.skip>true</maven.deploy.skip>
55-
<mockito.version>5.15.2</mockito.version>
55+
<mockito.version>5.17.0</mockito.version>
5656
<!-- To be overwritten by child projects -->
5757
<moduleName />
58-
<netty-bom.version>4.1.119.Final</netty-bom.version>
58+
<netty-bom.version>4.2.0.Final</netty-bom.version>
5959
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
6060
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
6161
<rootDir>${project.basedir}</rootDir>
6262
<sortpom-maven-plugin.version>4.0.0</sortpom-maven-plugin.version>
63-
<surefire.and.failsafe.version>3.1.2</surefire.and.failsafe.version>
63+
<surefire.and.failsafe.version>3.5.3</surefire.and.failsafe.version>
6464
<surefire.jpms.args />
6565
</properties>
6666

0 commit comments

Comments
 (0)