Skip to content

Commit bac5a55

Browse files
committed
Fix CI failures: missing properties, jackson-annotations version, and Netty 4.2-only artifacts
- Add jackson2-annotations-version=2.20 property (annotations uses different versioning than core/databind which use 2.20.x) - Restore jspecify-version, nimbusds-content-type-version, nimbusds-lang-tag-version, and nimbusds-oauth2-oidc-sdk-version properties accidentally dropped in 4.18.1 upgrade - Remove netty-codec-http3 and netty-codec-classes-quic bundles from azure-eventhubs, azure-storage-blob, and stitch features (only exist in Netty 4.2+, already optional)
1 parent bae83d6 commit bac5a55

2 files changed

Lines changed: 6 additions & 7 deletions

File tree

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

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-databind/${jackson2-version}</bundle>
104104
<!-- wrap needed to add the missing SPI-Provider clause to the manifest -->
105105
<bundle dependency='true'>wrap:mvn:com.fasterxml.jackson.core/jackson-core/${jackson2-version}$overwrite=merge</bundle>
106-
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-version}</bundle>
106+
<bundle dependency='true'>mvn:com.fasterxml.jackson.core/jackson-annotations/${jackson2-annotations-version}</bundle>
107107
</feature>
108108

109109
<feature name="jackson" version="${jackson216-version}">
@@ -715,8 +715,6 @@
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 dependency='true'>mvn:io.netty/netty-codec-http3/${netty-version}</bundle>
719-
<bundle dependency='true'>mvn:io.netty/netty-codec-classes-quic/${netty-version}</bundle>
720718
<bundle dependency='true'>mvn:org.jspecify/jspecify/${jspecify-version}</bundle>
721719
<bundle dependency='true'>mvn:io.projectreactor.netty/reactor-netty-core/${reactor-netty-version}</bundle>
722720
<bundle dependency='true'>wrap:mvn:io.projectreactor.netty/reactor-netty-http/${auto-detect-version}$overwrite=merge&amp;Import-Package=io.netty.handler.codec.haproxy;resolution:=optional,io.netty.handler.codec.http3;resolution:=optional,io.netty.handler.codec.quic;resolution:=optional,io.netty.incubator.codec*;resolution:=optional,io.micrometer*;resolution:=optional,*</bundle>
@@ -767,8 +765,6 @@
767765
<bundle dependency='true'>mvn:io.netty/netty-codec-socks/${netty-version}</bundle>
768766
<bundle dependency='true'>mvn:io.netty/netty-resolver-dns/${netty-version}</bundle>
769767
<bundle dependency='true'>mvn:io.netty/netty-codec-dns/${netty-version}</bundle>
770-
<bundle dependency='true'>mvn:io.netty/netty-codec-http3/${netty-version}</bundle>
771-
<bundle dependency='true'>mvn:io.netty/netty-codec-classes-quic/${netty-version}</bundle>
772768
<bundle dependency='true'>mvn:org.jspecify/jspecify/${jspecify-version}</bundle>
773769
<bundle dependency='true'>mvn:io.projectreactor.netty/reactor-netty-core/${reactor-netty-version}</bundle>
774770
<bundle dependency='true'>wrap:mvn:io.projectreactor.netty/reactor-netty-http/${auto-detect-version}$overwrite=merge&amp;Import-Package=io.netty.handler.codec.haproxy;resolution:=optional,io.netty.handler.codec.http3;resolution:=optional,io.netty.handler.codec.quic;resolution:=optional,io.netty.incubator.codec*;resolution:=optional,io.micrometer*;resolution:=optional,*</bundle>
@@ -3320,8 +3316,6 @@ Chain 2:
33203316
<bundle dependency='true'>mvn:io.netty/netty-codec-socks/${netty-version}</bundle>
33213317
<bundle dependency='true'>mvn:io.netty/netty-codec-http/${netty-version}</bundle>
33223318
<bundle dependency='true'>mvn:io.netty/netty-codec-http2/${netty-version}</bundle>
3323-
<bundle dependency='true'>mvn:io.netty/netty-codec-http3/${netty-version}</bundle>
3324-
<bundle dependency='true'>mvn:io.netty/netty-codec-classes-quic/${netty-version}</bundle>
33253319
<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>
33263320
<bundle dependency='true'>mvn:com.google.code.findbugs/jsr305/${findbugs-version}</bundle>
33273321
<bundle>mvn:org.apache.camel.karaf/camel-stitch/${project.version}</bundle>

pom.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,7 @@
298298
<jackson-databind-nullable-version>0.2.9</jackson-databind-nullable-version>
299299
<jackson-jq-version>1.6.0</jackson-jq-version>
300300
<jackson2-version>2.20.1</jackson2-version>
301+
<jackson2-annotations-version>2.20</jackson2-annotations-version>
301302
<jackrabbit-version>2.22.3</jackrabbit-version>
302303
<jasminb-jsonapi-version>0.15</jasminb-jsonapi-version>
303304
<jandex-version>3.5.3</jandex-version>
@@ -363,6 +364,7 @@
363364
<json-patch-version>1.13</json-patch-version>
364365
<json-smart-version>2.6.0</json-smart-version>
365366
<jsonata-version>0.9.9</jsonata-version>
367+
<jspecify-version>1.0.0</jspecify-version>
366368
<json-unit-version>5.1.0</json-unit-version>
367369
<jsoup-version>1.22.1</jsoup-version>
368370
<jt400-version>21.0.6</jt400-version>
@@ -423,6 +425,9 @@
423425
<netty-version>4.1.131.Final</netty-version>
424426
<netty-reactive-streams-version>2.0.5</netty-reactive-streams-version>
425427
<networknt-json-schema-validator-version>1.5.9</networknt-json-schema-validator-version>
428+
<nimbusds-content-type-version>2.3</nimbusds-content-type-version>
429+
<nimbusds-lang-tag-version>1.7</nimbusds-lang-tag-version>
430+
<nimbusds-oauth2-oidc-sdk-version>11.23</nimbusds-oauth2-oidc-sdk-version>
426431
<nimbus-jose-jwt>10.7</nimbus-jose-jwt>
427432
<nitrite-version>3.4.4</nitrite-version>
428433
<olingo2-version>2.0.13</olingo2-version>

0 commit comments

Comments
 (0)