From ccd5f251b31e6c1fcbddb58a8e05f0db2c79e0f4 Mon Sep 17 00:00:00 2001 From: sankriti mishra Date: Mon, 12 Feb 2024 16:57:30 +0530 Subject: [PATCH] Fields with matching name in AbstractJKubeMojo are removed from UndeployMojo --- .../enricher/generic/TriggersAnnotationEnricherTest.java | 2 ++ .../jkube/maven/plugin/mojo/develop/UndeployMojo.java | 6 +----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/jkube-kit/enricher/generic/src/test/java/org/eclipse/jkube/enricher/generic/TriggersAnnotationEnricherTest.java b/jkube-kit/enricher/generic/src/test/java/org/eclipse/jkube/enricher/generic/TriggersAnnotationEnricherTest.java index be08a78b56..ad4f6626a3 100644 --- a/jkube-kit/enricher/generic/src/test/java/org/eclipse/jkube/enricher/generic/TriggersAnnotationEnricherTest.java +++ b/jkube-kit/enricher/generic/src/test/java/org/eclipse/jkube/enricher/generic/TriggersAnnotationEnricherTest.java @@ -242,4 +242,6 @@ private List createContainers(String... nameImage) { return containers; } + + } diff --git a/kubernetes-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/develop/UndeployMojo.java b/kubernetes-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/develop/UndeployMojo.java index 9e8754ad9e..973b3a5d43 100644 --- a/kubernetes-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/develop/UndeployMojo.java +++ b/kubernetes-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/develop/UndeployMojo.java @@ -47,16 +47,12 @@ public class UndeployMojo extends AbstractJKubeMojo implements ManifestProvider /** * Folder where to find project specific files */ - @Parameter(property = "jkube.resourceDir", defaultValue = "${basedir}/src/main/jkube") - protected File resourceDir; /** * Environment name where resources are placed. For example, if you set this property to dev and resourceDir is the default one, jkube will look at src/main/jkube/dev * Same applies for resourceDirOpenShiftOverride property. */ - @Parameter(property = "jkube.environment") - private String environment; - + @Parameter(property = "jkube.skip.undeploy", defaultValue = "false") protected boolean skipUndeploy;