Skip to content

Commit 042e674

Browse files
authored
Upgrade to Camel 4.18.1 (#695)
* Upgrade to Camel 4.18.1 * Fix undefined jackson2-annotations-version property Replace ${jackson2-annotations-version} with ${jackson2-version} in camel-jackson and camel-jacksonxml test POMs as the former property is not defined and breaks the build. * Fix netty feature bundles for Netty 4.1.x compatibility Replace netty-codec-base and netty-codec-compression bundles with netty-codec, as the split artifacts only exist in Netty 4.2.x. Camel 4.18.1 uses Netty 4.1.131.Final where codec and compression are packaged together in the netty-codec artifact. * Fix CI failures caused by missing/incorrect version properties after 4.18.1 upgrade - Fix camel-osgi-jackson2-version range from [2.20,2.21) to [2.19,2.20) to match jackson2-version 2.19.4 used by Camel 4.18.1 - Restore missing version properties accidentally removed during upgrade: docling-core-version, docling-serve-api-version, docling-serve-client-version, langchain4j-hugging-face-version, langchain4j-community-dashscope-version, microprofile-fault-tolerance-version, neo4j-bolt-version, reactor-netty-incubator-quic-version, async-http-client-version - Fix camel-kafka feature to use explicit lz4-java-version instead of auto-detect-version which failed version resolution * Fix undefined jackson2-annotations-version property in jackson feature Use jackson2-version instead of the undefined jackson2-annotations-version property for jackson-annotations bundle, consistent with jackson-databind and jackson-core in the same feature block. * Fix camel-avro feature resolution by upgrading Jackson to 2.20.1 Avro 1.12.1 requires com.fasterxml.jackson.annotation >= 2.20.0 in its OSGi manifest, but jackson2-version was 2.19.4 and the OSGi import range was [2.19,2.20) which explicitly excluded 2.20+. * 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) * Fix remaining CI failures: Netty version, lz4 groupId, snakeyaml property - Restore Netty to 4.2.12.Final (4.18.1 upgrade incorrectly downgraded to 4.1.131 which is incompatible with reactor-netty 1.3.3 OSGi imports requiring >=4.2.0) - Restore netty-codec-http3 and netty-codec-classes-quic bundles (exist in 4.2.x) - Fix lz4-java groupId from org.lz4 to at.yawk.lz4 (Kafka 3.9.2 uses the new groupId) - Restore snakeyaml-engine-kubernetes-version=2.10 property (fabric8 kubernetes-client imports snakeyaml-engine [2.10,3), needs separate 2.x version) * Add netty-codec-base to netty feature to fix OSGi resolution failures In Netty 4.2.x, io.netty.handler.codec was moved from netty-codec to the new netty-codec-base artifact. Without it, any feature depending on io.netty.handler.codec (camel-amqp, camel-netty, camel-cassandraql, camel-avro-rpc, camel-azure-eventhubs, reactor-netty-core, etc.) fails feature resolution. * Add netty-codec-base and netty-codec-compression to netty feature In Netty 4.2.x, io.netty.handler.codec and io.netty.handler.codec.compression were extracted from netty-codec into two new dedicated artifacts. Without them the feature resolver cannot satisfy the import requirements of netty-codec-http and any bundle that depends on it (camel-amqp, camel-netty-http, camel-azure-*, camel-stitch, camel-platform-http-vertx, camel-micrometer-prometheus, etc.). * Fix jackson-annotations version * Fix jackson-annotations version
1 parent 8d0247f commit 042e674

570 files changed

Lines changed: 604 additions & 603 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

components/camel-activemq/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.camel.karaf</groupId>
2626
<artifactId>camel-karaf-components</artifactId>
27-
<version>4.18.0-SNAPSHOT</version>
27+
<version>4.18.1-SNAPSHOT</version>
2828
<relativePath>../pom.xml</relativePath>
2929
</parent>
3030

components/camel-activemq6/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.camel.karaf</groupId>
2626
<artifactId>camel-karaf-components</artifactId>
27-
<version>4.18.0-SNAPSHOT</version>
27+
<version>4.18.1-SNAPSHOT</version>
2828
<relativePath>../pom.xml</relativePath>
2929
</parent>
3030

components/camel-ai/camel-chatscript/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.camel.karaf</groupId>
2626
<artifactId>camel-ai-parent</artifactId>
27-
<version>4.18.0-SNAPSHOT</version>
27+
<version>4.18.1-SNAPSHOT</version>
2828
<relativePath>../pom.xml</relativePath>
2929
</parent>
3030

components/camel-ai/camel-djl/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.camel.karaf</groupId>
2626
<artifactId>camel-ai-parent</artifactId>
27-
<version>4.18.0-SNAPSHOT</version>
27+
<version>4.18.1-SNAPSHOT</version>
2828
<relativePath>../pom.xml</relativePath>
2929
</parent>
3030

components/camel-ai/camel-docling/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.camel.karaf</groupId>
2626
<artifactId>camel-ai-parent</artifactId>
27-
<version>4.18.0-SNAPSHOT</version>
27+
<version>4.18.1-SNAPSHOT</version>
2828
<relativePath>../pom.xml</relativePath>
2929
</parent>
3030

components/camel-ai/camel-kserve/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.camel.karaf</groupId>
2626
<artifactId>camel-ai-parent</artifactId>
27-
<version>4.18.0-SNAPSHOT</version>
27+
<version>4.18.1-SNAPSHOT</version>
2828
<relativePath>../pom.xml</relativePath>
2929
</parent>
3030

components/camel-ai/camel-langchain4j-agent/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.camel.karaf</groupId>
2626
<artifactId>camel-ai-parent</artifactId>
27-
<version>4.18.0-SNAPSHOT</version>
27+
<version>4.18.1-SNAPSHOT</version>
2828
<relativePath>../pom.xml</relativePath>
2929
</parent>
3030

components/camel-ai/camel-langchain4j-chat/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.camel.karaf</groupId>
2626
<artifactId>camel-ai-parent</artifactId>
27-
<version>4.18.0-SNAPSHOT</version>
27+
<version>4.18.1-SNAPSHOT</version>
2828
<relativePath>../pom.xml</relativePath>
2929
</parent>
3030

components/camel-ai/camel-langchain4j-core/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.camel.karaf</groupId>
2626
<artifactId>camel-ai-parent</artifactId>
27-
<version>4.18.0-SNAPSHOT</version>
27+
<version>4.18.1-SNAPSHOT</version>
2828
<relativePath>../pom.xml</relativePath>
2929
</parent>
3030

components/camel-ai/camel-langchain4j-embeddings/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<parent>
2525
<groupId>org.apache.camel.karaf</groupId>
2626
<artifactId>camel-ai-parent</artifactId>
27-
<version>4.18.0-SNAPSHOT</version>
27+
<version>4.18.1-SNAPSHOT</version>
2828
<relativePath>../pom.xml</relativePath>
2929
</parent>
3030

0 commit comments

Comments
 (0)