Skip to content

Commit 9fc3aae

Browse files
committed
Stop wrapping reactor-netty-http and add http3/quic bundles to Azure features
Instead of wrapping reactor-netty-http to make http3 and quic imports optional, use the unwrapped bundle and provide the actual netty-codec-http3 and netty-codec-classes-quic dependencies, matching the approach used by camel-stitch. This fixes the ClassNotFoundException for reactor.netty.http.client.HttpClient in the azure-core-http-netty bundle caused by the wrap protocol not correctly preserving Export-Package headers.
1 parent 8e77bea commit 9fc3aae

1 file changed

Lines changed: 9 additions & 3 deletions

File tree

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

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -718,7 +718,9 @@
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'>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>
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>
722724
<bundle dependency='true'>wrap:mvn:com.azure/azure-storage-blob/${azure-storage-blob-version}</bundle>
723725
<bundle>mvn:org.apache.camel.karaf/camel-azure-eventhubs/${project.version}</bundle>
724726
</feature>
@@ -768,7 +770,9 @@
768770
<bundle dependency='true'>mvn:io.netty/netty-codec-dns/${netty-version}</bundle>
769771
<bundle dependency='true'>mvn:org.jspecify/jspecify/${jspecify-version}</bundle>
770772
<bundle dependency='true'>mvn:io.projectreactor.netty/reactor-netty-core/${reactor-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>
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>
772776
<bundle>mvn:org.apache.camel.karaf/camel-azure-storage-blob/${project.version}</bundle>
773777
</feature>
774778
<feature name='camel-azure-storage-datalake' version='${project.version}' start-level='50'>
@@ -794,7 +798,9 @@
794798
<bundle dependency='true'>mvn:io.netty/netty-codec-dns/${netty-version}</bundle>
795799
<bundle dependency='true'>mvn:org.jspecify/jspecify/${jspecify-version}</bundle>
796800
<bundle dependency='true'>mvn:io.projectreactor.netty/reactor-netty-core/${auto-detect-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>
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>
798804
<bundle dependency='true'>wrap:mvn:com.azure/azure-storage-queue/${azure-storage-queue-version}</bundle>
799805
<bundle>mvn:org.apache.camel.karaf/camel-azure-storage-queue/${project.version}</bundle>
800806
</feature>

0 commit comments

Comments
 (0)