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
The following commit(s) were added to refs/heads/main by this push: new 23422249d6 fixes #7269: bump com.ibm.cloud:sdk-core to 9.23.1 23422249d6 is described below commit 23422249d653061211917fb9c61f74044c7aa9ef Author: Jiri Ondrusek <ondrusek.j...@gmail.com> AuthorDate: Tue Apr 22 09:19:16 2025 +0200 fixes #7269: bump com.ibm.cloud:sdk-core to 9.23.1 --- extensions/couchdb/runtime/pom.xml | 10 ++++++++++ integration-tests/couchdb/pom.xml | 2 -- .../apache/camel/quarkus/component/couchdb/it/CouchdbTest.java | 2 -- pom.xml | 1 + poms/bom/pom.xml | 5 +++++ poms/bom/src/main/generated/flattened-full-pom.xml | 5 +++++ poms/bom/src/main/generated/flattened-reduced-pom.xml | 5 +++++ poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml | 5 +++++ 8 files changed, 31 insertions(+), 4 deletions(-) diff --git a/extensions/couchdb/runtime/pom.xml b/extensions/couchdb/runtime/pom.xml index 87d7206c85..02800dd1ea 100644 --- a/extensions/couchdb/runtime/pom.xml +++ b/extensions/couchdb/runtime/pom.xml @@ -46,6 +46,16 @@ <dependency> <groupId>org.apache.camel</groupId> <artifactId>camel-couchdb</artifactId> + <exclusions> + <exclusion> + <artifactId>sdk-core</artifactId> + <groupId>com.ibm.cloud</groupId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <artifactId>sdk-core</artifactId> + <groupId>com.ibm.cloud</groupId> </dependency> </dependencies> diff --git a/integration-tests/couchdb/pom.xml b/integration-tests/couchdb/pom.xml index a25590af85..7abd358f16 100644 --- a/integration-tests/couchdb/pom.xml +++ b/integration-tests/couchdb/pom.xml @@ -80,7 +80,6 @@ <profiles> - <!-- see https://github.com/apache/camel-quarkus/issues/7269 <profile> <id>native</id> <activation> @@ -108,7 +107,6 @@ </plugins> </build> </profile> - --> <profile> <id>virtualDependencies</id> <activation> diff --git a/integration-tests/couchdb/src/test/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbTest.java b/integration-tests/couchdb/src/test/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbTest.java index ac8771493a..338b85a4d3 100644 --- a/integration-tests/couchdb/src/test/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbTest.java +++ b/integration-tests/couchdb/src/test/java/org/apache/camel/quarkus/component/couchdb/it/CouchdbTest.java @@ -22,7 +22,6 @@ import io.quarkus.test.common.QuarkusTestResource; import io.quarkus.test.junit.QuarkusTest; import io.restassured.RestAssured; import io.restassured.http.ContentType; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import static org.awaitility.Awaitility.await; @@ -32,7 +31,6 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; @QuarkusTest @QuarkusTestResource(CouchdbTestResource.class) -@Disabled("https://github.com/apache/camel-quarkus/issues/7269") class CouchdbTest { @Test diff --git a/pom.xml b/pom.xml index 317cec8148..9b1a44a551 100644 --- a/pom.xml +++ b/pom.xml @@ -117,6 +117,7 @@ <hapi-base.version>${hapi-base-version}</hapi-base.version> <hapi-fhir.version>${hapi-fhir-version}</hapi-fhir.version> <hapi-fhir-core.version>6.4.0</hapi-fhir-core.version><!-- @sync ca.uhn.hapi.fhir:hapi-fhir:${hapi-fhir.version} prop:fhir_core_version --> + <ibm.java-sdk-core.version>9.23.1</ibm.java-sdk-core.version><!-- Required because of https://github.com/apache/camel-quarkus/issues/7269 --> <ibm.mq.client.version>9.4.2.0</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 e5e370dc0c..5d95bcaca4 100644 --- a/poms/bom/pom.xml +++ b/poms/bom/pom.xml @@ -6931,6 +6931,11 @@ <artifactId>re2j</artifactId> <version>${re2j.version}</version> </dependency> + <dependency> + <groupId>com.ibm.cloud</groupId> + <artifactId>sdk-core</artifactId> + <version>${ibm.java-sdk-core.version}</version> + </dependency> <dependency> <groupId>com.ibm.icu</groupId> <artifactId>icu4j</artifactId> diff --git a/poms/bom/src/main/generated/flattened-full-pom.xml b/poms/bom/src/main/generated/flattened-full-pom.xml index a8566527bd..9365c827ae 100644 --- a/poms/bom/src/main/generated/flattened-full-pom.xml +++ b/poms/bom/src/main/generated/flattened-full-pom.xml @@ -6832,6 +6832,11 @@ <artifactId>re2j</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>1.7</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> + <dependency> + <groupId>com.ibm.cloud</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>sdk-core</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>9.23.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </dependency> <dependency> <groupId>com.ibm.icu</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>icu4j</artifactId><!-- 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 9aad46d7ce..ad251c85f4 100644 --- a/poms/bom/src/main/generated/flattened-reduced-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-pom.xml @@ -6822,6 +6822,11 @@ <artifactId>re2j</artifactId> <version>1.7</version> </dependency> + <dependency> + <groupId>com.ibm.cloud</groupId> + <artifactId>sdk-core</artifactId> + <version>9.23.1</version> + </dependency> <dependency> <groupId>com.ibm.icu</groupId> <artifactId>icu4j</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 bf6be59da1..7b8bbcaa5d 100644 --- a/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml +++ b/poms/bom/src/main/generated/flattened-reduced-verbose-pom.xml @@ -6822,6 +6822,11 @@ <artifactId>re2j</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <version>1.7</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> </dependency> + <dependency> + <groupId>com.ibm.cloud</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <artifactId>sdk-core</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + <version>9.23.1</version><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> + </dependency> <dependency> <groupId>com.ibm.icu</groupId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} --> <artifactId>icu4j</artifactId><!-- org.apache.camel.quarkus:camel-quarkus-bom:${project.version} -->