(camel) branch main updated: CAMEL-20877: camel-jbang export shold set jkube/jib versions with values from application.properties.

[davsclaus]

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 9b8f3c2da02 CAMEL-20877: camel-jbang export shold set jkube/jib 
versions with values from application.properties.
9b8f3c2da02 is described below

commit 9b8f3c2da024f812a073768a55f7ade58d4ca297
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Sat Jun 15 08:52:35 2024 +0200

    CAMEL-20877: camel-jbang export shold set jkube/jib versions with values 
from application.properties.
---
 .../dsl/jbang/core/commands/ExportBaseCommand.java | 34 ++++++++++++++--------
 .../dsl/jbang/core/commands/ExportCamelMain.java   |  5 ++--
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
index f366c50f91c..f577965982f 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportBaseCommand.java
@@ -700,27 +700,37 @@ abstract class ExportBaseCommand extends CamelCommand {
         return -1;
     }
 
-    protected static String jibMavenPluginVersion(File settings) {
-        try {
-            List<String> lines = RuntimeUtil.loadPropertiesLines(settings);
-            return lines.stream().filter(l -> 
l.startsWith("camel.jbang.jib-maven-plugin-version="))
-                    .map(s -> StringHelper.after(s, 
"=")).findFirst().orElse("3.4.3");
-        } catch (Exception e) {
-            // ignore
+    protected static String jibMavenPluginVersion(File settings, Properties 
prop) {
+        String answer = null;
+        if (prop != null) {
+            answer = prop.getProperty("camel.jbang.jib-maven-plugin-version");
         }
-        return "3.4.3";
+        if (answer == null) {
+            try {
+                List<String> lines = RuntimeUtil.loadPropertiesLines(settings);
+                answer = lines.stream().filter(l -> 
l.startsWith("camel.jbang.jib-maven-plugin-version="))
+                        .map(s -> StringHelper.after(s, 
"=")).findFirst().orElse(null);
+            } catch (Exception e) {
+                // ignore
+            }
+        }
+        return answer != null ? answer : "3.4.3";
     }
 
-    protected static String jkubeMavenPluginVersion(File settings) {
+    protected static String jkubeMavenPluginVersion(File settings, Properties 
prop) {
+        String answer = null;
+        if (prop != null) {
+            answer = 
prop.getProperty("camel.jbang.jkube-maven-plugin-version");
+        }
         try {
             List<String> lines = RuntimeUtil.loadPropertiesLines(settings);
-            return lines.stream()
+            answer = lines.stream()
                     .filter(l -> 
l.startsWith("camel.jbang.jkube-maven-plugin-version=") || 
l.startsWith("jkube.version="))
-                    .map(s -> StringHelper.after(s, 
"=")).findFirst().orElse("1.16.2");
+                    .map(s -> StringHelper.after(s, 
"=")).findFirst().orElse(null);
         } catch (Exception e) {
             // ignore
         }
-        return "1.16.2";
+        return answer != null ? answer : "1.16.2";
     }
 
     protected void safeCopy(File source, File target, boolean override) throws 
Exception {
diff --git 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
index fd37cf570c0..38e7c21ba72 100644
--- 
a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
+++ 
b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/commands/ExportCamelMain.java
@@ -269,7 +269,7 @@ class ExportCamelMain extends Export {
             String context2 = IOHelper.loadText(is);
             IOHelper.close(is);
 
-            context2 = context2.replaceFirst("\\{\\{ \\.JibMavenPluginVersion 
}}", jibMavenPluginVersion(settings));
+            context2 = context2.replaceFirst("\\{\\{ \\.JibMavenPluginVersion 
}}", jibMavenPluginVersion(settings, prop));
 
             // image from/to auth
             String auth = "";
@@ -298,7 +298,8 @@ class ExportCamelMain extends Export {
                 is = 
ExportCamelMain.class.getClassLoader().getResourceAsStream("templates/main-kubernetes-pom.tmpl");
                 String context3 = IOHelper.loadText(is);
                 IOHelper.close(is);
-                context3 = context3.replaceFirst("\\{\\{ 
\\.JkubeMavenPluginVersion }}", jkubeMavenPluginVersion(settings));
+                context3 = context3.replaceFirst("\\{\\{ 
\\.JkubeMavenPluginVersion }}",
+                        jkubeMavenPluginVersion(settings, prop));
                 sb2.append(context3);
             }
         }