Skip to content

build(deps): Update dependencies #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

build(deps): Update dependencies #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7045ae7
build(deps): Update dependencies
injectives Apr 23, 2025
a9748f9
Merge branch 'main' into dependencies
injectives May 7, 2025
7e149b4
Update netty-bom to 4.2.1.Final
injectives May 7, 2025
0edc736
Update LICENSES.txt and NOTICE.txt
injectives May 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion neo4j-bolt-connection-netty/LICENSES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +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/Common
Netty/Handler
Netty/Resolver
Expand Down
2 changes: 1 addition & 1 deletion neo4j-bolt-connection-netty/NOTICE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Third-party licenses
Apache Software License, Version 2.0
Neo4j Bolt Connection (Provider SPI)
Netty/Buffer
Netty/Codec
Netty/Codec/Base
Netty/Common
Netty/Handler
Netty/Resolver
Expand Down
4 changes: 4 additions & 0 deletions ...ain/java/org/neo4j/bolt/connection/netty/impl/async/connection/EventLoopGroupFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);
Expand Down
4 changes: 4 additions & 0 deletions ...java/org/neo4j/bolt/connection/netty/impl/async/connection/EventLoopGroupFactoryTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
8 changes: 4 additions & 4 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,21 +46,21 @@
<properties>
<bouncycastle-jdk18on.version>1.80</bouncycastle-jdk18on.version>
<build-resources.version>2024-12.1</build-resources.version>
<junit.version>5.11.4</junit.version>
<junit.version>5.12.2</junit.version>
<maven.build.timestamp.format>'v'yyyyMMdd-HHmm</maven.build.timestamp.format>
<maven.compiler.release>17</maven.compiler.release>
<maven.compiler.xlint.extras />
<!-- Skip deployment by default for everything in this project. -->
<maven.deploy.skip>true</maven.deploy.skip>
<mockito.version>5.15.2</mockito.version>
<mockito.version>5.17.0</mockito.version>
<!-- To be overwritten by child projects -->
<moduleName />
<netty-bom.version>4.1.119.Final</netty-bom.version>
<netty-bom.version>4.2.1.Final</netty-bom.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<rootDir>${project.basedir}</rootDir>
<sortpom-maven-plugin.version>4.0.0</sortpom-maven-plugin.version>
<surefire.and.failsafe.version>3.1.2</surefire.and.failsafe.version>
<surefire.and.failsafe.version>3.5.3</surefire.and.failsafe.version>
<surefire.jpms.args />
</properties>

Expand Down