You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ja...@apache.org on 2024/10/04 06:14:44 UTC
(camel-quarkus) 02/02: Rely on quarkus-cxf-bom for managing httpclient5
This is an automated email from the ASF dual-hosted git repository.
jamesnetherton pushed a commit to branch 3.15.x
in repository https://gitbox.apache.org/repos/asf/camel-quarkus.git
commit d1a9d123e4b8b5ab9f56043a53b7f1e90fa69308
Author: Peter Palaga <pp...@redhat.com>
AuthorDate: Thu Oct 3 22:28:32 2024 +0200
Rely on quarkus-cxf-bom for managing httpclient5
---
pom.xml | 2 +-
poms/bom/pom.xml | 5 -----
poms/bom/src/main/generated/flattened-full-pom.xml | 10 +++++-----
poms/bom/src/main/generated/flattened-reduced-pom.xml | 10 +++++-----
poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 10 +++++-----
5 files changed, 16 insertions(+), 21 deletions(-)
diff --git a/pom.xml b/pom.xml
index 95f53d3a03..d8925dd956 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,7 +111,7 @@
<hapi-base.version>${hapi-base-version}</hapi-base.version>
<hapi-fhir.version>${hapi-fhir-version}</hapi-fhir.version>
<hapi-fhir-core.version>6.3.11</hapi-fhir-core.version><!-- @sync ca.uhn.hapi.fhir:hapi-fhir:${hapi-fhir.version} prop:fhir_core_version -->
- <httpclient5.version>${httpclient-version}</httpclient5.version><!-- Saxon and Wiremock -->
+ <httpclient5.version>5.2.3</httpclient5.version><!-- @sync io.quarkiverse.cxf:quarkus-cxf-parent:${quarkiverse-cxf.version} prop:httpclient5.version -->
<ibm.mq.client.version>9.4.0.5</ibm.mq.client.version>
<icu4j.version>${icu4j-version}</icu4j.version>
<influxdb.version>${influx-java-driver-version}</influxdb.version>
diff --git a/poms/bom/pom.xml b/poms/bom/pom.xml
index 90781bd084..33b7b0f5eb 100644
--- a/poms/bom/pom.xml
+++ b/poms/bom/pom.xml
@@ -7120,11 +7120,6 @@
<artifactId>commons-collections4</artifactId>
<version>${commons-collections4.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.httpcomponents.client5</groupId>
- <artifactId>httpclient5</artifactId>
- <version>${httpclient5.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-jackrabbit-api</artifactId>
diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml
index 6dfe3f1a2d..4d4ba9731e 100644
--- a/poms/bom/src/main/generated/flattened-full-pom.xml
+++ b/poms/bom/src/main/generated/flattened-full-pom.xml
@@ -7042,11 +7042,6 @@
<artifactId>commons-collections4</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>4.4</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
- <dependency>
- <groupId>org.apache.httpcomponents.client5</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>httpclient5</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>org.apache.jackrabbit</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>oak-jackrabbit-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -7809,6 +7804,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents.client5</groupId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:3.15.2 -->
+ <artifactId>httpclient5</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:3.15.2 -->
+ <version>5.2.3</version><!-- io.quarkiverse.cxf:quarkus-cxf-bom:3.15.2 -->
+ </dependency>
<dependency>
<groupId>org.apache.httpcomponents.core5</groupId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:3.15.2 -->
<artifactId>httpcore5</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:3.15.2 -->
diff --git a/poms/bom/src/main/generated/flattened-reduced-pom.xml b/poms/bom/src/main/generated/flattened-reduced-pom.xml
index d81f99231a..c041213af7 100644
--- a/poms/bom/src/main/generated/flattened-reduced-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml
@@ -6992,11 +6992,6 @@
<artifactId>commons-collections4</artifactId>
<version>4.4</version>
</dependency>
- <dependency>
- <groupId>org.apache.httpcomponents.client5</groupId>
- <artifactId>httpclient5</artifactId>
- <version>5.2.1</version>
- </dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-jackrabbit-api</artifactId>
@@ -7729,6 +7724,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents.client5</groupId>
+ <artifactId>httpclient5</artifactId>
+ <version>5.2.3</version>
+ </dependency>
<dependency>
<groupId>org.apache.httpcomponents.core5</groupId>
<artifactId>httpcore5</artifactId>
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 6dcc7e6ab7..4782fd3694 100644
--- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
+++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml
@@ -6992,11 +6992,6 @@
<artifactId>commons-collections4</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<version>4.4</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
</dependency>
- <dependency>
- <groupId>org.apache.httpcomponents.client5</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
- <artifactId>httpclient5</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>org.apache.jackrabbit</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
<artifactId>oak-jackrabbit-api</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->
@@ -7729,6 +7724,11 @@
</exclusion>
</exclusions>
</dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents.client5</groupId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:3.15.2 -->
+ <artifactId>httpclient5</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:3.15.2 -->
+ <version>5.2.3</version><!-- io.quarkiverse.cxf:quarkus-cxf-bom:3.15.2 -->
+ </dependency>
<dependency>
<groupId>org.apache.httpcomponents.core5</groupId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:3.15.2 -->
<artifactId>httpcore5</artifactId><!-- io.quarkiverse.cxf:quarkus-cxf-bom:3.15.2 -->