Skip to content
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

3.x upgrade netty to 4.1.90.Final #6511

Merged
merged 6 commits into from
Mar 30, 2023
Merged

3.x upgrade netty to 4.1.90.Final #6511

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b59c741
Netty 4.1.88 final
sullis Feb 13, 2023
92147dc
Add dependency on netty-incubator-transport-classes-io_uring
romain-grecourt Feb 14, 2023
f24327a
netty 4.1.89
sullis Feb 25, 2023
9a7607b
netty 4.1.90
sullis Mar 25, 2023
e1a862e
netty io_uring 0.0.19
sullis Mar 25, 2023
3516390
Upgrade Netty
barchetta Mar 28, 2023
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
75 changes: 12 additions & 63 deletions dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@
<version.lib.mysql-connector-java>8.0.28</version.lib.mysql-connector-java>
<version.lib.narayana>5.12.0.Final</version.lib.narayana>
<version.lib.neo4j>4.4.11</version.lib.neo4j>
<version.lib.netty>4.1.86.Final</version.lib.netty>
<version.lib.netty-io_uring>0.0.8.Final</version.lib.netty-io_uring>
<version.lib.netty>4.1.90.Final</version.lib.netty>
<version.lib.netty-io_uring>0.0.19.Final</version.lib.netty-io_uring>
<version.lib.oci>3.8.0</version.lib.oci>
<version.lib.ojdbc8>21.3.0.0</version.lib.ojdbc8>
<version.lib.database.messaging>19.3.0.0</version.lib.database.messaging>
Expand Down Expand Up @@ -350,31 +350,6 @@
<artifactId>parsson-media</artifactId>
<version>${version.lib.parsson}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
<version>${version.lib.netty}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler-proxy</artifactId>
<version>${version.lib.netty}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
<version>${version.lib.netty}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http2</artifactId>
<version>${version.lib.netty}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-buffer</artifactId>
<version>${version.lib.netty}</version>
</dependency>
<dependency>
<groupId>org.eclipse</groupId>
<artifactId>yasson</artifactId>
Expand Down Expand Up @@ -1219,49 +1194,16 @@
<!-- END OF Section 2: third party dependencies used by examples -->

<!-- Section 3: transitive dependencies we manage the version of for convergence/upgrade -->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-dns</artifactId>
<version>${version.lib.netty}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-resolver-dns</artifactId>
<version>${version.lib.netty}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
<version>${version.lib.netty}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<version>${version.lib.netty}</version>
<classifier>linux-x86_64</classifier>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
<version>${version.lib.netty}</version>
<classifier>linux-aarch64</classifier>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-kqueue</artifactId>
<version>${version.lib.netty}</version>
<classifier>osx-x86_64</classifier>
</dependency>
<dependency>
<groupId>io.netty.incubator</groupId>
<artifactId>netty-incubator-transport-native-io_uring</artifactId>
<version>${version.lib.netty-io_uring}</version>
<classifier>linux-x86_64</classifier>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-unix-common</artifactId>
<version>${version.lib.netty}</version>
<groupId>io.netty.incubator</groupId>
<artifactId>netty-incubator-transport-classes-io_uring</artifactId>
<version>${version.lib.netty-io_uring}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
Expand Down Expand Up @@ -1440,6 +1382,13 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-bom</artifactId>
<version>${version.lib.netty}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>com.oracle.database.jdbc</groupId>
<artifactId>ojdbc-bom</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
<version.lib.junit4>4.13.1</version.lib.junit4>
<version.lib.kafka-junit5>3.2.3</version.lib.kafka-junit5>
<version.lib.mockito>2.23.4</version.lib.mockito>
<version.lib.netty.tcnative>2.0.54.Final</version.lib.netty.tcnative>
<version.lib.netty.tcnative>2.0.59.Final</version.lib.netty.tcnative>
<version.lib.restito>0.9.1</version.lib.restito>
<version.lib.rxjava2-jdk9-interop>0.1.0</version.lib.rxjava2-jdk9-interop>
<version.lib.rxjava>2.2.10</version.lib.rxjava>
Expand Down
6 changes: 4 additions & 2 deletions webserver/transport/netty/iouring/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@
<artifactId>netty-incubator-transport-native-io_uring</artifactId>
<classifier>linux-x86_64</classifier>
</dependency>

<dependency>
<groupId>io.netty.incubator</groupId>
<artifactId>netty-incubator-transport-classes-io_uring</artifactId>
</dependency>
</dependencies>

</project>
4 changes: 2 additions & 2 deletions webserver/transport/netty/iouring/src/main/java/module-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2021 Oracle and/or its affiliates.
* Copyright (c) 2021, 2023 Oracle and/or its affiliates.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand All @@ -22,7 +22,7 @@

requires io.netty.transport;

requires io.netty.incubator.transport.io_uring;
requires io.netty.incubator.transport.classes.io_uring;

exports io.helidon.webserver.transport.netty.iouring;
}