From 7045ae72fd4ea6781dec3f408c8c7df6ae67863d Mon Sep 17 00:00:00 2001 From: Dmitriy Tverdiakov Date: Wed, 23 Apr 2025 19:56:59 +0100 Subject: [PATCH 1/3] build(deps): Update dependencies --- neo4j-bolt-connection-netty/LICENSES.txt | 4 ++++ neo4j-bolt-connection-netty/NOTICE.txt | 4 ++++ .../impl/async/connection/EventLoopGroupFactory.java | 4 ++++ .../impl/async/connection/EventLoopGroupFactoryTest.java | 4 ++++ pom.xml | 8 ++++---- 5 files changed, 20 insertions(+), 4 deletions(-) diff --git a/neo4j-bolt-connection-netty/LICENSES.txt b/neo4j-bolt-connection-netty/LICENSES.txt index 0cbd1f4..32fddf7 100644 --- a/neo4j-bolt-connection-netty/LICENSES.txt +++ b/neo4j-bolt-connection-netty/LICENSES.txt @@ -7,6 +7,10 @@ Apache Software License, Version 2.0 Neo4j Bolt Connection (Provider SPI) Netty/Buffer Netty/Codec + Netty/Codec/Base + Netty/Codec/Compression + Netty/Codec/Marshalling + Netty/Codec/Protobuf Netty/Common Netty/Handler Netty/Resolver diff --git a/neo4j-bolt-connection-netty/NOTICE.txt b/neo4j-bolt-connection-netty/NOTICE.txt index fa18ba2..32b96b8 100644 --- a/neo4j-bolt-connection-netty/NOTICE.txt +++ b/neo4j-bolt-connection-netty/NOTICE.txt @@ -22,6 +22,10 @@ Apache Software License, Version 2.0 Neo4j Bolt Connection (Provider SPI) Netty/Buffer Netty/Codec + Netty/Codec/Base + Netty/Codec/Compression + Netty/Codec/Marshalling + Netty/Codec/Protobuf Netty/Common Netty/Handler Netty/Resolver diff --git a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/async/connection/EventLoopGroupFactory.java b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/async/connection/EventLoopGroupFactory.java index 06365dc..656f5bc 100644 --- a/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/async/connection/EventLoopGroupFactory.java +++ b/neo4j-bolt-connection-netty/src/main/java/org/neo4j/bolt/connection/netty/impl/async/connection/EventLoopGroupFactory.java @@ -87,6 +87,8 @@ public static boolean isEventLoopThread(Thread thread) { * Same as {@link NioEventLoopGroup} but uses a different {@link ThreadFactory} that produces threads of * {@link EventLoopThread} class. Such threads can be recognized by {@link #assertNotInEventLoopThread()}. */ + // use NioEventLoopGroup for now to be compatible with Netty 4.1 + @SuppressWarnings("deprecation") private static class DriverEventLoopGroup extends NioEventLoopGroup { DriverEventLoopGroup(int nThreads) { super(nThreads); @@ -102,6 +104,8 @@ protected ThreadFactory newDefaultThreadFactory() { * Same as {@link DefaultThreadFactory} created by {@link NioEventLoopGroup} by default, except produces threads of * {@link DriverThread} class. Such threads can be recognized by {@link #assertNotInEventLoopThread()}. */ + // use NioEventLoopGroup for now to be compatible with Netty 4.1 + @SuppressWarnings("deprecation") private static class DriverThreadFactory extends DefaultThreadFactory { DriverThreadFactory() { super(THREAD_NAME_PREFIX, THREAD_IS_DAEMON, THREAD_PRIORITY); diff --git a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/async/connection/EventLoopGroupFactoryTest.java b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/async/connection/EventLoopGroupFactoryTest.java index 3427174..7658223 100644 --- a/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/async/connection/EventLoopGroupFactoryTest.java +++ b/neo4j-bolt-connection-netty/src/test/java/org/neo4j/bolt/connection/netty/impl/async/connection/EventLoopGroupFactoryTest.java @@ -44,6 +44,8 @@ void shouldReturnCorrectChannelClass() { assertEquals(NioSocketChannel.class, EventLoopGroupFactory.channelClass()); } + // use NioEventLoopGroup for now to be compatible with Netty 4.1 + @SuppressWarnings("deprecation") @Test void shouldCreateEventLoopGroupWithSpecifiedThreadCount() { var threadCount = 2; @@ -85,6 +87,8 @@ void shouldCheckIfEventLoopThread() throws Exception { * Test verifies that our event loop group uses same kind of thread as Netty does by default. * It's needed because default Netty setup has good performance. */ + // use NioEventLoopGroup for now to be compatible with Netty 4.1 + @SuppressWarnings("deprecation") @Test void shouldUseSameThreadClassAsNioEventLoopGroupDoesByDefault() throws Exception { var nioEventLoopGroup = new NioEventLoopGroup(1); diff --git a/pom.xml b/pom.xml index 75bdcbc..c117782 100644 --- a/pom.xml +++ b/pom.xml @@ -46,21 +46,21 @@ 1.80 2024-12.1 - 5.11.4 + 5.12.2 'v'yyyyMMdd-HHmm 17 true - 5.15.2 + 5.17.0 - 4.1.119.Final + 4.2.0.Final UTF-8 UTF-8 ${project.basedir} 4.0.0 - 3.1.2 + 3.5.3 From 7e149b405ea2e20afd43e2468e09473e0a9f7d7e Mon Sep 17 00:00:00 2001 From: Dmitriy Tverdiakov Date: Wed, 7 May 2025 11:15:53 +0100 Subject: [PATCH 2/3] Update netty-bom to 4.2.1.Final --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index dc7ecba..6d260a9 100644 --- a/pom.xml +++ b/pom.xml @@ -55,7 +55,7 @@ 5.17.0 - 4.2.0.Final + 4.2.1.Final UTF-8 UTF-8 ${project.basedir} From 0edc7363ca03ed51a3350b5b8e8a969f55b2c131 Mon Sep 17 00:00:00 2001 From: Dmitriy Tverdiakov Date: Wed, 7 May 2025 11:17:03 +0100 Subject: [PATCH 3/3] Update LICENSES.txt and NOTICE.txt --- neo4j-bolt-connection-netty/LICENSES.txt | 4 ---- neo4j-bolt-connection-netty/NOTICE.txt | 4 ---- 2 files changed, 8 deletions(-) diff --git a/neo4j-bolt-connection-netty/LICENSES.txt b/neo4j-bolt-connection-netty/LICENSES.txt index 32fddf7..e99b9dd 100644 --- a/neo4j-bolt-connection-netty/LICENSES.txt +++ b/neo4j-bolt-connection-netty/LICENSES.txt @@ -6,11 +6,7 @@ libraries. For an overview of the licenses see the NOTICE.txt file. Apache Software License, Version 2.0 Neo4j Bolt Connection (Provider SPI) Netty/Buffer - Netty/Codec Netty/Codec/Base - Netty/Codec/Compression - Netty/Codec/Marshalling - Netty/Codec/Protobuf Netty/Common Netty/Handler Netty/Resolver diff --git a/neo4j-bolt-connection-netty/NOTICE.txt b/neo4j-bolt-connection-netty/NOTICE.txt index 32b96b8..37e6ac2 100644 --- a/neo4j-bolt-connection-netty/NOTICE.txt +++ b/neo4j-bolt-connection-netty/NOTICE.txt @@ -21,11 +21,7 @@ Third-party licenses Apache Software License, Version 2.0 Neo4j Bolt Connection (Provider SPI) Netty/Buffer - Netty/Codec Netty/Codec/Base - Netty/Codec/Compression - Netty/Codec/Marshalling - Netty/Codec/Protobuf Netty/Common Netty/Handler Netty/Resolver