Skip to content

Commit 5e6585e

Browse files
committed
Upgrade Netty from 4.1.130 to 4.2.10 for reactor-netty 1.3.3 compatibility
reactor-netty 1.3.3 requires Netty 4.2+. In Netty 4.2, netty-codec was split into netty-codec-base and netty-codec-compression, and the incubator modules (quic, io_uring) graduated to the main Netty project.
1 parent 555d922 commit 5e6585e

2 files changed

Lines changed: 9 additions & 6 deletions

File tree

features/src/main/feature/camel-features.xml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,8 @@
154154
<feature name="netty" version="${netty-version}">
155155
<bundle dependency='true'>mvn:io.netty/netty-buffer/${netty-version}</bundle>
156156
<bundle dependency='true'>mvn:io.netty/netty-common/${netty-version}</bundle>
157-
<bundle dependency='true'>mvn:io.netty/netty-codec/${netty-version}</bundle>
157+
<bundle dependency='true'>mvn:io.netty/netty-codec-base/${netty-version}</bundle>
158+
<bundle dependency='true'>mvn:io.netty/netty-codec-compression/${netty-version}</bundle>
158159
<bundle dependency='true'>mvn:io.netty/netty-codec-http/${netty-version}</bundle>
159160
<bundle dependency='true'>mvn:io.netty/netty-handler/${netty-version}</bundle>
160161
<bundle dependency='true'>mvn:io.netty/netty-resolver/${netty-version}</bundle>
@@ -2957,7 +2958,7 @@
29572958
<bundle dependency='true'>mvn:io.netty/netty-codec-dns/${netty-version}</bundle>
29582959
<bundle dependency='true'>mvn:io.netty/netty-transport-classes-epoll/${netty-version}</bundle>
29592960
<bundle dependency='true'>mvn:io.netty/netty-transport-classes-kqueue/${netty-version}</bundle>
2960-
<bundle dependency='true'>mvn:io.netty.incubator/netty-incubator-transport-classes-io_uring/${netty-incubator-transport-classes-io_uring-version}</bundle>
2961+
<bundle dependency='true'>mvn:io.netty/netty-transport-classes-io_uring/${netty-version}</bundle>
29612962
<bundle dependency='true'>mvn:io.reactivex.rxjava3/rxjava/${auto-detect-version}</bundle>
29622963
<bundle dependency='true'>mvn:org.reactivestreams/reactive-streams/${reactive-streams-version}</bundle>
29632964
<bundle dependency='true'>mvn:javax.cache/cache-api/${jcache-version}</bundle>
@@ -3301,6 +3302,7 @@ Chain 2:
33013302
<feature version='[4.1,5)'>netty</feature>
33023303
<bundle dependency='true'>mvn:org.reactivestreams/reactive-streams/${reactive-streams-version}</bundle>
33033304
<bundle dependency='true'>wrap:mvn:io.projectreactor/reactor-core/${reactor-version}$overwrite=merge&amp;Import-Package=jdk.internal*;resolution:=optional,io.micrometer*;resolution:=optional,javax.annotation*;resolution:=optional,org.jspecify*;resolution:=optional,kotlin*;resolution:=optional,reactor.blockhound*;resolution:=optional,*</bundle>
3305+
<bundle dependency='true'>mvn:org.jspecify/jspecify/${jspecify-version}</bundle>
33043306
<bundle dependency='true'>mvn:io.projectreactor.netty/reactor-netty-core/${reactor-netty-version}</bundle>
33053307
<bundle dependency='true'>mvn:io.projectreactor.netty/reactor-netty-http/${reactor-netty-version}</bundle>
33063308
<bundle dependency='true'>mvn:io.netty/netty-transport-classes-epoll/${netty-version}</bundle>
@@ -3310,8 +3312,9 @@ Chain 2:
33103312
<bundle dependency='true'>mvn:io.netty/netty-codec-socks/${netty-version}</bundle>
33113313
<bundle dependency='true'>mvn:io.netty/netty-codec-http/${netty-version}</bundle>
33123314
<bundle dependency='true'>mvn:io.netty/netty-codec-http2/${netty-version}</bundle>
3315+
<bundle dependency='true'>mvn:io.netty/netty-codec-http3/${netty-version}</bundle>
3316+
<bundle dependency='true'>mvn:io.netty/netty-codec-classes-quic/${netty-version}</bundle>
33133317
<bundle dependency='true'>wrap:mvn:io.projectreactor.netty.incubator/reactor-netty-incubator-quic/${reactor-netty-incubator-quic-version}$overwrite=merge&amp;Import-Package=io.netty.channel.kqueue;resolution:=optional;version="[4.1,5)",io.netty.channel.uring;resolution:=optional;version="[4.1,5)",io.netty.incubator.channel.uring;resolution:=optional,io.netty*;version="[4.1,5)",*;resolution:=optional</bundle>
3314-
<bundle dependency='true'>wrap:mvn:io.netty.incubator/netty-incubator-codec-classes-quic/${netty-incubator-codec-classes-quic-version}$overwrite=merge&amp;Import-Package=*;resolution:=optional</bundle>
33153318
<bundle dependency='true'>mvn:com.google.code.findbugs/jsr305/${findbugs-version}</bundle>
33163319
<bundle>mvn:org.apache.camel.karaf/camel-stitch/${project.version}</bundle>
33173320
</feature>

pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -362,6 +362,7 @@
362362
<json-patch-version>1.13</json-patch-version>
363363
<json-smart-version>2.6.0</json-smart-version>
364364
<jsonata-version>0.9.9</jsonata-version>
365+
<jspecify-version>1.0.0</jspecify-version>
365366
<json-unit-version>5.1.0</json-unit-version>
366367
<jsoup-version>1.22.1</jsoup-version>
367368
<jt400-version>21.0.6</jt400-version>
@@ -419,8 +420,7 @@
419420
<neoscada-version>0.4.0</neoscada-version>
420421
<neo4j-version>6.0.2</neo4j-version>
421422
<neo4j-bolt-version>6.0.2</neo4j-bolt-version>
422-
<netty-version>4.1.130.Final</netty-version>
423-
<netty-incubator-codec-classes-quic-version>0.0.63.Final</netty-incubator-codec-classes-quic-version>
423+
<netty-version>4.2.10.Final</netty-version>
424424
<netty-reactive-streams-version>2.0.5</netty-reactive-streams-version>
425425
<networknt-json-schema-validator-version>1.5.9</networknt-json-schema-validator-version>
426426
<nimbusds-content-type-version>2.3</nimbusds-content-type-version>
@@ -646,7 +646,7 @@
646646
<jetty11-version>11.0.21</jetty11-version>
647647
<junit4-version>4.13.2</junit4-version>
648648
<karaf-version>4.4.8</karaf-version>
649-
<netty-incubator-transport-classes-io_uring-version>0.0.25.Final</netty-incubator-transport-classes-io_uring-version>
649+
<!-- io_uring and quic graduated to main Netty in 4.2 -->
650650
<objenesis-version>3.4</objenesis-version>
651651
<osgi-cmpn-version>7.0.0</osgi-cmpn-version>
652652
<osgi-resource-locator-version>2.5.0-b42</osgi-resource-locator-version>

0 commit comments

Comments
 (0)