This is an automated email from the ASF dual-hosted git repository. claudio4j pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
The following commit(s) were added to refs/heads/main by this push: new f1a37e24 The camel-quarkus dependencies must come exclusively from quarkus-camel-bom (#1156) f1a37e24 is described below commit f1a37e24eb0ab78b54f1b728ed02f11659ef015f Author: Claudio Miranda <clau...@claudius.com.br> AuthorDate: Wed Jan 24 10:40:23 2024 -0300 The camel-quarkus dependencies must come exclusively from quarkus-camel-bom (#1156) --- pom.xml | 1 - support/camel-k-maven-plugin/pom.xml | 3 --- support/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 450de17b..4c058b26 100644 --- a/pom.xml +++ b/pom.xml @@ -43,7 +43,6 @@ <camel-version>4.2.0</camel-version> <!-- quarkus --> - <camel-quarkus-version>3.6.0</camel-quarkus-version> <quarkus-version>3.6.0</quarkus-version> <quarkus-platform-group>io.quarkus.platform</quarkus-platform-group> <quarkus-platform-version>3.6.0</quarkus-platform-version> diff --git a/support/camel-k-maven-plugin/pom.xml b/support/camel-k-maven-plugin/pom.xml index 88a17524..673f28d8 100644 --- a/support/camel-k-maven-plugin/pom.xml +++ b/support/camel-k-maven-plugin/pom.xml @@ -72,12 +72,10 @@ <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-catalog</artifactId> - <version>${camel-quarkus-version}</version> </dependency> <dependency> <groupId>org.apache.camel.quarkus</groupId> <artifactId>camel-quarkus-core</artifactId> - <version>${camel-quarkus-version}</version> </dependency> <dependency> <groupId>org.apache.camel</groupId> @@ -171,7 +169,6 @@ <scriptVariables> <runtimeVersion>${project.version}</runtimeVersion> <camelVersion>${camel-version}</camelVersion> - <camelQuarkusVersion>${camel-quarkus-version}</camelQuarkusVersion> <quarkusVersion>${quarkus-version}</quarkusVersion> <quarkusNativeBuilderImage>${quarkus-native-builder-image}</quarkusNativeBuilderImage> <jibMavenPluginVersion>${jib-maven-plugin-version}</jibMavenPluginVersion> 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 c863cba9..4fc3e61c 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.metadata['jib.maven-plugin.version'] == jibMavenPluginVersion assert catalog.spec.runtime.metadata['jib.layer-filter-extension-maven.version'] == jibLayerFilterExtensionMavenVersion