Skip to content

Commit 555d922

Browse files
committed
Stop wrapping reactor-netty bundles to fix OSGi resolution
The wrap protocol with overwrite=merge and BND wildcard Import-Package directives was preventing reactor-netty-http from resolving properly, causing NoClassDefFoundError for reactor.netty.http.client.HttpClient in the azure-eventhubs integration test. Use direct bundle references instead, consistent with the camel-azure-storage-queue feature.
1 parent ae9b904 commit 555d922

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -715,8 +715,8 @@
715715
<bundle dependency='true'>mvn:io.netty/netty-codec-socks/${netty-version}</bundle>
716716
<bundle dependency='true'>mvn:io.netty/netty-resolver-dns/${netty-version}</bundle>
717717
<bundle dependency='true'>mvn:io.netty/netty-codec-dns/${netty-version}</bundle>
718-
<bundle>wrap:mvn:io.projectreactor.netty/reactor-netty-core/${reactor-netty-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)",reactor*,*;resolution:=optional</bundle>
719-
<bundle>wrap:mvn:io.projectreactor.netty/reactor-netty-http/${reactor-netty-version}$overwrite=merge&amp;Import-Package=io.netty.handler.codec.haproxy;resolution:=optional;version="[4.1,5)",io.netty.handler.codec.http3;resolution:=optional;version="[4.1,5)",io.netty.handler.codec.quic;resolution:=optional;version="[4.1,5)",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)",reactor*,*;resolution:=optional</bundle>
718+
<bundle dependency='true'>mvn:io.projectreactor.netty/reactor-netty-core/${reactor-netty-version}</bundle>
719+
<bundle dependency='true'>mvn:io.projectreactor.netty/reactor-netty-http/${reactor-netty-version}</bundle>
720720
<bundle dependency='true'>wrap:mvn:com.azure/azure-storage-blob/${azure-storage-blob-version}</bundle>
721721
<bundle>mvn:org.apache.camel.karaf/camel-azure-eventhubs/${project.version}</bundle>
722722
</feature>
@@ -764,8 +764,8 @@
764764
<bundle dependency='true'>mvn:io.netty/netty-codec-socks/${netty-version}</bundle>
765765
<bundle dependency='true'>mvn:io.netty/netty-resolver-dns/${netty-version}</bundle>
766766
<bundle dependency='true'>mvn:io.netty/netty-codec-dns/${netty-version}</bundle>
767-
<bundle>wrap:mvn:io.projectreactor.netty/reactor-netty-core/${reactor-netty-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)",reactor*,*;resolution:=optional</bundle>
768-
<bundle>wrap:mvn:io.projectreactor.netty/reactor-netty-http/${reactor-netty-version}$overwrite=merge&amp;Import-Package=io.netty.handler.codec.haproxy;resolution:=optional;version="[4.1,5)",io.netty.handler.codec.http3;resolution:=optional;version="[4.1,5)",io.netty.handler.codec.quic;resolution:=optional;version="[4.1,5)",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)",reactor*,*;resolution:=optional</bundle>
767+
<bundle dependency='true'>mvn:io.projectreactor.netty/reactor-netty-core/${reactor-netty-version}</bundle>
768+
<bundle dependency='true'>mvn:io.projectreactor.netty/reactor-netty-http/${reactor-netty-version}</bundle>
769769
<bundle>mvn:org.apache.camel.karaf/camel-azure-storage-blob/${project.version}</bundle>
770770
</feature>
771771
<feature name='camel-azure-storage-datalake' version='${project.version}' start-level='50'>
@@ -3301,8 +3301,8 @@ Chain 2:
33013301
<feature version='[4.1,5)'>netty</feature>
33023302
<bundle dependency='true'>mvn:org.reactivestreams/reactive-streams/${reactive-streams-version}</bundle>
33033303
<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>
3304-
<bundle dependency='true'>wrap:mvn:io.projectreactor.netty/reactor-netty-core/${reactor-netty-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)",reactor*,*;resolution:=optional</bundle>
3305-
<bundle dependency='true'>wrap:mvn:io.projectreactor.netty/reactor-netty-http/${reactor-netty-version}$overwrite=merge&amp;Import-Package=io.netty.handler.codec.haproxy;resolution:=optional;version="[4.1,5)",io.netty.handler.codec.http3;resolution:=optional;version="[4.1,5)",io.netty.handler.codec.quic;resolution:=optional;version="[4.1,5)",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)",reactor*,*;resolution:=optional</bundle>
3304+
<bundle dependency='true'>mvn:io.projectreactor.netty/reactor-netty-core/${reactor-netty-version}</bundle>
3305+
<bundle dependency='true'>mvn:io.projectreactor.netty/reactor-netty-http/${reactor-netty-version}</bundle>
33063306
<bundle dependency='true'>mvn:io.netty/netty-transport-classes-epoll/${netty-version}</bundle>
33073307
<bundle dependency='true'>mvn:io.netty/netty-handler-proxy/${netty-version}</bundle>
33083308
<bundle dependency='true'>mvn:io.netty/netty-resolver-dns/${netty-version}</bundle>

0 commit comments

Comments
 (0)