Skip to content

Commit 0128836

Browse files
authored
Upgrade to Camel 4.14.6 (#701)
* Upgrade to Camel 4.14.6 * fix: add WSS4J bundles to camel-cxf feature to resolve OSGi import CXF 4.1.4 transitively requires WSS4J 4.x, causing camel-cxf-all to generate a mandatory OSGi import for org.apache.wss4j.binding.wss10. Add the WSS4J 4.0.1 bundles as dependencies to the camel-cxf feature to satisfy this requirement and fix Karaf feature verification. * fix: update lz4-java groupId to at.yawk.lz4 in camel-kafka feature kafka-clients 3.9.2 depends on at.yawk.lz4:lz4-java:1.10.2 (groupId changed from org.lz4 since version 1.10.x). Update the feature bundle reference and use the explicit lz4-java-version property. * fix: add missing version properties and fix features for Karaf verification Add missing pom.xml version properties that the Karaf feature verifier needs to resolve bundle URLs: - async-http-client-version (camel-zendesk) - langchain4j-hugging-face-version (camel-langchain4j-chat/embeddings) - langchain4j-community-dashscope-version (camel-langchain4j-tokenizer) - microprofile-fault-tolerance-version (camel-microprofile-fault-tolerance) - neo4j-bolt-version (camel-neo4j) Also fix two 'dependnecy' typos in camel-features.xml and add Import-Package=*;resolution:=optional to neo4j-bolt wrap bundles to avoid OSGi resolution failures.
1 parent 7d1ce46 commit 0128836

2 files changed

Lines changed: 50 additions & 42 deletions

File tree

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

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -946,6 +946,12 @@
946946
<bundle dependency="true">mvn:org.apache.ws.xmlschema/xmlschema-core/${auto-detect-version}</bundle>
947947
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.cglib/${cglib-version}_1</bundle>
948948
<bundle dependency="true">mvn:org.apache.servicemix.bundles/org.apache.servicemix.bundles.wsdl4j/${auto-detect-version:alias=wsdl4j/wsdl4j}_1</bundle>
949+
<bundle dependency='true'>wrap:mvn:org.apache.wss4j/wss4j-bindings/${wss4j-version}$overwrite=merge&amp;Import-Package=*;resolution:=optional</bundle>
950+
<bundle dependency='true'>wrap:mvn:org.apache.wss4j/wss4j-ws-security-common/${wss4j-version}$overwrite=merge&amp;Import-Package=*;resolution:=optional</bundle>
951+
<bundle dependency='true'>wrap:mvn:org.apache.wss4j/wss4j-ws-security-dom/${wss4j-version}$overwrite=merge&amp;Import-Package=*;resolution:=optional</bundle>
952+
<bundle dependency='true'>wrap:mvn:org.apache.wss4j/wss4j-policy/${wss4j-version}$overwrite=merge&amp;Import-Package=*;resolution:=optional</bundle>
953+
<bundle dependency='true'>wrap:mvn:org.apache.wss4j/wss4j-ws-security-policy-stax/${wss4j-version}$overwrite=merge&amp;Import-Package=*;resolution:=optional</bundle>
954+
<bundle dependency='true'>wrap:mvn:org.apache.wss4j/wss4j-ws-security-stax/${wss4j-version}$overwrite=merge&amp;Import-Package=*;resolution:=optional</bundle>
949955
<bundle>mvn:org.apache.camel.karaf/camel-attachments/${project.version}</bundle>
950956
<bundle>mvn:org.apache.camel.karaf/camel-http-base/${project.version}</bundle>
951957
<bundle>mvn:org.apache.camel.karaf/camel-http-common/${project.version}</bundle>
@@ -1977,7 +1983,7 @@
19771983
<bundle dependency='true'>wrap:mvn:org.apache.kafka/kafka-clients/${kafka-version}</bundle>
19781984
<bundle dependency='true'>mvn:com.github.luben/zstd-jni/${auto-detect-version}</bundle>
19791985
<bundle dependency="true">mvn:org.xerial.snappy/snappy-java/${auto-detect-version}</bundle>
1980-
<bundle dependency="true">wrap:mvn:org.lz4/lz4-java/${auto-detect-version}</bundle>
1986+
<bundle dependency="true">wrap:mvn:at.yawk.lz4/lz4-java/${lz4-java-version}</bundle>
19811987
<bundle>mvn:org.apache.camel.karaf/camel-kafka/${project.version}</bundle>
19821988
</feature>
19831989
<feature name='camel-kamelet' version='${project.version}' start-level='50'>
@@ -2072,7 +2078,7 @@
20722078
<feature version='${camel-osgi-version-range}'>camel-core</feature>
20732079
<feature version='${camel-osgi-jackson2-version}'>jackson</feature>
20742080
<bundle dependency='true'>wrap:mvn:dev.langchain4j/langchain4j-core/${langchain4j-version}</bundle>
2075-
<bundle dependnecy='true'>wrap:mvn:dev.langchain4j/langchain4j-hugging-face/${langchain4j-hugging-face-version}</bundle>
2081+
<bundle dependency='true'>wrap:mvn:dev.langchain4j/langchain4j-hugging-face/${langchain4j-hugging-face-version}</bundle>
20762082
<bundle dependency='true'>wrap:mvn:dev.langchain4j/langchain4j-open-ai/${langchain4j-version}</bundle>
20772083
<bundle>mvn:org.apache.camel.karaf/camel-langchain4j-chat/${project.version}</bundle>
20782084
</feature>
@@ -2084,7 +2090,7 @@
20842090
<feature name='camel-langchain4j-embeddings' version='${project.version}' start-level='50'>
20852091
<feature version='${camel-osgi-version-range}'>camel-core</feature>
20862092
<bundle dependency='true'>wrap:mvn:dev.langchain4j/langchain4j-core/${langchain4j-version}</bundle>
2087-
<bundle dependnecy='true'>wrap:mvn:dev.langchain4j/langchain4j-hugging-face/${langchain4j-hugging-face-version}</bundle>
2093+
<bundle dependency='true'>wrap:mvn:dev.langchain4j/langchain4j-hugging-face/${langchain4j-hugging-face-version}</bundle>
20882094
<bundle dependency='true'>wrap:mvn:dev.langchain4j/langchain4j-open-ai/${langchain4j-version}</bundle>
20892095
<bundle>mvn:org.apache.camel.karaf/camel-langchain4j-embeddings/${project.version}</bundle>
20902096
</feature>
@@ -2341,10 +2347,10 @@
23412347
<feature version='[4.1,5)'>netty</feature>
23422348
<feature version='${camel-osgi-jackson2-version}'>jackson</feature>
23432349
<bundle dependency='true'>wrap:mvn:dev.langchain4j/langchain4j-core/${langchain4j-version}</bundle>
2344-
<bundle dependency='true'>wrap:mvn:org.neo4j.bolt/neo4j-bolt-connection/${neo4j-bolt-version}</bundle>
2345-
<bundle dependency='true'>wrap:mvn:org.neo4j.bolt/neo4j-bolt-connection-netty/${neo4j-bolt-version}</bundle>
2346-
<bundle dependency='true'>wrap:mvn:org.neo4j.bolt/neo4j-bolt-connection-pooled/${neo4j-bolt-version}</bundle>
2347-
<bundle dependency='true'>wrap:mvn:org.neo4j.bolt/neo4j-bolt-connection-routed/${neo4j-bolt-version}</bundle>
2350+
<bundle dependency='true'>wrap:mvn:org.neo4j.bolt/neo4j-bolt-connection/${neo4j-bolt-version}$overwrite=merge&amp;Import-Package=*;resolution:=optional</bundle>
2351+
<bundle dependency='true'>wrap:mvn:org.neo4j.bolt/neo4j-bolt-connection-netty/${neo4j-bolt-version}$overwrite=merge&amp;Import-Package=*;resolution:=optional</bundle>
2352+
<bundle dependency='true'>wrap:mvn:org.neo4j.bolt/neo4j-bolt-connection-pooled/${neo4j-bolt-version}$overwrite=merge&amp;Import-Package=*;resolution:=optional</bundle>
2353+
<bundle dependency='true'>wrap:mvn:org.neo4j.bolt/neo4j-bolt-connection-routed/${neo4j-bolt-version}$overwrite=merge&amp;Import-Package=*;resolution:=optional</bundle>
23482354
<bundle dependency='true'>mvn:org.neo4j.driver/neo4j-java-driver/${neo4j-version}</bundle>
23492355
<bundle dependency='true'>mvn:org.reactivestreams/reactive-streams/${reactive-streams-version}</bundle>
23502356
<bundle dependency='true'>mvn:io.projectreactor/reactor-core/${auto-detect-version}</bundle>

pom.xml

Lines changed: 37 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,11 @@
9090
<javaVersion>17</javaVersion>
9191
<project.build.outputTimestamp>1777610224</project.build.outputTimestamp>
9292

93-
<camel-version>4.14.5</camel-version>
93+
<camel-version>4.14.6</camel-version>
9494

9595
<!-- START: Maven Properties defining the version of 3rd party libraries used in Camel -->
96-
<activemq-version>5.19.0</activemq-version>
97-
<activemq6-version>6.1.7</activemq6-version>
96+
<activemq-version>5.19.2</activemq-version>
97+
<activemq6-version>6.1.8</activemq6-version>
9898
<activemq-artemis-version>2.42.0</activemq-artemis-version>
9999
<allegro-converter-version>0.3.0</allegro-converter-version>
100100
<amazon-kinesis-client-version>2.6.0</amazon-kinesis-client-version>
@@ -107,8 +107,8 @@
107107
<asm-version>9.8</asm-version>
108108
<asn1bean-version>1.14.0</asn1bean-version>
109109
<assertj-version>3.27.7</assertj-version>
110-
<async-http-client-version>3.0.1</async-http-client-version>
111110
<asterisk-java-version>3.41.0</asterisk-java-version>
111+
<async-http-client-version>3.0.1</async-http-client-version>
112112
<atlassian-fugue-version>6.1.2</atlassian-fugue-version>
113113
<atmosphere-version>3.0.13</atmosphere-version>
114114
<avro-version>1.12.0</avro-version>
@@ -123,14 +123,14 @@
123123
<bouncycastle-version>1.81</bouncycastle-version>
124124
<box-java-sdk-version>4.16.3</box-java-sdk-version>
125125
<braintree-gateway-version>3.44.0</braintree-gateway-version>
126-
<bytebuddy-version>1.17.6</bytebuddy-version>
127-
<c3p0-version>0.11.2</c3p0-version>
128-
<caffeine-version>3.2.2</caffeine-version>
126+
<bytebuddy-version>1.17.8</bytebuddy-version>
127+
<c3p0-version>0.12.0</c3p0-version>
128+
<caffeine-version>3.2.3</caffeine-version>
129129
<californium-version>3.14.0</californium-version>
130130
<californium-scandium-version>3.11.0</californium-scandium-version>
131131
<camel-lsp-version>1.34.0</camel-lsp-version>
132132
<camunda-version>7.23.0</camunda-version>
133-
<cassandra-driver-version>4.19.0</cassandra-driver-version>
133+
<cassandra-driver-version>4.19.2</cassandra-driver-version>
134134
<jta-api-1-2-version>1.2</jta-api-1-2-version>
135135
<cglib-version>3.3.0</cglib-version>
136136
<chicory-version>1.5.1</chicory-version>
@@ -164,6 +164,7 @@
164164
<curator-version>5.9.0</curator-version>
165165
<cxf-version>4.1.4</cxf-version>
166166
<cxf-codegen-plugin-version>4.1.3</cxf-codegen-plugin-version>
167+
<wss4j-version>4.0.1</wss4j-version>
167168
<cxf-xjc-plugin-version>4.1.0</cxf-xjc-plugin-version>
168169
<cxf-xjc-utils-version>4.1.0</cxf-xjc-utils-version>
169170
<daffodil-version>3.10.0</daffodil-version>
@@ -238,12 +239,12 @@
238239
<graphql-java-version>24.2</graphql-java-version>
239240
<greenmail-version>2.1.5</greenmail-version>
240241
<grizzly-websockets-version>2.4.4</grizzly-websockets-version>
241-
<groovy-version>4.0.29</groovy-version>
242+
<groovy-version>4.0.30</groovy-version>
242243
<grpc-version>1.75.0</grpc-version>
243244
<grpc-google-auth-library-version>1.39.1</grpc-google-auth-library-version>
244245
<grpc-java-jwt-version>4.5.0</grpc-java-jwt-version>
245246
<grpc-netty-tcnative-boringssl-static-version>2.0.59.Final</grpc-netty-tcnative-boringssl-static-version>
246-
<gson-version>2.13.1</gson-version>
247+
<gson-version>2.13.2</gson-version>
247248
<guava-version>33.4.8-jre</guava-version>
248249
<guice3-version>3.0</guice3-version>
249250
<h2-version>2.3.232</h2-version>
@@ -252,14 +253,15 @@
252253
<hapi-version>2.6.0</hapi-version>
253254
<hapi-base-version>2.6.0</hapi-base-version>
254255
<hapi-fhir-version>8.2.1</hapi-fhir-version>
256+
<hapi-fhir-utilities-version>6.9.1</hapi-fhir-utilities-version>
255257
<hazelcast-version>5.4.0</hazelcast-version>
256258
<hdrhistrogram-version>2.2.2</hdrhistrogram-version>
257259
<hibernate-validator-version>9.0.1.Final</hibernate-validator-version>
258260
<hibernate-version>6.3.2.Final</hibernate-version>
259261
<hk2-version>2.6.1</hk2-version>
260262
<hsqldb-version>2.7.4</hsqldb-version>
261263
<httpunit-version>1.7</httpunit-version>
262-
<httpcore-version>5.3.5</httpcore-version>
264+
<httpcore-version>5.3.6</httpcore-version>
263265
<httpclient-version>5.4.4</httpclient-version>
264266
<httpcore4-version>4.4.16</httpcore4-version>
265267
<httpclient4-version>4.5.14</httpclient4-version>
@@ -270,8 +272,8 @@
270272
<ical4j-version>4.1.1</ical4j-version>
271273
<icu4j-version>77.1</icu4j-version>
272274
<ignite-version>2.17.0</ignite-version>
273-
<infinispan-version>15.2.5.Final</infinispan-version>
274-
<infinispan-protostream-version>15.0.13.Final</infinispan-protostream-version>
275+
<infinispan-version>15.2.6.Final</infinispan-version>
276+
<infinispan-protostream-version>5.0.13.Final</infinispan-protostream-version>
275277
<influx-java-driver-version>2.25</influx-java-driver-version>
276278
<influx-client-java-driver-version>7.3.0</influx-client-java-driver-version>
277279
<irclib-version>1.10</irclib-version>
@@ -314,7 +316,7 @@
314316
<jcip-annotations-version>1.0-1</jcip-annotations-version>
315317
<jcr-version>2.0</jcr-version>
316318
<jedis-client-version>6.1.0</jedis-client-version>
317-
<jetty-version>12.0.31</jetty-version>
319+
<jetty-version>12.0.33</jetty-version>
318320
<jetty-for-solr-version>10.0.20</jetty-for-solr-version>
319321
<jetty-plugin-version>${jetty-version}</jetty-plugin-version>
320322
<jetty-runner-groupId>org.eclipse.jetty</jetty-runner-groupId>
@@ -331,7 +333,7 @@
331333
<jolokia-version>2.3.0</jolokia-version>
332334
<jolt-version>0.1.8</jolt-version>
333335
<jool-version>0.9.15</jool-version>
334-
<jooq-version>3.19.22</jooq-version>
336+
<jooq-version>3.19.30</jooq-version>
335337
<joor-version>0.9.15</joor-version>
336338
<jose4j-version>0.9.3</jose4j-version>
337339
<johnzon-version>2.0.2</johnzon-version>
@@ -356,33 +358,33 @@
356358
<jxmpp-version>1.1.0</jxmpp-version>
357359
<jython-version>2.7.4</jython-version>
358360
<jzlib-version>1.1.3</jzlib-version>
359-
<kafka-version>3.9.1</kafka-version>
361+
<kafka-version>3.9.2</kafka-version>
360362
<keycloak-client-version>26.0.6</keycloak-client-version>
361363
<kubernetes-client-version>7.3.1</kubernetes-client-version>
362364
<kudu-version>1.18.0</kudu-version>
363365
<langchain4j-version>1.3.0</langchain4j-version>
364-
<langchain4j-hugging-face-version>1.3.0-beta9</langchain4j-hugging-face-version>
365-
<langchain4j-community-dashscope-version>1.3.0-beta9</langchain4j-community-dashscope-version>
366366
<langchain4j-rc-version>1.3.0</langchain4j-rc-version>
367367
<langchain4j-beta-version>1.3.0-beta9</langchain4j-beta-version>
368368
<langchain4j-community-version>1.3.0-beta9</langchain4j-community-version>
369+
<langchain4j-community-dashscope-version>1.3.0-beta9</langchain4j-community-dashscope-version>
370+
<langchain4j-hugging-face-version>1.3.0-beta9</langchain4j-hugging-face-version>
369371
<leveldbjni-version>1.8</leveldbjni-version>
370372
<leveldb-api-version>0.12</leveldb-api-version>
371373
<leveldb-version>0.12</leveldb-version>
372374
<libphonenumber-version>9.0.12</libphonenumber-version>
373375
<lifecycle-mapping-version>1.0.0</lifecycle-mapping-version>
374376
<log4j2-version>2.25.3</log4j2-version>
375-
<logback-version>1.5.18</logback-version>
377+
<logback-version>1.5.32</logback-version>
376378
<lucene-version>9.12.0</lucene-version>
377379
<lightcouch-version>0.2.0</lightcouch-version>
378380
<littleproxy-version>2.4.4</littleproxy-version>
379381
<lz4-java-version>1.10.2</lz4-java-version>
380382
<mapstruct-version>1.6.3</mapstruct-version>
381383
<metrics-version>4.2.33</metrics-version>
382-
<micrometer-version>1.15.7</micrometer-version>
383-
<micrometer-tracing-version>1.5.3</micrometer-tracing-version>
384+
<micrometer-version>1.15.10</micrometer-version>
385+
<micrometer-tracing-version>1.5.10</micrometer-tracing-version>
384386
<microprofile-config-version>3.1</microprofile-config-version>
385-
<microprofile-fault-tolerance-version>4.1.1</microprofile-fault-tolerance-version>
387+
<microprofile-fault-tolerance-version>4.1.2</microprofile-fault-tolerance-version>
386388
<milvus-client-version>2.6.2</milvus-client-version>
387389
<mina-version>2.2.4</mina-version>
388390
<minidns-version>0.3.4</minidns-version>
@@ -391,17 +393,17 @@
391393
<mock-javamail-version>1.9</mock-javamail-version>
392394
<mockito-version>5.18.0</mockito-version>
393395
<mojo-executor-version>2.4.1</mojo-executor-version>
394-
<mongo-java-driver-version>5.5.1</mongo-java-driver-version>
396+
<mongo-java-driver-version>5.5.2</mongo-java-driver-version>
395397
<mongo-hadoop-version>1.5.0</mongo-hadoop-version>
396398
<msal4j-version>1.22.0</msal4j-version>
397399
<mustache-java-version>0.9.14</mustache-java-version>
398400
<mvel-version>2.5.2.Final</mvel-version>
399401
<mybatis-version>3.5.19</mybatis-version>
400402
<narayana-version>5.13.1.Final</narayana-version>
401403
<neoscada-version>0.4.0</neoscada-version>
402-
<neo4j-version>5.28.9</neo4j-version>
404+
<neo4j-version>5.28.10</neo4j-version>
403405
<neo4j-bolt-version>6.0.2</neo4j-bolt-version>
404-
<netty-version>4.1.130.Final</netty-version>
406+
<netty-version>4.1.131.Final</netty-version>
405407
<netty-reactive-streams-version>2.0.5</netty-reactive-streams-version>
406408
<networknt-json-schema-validator-version>1.5.8</networknt-json-schema-validator-version>
407409
<nimbus-jose-jwt>10.4.2</nimbus-jose-jwt>
@@ -435,25 +437,25 @@
435437
<plexus-container-default-version>2.1.1</plexus-container-default-version>
436438
<plexus-utils-version>4.0.2</plexus-utils-version>
437439
<plexus-xml-version>3.0.1</plexus-xml-version>
438-
<pooled-jms-version>3.1.7</pooled-jms-version>
440+
<pooled-jms-version>3.1.9</pooled-jms-version>
439441
<proto-google-common-protos-version>2.22.0</proto-google-common-protos-version>
440442
<protobuf-version>3.25.5</protobuf-version>
441443
<protonpack-version>1.8</protonpack-version>
442444
<prowide-version>SRU2024-10.2.7</prowide-version>
443445
<pubnub-version>10.5.8</pubnub-version>
444-
<pulsar-version>4.0.7</pulsar-version>
446+
<pulsar-version>4.0.9</pulsar-version>
445447
<qdrant-client-version>1.15.0</qdrant-client-version>
446448
<qpid-broker-version>9.2.1</qpid-broker-version>
447449
<qpid-proton-j-version>0.34.1</qpid-proton-j-version>
448450
<qpid-jms-client-version>2.7.0</qpid-jms-client-version>
449-
<quartz-version>2.5.0</quartz-version>
451+
<quartz-version>2.5.2</quartz-version>
450452
<quickfixj-version>2.3.2</quickfixj-version>
451453
<reactive-streams-version>1.0.4</reactive-streams-version>
452454
<reactor-version>3.7.9</reactor-version>
453455
<reactor-netty-version>1.2.9</reactor-netty-version>
454456
<redisson-version>3.50.0</redisson-version>
455457
<resilience4j-version>2.3.0</resilience4j-version>
456-
<rest-assured-version>5.5.5</rest-assured-version>
458+
<rest-assured-version>5.5.7</rest-assured-version>
457459
<roaster-version>2.30.1.Final</roaster-version>
458460
<robotframework-version>4.1.2</robotframework-version>
459461
<rocketmq-version>5.3.2</rocketmq-version>
@@ -480,14 +482,14 @@
480482
<splunk-version>1.9.5_1</splunk-version>
481483
<spock-version>2.3-groovy-4.0</spock-version>
482484
<spring-cloud-config-version>4.3.0</spring-cloud-config-version>
483-
<spring-batch-version>5.2.4</spring-batch-version>
485+
<spring-batch-version>5.2.5</spring-batch-version>
484486
<spring-data-redis-version>3.5.5</spring-data-redis-version>
485-
<spring-ldap-version>3.3.5</spring-ldap-version>
487+
<spring-ldap-version>3.3.6</spring-ldap-version>
486488
<spring-vault-core-version>3.2.0</spring-vault-core-version>
487-
<spring-version>6.2.15</spring-version>
489+
<spring-version>6.2.17</spring-version>
488490
<spring-rabbitmq-version>3.2.6</spring-rabbitmq-version>
489-
<spring-security-version>6.5.7</spring-security-version>
490-
<spring-ws-version>4.1.2</spring-ws-version>
491+
<spring-security-version>6.5.9</spring-security-version>
492+
<spring-ws-version>4.1.3</spring-ws-version>
491493
<squareup-okhttp-version>3.14.9</squareup-okhttp-version>
492494
<squareup-okhttp5-version>5.1.0</squareup-okhttp5-version>
493495
<squareup-okio-version>1.17.5</squareup-okio-version>
@@ -513,7 +515,7 @@
513515
<vavr-version>0.10.7</vavr-version>
514516
<velocity-tools-version>3.1</velocity-tools-version>
515517
<velocity-version>2.4.1</velocity-version>
516-
<vertx-version>4.5.24</vertx-version>
518+
<vertx-version>4.5.26</vertx-version>
517519
<vysper-version>0.7</vysper-version>
518520
<weaviate-client-version>5.4.0</weaviate-client-version>
519521
<web3j-version>5.0.0</web3j-version>

0 commit comments

Comments
 (0)