You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cl...@apache.org on 2024/01/24 13:40:37 UTC
(camel-k-runtime) branch release-3.2.x updated: The camel-quarkus dependencies must come exclusively from quarkus-camel-bom (#1157)
This is an automated email from the ASF dual-hosted git repository.
claudio4j pushed a commit to branch release-3.2.x
in repository https://gitbox.apache.org/repos/asf/camel-k-runtime.git
The following commit(s) were added to refs/heads/release-3.2.x by this push:
new d1cae1f5 The camel-quarkus dependencies must come exclusively from quarkus-camel-bom (#1157)
d1cae1f5 is described below
commit d1cae1f50847b90386ef08012a555a76e9e3d05a
Author: Claudio Miranda <cl...@claudius.com.br>
AuthorDate: Wed Jan 24 10:40:32 2024 -0300
The camel-quarkus dependencies must come exclusively from quarkus-camel-bom (#1157)
---
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 5b536ef4..479267bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,6 @@
<camel-version>4.0.3</camel-version>
<!-- quarkus -->
- <camel-quarkus-version>3.2.3</camel-quarkus-version>
<quarkus-version>3.2.9.Final</quarkus-version>
<quarkus-platform-group>io.quarkus.platform</quarkus-platform-group>
<quarkus-platform-version>3.2.9.Final</quarkus-platform-version>
diff --git a/support/camel-k-maven-plugin/pom.xml b/support/camel-k-maven-plugin/pom.xml
index b4142ba6..6f472cb4 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>
</scriptVariables>
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 6e3ae149..7d53f64f 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 {