This is an automated email from the ASF dual-hosted git repository. jamesnetherton pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit 849bdfe295edfe62eb43a72098ce894c27c78a01 Author: James Netherton <[email protected]> AuthorDate: Mon Feb 19 07:44:36 2024 +0000 Upgrade okhttp to 4.12.0 Fixes #5635 Fixes #5960 Fixes #5691 --- integration-tests/consul/pom.xml | 2 -- .../camel/quarkus/component/consul/it/ConsulTest.java | 2 -- pom.xml | 4 ++-- poms/bom-test/pom.xml | 5 +++++ poms/bom/pom.xml | 5 +++++ poms/bom/src/main/generated/flattened-full-pom.xml | 14 +++++++------- poms/bom/src/main/generated/flattened-reduced-pom.xml | 9 +++++++-- .../src/main/generated/flattened-reduced-verbose-pom.xml | 9 +++++++-- 8 files changed, 33 insertions(+), 17 deletions(-) diff --git a/integration-tests/consul/pom.xml b/integration-tests/consul/pom.xml index df76c997a7..f4014f6189 100644 --- a/integration-tests/consul/pom.xml +++ b/integration-tests/consul/pom.xml @@ -75,7 +75,6 @@ <profiles> - <!-- https://github.com/apache/camel-quarkus/issues/5635 <profile> <id>native</id> <activation> @@ -103,7 +102,6 @@ </plugins> </build> </profile> - --> <profile> <id>virtualDependencies</id> <activation> diff --git a/integration-tests/consul/src/test/java/org/apache/camel/quarkus/component/consul/it/ConsulTest.java b/integration-tests/consul/src/test/java/org/apache/camel/quarkus/component/consul/it/ConsulTest.java index b494b68d7f..4e52a1ebbb 100644 --- a/integration-tests/consul/src/test/java/org/apache/camel/quarkus/component/consul/it/ConsulTest.java +++ b/integration-tests/consul/src/test/java/org/apache/camel/quarkus/component/consul/it/ConsulTest.java @@ -21,14 +21,12 @@ import java.util.UUID; import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import static org.hamcrest.core.Is.is; @QuarkusTest @QuarkusTestResource(ConsulTestResource.class) -@Disabled //https://github.com/apache/camel-quarkus/issues/5635 class ConsulTest { @Test public void basic() { diff --git a/pom.xml b/pom.xml index ae1eea4a60..9774ba3103 100644 --- a/pom.xml +++ b/pom.xml @@ -141,8 +141,8 @@ <mvel2.version>2.5.2.Final</mvel2.version><!-- @sync org.apache.camel:camel-dependencies:${camel.version} prop:mvel-version --> <mybatis.version>3.5.15</mybatis.version><!-- @sync io.quarkiverse.mybatis:quarkus-parent:${quarkiverse-mybatis.version} prop:mybatis.version --> <oak-jackrabbit-api.version>1.60.0</oak-jackrabbit-api.version><!-- @sync org.apache.jackrabbit:jackrabbit-parent:${jackrabbit-version} prop:oak-jackrabbit-api.version.implemented --> - <okhttp.version>${squareup-okhttp-version}</okhttp.version> - <okio.version>${squareup-okio-version}</okio.version> + <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--> <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 --> <perfmark-api.version>0.26.0</perfmark-api.version><!-- @sync io.grpc:grpc-netty-shaded:${grpc.version} dep:io.perfmark:perfmark-api --> <protobuf.version>3.25.0</protobuf.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:com.google.protobuf:protobuf-java --> diff --git a/poms/bom-test/pom.xml b/poms/bom-test/pom.xml index 385218d695..019ae1d9cd 100644 --- a/poms/bom-test/pom.xml +++ b/poms/bom-test/pom.xml @@ -70,6 +70,11 @@ <scope>import</scope> </dependency> + <dependency> + <groupId>com.squareup.okhttp3</groupId> + <artifactId>mockwebserver</artifactId> + <version>${okhttp.version}</version> + </dependency> <dependency> <groupId>io.quarkiverse.micrometer.registry</groupId> <artifactId>quarkus-micrometer-registry-jmx</artifactId> diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml index 922e6d6930..10d6672531 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -6328,6 +6328,11 @@ <artifactId>okhttp</artifactId> <version>${okhttp.version}</version> </dependency> + <dependency> + <groupId>com.squareup.okhttp3</groupId> + <artifactId>logging-interceptor</artifactId> + <version>${okhttp.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 0c4d4e18a3..8b6277e70b 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6249,12 +6249,17 @@ <dependency> <groupId>com.squareup.okhttp3</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>okhttp</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>3.14.9</version><!-- 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>logging-interceptor</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.okio</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>okio</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.17.5</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>3.6.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} --> @@ -10482,11 +10487,6 @@ <artifactId>jprotoc</artifactId><!-- io.quarkus:quarkus-bom:3.6.0 --> <version>1.2.1</version><!-- io.quarkus:quarkus-bom:3.6.0 --> </dependency> - <dependency> - <groupId>com.squareup.okhttp3</groupId><!-- io.quarkus:quarkus-bom:3.6.0 --> - <artifactId>logging-interceptor</artifactId><!-- io.quarkus:quarkus-bom:3.6.0 --> - <version>3.14.9</version><!-- io.quarkus:quarkus-bom:3.6.0 --> - </dependency> <dependency> <groupId>com.sun.mail</groupId><!-- io.quarkus:quarkus-bom:3.6.0 --> <artifactId>jakarta.mail</artifactId><!-- io.quarkus:quarkus-bom:3.6.0 --> diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml index c33e1955a0..a22f63f908 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6234,12 +6234,17 @@ <dependency> <groupId>com.squareup.okhttp3</groupId> <artifactId>okhttp</artifactId> - <version>3.14.9</version> + <version>4.12.0</version> + </dependency> + <dependency> + <groupId>com.squareup.okhttp3</groupId> + <artifactId>logging-interceptor</artifactId> + <version>4.12.0</version> </dependency> <dependency> <groupId>com.squareup.okio</groupId> <artifactId>okio</artifactId> - <version>1.17.5</version> + <version>3.6.0</version> </dependency> <dependency> <groupId>com.squareup.retrofit2</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 edf60befa6..4a124b7d26 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6234,12 +6234,17 @@ <dependency> <groupId>com.squareup.okhttp3</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>okhttp</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>3.14.9</version><!-- 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>logging-interceptor</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.okio</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>okio</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> - <version>1.17.5</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>3.6.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} -->
