This is an automated email from the ASF dual-hosted git repository. acosentino pushed a commit to branch task-48 in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8fac2f86eb1f4cf7c3aafc83a84829b1ed32dfa4 Author: Andrea Cosentino <[email protected]> AuthorDate: Thu Mar 5 20:14:06 2026 +0100 CAMEL-23112 - Drop JDK 17 Support - Update Kubernetes plugin tests to use JDK 21 instead of JDK 17 JDK 17 is no longer the minimum baseline. Update all test references in KubernetesRunTest and KubernetesExportTest to use --java-version=21 and eclipse-temurin:21 accordingly. Signed-off-by: Andrea Cosentino <[email protected]> --- .../jbang/core/commands/kubernetes/KubernetesExportTest.java | 6 +++--- .../jbang/core/commands/kubernetes/KubernetesRunTest.java | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExportTest.java b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExportTest.java index e2e182c91912..07165fac9c02 100644 --- a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExportTest.java +++ b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesExportTest.java @@ -98,9 +98,9 @@ class KubernetesExportTest extends KubernetesExportBaseTestSupport { @ParameterizedTest @MethodSource("runtimeProvider") - public void shouldGenerateJava17Project(RuntimeType rt) throws Exception { + public void shouldGenerateJava21Project(RuntimeType rt) throws Exception { KubernetesExport command = createCommand(new String[] { "classpath:route.yaml" }, - "--gav=examples:route:1.0.0", "--runtime=" + rt.runtime(), "--java-version=17"); + "--gav=examples:route:1.0.0", "--runtime=" + rt.runtime(), "--java-version=21"); int exit = command.doCall(); Assertions.assertEquals(0, exit); @@ -112,7 +112,7 @@ class KubernetesExportTest extends KubernetesExportBaseTestSupport { Properties props = model.getProperties(); Assertions.assertEquals("route:1.0.0", props.get("jkube.image.name")); Assertions.assertEquals("route:1.0.0", props.get("jkube.container-image.name")); - Assertions.assertEquals("mirror.gcr.io/library/eclipse-temurin:17", props.get("jkube.container-image.from")); + Assertions.assertEquals("mirror.gcr.io/library/eclipse-temurin:21", props.get("jkube.container-image.from")); Assertions.assertEquals("jib", props.get("jkube.build.strategy")); Assertions.assertNull(props.get("jkube.docker.push.registry")); Assertions.assertNull(props.get("jkube.container-image.registry")); diff --git a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesRunTest.java b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesRunTest.java index 96dcd56ff601..ba2c5a81ec10 100644 --- a/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesRunTest.java +++ b/dsl/camel-jbang/camel-jbang-plugin-kubernetes/src/test/java/org/apache/camel/dsl/jbang/core/commands/kubernetes/KubernetesRunTest.java @@ -72,7 +72,7 @@ class KubernetesRunTest extends KubernetesBaseTestSupport { @MethodSource("runtimeProvider") public void shouldHandleMissingSourceFile(RuntimeType rt) throws Exception { KubernetesRun command = createCommand(List.of("mickey-mouse.groovy"), - "--disable-auto=true", "--output=yaml", "--runtime=" + rt.runtime(), "--java-version=17"); + "--disable-auto=true", "--output=yaml", "--runtime=" + rt.runtime(), "--java-version=21"); int exit = command.doCall(); Assertions.assertEquals(1, exit); @@ -86,7 +86,7 @@ class KubernetesRunTest extends KubernetesBaseTestSupport { "--gav=examples:route:1.0.0", "--runtime=quarkus", "--name=my-route-props", "--disable-auto=true", "--image-registry=quay.io", "--image-group=camel-test", "--output=yaml", "--property=a=b", "--property=c=d", "--property=src/test/resources/my-route-props1.properties", - "--property=file:src/test/resources/my-route-props2.properties", "--java-version=17"); + "--property=file:src/test/resources/my-route-props2.properties", "--java-version=21"); int exit = command.doCall(); Assertions.assertEquals(0, exit); @@ -108,7 +108,7 @@ class KubernetesRunTest extends KubernetesBaseTestSupport { KubernetesRun command = createCommand(List.of("classpath:route.yaml"), "--disable-auto=true", "--image-registry=quay.io", "--image-group=camel-test", "--output=yaml", "--trait", "container.image-pull-policy=IfNotPresent", - "--runtime=" + rt.runtime(), "--java-version=17"); + "--runtime=" + rt.runtime(), "--java-version=21"); int exit = command.doCall(); Assertions.assertEquals(0, exit); @@ -157,7 +157,7 @@ class KubernetesRunTest extends KubernetesBaseTestSupport { public void shouldGenerateKubernetesCronjobManifest(RuntimeType rt) throws Exception { KubernetesRun command = createCommand(List.of("classpath:route.yaml"), "--disable-auto=true", "--image-registry=quay.io", "--image-group=camel-test", "--output=yaml", - "--service-account=my-svc-account", "--runtime=" + rt.runtime(), "--java-version=17"); + "--service-account=my-svc-account", "--runtime=" + rt.runtime(), "--java-version=21"); command.traits = new String[] { "cronjob.enabled=true", "cronjob.schedule=\"0 22 * * 1-5\"", @@ -196,7 +196,7 @@ class KubernetesRunTest extends KubernetesBaseTestSupport { @MethodSource("runtimeProvider") public void shouldHandleUnsupportedOutputFormat(RuntimeType rt) throws Exception { KubernetesRun command = createCommand(List.of("classpath:route.yaml"), - "--disable-auto=true", "--output=wrong", "--runtime=" + rt.runtime(), "--java-version=17"); + "--disable-auto=true", "--output=wrong", "--runtime=" + rt.runtime(), "--java-version=21"); Assertions.assertEquals(1, command.doCall()); Assertions.assertTrue(printer.getOutput().endsWith("ERROR: Unsupported output format 'wrong' (supported: yaml, json)")); @@ -208,7 +208,7 @@ class KubernetesRunTest extends KubernetesBaseTestSupport { KubernetesRun command = createCommand(List.of("classpath:route.yaml"), "--disable-auto=true", "--image-registry=quay.io", "--image-group=camel-test", "--output=yaml", "--namespace", "custom", - "--runtime=" + rt.runtime(), "--java-version=17"); + "--runtime=" + rt.runtime(), "--java-version=21"); int exit = command.doCall(); Assertions.assertEquals(0, exit);
