Skip to content

Commit cdfed0f

Browse files
jamesnethertonJiriOndrusek
jamesnetherton
authored and
JiriOndrusek
committed
Enable okhttp 5.x to coexist with 4.x
1 parent 4e0a728 commit cdfed0f

File tree

8 files changed

+41
-116
lines changed

8 files changed

+41
-116
lines changed

‎docs/modules/ROOT/pages/reference/extensions/pqc.adoc‎

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎extensions-support/retrofit/runtime/src/main/java/org/apache/camel/quarkus/support/retrofit/graal/CompletableFutureCallAdapterFactorySubstitution.java‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎extensions-support/retrofit/runtime/src/main/java/org/apache/camel/quarkus/support/retrofit/graal/OptionalConverterFactorySubstitution.java‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎pom.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,14 +148,15 @@
148148
<mybatis.version>3.5.19</mybatis.version><!-- @sync io.quarkiverse.mybatis:quarkus-parent:${quarkiverse-mybatis.version} prop:mybatis.version -->
149149
<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 -->
150150
<okhttp.version>4.12.0</okhttp.version>
151-
<okio.version>3.6.0</okio.version><!-- @sync com.squareup.okhttp3:okhttp:${okhttp.version} dep:com.squareup.okio:okio-->
151+
<okhttp-jvm.version>5.2.1</okhttp-jvm.version>
152+
<okio.version>3.16.1</okio.version><!-- @sync com.squareup.okhttp3:okhttp-jvm:${okhttp-jvm.version} dep:com.squareup.okio:okio-jvm-->
152153
<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 -->
153154
<opentelemetry-semconv-legacy.version>1.29.0-alpha</opentelemetry-semconv-legacy.version><!-- Alignment for camel-opentelemetry and google-pubsub -->
154155
<org.json.version>20240303</org.json.version><!-- Used by amazon-kinesis-client, google-cloud-bigquery and com.ibm.mq.jakarta.client -->
155156
<re2j.version>1.7</re2j.version><!-- Used by google-cloud-pubsub and amazon-kinesis-client -->
156157
<reactor-core.version>3.7.9</reactor-core.version><!-- @sync com.azure:azure-core:${azure-core.version} dep:io.projectreactor:reactor-core -->
157158
<reactor-netty.version>${reactor-netty-version}</reactor-netty.version>
158-
<retrofit.version>2.9.0</retrofit.version><!-- @sync org.influxdb:influxdb-java:${influxdb.version} dep:com.squareup.retrofit2:retrofit -->
159+
<retrofit.version>3.0.0</retrofit.version><!-- @sync org.kiwiproject:consul-client:${consul-client-version} prop:retrofit.version -->
159160
<rxjava3.version>3.1.8</rxjava3.version><!-- Used by amazon-kinesis-client and infinispan-client-hotrod-jakarta -->
160161
<smooks.version>${smooks-version}</smooks.version>
161162
<snakeyaml.version>2.5</snakeyaml.version><!-- @sync io.quarkus:quarkus-bom:${quarkus.version} dep:org.yaml:snakeyaml -->

‎poms/bom/pom.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7266,6 +7266,11 @@
72667266
<artifactId>okhttp</artifactId>
72677267
<version>${okhttp.version}</version>
72687268
</dependency>
7269+
<dependency>
7270+
<groupId>com.squareup.okhttp3</groupId>
7271+
<artifactId>okhttp-jvm</artifactId>
7272+
<version>${okhttp-jvm.version}</version>
7273+
</dependency>
72697274
<dependency>
72707275
<groupId>com.squareup.okio</groupId>
72717276
<artifactId>okio</artifactId>

‎poms/bom/src/main/generated/flattened-full-pom.xml‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7152,20 +7152,25 @@
71527152
<artifactId>okhttp</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
71537153
<version>4.12.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
71547154
</dependency>
7155+
<dependency>
7156+
<groupId>com.squareup.okhttp3</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7157+
<artifactId>okhttp-jvm</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7158+
<version>5.2.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7159+
</dependency>
71557160
<dependency>
71567161
<groupId>com.squareup.okio</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
71577162
<artifactId>okio</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7158-
<version>3.6.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7163+
<version>3.16.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
71597164
</dependency>
71607165
<dependency>
71617166
<groupId>com.squareup.okio</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
71627167
<artifactId>okio-fakefilesystem</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7163-
<version>3.6.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7168+
<version>3.16.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
71647169
</dependency>
71657170
<dependency>
71667171
<groupId>com.squareup.okio</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
71677172
<artifactId>okio-fakefilesystem-jvm</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7168-
<version>3.6.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7173+
<version>3.16.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
71697174
<exclusions>
71707175
<exclusion>
71717176
<groupId>org.jetbrains.kotlin</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -7176,7 +7181,7 @@
71767181
<dependency>
71777182
<groupId>com.squareup.okio</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
71787183
<artifactId>okio-jvm</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7179-
<version>3.6.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7184+
<version>3.16.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
71807185
<exclusions>
71817186
<exclusion>
71827187
<groupId>org.jetbrains.kotlin</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -7187,12 +7192,12 @@
71877192
<dependency>
71887193
<groupId>com.squareup.retrofit2</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
71897194
<artifactId>converter-jackson</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7190-
<version>2.9.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7195+
<version>3.0.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
71917196
</dependency>
71927197
<dependency>
71937198
<groupId>com.squareup.retrofit2</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
71947199
<artifactId>retrofit</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7195-
<version>2.9.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7200+
<version>3.0.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
71967201
</dependency>
71977202
<dependency>
71987203
<groupId>commons-beanutils</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->

‎poms/bom/src/main/generated/flattened-reduced-pom.xml‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7127,20 +7127,25 @@
71277127
<artifactId>okhttp</artifactId>
71287128
<version>4.12.0</version>
71297129
</dependency>
7130+
<dependency>
7131+
<groupId>com.squareup.okhttp3</groupId>
7132+
<artifactId>okhttp-jvm</artifactId>
7133+
<version>5.2.1</version>
7134+
</dependency>
71307135
<dependency>
71317136
<groupId>com.squareup.okio</groupId>
71327137
<artifactId>okio</artifactId>
7133-
<version>3.6.0</version>
7138+
<version>3.16.1</version>
71347139
</dependency>
71357140
<dependency>
71367141
<groupId>com.squareup.okio</groupId>
71377142
<artifactId>okio-fakefilesystem</artifactId>
7138-
<version>3.6.0</version>
7143+
<version>3.16.1</version>
71397144
</dependency>
71407145
<dependency>
71417146
<groupId>com.squareup.okio</groupId>
71427147
<artifactId>okio-fakefilesystem-jvm</artifactId>
7143-
<version>3.6.0</version>
7148+
<version>3.16.1</version>
71447149
<exclusions>
71457150
<exclusion>
71467151
<groupId>org.jetbrains.kotlin</groupId>
@@ -7151,7 +7156,7 @@
71517156
<dependency>
71527157
<groupId>com.squareup.okio</groupId>
71537158
<artifactId>okio-jvm</artifactId>
7154-
<version>3.6.0</version>
7159+
<version>3.16.1</version>
71557160
<exclusions>
71567161
<exclusion>
71577162
<groupId>org.jetbrains.kotlin</groupId>
@@ -7162,12 +7167,12 @@
71627167
<dependency>
71637168
<groupId>com.squareup.retrofit2</groupId>
71647169
<artifactId>converter-jackson</artifactId>
7165-
<version>2.9.0</version>
7170+
<version>3.0.0</version>
71667171
</dependency>
71677172
<dependency>
71687173
<groupId>com.squareup.retrofit2</groupId>
71697174
<artifactId>retrofit</artifactId>
7170-
<version>2.9.0</version>
7175+
<version>3.0.0</version>
71717176
</dependency>
71727177
<dependency>
71737178
<groupId>commons-beanutils</groupId>

‎poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7127,20 +7127,25 @@
71277127
<artifactId>okhttp</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
71287128
<version>4.12.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
71297129
</dependency>
7130+
<dependency>
7131+
<groupId>com.squareup.okhttp3</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7132+
<artifactId>okhttp-jvm</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7133+
<version>5.2.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7134+
</dependency>
71307135
<dependency>
71317136
<groupId>com.squareup.okio</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
71327137
<artifactId>okio</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7133-
<version>3.6.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7138+
<version>3.16.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
71347139
</dependency>
71357140
<dependency>
71367141
<groupId>com.squareup.okio</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
71377142
<artifactId>okio-fakefilesystem</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7138-
<version>3.6.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7143+
<version>3.16.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
71397144
</dependency>
71407145
<dependency>
71417146
<groupId>com.squareup.okio</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
71427147
<artifactId>okio-fakefilesystem-jvm</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7143-
<version>3.6.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7148+
<version>3.16.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
71447149
<exclusions>
71457150
<exclusion>
71467151
<groupId>org.jetbrains.kotlin</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -7151,7 +7156,7 @@
71517156
<dependency>
71527157
<groupId>com.squareup.okio</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
71537158
<artifactId>okio-jvm</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7154-
<version>3.6.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7159+
<version>3.16.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
71557160
<exclusions>
71567161
<exclusion>
71577162
<groupId>org.jetbrains.kotlin</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -7162,12 +7167,12 @@
71627167
<dependency>
71637168
<groupId>com.squareup.retrofit2</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
71647169
<artifactId>converter-jackson</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7165-
<version>2.9.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7170+
<version>3.0.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
71667171
</dependency>
71677172
<dependency>
71687173
<groupId>com.squareup.retrofit2</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
71697174
<artifactId>retrofit</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7170-
<version>2.9.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
7175+
<version>3.0.0</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
71717176
</dependency>
71727177
<dependency>
71737178
<groupId>commons-beanutils</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->

0 commit comments

Comments
 (0)