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

Jump to bottom

4.x: Upgrade netty to 4.1.86.Final and use netty bom #5734

Merged
merged 2 commits into from
Dec 21, 2022
Merged

4.x: Upgrade netty to 4.1.86.Final and use netty bom #5734

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b153de0
Upgrade netty to 4.1.86.Final and use netty bom
barchetta Dec 20, 2022
099abe1
Update test for new netty version
barchetta Dec 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
77 changes: 8 additions & 69 deletions dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
<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.3</version.lib.neo4j>
<version.lib.netty>4.1.77.Final</version.lib.netty>
<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.oci>2.37.0</version.lib.oci>
<version.lib.ojdbc8>21.3.0.0</version.lib.ojdbc8>
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 @@ -1234,55 +1209,12 @@
<!-- 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>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
<version>${version.lib.netty}</version>
</dependency>
<dependency>
<!-- required for dependency convergence, used from guava and perfmark-api -->
<groupId>com.google.errorprone</groupId>
Expand Down Expand Up @@ -1455,6 +1387,13 @@
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-bom</artifactId>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yay!

<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
6 changes: 0 additions & 6 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@
<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.52.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 Expand Up @@ -956,11 +955,6 @@
<artifactId>restito</artifactId>
<version>${version.lib.restito}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
<version>${version.lib.netty.tcnative}</version>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion ...bserver/webserver/src/test/java/io/helidon/reactive/webserver/TestNettyRejectRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,6 @@ void testBadHeader() throws Exception {

assertThat(headers, hasHeader(Http.Header.CONTENT_LENGTH));
assertThat(status, is(Http.Status.BAD_REQUEST_400));
assertThat(entity, containsString("prohibited characters"));
assertThat(entity, containsString("invalid character"));
}
}