This is an automated email from the ASF dual-hosted git repository. davsclaus pushed a commit to branch fix/CAMEL-24239 in repository https://gitbox.apache.org/repos/asf/camel.git
commit a01385532220a95ac007b761d2eb86dc72cee9f5 Author: Claus Ibsen <[email protected]> AuthorDate: Wed Jul 22 14:47:42 2026 +0200 CAMEL-24239: Upgrade jkube-maven-plugin 1.20.0 and jib-maven-plugin 3.5.2 Co-Authored-By: Claude Opus 4.6 <[email protected]> Signed-off-by: Claus Ibsen <[email protected]> --- .../modules/ROOT/pages/camel-jbang-configuration.adoc | 4 ++-- .../resources/META-INF/camel-jbang-configuration-metadata.json | 4 ++-- .../camel/dsl/jbang/core/commands/ExportBaseCommand.java | 4 ++-- .../camel/dsl/jbang/core/common/CamelJBangConstants.java | 4 ++-- .../camel/dsl/jbang/core/commands/ExportMainJkubeTest.java | 2 +- .../apache/camel/dsl/jbang/core/common/TemplateHelperTest.java | 10 +++++----- .../src/test/resources/application-jkube.properties | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/docs/user-manual/modules/ROOT/pages/camel-jbang-configuration.adoc b/docs/user-manual/modules/ROOT/pages/camel-jbang-configuration.adoc index f37467779487..56301db3ccf3 100644 --- a/docs/user-manual/modules/ROOT/pages/camel-jbang-configuration.adoc +++ b/docs/user-manual/modules/ROOT/pages/camel-jbang-configuration.adoc @@ -29,8 +29,8 @@ The camel.jbang supports 50 options, which are listed below. | *camel.jbang.javaVersion* | Java version | 21 | String | *camel.jbang.jfr* | Enables Java Flight Recorder saving recording to disk on exit | false | boolean | *camel.jbang.jfr-profile* | Java Flight Recorder profile to use (such as default or profile) | default | String -| *camel.jbang.jib-maven-plugin-version* | Version to use for jib-maven-plugin when exporting the application | 3.5.1 | String -| *camel.jbang.jkube-maven-plugin-version* | Version to use for jkube-maven-plugin if exporting to camel-main and have Kubernetes enabled (jkube.xxx options) | 1.19.0 | String +| *camel.jbang.jib-maven-plugin-version* | Version to use for jib-maven-plugin when exporting the application | 3.5.2 | String +| *camel.jbang.jkube-maven-plugin-version* | Version to use for jkube-maven-plugin if exporting to camel-main and have Kubernetes enabled (jkube.xxx options) | 1.20.0 | String | *camel.jbang.jkubeFiles* | Resource YAML fragments for Kubernetes using Eclipse JKube tool (Use commas to separate multiple files). | | String | *camel.jbang.kameletsVersion* | Apache Camel Kamelets version. By default the Kamelets are the same version as Camel. | | String | *camel.jbang.lazyBean* | Whether to use lazy bean initialization (can help with complex classloading issues) | false | boolean diff --git a/dsl/camel-jbang/camel-jbang-core/src/generated/resources/META-INF/camel-jbang-configuration-metadata.json b/dsl/camel-jbang/camel-jbang-core/src/generated/resources/META-INF/camel-jbang-configuration-metadata.json index 38820baacb31..4f02be84a402 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/generated/resources/META-INF/camel-jbang-configuration-metadata.json +++ b/dsl/camel-jbang/camel-jbang-core/src/generated/resources/META-INF/camel-jbang-configuration-metadata.json @@ -23,8 +23,8 @@ { "name": "camel.jbang.javaVersion", "required": false, "description": "Java version", "type": "enum", "javaType": "String", "defaultValue": "21", "secret": false, "enum": [ "21" ] }, { "name": "camel.jbang.jfr", "required": false, "description": "Enables Java Flight Recorder saving recording to disk on exit", "type": "boolean", "javaType": "boolean", "defaultValue": false, "secret": false }, { "name": "camel.jbang.jfr-profile", "required": false, "description": "Java Flight Recorder profile to use (such as default or profile)", "type": "string", "javaType": "String", "defaultValue": "default", "secret": false }, - { "name": "camel.jbang.jib-maven-plugin-version", "required": false, "description": "Version to use for jib-maven-plugin when exporting the application", "label": "maven", "type": "string", "javaType": "String", "defaultValue": "3.5.1", "secret": false }, - { "name": "camel.jbang.jkube-maven-plugin-version", "required": false, "description": "Version to use for jkube-maven-plugin if exporting to camel-main and have Kubernetes enabled (jkube.xxx options)", "label": "kubernetes", "type": "string", "javaType": "String", "defaultValue": "1.19.0", "secret": false }, + { "name": "camel.jbang.jib-maven-plugin-version", "required": false, "description": "Version to use for jib-maven-plugin when exporting the application", "label": "maven", "type": "string", "javaType": "String", "defaultValue": "3.5.2", "secret": false }, + { "name": "camel.jbang.jkube-maven-plugin-version", "required": false, "description": "Version to use for jkube-maven-plugin if exporting to camel-main and have Kubernetes enabled (jkube.xxx options)", "label": "kubernetes", "type": "string", "javaType": "String", "defaultValue": "1.20.0", "secret": false }, { "name": "camel.jbang.jkubeFiles", "required": false, "description": "Resource YAML fragments for Kubernetes using Eclipse JKube tool (Use commas to separate multiple files).", "label": "kubernetes", "type": "string", "javaType": "String", "secret": false }, { "name": "camel.jbang.kameletsVersion", "required": false, "description": "Apache Camel Kamelets version. By default the Kamelets are the same version as Camel.", "type": "string", "javaType": "String", "secret": false }, { "name": "camel.jbang.lazyBean", "required": false, "description": "Whether to use lazy bean initialization (can help with complex classloading issues)", "label": "advanced", "type": "boolean", "javaType": "boolean", "defaultValue": false, "secret": false }, 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 dc2304e28fcc..6fe3c6fa9f59 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 @@ -1280,7 +1280,7 @@ public abstract class ExportBaseCommand extends CamelCommand { // ignore } } - return answer != null ? answer : "3.5.1"; + return answer != null ? answer : "3.5.2"; } protected static String jkubeMavenPluginVersion(Path settings, Properties props) { @@ -1298,7 +1298,7 @@ public abstract class ExportBaseCommand extends CamelCommand { // ignore } } - return answer != null ? answer : "1.19.0"; + return answer != null ? answer : "1.20.0"; } // This method is kept for backward compatibility with derived classes diff --git a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/CamelJBangConstants.java b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/CamelJBangConstants.java index 526867409907..e97203d1d431 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/CamelJBangConstants.java +++ b/dsl/camel-jbang/camel-jbang-core/src/main/java/org/apache/camel/dsl/jbang/core/common/CamelJBangConstants.java @@ -156,11 +156,11 @@ public final class CamelJBangConstants { public static final String DEPENDENCIES_QUARKUS = "camel.jbang.dependencies.quarkus"; @Metadata(description = "Version to use for jib-maven-plugin when exporting the application", - javaType = "String", defaultValue = "3.5.1", label = "maven") + javaType = "String", defaultValue = "3.5.2", label = "maven") public static final String JIB_MAVEN_PLUGIN_VERSION = "camel.jbang.jib-maven-plugin-version"; @Metadata(description = "Version to use for jkube-maven-plugin if exporting to camel-main and have Kubernetes enabled (jkube.xxx options)", - javaType = "String", defaultValue = "1.19.0", label = "kubernetes") + javaType = "String", defaultValue = "1.20.0", label = "kubernetes") public static final String JKUBE_MAVEN_PLUGIN_VERSION = "camel.jbang.jkube-maven-plugin-version"; @Metadata(description = "Stubs all the matching endpoint with the given component name or pattern. Multiple names can be separated by comma. (all = stub all endpoints, remote = stub only remote components).", diff --git a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/ExportMainJkubeTest.java b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/ExportMainJkubeTest.java index b90703c66ddb..aaed6f734ae1 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/ExportMainJkubeTest.java +++ b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/commands/ExportMainJkubeTest.java @@ -91,7 +91,7 @@ class ExportMainJkubeTest { p = model.getBuild().getPlugins().get(6); Assertions.assertEquals("org.eclipse.jkube", p.getGroupId()); Assertions.assertEquals("kubernetes-maven-plugin", p.getArtifactId()); - Assertions.assertEquals("1.19.0", p.getVersion()); + Assertions.assertEquals("1.20.0", p.getVersion()); command.printConfigurationValues("export command"); } diff --git a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/common/TemplateHelperTest.java b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/common/TemplateHelperTest.java index 55a6e6c31769..41ba25f1e2ea 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/common/TemplateHelperTest.java +++ b/dsl/camel-jbang/camel-jbang-core/src/test/java/org/apache/camel/dsl/jbang/core/common/TemplateHelperTest.java @@ -210,7 +210,7 @@ class TemplateHelperTest { model.put("KubernetesProperties", List.of()); model.put("hasJib", false); model.put("hasJkube", false); - model.put("JibMavenPluginVersion", "3.5.1"); + model.put("JibMavenPluginVersion", "3.5.2"); List<Map<String, Object>> deps = new ArrayList<>(); Map<String, Object> dep = new HashMap<>(); @@ -260,7 +260,7 @@ class TemplateHelperTest { model.put("hasJib", false); model.put("hasJkube", false); model.put("Dependencies", List.of()); - model.put("JibMavenPluginVersion", "3.5.1"); + model.put("JibMavenPluginVersion", "3.5.2"); List<Map<String, Object>> repos = new ArrayList<>(); repos.add(Map.of("id", "custom1", "url", "https://repo.example.com/snapshots";, "isSnapshot", true)); @@ -287,7 +287,7 @@ class TemplateHelperTest { model.put("BuildProperties", ""); model.put("Repositories", List.of()); model.put("Dependencies", List.of()); - model.put("JibMavenPluginVersion", "3.5.1"); + model.put("JibMavenPluginVersion", "3.5.2"); String result = TemplateHelper.processTemplate("spring-boot-pom.ftl", model); @@ -314,7 +314,7 @@ class TemplateHelperTest { model.put("BuildProperties", ""); model.put("Repositories", List.of()); model.put("Dependencies", List.of()); - model.put("JibMavenPluginVersion", "3.5.1"); + model.put("JibMavenPluginVersion", "3.5.2"); String result = TemplateHelper.processTemplate("quarkus-pom.ftl", model); @@ -349,7 +349,7 @@ class TemplateHelperTest { model.put("BuildProperties", ""); model.put("Repositories", List.of()); model.put("Dependencies", List.of()); - model.put("JibMavenPluginVersion", "3.5.1"); + model.put("JibMavenPluginVersion", "3.5.2"); String result = TemplateHelper.processTemplate("quarkus-pom.ftl", model); diff --git a/dsl/camel-jbang/camel-jbang-core/src/test/resources/application-jkube.properties b/dsl/camel-jbang/camel-jbang-core/src/test/resources/application-jkube.properties index 7a9350f3ca22..bfd428105d28 100644 --- a/dsl/camel-jbang/camel-jbang-core/src/test/resources/application-jkube.properties +++ b/dsl/camel-jbang/camel-jbang-core/src/test/resources/application-jkube.properties @@ -16,7 +16,7 @@ ## --------------------------------------------------------------------------- jib.label=abc label.runtime=camel-main -jkube.version=1.19.0 +jkube.version=1.20.0 jkube.skip.build=true jkube.skip.push=true jkube.imagePullPolicy=Always
