Skip to content

Commit a13e9cf

Browse files
barchettabarchetta
authored
4.x: Upgrade netty to 4.1.86.Final and use netty bom (helidon-io#5734)
* Upgrade netty to 4.1.86.Final and use netty bom
1 parent f2db0ca commit a13e9cf

3 files changed

Lines changed: 9 additions & 76 deletions

File tree

‎dependencies/pom.xml‎

Lines changed: 8 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
<version.lib.mysql-connector-java>8.0.28</version.lib.mysql-connector-java>
123123
<version.lib.narayana>5.12.0.Final</version.lib.narayana>
124124
<version.lib.neo4j>4.4.3</version.lib.neo4j>
125-
<version.lib.netty>4.1.77.Final</version.lib.netty>
125+
<version.lib.netty>4.1.86.Final</version.lib.netty>
126126
<version.lib.netty-io_uring>0.0.8.Final</version.lib.netty-io_uring>
127127
<version.lib.oci>2.37.0</version.lib.oci>
128128
<version.lib.ojdbc8>21.3.0.0</version.lib.ojdbc8>
@@ -350,31 +350,6 @@
350350
<artifactId>parsson-media</artifactId>
351351
<version>${version.lib.parsson}</version>
352352
</dependency>
353-
<dependency>
354-
<groupId>io.netty</groupId>
355-
<artifactId>netty-handler</artifactId>
356-
<version>${version.lib.netty}</version>
357-
</dependency>
358-
<dependency>
359-
<groupId>io.netty</groupId>
360-
<artifactId>netty-handler-proxy</artifactId>
361-
<version>${version.lib.netty}</version>
362-
</dependency>
363-
<dependency>
364-
<groupId>io.netty</groupId>
365-
<artifactId>netty-codec-http</artifactId>
366-
<version>${version.lib.netty}</version>
367-
</dependency>
368-
<dependency>
369-
<groupId>io.netty</groupId>
370-
<artifactId>netty-codec-http2</artifactId>
371-
<version>${version.lib.netty}</version>
372-
</dependency>
373-
<dependency>
374-
<groupId>io.netty</groupId>
375-
<artifactId>netty-buffer</artifactId>
376-
<version>${version.lib.netty}</version>
377-
</dependency>
378353
<dependency>
379354
<groupId>org.eclipse</groupId>
380355
<artifactId>yasson</artifactId>
@@ -1234,55 +1209,12 @@
12341209
<!-- END OF Section 2: third party dependencies used by examples -->
12351210

12361211
<!-- Section 3: transitive dependencies we manage the version of for convergence/upgrade -->
1237-
<dependency>
1238-
<groupId>io.netty</groupId>
1239-
<artifactId>netty-codec-dns</artifactId>
1240-
<version>${version.lib.netty}</version>
1241-
</dependency>
1242-
<dependency>
1243-
<groupId>io.netty</groupId>
1244-
<artifactId>netty-resolver-dns</artifactId>
1245-
<version>${version.lib.netty}</version>
1246-
</dependency>
1247-
<dependency>
1248-
<groupId>io.netty</groupId>
1249-
<artifactId>netty-transport</artifactId>
1250-
<version>${version.lib.netty}</version>
1251-
</dependency>
1252-
<dependency>
1253-
<groupId>io.netty</groupId>
1254-
<artifactId>netty-transport-native-epoll</artifactId>
1255-
<version>${version.lib.netty}</version>
1256-
<classifier>linux-x86_64</classifier>
1257-
</dependency>
1258-
<dependency>
1259-
<groupId>io.netty</groupId>
1260-
<artifactId>netty-transport-native-epoll</artifactId>
1261-
<version>${version.lib.netty}</version>
1262-
<classifier>linux-aarch64</classifier>
1263-
</dependency>
1264-
<dependency>
1265-
<groupId>io.netty</groupId>
1266-
<artifactId>netty-transport-native-kqueue</artifactId>
1267-
<version>${version.lib.netty}</version>
1268-
<classifier>osx-x86_64</classifier>
1269-
</dependency>
12701212
<dependency>
12711213
<groupId>io.netty.incubator</groupId>
12721214
<artifactId>netty-incubator-transport-native-io_uring</artifactId>
12731215
<version>${version.lib.netty-io_uring}</version>
12741216
<classifier>linux-x86_64</classifier>
12751217
</dependency>
1276-
<dependency>
1277-
<groupId>io.netty</groupId>
1278-
<artifactId>netty-transport-native-unix-common</artifactId>
1279-
<version>${version.lib.netty}</version>
1280-
</dependency>
1281-
<dependency>
1282-
<groupId>io.netty</groupId>
1283-
<artifactId>netty-common</artifactId>
1284-
<version>${version.lib.netty}</version>
1285-
</dependency>
12861218
<dependency>
12871219
<!-- required for dependency convergence, used from guava and perfmark-api -->
12881220
<groupId>com.google.errorprone</groupId>
@@ -1455,6 +1387,13 @@
14551387
<type>pom</type>
14561388
<scope>import</scope>
14571389
</dependency>
1390+
<dependency>
1391+
<groupId>io.netty</groupId>
1392+
<artifactId>netty-bom</artifactId>
1393+
<version>${version.lib.netty}</version>
1394+
<type>pom</type>
1395+
<scope>import</scope>
1396+
</dependency>
14581397
<dependency>
14591398
<groupId>com.oracle.database.jdbc</groupId>
14601399
<artifactId>ojdbc-bom</artifactId>

‎pom.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@
6565
<version.lib.junit4>4.13.1</version.lib.junit4>
6666
<version.lib.kafka-junit5>3.2.3</version.lib.kafka-junit5>
6767
<version.lib.mockito>2.23.4</version.lib.mockito>
68-
<version.lib.netty.tcnative>2.0.52.Final</version.lib.netty.tcnative>
6968
<version.lib.restito>0.9.1</version.lib.restito>
7069
<version.lib.rxjava2-jdk9-interop>0.1.0</version.lib.rxjava2-jdk9-interop>
7170
<version.lib.rxjava>2.2.10</version.lib.rxjava>
@@ -956,11 +955,6 @@
956955
<artifactId>restito</artifactId>
957956
<version>${version.lib.restito}</version>
958957
</dependency>
959-
<dependency>
960-
<groupId>io.netty</groupId>
961-
<artifactId>netty-tcnative-boringssl-static</artifactId>
962-
<version>${version.lib.netty.tcnative}</version>
963-
</dependency>
964958
<dependency>
965959
<groupId>org.mockito</groupId>
966960
<artifactId>mockito-core</artifactId>

‎reactive/webserver/webserver/src/test/java/io/helidon/reactive/webserver/TestNettyRejectRequest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,6 @@ void testBadHeader() throws Exception {
7777

7878
assertThat(headers, hasHeader(Http.Header.CONTENT_LENGTH));
7979
assertThat(status, is(Http.Status.BAD_REQUEST_400));
80-
assertThat(entity, containsString("prohibited characters"));
80+
assertThat(entity, containsString("invalid character"));
8181
}
8282
}

0 commit comments

Comments
 (0)