This is an automated email from the ASF dual-hosted git repository. jiriondrusek pushed a commit to branch camel-main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 76341aeb0c25167c0b723213db36260e08024447 Author: James Netherton <[email protected]> AuthorDate: Thu Oct 23 15:11:24 2025 +0100 Enable okhttp 5.x to coexist with 4.x --- .../ROOT/pages/reference/extensions/pqc.adoc | 42 ---------------------- ...etableFutureCallAdapterFactorySubstitution.java | 27 -------------- .../OptionalConverterFactorySubstitution.java | 27 -------------- pom.xml | 5 +-- poms/bom/pom.xml | 5 +++ poms/bom/src/main/generated/flattened-full-pom.xml | 17 +++++---- .../src/main/generated/flattened-reduced-pom.xml | 17 +++++---- .../generated/flattened-reduced-verbose-pom.xml | 17 +++++---- 8 files changed, 41 insertions(+), 116 deletions(-) diff --git a/docs/modules/ROOT/pages/reference/extensions/pqc.adoc b/docs/modules/ROOT/pages/reference/extensions/pqc.adoc deleted file mode 100644 index 2e95efcd0c..0000000000 --- a/docs/modules/ROOT/pages/reference/extensions/pqc.adoc +++ /dev/null @@ -1,42 +0,0 @@ -// Do not edit directly! -// This file was generated by camel-quarkus-maven-plugin:update-extension-doc-page -[id="extensions-pqc"] -= PQC Algorithms -:linkattrs: -:cq-artifact-id: camel-quarkus-pqc -:cq-native-supported: false -:cq-status: Preview -:cq-status-deprecation: Preview -:cq-description: Post Quantum Computing Signature and Verification component. -:cq-deprecated: false -:cq-jvm-since: 3.24.0 -:cq-native-since: n/a - -ifeval::[{doc-show-badges} == true] -[.badges] -[.badge-key]##JVM since##[.badge-supported]##3.24.0## [.badge-key]##Native##[.badge-unsupported]##unsupported## -endif::[] - -Post Quantum Computing Signature and Verification component. - -[id="extensions-pqc-whats-inside"] -== What's inside - -* xref:{cq-camel-components}:dataformats:pqc-dataformat.adoc[PQC (Post-Quantum Cryptography) data format] -* xref:{cq-camel-components}::pqc-component.adoc[PQC Algorithms component], URI syntax: `pqc:label` - -Please refer to the above links for usage and configuration details. - -[id="extensions-pqc-maven-coordinates"] -== Maven coordinates - -[source,xml] ----- -<dependency> - <groupId>org.apache.camel.quarkus</groupId> - <artifactId>camel-quarkus-pqc</artifactId> -</dependency> ----- -ifeval::[{doc-show-user-guide-link} == true] -Check the xref:user-guide/index.adoc[User guide] for more information about writing Camel Quarkus applications. -endif::[] diff --git a/extensions-support/retrofit/runtime/src/main/java/org/apache/camel/quarkus/support/retrofit/graal/CompletableFutureCallAdapterFactorySubstitution.java b/extensions-support/retrofit/runtime/src/main/java/org/apache/camel/quarkus/support/retrofit/graal/CompletableFutureCallAdapterFactorySubstitution.java deleted file mode 100644 index 0a1ac3cd8e..0000000000 --- a/extensions-support/retrofit/runtime/src/main/java/org/apache/camel/quarkus/support/retrofit/graal/CompletableFutureCallAdapterFactorySubstitution.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.quarkus.support.retrofit.graal; - -import com.oracle.svm.core.annotate.Alias; -import com.oracle.svm.core.annotate.TargetClass; -import retrofit2.CallAdapter; - -@TargetClass(className = "retrofit2.CompletableFutureCallAdapterFactory") -final class CompletableFutureCallAdapterFactorySubstitution { - @Alias - static CallAdapter.Factory INSTANCE; -} diff --git a/extensions-support/retrofit/runtime/src/main/java/org/apache/camel/quarkus/support/retrofit/graal/OptionalConverterFactorySubstitution.java b/extensions-support/retrofit/runtime/src/main/java/org/apache/camel/quarkus/support/retrofit/graal/OptionalConverterFactorySubstitution.java deleted file mode 100644 index 14dc320d38..0000000000 --- a/extensions-support/retrofit/runtime/src/main/java/org/apache/camel/quarkus/support/retrofit/graal/OptionalConverterFactorySubstitution.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.camel.quarkus.support.retrofit.graal; - -import com.oracle.svm.core.annotate.Alias; -import com.oracle.svm.core.annotate.TargetClass; -import retrofit2.Converter; - -@TargetClass(className = "retrofit2.OptionalConverterFactory") -final class OptionalConverterFactorySubstitution { - @Alias - static Converter.Factory INSTANCE; -} diff --git a/pom.xml b/pom.xml index 4f929efd17..1e0fda7d9e 100644 --- a/pom.xml +++ b/pom.xml @@ -148,14 +148,15 @@ <mybatis.version>3.5.19</mybatis.version><!-- @sync io.quarkiverse.mybatis:quarkus-parent:${quarkiverse-mybatis.version} prop:mybatis.version --> <oak-jackrabbit-api.version>1.82.0</oak-jackrabbit-api.version><!-- @sync org.apache.jackrabbit:jackrabbit-parent:${jackrabbit-version} prop:oak-jackrabbit-api.version.implemented --> <okhttp.version>4.12.0</okhttp.version> - <okio.version>3.6.0</okio.version><!-- @sync com.squareup.okhttp3:okhttp:${okhttp.version} dep:com.squareup.okio:okio--> + <okhttp-jvm.version>5.2.1</okhttp-jvm.version> + <okio.version>3.16.1</okio.version><!-- @sync com.squareup.okhttp3:okhttp-jvm:${okhttp-jvm.version} dep:com.squareup.okio:okio-jvm--> <opencensus.version>0.31.0</opencensus.version><!-- Mess in Google cloud. Keep in sync with version used in com.google.http-client:google-http-client --> <opentelemetry-semconv-legacy.version>1.29.0-alpha</opentelemetry-semconv-legacy.version><!-- Alignment for camel-opentelemetry and google-pubsub --> <org.json.version>20240303</org.json.version><!-- Used by amazon-kinesis-client, google-cloud-bigquery and com.ibm.mq.jakarta.client --> <re2j.version>1.7</re2j.version><!-- Used by google-cloud-pubsub and amazon-kinesis-client --> <reactor-core.version>3.7.9</reactor-core.version><!-- @sync com.azure:azure-core:${azure-core.version} dep:io.projectreactor:reactor-core --> <reactor-netty.version>${reactor-netty-version}</reactor-netty.version> - <retrofit.version>2.9.0</retrofit.version><!-- @sync org.influxdb:influxdb-java:${influxdb.version} dep:com.squareup.retrofit2:retrofit --> + <retrofit.version>3.0.0</retrofit.version><!-- @sync org.kiwiproject:consul-client:${consul-client-version} prop:retrofit.version --> <rxjava3.version>3.1.8</rxjava3.version><!-- Used by amazon-kinesis-client and infinispan-client-hotrod-jakarta --> <smooks.version>${smooks-version}</smooks.version> <snakeyaml.version>2.5</snakeyaml.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.yaml:snakeyaml --> diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index a643876b61..e2cf3e13b2 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -7266,6 +7266,11 @@ <artifactId>okhttp</artifactId> <version>${okhttp.version}</version> </dependency> + <dependency> + <groupId>com.squareup.okhttp3</groupId> + <artifactId>okhttp-jvm</artifactId> + <version>${okhttp-jvm.version}</version> + </dependency> <dependency> <groupId>com.squareup.okio</groupId> <artifactId>okio</artifactId> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index bbbe6cd30f..91235891b1 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -7152,20 +7152,25 @@ <artifactId>okhttp</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>4.12.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> + <dependency> + <groupId>com.squareup.okhttp3</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>okhttp-jvm</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>5.2.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </dependency> <dependency> <groupId>com.squareup.okio</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>okio</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>3.6.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>3.16.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>com.squareup.okio</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>okio-fakefilesystem</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>3.6.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>3.16.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>com.squareup.okio</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>okio-fakefilesystem-jvm</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>3.6.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>3.16.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>org.jetbrains.kotlin</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -7176,7 +7181,7 @@ <dependency> <groupId>com.squareup.okio</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>okio-jvm</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>3.6.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>3.16.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>org.jetbrains.kotlin</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -7187,12 +7192,12 @@ <dependency> <groupId>com.squareup.retrofit2</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>converter-jackson</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>2.9.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>3.0.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>com.squareup.retrofit2</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>retrofit</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>2.9.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>3.0.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>commons-beanutils</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index f0693cba13..32d562f2b6 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -7127,20 +7127,25 @@ <artifactId>okhttp</artifactId> <version>4.12.0</version> </dependency> + <dependency> + <groupId>com.squareup.okhttp3</groupId> + <artifactId>okhttp-jvm</artifactId> + <version>5.2.1</version> + </dependency> <dependency> <groupId>com.squareup.okio</groupId> <artifactId>okio</artifactId> - <version>3.6.0</version> + <version>3.16.1</version> </dependency> <dependency> <groupId>com.squareup.okio</groupId> <artifactId>okio-fakefilesystem</artifactId> - <version>3.6.0</version> + <version>3.16.1</version> </dependency> <dependency> <groupId>com.squareup.okio</groupId> <artifactId>okio-fakefilesystem-jvm</artifactId> - <version>3.6.0</version> + <version>3.16.1</version> <exclusions> <exclusion> <groupId>org.jetbrains.kotlin</groupId> @@ -7151,7 +7156,7 @@ <dependency> <groupId>com.squareup.okio</groupId> <artifactId>okio-jvm</artifactId> - <version>3.6.0</version> + <version>3.16.1</version> <exclusions> <exclusion> <groupId>org.jetbrains.kotlin</groupId> @@ -7162,12 +7167,12 @@ <dependency> <groupId>com.squareup.retrofit2</groupId> <artifactId>converter-jackson</artifactId> - <version>2.9.0</version> + <version>3.0.0</version> </dependency> <dependency> <groupId>com.squareup.retrofit2</groupId> <artifactId>retrofit</artifactId> - <version>2.9.0</version> + <version>3.0.0</version> </dependency> <dependency> <groupId>commons-beanutils</groupId> diff --git a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml index 22ac76e693..bae13c91cf 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -7127,20 +7127,25 @@ <artifactId>okhttp</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>4.12.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> + <dependency> + <groupId>com.squareup.okhttp3</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>okhttp-jvm</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>5.2.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </dependency> <dependency> <groupId>com.squareup.okio</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>okio</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>3.6.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>3.16.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>com.squareup.okio</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>okio-fakefilesystem</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>3.6.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>3.16.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>com.squareup.okio</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>okio-fakefilesystem-jvm</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>3.6.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>3.16.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>org.jetbrains.kotlin</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -7151,7 +7156,7 @@ <dependency> <groupId>com.squareup.okio</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>okio-jvm</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>3.6.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>3.16.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <exclusions> <exclusion> <groupId>org.jetbrains.kotlin</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> @@ -7162,12 +7167,12 @@ <dependency> <groupId>com.squareup.retrofit2</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>converter-jackson</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>2.9.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>3.0.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>com.squareup.retrofit2</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>retrofit</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>2.9.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>3.0.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> <dependency> <groupId>commons-beanutils</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
