From d1cae1f50847b90386ef08012a555a76e9e3d05a Mon Sep 17 00:00:00 2001 From: Claudio Miranda Date: Wed, 24 Jan 2024 10:40:32 -0300 Subject: [PATCH] The camel-quarkus dependencies must come exclusively from quarkus-camel-bom (#1157) --- pom.xml | 1 - support/camel-k-maven-plugin/pom.xml | 3 --- .../camel-k-maven-plugin/src/it/generate-catalog/verify.groovy | 3 --- 3 files changed, 7 deletions(-) diff --git a/pom.xml b/pom.xml index 5b536ef47..479267bd6 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,6 @@ 4.0.3 - 3.2.3 3.2.9.Final io.quarkus.platform 3.2.9.Final diff --git a/support/camel-k-maven-plugin/pom.xml b/support/camel-k-maven-plugin/pom.xml index b4142ba68..6f472cb40 100644 --- a/support/camel-k-maven-plugin/pom.xml +++ b/support/camel-k-maven-plugin/pom.xml @@ -72,12 +72,10 @@ org.apache.camel.quarkus camel-quarkus-catalog - ${camel-quarkus-version} org.apache.camel.quarkus camel-quarkus-core - ${camel-quarkus-version} org.apache.camel @@ -171,7 +169,6 @@ ${project.version} ${camel-version} - ${camel-quarkus-version} ${quarkus-version} ${quarkus-native-builder-image} diff --git a/support/camel-k-maven-plugin/src/it/generate-catalog/verify.groovy b/support/camel-k-maven-plugin/src/it/generate-catalog/verify.groovy index 6e3ae149a..7d53f64f4 100644 --- a/support/camel-k-maven-plugin/src/it/generate-catalog/verify.groovy +++ b/support/camel-k-maven-plugin/src/it/generate-catalog/verify.groovy @@ -21,9 +21,6 @@ new File(basedir, "catalog.yaml").withReader { assert catalog.spec.runtime.version == runtimeVersion assert catalog.spec.runtime.applicationClass == 'io.quarkus.bootstrap.runner.QuarkusEntryPoint' assert catalog.spec.runtime.metadata['camel.version'] == camelVersion - // Re-enabled this when the version will be the same again - //assert catalog.spec.runtime.metadata['quarkus.version'] == quarkusVersion - assert catalog.spec.runtime.metadata['camel-quarkus.version'] == camelQuarkusVersion assert catalog.spec.runtime.metadata['quarkus.native-builder-image'] == quarkusNativeBuilderImage assert catalog.spec.runtime.dependencies.any {