This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git


The following commit(s) were added to refs/heads/main by this push:
     new 9289a6d0a38 CAMEL-22165: camel-jbang dependency runtime (deep analysis 
to resolve from parent poms)
9289a6d0a38 is described below

commit 9289a6d0a38760fa71451190a79a4adbf5666c02
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Fri Jun 13 09:47:47 2025 +0200

    CAMEL-22165: camel-jbang dependency runtime (deep analysis to resolve from 
parent poms)
---
 .../apache/camel/dsl/jbang/core/commands/DependencyRuntime.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyRuntime.java
 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyRuntime.java
index a984fc89a6d..2472ea213fe 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyRuntime.java
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/DependencyRuntime.java
@@ -102,14 +102,14 @@ public class DependencyRuntime extends CamelCommand {
             }
         }
 
-        if (springBootVersion != null && camelVersion == null) {
-            camelVersion = 
CatalogLoader.resolveCamelVersionFromSpringBoot(mavenRepos(model, repositories),
-                    camelSpringBootVersion, download);
-        }
         if (springBootVersion == null && camelSpringBootVersion != null) {
             springBootVersion = 
CatalogLoader.resolveSpringBootVersionFromCamelSpringBoot(mavenRepos(model, 
repositories),
                     camelSpringBootVersion, download);
         }
+        if (springBootVersion != null && camelVersion == null) {
+            camelVersion = 
CatalogLoader.resolveCamelVersionFromSpringBoot(mavenRepos(model, repositories),
+                    camelSpringBootVersion, download);
+        }
         if (quarkusVersion != null && camelVersion == null) {
             String repos = mavenRepos(model, repositories);
             CamelCatalog catalog = CatalogLoader.loadQuarkusCatalog(repos, 
quarkusVersion, quarkusGroupId, download);

Reply via email to