This is an automated email from the ASF dual-hosted git repository.
pcongiusti 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 3938a34f Revert camel-quarkus-version remove from PR #1156
3938a34f is described below
commit 3938a34fc1a57d76ce9f06872b184bed0c1f9572
Author: Gaelle Fournier <[email protected]>
AuthorDate: Mon Feb 5 12:13:24 2024 +0100
Revert camel-quarkus-version remove from PR #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 insertions(+)
diff --git a/pom.xml b/pom.xml
index 188348ff..82fd1386 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,6 +43,7 @@
<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 673f28d8..88a17524 100644
--- a/support/camel-k-maven-plugin/pom.xml
+++ b/support/camel-k-maven-plugin/pom.xml
@@ -72,10 +72,12 @@
<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>
@@ -169,6 +171,7 @@
<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 4fc3e61c..c863cba9 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,6 +21,9 @@ 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
