Skip to content

Commit 63597e3

Browse files
committed
Wrap reactor-netty-http with optional http3/quic imports in Azure features
The plain reactor-netty-http bundle from 1.3.3 has mandatory imports on io.netty.handler.codec.http3 and io.netty.handler.codec.quic. Providing the actual http3/quic bundles doesn't work because netty-codec-http3 itself requires javax.annotation (JSR-305) which isn't in these features. Since the Azure features don't use HTTP/3 or QUIC, wrapping reactor-netty-http to make those imports optional is the correct fix.
1 parent 9fc3aae commit 63597e3

1 file changed

Lines changed: 3 additions & 9 deletions

File tree

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

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -718,9 +718,7 @@
718718
<bundle dependency='true'>mvn:io.netty/netty-codec-dns/${netty-version}</bundle>
719719
<bundle dependency='true'>mvn:org.jspecify/jspecify/${jspecify-version}</bundle>
720720
<bundle dependency='true'>mvn:io.projectreactor.netty/reactor-netty-core/${reactor-netty-version}</bundle>
721-
<bundle dependency='true'>mvn:io.projectreactor.netty/reactor-netty-http/${reactor-netty-version}</bundle>
722-
<bundle dependency='true'>mvn:io.netty/netty-codec-http3/${netty-version}</bundle>
723-
<bundle dependency='true'>mvn:io.netty/netty-codec-classes-quic/${netty-version}</bundle>
721+
<bundle dependency='true'>wrap:mvn:io.projectreactor.netty/reactor-netty-http/${reactor-netty-version}$overwrite=merge&amp;Import-Package=io.netty.handler.codec.http3;resolution:=optional,io.netty.handler.codec.quic;resolution:=optional,*</bundle>
724722
<bundle dependency='true'>wrap:mvn:com.azure/azure-storage-blob/${azure-storage-blob-version}</bundle>
725723
<bundle>mvn:org.apache.camel.karaf/camel-azure-eventhubs/${project.version}</bundle>
726724
</feature>
@@ -770,9 +768,7 @@
770768
<bundle dependency='true'>mvn:io.netty/netty-codec-dns/${netty-version}</bundle>
771769
<bundle dependency='true'>mvn:org.jspecify/jspecify/${jspecify-version}</bundle>
772770
<bundle dependency='true'>mvn:io.projectreactor.netty/reactor-netty-core/${reactor-netty-version}</bundle>
773-
<bundle dependency='true'>mvn:io.projectreactor.netty/reactor-netty-http/${reactor-netty-version}</bundle>
774-
<bundle dependency='true'>mvn:io.netty/netty-codec-http3/${netty-version}</bundle>
775-
<bundle dependency='true'>mvn:io.netty/netty-codec-classes-quic/${netty-version}</bundle>
771+
<bundle dependency='true'>wrap:mvn:io.projectreactor.netty/reactor-netty-http/${reactor-netty-version}$overwrite=merge&amp;Import-Package=io.netty.handler.codec.http3;resolution:=optional,io.netty.handler.codec.quic;resolution:=optional,*</bundle>
776772
<bundle>mvn:org.apache.camel.karaf/camel-azure-storage-blob/${project.version}</bundle>
777773
</feature>
778774
<feature name='camel-azure-storage-datalake' version='${project.version}' start-level='50'>
@@ -798,9 +794,7 @@
798794
<bundle dependency='true'>mvn:io.netty/netty-codec-dns/${netty-version}</bundle>
799795
<bundle dependency='true'>mvn:org.jspecify/jspecify/${jspecify-version}</bundle>
800796
<bundle dependency='true'>mvn:io.projectreactor.netty/reactor-netty-core/${auto-detect-version}</bundle>
801-
<bundle dependency='true'>mvn:io.projectreactor.netty/reactor-netty-http/${auto-detect-version}</bundle>
802-
<bundle dependency='true'>mvn:io.netty/netty-codec-http3/${netty-version}</bundle>
803-
<bundle dependency='true'>mvn:io.netty/netty-codec-classes-quic/${netty-version}</bundle>
797+
<bundle dependency='true'>wrap:mvn:io.projectreactor.netty/reactor-netty-http/${auto-detect-version}$overwrite=merge&amp;Import-Package=io.netty.handler.codec.http3;resolution:=optional,io.netty.handler.codec.quic;resolution:=optional,*</bundle>
804798
<bundle dependency='true'>wrap:mvn:com.azure/azure-storage-queue/${azure-storage-queue-version}</bundle>
805799
<bundle>mvn:org.apache.camel.karaf/camel-azure-storage-queue/${project.version}</bundle>
806800
</feature>

0 commit comments

Comments
 (0)