From b892fd6ee8ec7676dcc5f3df2d3212c084156e66 Mon Sep 17 00:00:00 2001
From: Jurrie Overgoor <1213142+Jurrie@users.noreply.github.com>
Date: Wed, 6 Mar 2024 13:00:39 +0100
Subject: [PATCH 1/5] Add and fix warnings

- helm-lint and helm-push: Add warning when 'helm' goal is not ran
- helm: Fix warning when 'resource' goal is not ran

Signed-off-by: Jurrie Overgoor <eclipse.org@jurr.org>
---
 .../kit/resource/helm/HelmServiceUtil.java    |  71 +++---
 jkube-kit/parent/pom.xml                      |   6 +
 .../maven/plugin/mojo/build/HelmLintMojo.java |  27 +++
 .../maven/plugin/mojo/build/HelmPushMojo.java |  24 +-
 .../plugin/mojo/build/HelmLintMojoTest.java   |  41 ++--
 .../plugin/mojo/build/HelmPushMojoTest.java   | 186 ++++++++-------
 openshift-maven-plugin/plugin/pom.xml         |   2 +-
 .../mojo/build/OpenshiftHelmLintMojo.java     |   6 +
 .../mojo/build/OpenshiftHelmPushMojo.java     |   6 +
 .../mojo/build/OpenshiftHelmLintMojoTest.java |  78 ++++++
 .../mojo/build/OpenshiftHelmPushMojoTest.java | 225 ++++++++++++++++++
 11 files changed, 531 insertions(+), 141 deletions(-)
 create mode 100644 openshift-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/OpenshiftHelmLintMojoTest.java
 create mode 100644 openshift-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/OpenshiftHelmPushMojoTest.java

diff --git a/jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmServiceUtil.java b/jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmServiceUtil.java
index bbf7cd32b3..e266768060 100644
--- a/jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmServiceUtil.java
+++ b/jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmServiceUtil.java
@@ -108,7 +108,7 @@ public static HelmConfig.HelmConfigBuilder initHelmConfig(
     helmConfig.setSourceDir(resolveFromPropertyOrDefault(PROPERTY_SOURCE_DIR, project, helmConfig::getSourceDir,
         () -> separatorsToSystem(String.format("%s/META-INF/jkube/", project.getOutputDirectory()))));
     helmConfig.setOutputDir(resolveFromPropertyOrDefault(PROPERTY_OUTPUT_DIR, project, helmConfig::getOutputDir,
-      () -> separatorsToSystem(String.format("%s/jkube/helm/%s", project.getBuildDirectory(), helmConfig.getChart()))));
+        () -> separatorsToSystem(String.format("%s/jkube/helm/%s", project.getBuildDirectory(), helmConfig.getChart()))));
     helmConfig.setIcon(resolveFromPropertyOrDefault(PROPERTY_ICON, project, helmConfig::getIcon,
         () -> findIconURL(new File(helmConfig.getSourceDir()), helmConfig.getTypes())));
     helmConfig.setAppVersion(resolveFromPropertyOrDefault(PROPERTY_APP_VERSION, project, helmConfig::getAppVersion, project::getVersion));
@@ -134,25 +134,25 @@ static HelmRepository initHelmRepository(HelmRepository helmRepository, JavaProj
     }
 
     resolvedHelmRepository.setType(resolveFromPropertyOrDefault(String.format(PROPERTY_UPLOAD_REPO_TYPE, repositoryType), project,
-      resolvedHelmRepository::getTypeAsString, null));
+        resolvedHelmRepository::getTypeAsString, null));
     resolvedHelmRepository.setName(resolveFromPropertyOrDefault(String.format(PROPERTY_UPLOAD_REPO_NAME, repositoryType), project,
-      resolvedHelmRepository::getName, null));
+        resolvedHelmRepository::getName, null));
     resolvedHelmRepository.setUrl(resolveFromPropertyOrDefault(String.format(PROPERTY_UPLOAD_REPO_URL, repositoryType), project,
-      resolvedHelmRepository::getUrl, null));
+        resolvedHelmRepository::getUrl, null));
     resolvedHelmRepository.setUsername(resolveFromPropertyOrDefault(String.format(PROPERTY_UPLOAD_REPO_USERNAME, repositoryType), project,
-      resolvedHelmRepository::getUsername,  null));
+        resolvedHelmRepository::getUsername,  null));
     resolvedHelmRepository.setPassword(resolveFromPropertyOrDefault(String.format(PROPERTY_UPLOAD_REPO_PASSWORD, repositoryType), project,
-      resolvedHelmRepository::getPassword, null));
+        resolvedHelmRepository::getPassword, null));
 
     return resolvedHelmRepository;
   }
 
   static List<HelmConfig.HelmType> resolveHelmTypes(HelmConfig.HelmType defaultHelmType, JavaProject project) {
     final List<HelmConfig.HelmType> helmTypes = Optional.ofNullable(getProperty(PROPERTY_TYPE, project))
-      .filter(StringUtils::isNotBlank)
-      .map(types -> StringUtils.split(types, ","))
-      .map(Stream::of)
-      .map(s -> s.map(prop -> HelmConfig.HelmType.valueOf(prop.trim().toUpperCase())).collect(Collectors.toList())).orElse(null);
+        .filter(StringUtils::isNotBlank)
+        .map(types -> StringUtils.split(types, ","))
+        .map(Stream::of)
+        .map(s -> s.map(prop -> HelmConfig.HelmType.valueOf(prop.trim().toUpperCase())).collect(Collectors.toList())).orElse(null);
     if (helmTypes == null || helmTypes.isEmpty()) {
       return Collections.singletonList(defaultHelmType);
     }
@@ -161,17 +161,17 @@ static List<HelmConfig.HelmType> resolveHelmTypes(HelmConfig.HelmType defaultHel
 
   static String resolveFromPropertyOrDefault(String property, JavaProject project, Supplier<String> getter, Supplier<String> defaultValue) {
     return Optional.ofNullable(getProperty(property, project))
-      .filter(StringUtils::isNotBlank)
-      .orElse(Optional.ofNullable(getter.get())
         .filter(StringUtils::isNotBlank)
-        .orElseGet(defaultValue == null ? () -> null : defaultValue));
+        .orElse(Optional.ofNullable(getter.get())
+            .filter(StringUtils::isNotBlank)
+            .orElseGet(defaultValue == null ? () -> null : defaultValue));
   }
 
   static boolean resolveBooleanFromPropertyOrDefault(String property, JavaProject project, BooleanSupplier getter) {
     return Optional.ofNullable(getProperty(property, project))
-      .filter(StringUtils::isNotBlank)
-      .map(Boolean::parseBoolean)
-      .orElse(getter.getAsBoolean());
+        .filter(StringUtils::isNotBlank)
+        .map(Boolean::parseBoolean)
+        .orElse(getter.getAsBoolean());
   }
 
   static List<File> getAdditionalFiles(HelmConfig helm, JavaProject project) {
@@ -191,8 +191,8 @@ static Optional<File> firstProjectFile(String fileName, JavaProject project) {
       return lower.equalsIgnoreCase(fileName) || lower.startsWith(fileName.toLowerCase() + ".");
     };
     return Optional.ofNullable(project.getBaseDirectory().listFiles(filter))
-      .filter(files -> files.length > 0)
-      .map(files -> files[0]);
+        .filter(files -> files.length > 0)
+        .map(files -> files[0]);
   }
 
   static String findIconURL(File directory, Collection<HelmConfig.HelmType> types) {
@@ -232,26 +232,29 @@ static List<Template> findTemplates(File templateDir) throws IOException {
     final File[] sourceFiles;
     if (templateDir != null && templateDir.isDirectory()) {
       sourceFiles = templateDir.listFiles((dir, filename) ->
-              filename.toLowerCase(Locale.ROOT).endsWith("-template.yml") ||
-              filename.toLowerCase(Locale.ROOT).endsWith("-template.yaml"));
+      filename.toLowerCase(Locale.ROOT).endsWith("-template.yml") ||
+      filename.toLowerCase(Locale.ROOT).endsWith("-template.yaml"));
     } else if (templateDir != null) {
       sourceFiles = new File[] { templateDir };
     } else {
       sourceFiles = new File[0];
     }
     for (File sourceFile : Objects
-      .requireNonNull(sourceFiles, "No template files found in the provided directory")) {
+        .requireNonNull(sourceFiles, "No template files found in the provided directory")) {
+      if (!sourceFile.exists()) {
+        continue;
+      }
       final KubernetesResource dto = Serialization.unmarshal(sourceFile);
       if (dto instanceof Template) {
         ret.add((Template) dto);
       } else if (dto instanceof KubernetesList) {
         Optional.ofNullable(((KubernetesList)dto).getItems())
-          .map(List::stream)
-          .map(items -> items.filter(Template.class::isInstance)
+        .map(List::stream)
+        .map(items -> items.filter(Template.class::isInstance)
             .map(Template.class::cast)
             .collect(Collectors.toList())
-          )
-          .ifPresent(ret::addAll);
+            )
+        .ifPresent(ret::addAll);
       }
     }
     return ret;
@@ -266,9 +269,9 @@ static HelmRepository selectHelmRepository(HelmConfig helmConfig) {
 
   static boolean isRepositoryValid(HelmRepository repository) {
     return repository != null
-      && repository.getType() != null
-      && StringUtils.isNotBlank(repository.getName())
-      && StringUtils.isNotBlank(repository.getUrl());
+        && repository.getType() != null
+        && StringUtils.isNotBlank(repository.getName())
+        && StringUtils.isNotBlank(repository.getUrl());
   }
 
   static void setAuthentication(HelmRepository repository, KitLogger logger, List<RegistryServerConfiguration> registryServerConfigurations, UnaryOperator<String> passwordDecrypter)  {
@@ -282,19 +285,19 @@ static void setAuthentication(HelmRepository repository, KitLogger logger, List<
     } else {
 
       RegistryServerConfiguration server = registryServerConfigurations.stream()
-        .filter(r -> r.getId().equals(id))
-        .findAny()
-        .orElse(null);
+          .filter(r -> r.getId().equals(id))
+          .findAny()
+          .orElse(null);
       if (server == null) {
         throw new IllegalArgumentException(
-          "No credentials found for " + id + " in configuration or settings.xml server list.");
+            "No credentials found for " + id + " in configuration or settings.xml server list.");
       } else {
 
         logger.debug("Use credentials from server list for " + id + ".");
         if (server.getUsername() == null || server.getPassword() == null) {
           throw new IllegalArgumentException("Repo "
-            + id
-            + " was found in server list but has no username/password.");
+              + id
+              + " was found in server list but has no username/password.");
         }
         repository.setUsername(server.getUsername());
         repository.setPassword(passwordDecrypter.apply(server.getPassword()));
diff --git a/jkube-kit/parent/pom.xml b/jkube-kit/parent/pom.xml
index dca9659b69..b7cb6b55c7 100644
--- a/jkube-kit/parent/pom.xml
+++ b/jkube-kit/parent/pom.xml
@@ -736,6 +736,12 @@
         <version>${version.mockito}</version>
         <scope>test</scope>
       </dependency>
+      <dependency>
+        <groupId>org.mockito</groupId>
+        <artifactId>mockito-inline</artifactId>
+        <version>${version.mockito}</version>
+        <scope>test</scope>
+      </dependency>
 
       <dependency>
         <groupId>io.fabric8</groupId>
diff --git a/kubernetes-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/HelmLintMojo.java b/kubernetes-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/HelmLintMojo.java
index ab07a37a6e..43a0d616de 100644
--- a/kubernetes-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/HelmLintMojo.java
+++ b/kubernetes-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/HelmLintMojo.java
@@ -13,16 +13,43 @@
  */
 package org.eclipse.jkube.maven.plugin.mojo.build;
 
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
 import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.ResolutionScope;
+import org.eclipse.jkube.kit.resource.helm.HelmConfig;
+import org.eclipse.jkube.kit.resource.helm.HelmService;
 
 @Mojo(name = "helm-lint", defaultPhase = LifecyclePhase.INTEGRATION_TEST, requiresDependencyResolution = ResolutionScope.COMPILE)
 public class HelmLintMojo extends AbstractHelmMojo {
 
+  @Override
+  public void init() throws MojoFailureException {
+    super.init();
+
+    checkChartsExist(getHelm());
+  }
+
+  private void checkChartsExist(final HelmConfig helmConfig) {
+    for (HelmConfig.HelmType helmType : helmConfig.getTypes()) {
+      final Path chart = Paths.get(helmConfig.getOutputDir(), helmType.getOutputDir(), HelmService.CHART_FILENAME);
+      if (Files.notExists(chart)) {
+        logChartNotFoundWarning(chart);
+      }
+    }
+  }
+
   @Override
   public void executeInternal() throws MojoExecutionException {
     jkubeServiceHub.getHelmService().lint(getHelm());
   }
+
+  protected void logChartNotFoundWarning(final Path chart) {
+    getKitLogger().warn("No Helm chart has been generated yet by the k8s:helm goal at: " + chart);
+  }
 }
diff --git a/kubernetes-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/HelmPushMojo.java b/kubernetes-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/HelmPushMojo.java
index 24e53d2ac8..c2723291d8 100644
--- a/kubernetes-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/HelmPushMojo.java
+++ b/kubernetes-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/HelmPushMojo.java
@@ -13,15 +13,21 @@
  */
 package org.eclipse.jkube.maven.plugin.mojo.build;
 
+import static org.eclipse.jkube.kit.resource.helm.HelmServiceUtil.initHelmPushConfig;
+
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.ResolutionScope;
+import org.eclipse.jkube.kit.resource.helm.HelmConfig;
+import org.eclipse.jkube.kit.resource.helm.HelmService;
 import org.sonatype.plexus.components.sec.dispatcher.DefaultSecDispatcher;
 
-import static org.eclipse.jkube.kit.resource.helm.HelmServiceUtil.initHelmPushConfig;
-
 @Mojo(name = "helm-push", defaultPhase = LifecyclePhase.INSTALL, requiresDependencyResolution = ResolutionScope.COMPILE)
 public class HelmPushMojo extends AbstractHelmMojo {
 
@@ -29,9 +35,19 @@ public class HelmPushMojo extends AbstractHelmMojo {
   public void init() throws MojoFailureException {
     super.init();
 
+    checkChartsExist(getHelm());
     initHelmPushConfig(helm, javaProject);
   }
 
+  private void checkChartsExist(final HelmConfig helmConfig) {
+    for (HelmConfig.HelmType helmType : helmConfig.getTypes()) {
+      final Path chart = Paths.get(helmConfig.getOutputDir(), helmType.getOutputDir(), HelmService.CHART_FILENAME);
+      if (Files.notExists(chart)) {
+        logChartNotFoundWarning(chart);
+      }
+    }
+  }
+
   @Override
   public void executeInternal() throws MojoExecutionException {
     try {
@@ -44,4 +60,8 @@ public void executeInternal() throws MojoExecutionException {
       throw new MojoExecutionException(exp.getMessage(), exp);
     }
   }
+
+  protected void logChartNotFoundWarning(final Path chart) {
+    getKitLogger().warn("No Helm chart has been generated yet by the k8s:helm goal at: " + chart);
+  }
 }
diff --git a/kubernetes-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/HelmLintMojoTest.java b/kubernetes-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/HelmLintMojoTest.java
index b0ef06a230..626a34c7a4 100644
--- a/kubernetes-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/HelmLintMojoTest.java
+++ b/kubernetes-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/HelmLintMojoTest.java
@@ -13,6 +13,13 @@
  */
 package org.eclipse.jkube.maven.plugin.mojo.build;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.nio.file.Path;
+
 import com.marcnuri.helm.Helm;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.settings.Settings;
@@ -23,13 +30,6 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.io.TempDir;
 
-import java.io.ByteArrayOutputStream;
-import java.io.PrintStream;
-import java.nio.file.Path;
-
-import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-
 class HelmLintMojoTest {
 
   @TempDir
@@ -38,20 +38,20 @@ class HelmLintMojoTest {
   private ByteArrayOutputStream outputStream;
   private HelmLintMojo helmLintMojo;
 
-
   @BeforeEach
-  void setUp() throws Exception {
+  void setUp() {
     originalPrintStream = System.out;
     outputStream = new ByteArrayOutputStream();
     System.setOut(new PrintStream(outputStream));
     helmLintMojo = new HelmLintMojo();
+
     helmLintMojo.helm = HelmConfig.builder().chartExtension("tgz").build();
     helmLintMojo.interpolateTemplateParameters = true;
     helmLintMojo.settings = new Settings();
     helmLintMojo.project = new MavenProject();
     helmLintMojo.project.setVersion("0.1.0");
     helmLintMojo.project.getBuild()
-      .setOutputDirectory(projectDir.resolve("target").resolve("classes").toFile().getAbsolutePath());
+    .setOutputDirectory(projectDir.resolve("target").resolve("classes").toFile().getAbsolutePath());
     helmLintMojo.project.getBuild().setDirectory(projectDir.resolve("target").toFile().getAbsolutePath());
     helmLintMojo.project.setFile(projectDir.resolve("target").toFile());
   }
@@ -65,23 +65,24 @@ void tearDown() {
   @Test
   void execute_withMissingHelmPackage_shouldThrowException() {
     assertThatThrownBy(helmLintMojo::execute)
-      .isInstanceOf(JKubeException.class)
-      .hasMessage("Linting failed");
+    .isInstanceOf(JKubeException.class)
+    .hasMessage("Linting failed");
     assertThat(outputStream.toString())
-      .contains("Linting empty-project 0.1.0\n")
-      .contains("Using packaged file:")
-      .contains("[[W]]Error unable to open tarball:");
+    .contains("No Helm chart has been generated yet by the k8s:helm goal at: ")
+    .contains("Linting empty-project 0.1.0\n")
+    .contains("Using packaged file:")
+    .contains("[[W]]Error unable to open tarball:");
   }
 
   @Test
   void execute_withHelmPackage_shouldSucceed() throws Exception {
     Helm.create().withDir(projectDir).withName("empty-project").call()
-      .packageIt().withDestination(projectDir.resolve("target").resolve("jkube").resolve("helm").resolve("empty-project").resolve("kubernetes")).call();
+    .packageIt().withDestination(projectDir.resolve("target").resolve("jkube").resolve("helm").resolve("empty-project").resolve("kubernetes")).call();
     helmLintMojo.execute();
     assertThat(outputStream.toString())
-      .contains("Linting empty-project 0.1.0\n")
-      .contains("Using packaged file:")
-      .contains("[[W]][INFO] Chart.yaml: icon is recommended")
-      .contains("Linting successful");
+    .contains("Linting empty-project 0.1.0\n")
+    .contains("Using packaged file:")
+    .contains("[[W]][INFO] Chart.yaml: icon is recommended")
+    .contains("Linting successful");
   }
 }
diff --git a/kubernetes-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/HelmPushMojoTest.java b/kubernetes-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/HelmPushMojoTest.java
index 8268795cc1..26740cef82 100644
--- a/kubernetes-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/HelmPushMojoTest.java
+++ b/kubernetes-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/HelmPushMojoTest.java
@@ -13,6 +13,8 @@
  */
 package org.eclipse.jkube.maven.plugin.mojo.build;
 
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
 import java.nio.file.Path;
 import java.util.HashMap;
 
@@ -25,10 +27,12 @@
 import org.eclipse.jkube.kit.resource.helm.HelmService;
 import org.apache.maven.plugin.MojoExecution;
 import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
 import org.apache.maven.plugin.descriptor.MojoDescriptor;
 import org.apache.maven.project.MavenProject;
 import org.apache.maven.settings.Server;
 import org.apache.maven.settings.Settings;
+import org.assertj.core.api.ThrowableAssert.ThrowingCallable;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -50,13 +54,22 @@
 import static org.mockito.Mockito.when;
 
 class HelmPushMojoTest {
+  private PrintStream originalPrintStream;
+  private ByteArrayOutputStream outputStream;
 
   @TempDir
   private Path projectDir;
   private HelmPushMojo helmPushMojo;
+  private MockedConstruction<HelmService> helmServiceMockedConstruction;
 
   @BeforeEach
   void setUp() throws Exception {
+    helmServiceMockedConstruction = mockConstruction(HelmService.class);
+
+    originalPrintStream = System.out;
+    outputStream = new ByteArrayOutputStream();
+    System.setOut(new PrintStream(outputStream));
+
     helmPushMojo = new HelmPushMojo();
     helmPushMojo.helm = new HelmConfig();
     helmPushMojo.project = new MavenProject();
@@ -65,125 +78,130 @@ void setUp() throws Exception {
     helmPushMojo.mojoExecution = new MojoExecution(new MojoDescriptor());
     helmPushMojo.interpolateTemplateParameters = true;
     helmPushMojo.project.getBuild()
-      .setOutputDirectory(projectDir.resolve("target").resolve("classes").toFile().getAbsolutePath());
+    .setOutputDirectory(projectDir.resolve("target").resolve("classes").toFile().getAbsolutePath());
     helmPushMojo.project.getBuild().setDirectory(projectDir.resolve("target").toFile().getAbsolutePath());
     helmPushMojo.project.setFile(projectDir.resolve("target").toFile());
     helmPushMojo.mojoExecution.getMojoDescriptor().setPluginDescriptor(new PluginDescriptor());
     helmPushMojo.mojoExecution.getMojoDescriptor().getPluginDescriptor().setGoalPrefix("k8s");
     helmPushMojo.mojoExecution.getMojoDescriptor().setGoal("helm-push");
     when(helmPushMojo.securityDispatcher.decrypt(anyString()))
-      .thenReturn(String.valueOf(AdditionalAnswers.returnsFirstArg()));
+    .thenReturn(String.valueOf(AdditionalAnswers.returnsFirstArg()));
   }
 
   @AfterEach
   void tearDown() {
+    helmServiceMockedConstruction.close();
+
+    System.setOut(originalPrintStream);
     helmPushMojo = null;
   }
 
+  @Test
+  void execute_withMissingHelmPackage_shouldThrowException() throws MojoExecutionException, MojoFailureException {
+    // Given
+    helmPushMojo.helm.setSnapshotRepository(completeValidRepository());
+    helmPushMojo.project.setVersion("1337-SNAPSHOT");
+    // When
+    helmPushMojo.execute();
+    // Then
+    assertThat(outputStream.toString()).contains("No Helm chart has been generated yet by the k8s:helm goal at: ");
+  }
+
   @Test
   void execute_withValidXMLConfig_shouldUpload() throws Exception {
-    try (MockedConstruction<HelmService> helmServiceMockedConstruction = mockConstruction(HelmService.class)) {
-      // Given
-      helmPushMojo.helm.setSnapshotRepository(completeValidRepository());
-      helmPushMojo.project.setVersion("1337-SNAPSHOT");
-      // When
-      helmPushMojo.execute();
-      // Then
-      assertThat(helmPushMojo.helm)
-          .hasFieldOrPropertyWithValue("security", "~/.m2/settings-security.xml")
-          .hasFieldOrPropertyWithValue("snapshotRepository.type", HelmRepoType.ARTIFACTORY);
-      assertHelmServiceUpload(helmServiceMockedConstruction);
-    }
+    // Given
+    helmPushMojo.helm.setSnapshotRepository(completeValidRepository());
+    helmPushMojo.project.setVersion("1337-SNAPSHOT");
+    // When
+    helmPushMojo.execute();
+    // Then
+    assertThat(helmPushMojo.helm)
+    .hasFieldOrPropertyWithValue("security", "~/.m2/settings-security.xml")
+    .hasFieldOrPropertyWithValue("snapshotRepository.type", HelmRepoType.ARTIFACTORY);
+    assertHelmServiceUpload(helmServiceMockedConstruction);
   }
 
   @Test
   void execute_withValidXMLConfigAndUploadError_shouldFail() {
-    try (MockedConstruction<HelmService> helmServiceMockedConstruction = mockConstruction(HelmService.class,
-      (mock, ctx) -> doThrow(new BadUploadException("Error uploading helm chart")).when(mock).uploadHelmChart(any())
-    )) {
-      // Given
-      helmPushMojo.helm.setStableRepository(completeValidRepository());
-      helmPushMojo.project.setVersion("1337");
-      // When & Then
-      assertThatExceptionOfType(MojoExecutionException.class)
-          .isThrownBy(() -> helmPushMojo.execute())
-          .withMessage("Error uploading helm chart");
-      assertThat(helmServiceMockedConstruction.constructed()).hasSize(1);
-    }
+    // Given
+    helmServiceMockedConstruction.close();
+    helmServiceMockedConstruction = mockConstruction(HelmService.class,
+        (mock, ctx) -> doThrow(new BadUploadException("Error uploading helm chart")).when(mock).uploadHelmChart(any()));
+    helmPushMojo.helm.setStableRepository(completeValidRepository());
+    helmPushMojo.project.setVersion("1337");
+    // When
+    final ThrowingCallable throwingCallable = () -> helmPushMojo.execute();
+    // Then
+    assertThatExceptionOfType(MojoExecutionException.class)
+    .isThrownBy(throwingCallable)
+    .withMessage("Error uploading helm chart");
+    assertThat(helmServiceMockedConstruction.constructed()).hasSize(1);
   }
 
   @Test
   void execute_withValidPropertiesConfig_shouldUpload() throws Exception {
-    try (MockedConstruction<HelmService> helmServiceMockedConstruction = mockConstruction(HelmService.class)) {
-      // Given
-      helmPushMojo.project.getProperties().put("jkube.helm.snapshotRepository.name", "props repo");
-      helmPushMojo.project.getProperties().put("jkube.helm.snapshotRepository.type", "nExus");
-      helmPushMojo.project.getProperties().put("jkube.helm.snapshotRepository.url", "http://example.com/url");
-      helmPushMojo.project.getProperties().put("jkube.helm.snapshotRepository.username", "propsUser");
-      helmPushMojo.project.getProperties().put("jkube.helm.snapshotRepository.password", "propS3cret");
-      helmPushMojo.project.setVersion("1337-SNAPSHOT");
-      // When
-      helmPushMojo.execute();
-      // Then
-      assertThat(helmPushMojo.helm)
-          .hasFieldOrPropertyWithValue("snapshotRepository.name", "props repo")
-          .hasFieldOrPropertyWithValue("snapshotRepository.url", "http://example.com/url")
-          .hasFieldOrPropertyWithValue("snapshotRepository.username", "propsUser")
-          .hasFieldOrPropertyWithValue("snapshotRepository.password", "propS3cret")
-          .hasFieldOrPropertyWithValue("snapshotRepository.type", HelmRepoType.NEXUS)
-          .hasFieldOrPropertyWithValue("security", "~/.m2/settings-security.xml");
-      assertHelmServiceUpload(helmServiceMockedConstruction);
-    }
+    // Given
+    helmPushMojo.project.getProperties().put("jkube.helm.snapshotRepository.name", "props repo");
+    helmPushMojo.project.getProperties().put("jkube.helm.snapshotRepository.type", "nExus");
+    helmPushMojo.project.getProperties().put("jkube.helm.snapshotRepository.url", "http://example.com/url");
+    helmPushMojo.project.getProperties().put("jkube.helm.snapshotRepository.username", "propsUser");
+    helmPushMojo.project.getProperties().put("jkube.helm.snapshotRepository.password", "propS3cret");
+    helmPushMojo.project.setVersion("1337-SNAPSHOT");
+    // When
+    helmPushMojo.execute();
+    // Then
+    assertThat(helmPushMojo.helm)
+    .hasFieldOrPropertyWithValue("snapshotRepository.name", "props repo")
+    .hasFieldOrPropertyWithValue("snapshotRepository.url", "http://example.com/url")
+    .hasFieldOrPropertyWithValue("snapshotRepository.username", "propsUser")
+    .hasFieldOrPropertyWithValue("snapshotRepository.password", "propS3cret")
+    .hasFieldOrPropertyWithValue("snapshotRepository.type", HelmRepoType.NEXUS)
+    .hasFieldOrPropertyWithValue("security", "~/.m2/settings-security.xml");
+    assertHelmServiceUpload(helmServiceMockedConstruction);
   }
 
   @Test
   void execute_withValidPropertiesAndXMLConfig_shouldGenerateWithPropertiesTakingPrecedence() throws Exception {
-    try (MockedConstruction<HelmService> helmServiceMockedConstruction = mockConstruction(HelmService.class)) {
-      // Given
-      helmPushMojo.helm.setSnapshotRepository(completeValidRepository());
-      helmPushMojo.project.getProperties().put("jkube.helm.snapshotRepository.password", "propS3cret");
-      helmPushMojo.project.setVersion("1337-SNAPSHOT");
-      // When
-      helmPushMojo.execute();
-      // Then
-      assertThat(helmPushMojo.helm)
-          .hasFieldOrPropertyWithValue("snapshotRepository.name", "SNAP-REPO")
-          .hasFieldOrPropertyWithValue("snapshotRepository.url", "https://example.com/artifactory")
-          .hasFieldOrPropertyWithValue("snapshotRepository.username", "User")
-          .hasFieldOrPropertyWithValue("snapshotRepository.password", "propS3cret")
-          .hasFieldOrPropertyWithValue("snapshotRepository.type", HelmRepoType.ARTIFACTORY)
-          .hasFieldOrPropertyWithValue("security", "~/.m2/settings-security.xml");
-      assertHelmServiceUpload(helmServiceMockedConstruction);
-    }
+    // Given
+    helmPushMojo.helm.setSnapshotRepository(completeValidRepository());
+    helmPushMojo.project.getProperties().put("jkube.helm.snapshotRepository.password", "propS3cret");
+    helmPushMojo.project.setVersion("1337-SNAPSHOT");
+    // When
+    helmPushMojo.execute();
+    // Then
+    assertThat(helmPushMojo.helm)
+    .hasFieldOrPropertyWithValue("snapshotRepository.name", "SNAP-REPO")
+    .hasFieldOrPropertyWithValue("snapshotRepository.url", "https://example.com/artifactory")
+    .hasFieldOrPropertyWithValue("snapshotRepository.username", "User")
+    .hasFieldOrPropertyWithValue("snapshotRepository.password", "propS3cret")
+    .hasFieldOrPropertyWithValue("snapshotRepository.type", HelmRepoType.ARTIFACTORY)
+    .hasFieldOrPropertyWithValue("security", "~/.m2/settings-security.xml");
+    assertHelmServiceUpload(helmServiceMockedConstruction);
   }
 
   @Test
   void execute_withValidMavenSettings_shouldUpload() throws Exception {
-    try (MockedConstruction<HelmService> helmServiceMockedConstruction = mockConstruction(HelmService.class)) {
-      // Given
-      helmPushMojo.settings.addServer(completeValidServer());
-      helmPushMojo.project.setVersion("1337-SNAPSHOT");
-      // When
-      helmPushMojo.execute();
-      // Then
-      assertThat(helmPushMojo.jkubeServiceHub.getConfiguration().getRegistryConfig().getSettings()).singleElement()
-          .isEqualTo(RegistryServerConfiguration.builder()
-              .id("SNAP-REPO").username("mavenUser").password("mavenPassword").configuration(new HashMap<>()).build());
-      assertThat(helmServiceMockedConstruction.constructed()).hasSize(1);
-      verify(helmServiceMockedConstruction.constructed().get(0), times(1)).uploadHelmChart(helmPushMojo.helm);
-    }
+    // Given
+    helmPushMojo.settings.addServer(completeValidServer());
+    helmPushMojo.project.setVersion("1337-SNAPSHOT");
+    // When
+    helmPushMojo.execute();
+    // Then
+    assertThat(helmPushMojo.jkubeServiceHub.getConfiguration().getRegistryConfig().getSettings()).singleElement()
+    .isEqualTo(RegistryServerConfiguration.builder()
+        .id("SNAP-REPO").username("mavenUser").password("mavenPassword").configuration(new HashMap<>()).build());
+    assertThat(helmServiceMockedConstruction.constructed()).hasSize(1);
+    verify(helmServiceMockedConstruction.constructed().get(0), times(1)).uploadHelmChart(helmPushMojo.helm);
   }
 
   @Test
   void execute_withSkip_shouldSkipExecution() throws Exception {
-    try (MockedConstruction<HelmService> helmServiceMockedConstruction = mockConstruction(HelmService.class)) {
-      // Given
-      helmPushMojo.skip = true;
-      // When
-      helmPushMojo.execute();
-      // Then
-      assertThat(helmServiceMockedConstruction.constructed()).isEmpty();
-    }
+    // Given
+    helmPushMojo.skip = true;
+    // When
+    helmPushMojo.execute();
+    // Then
+    assertThat(helmServiceMockedConstruction.constructed()).isEmpty();
   }
 
   @Test
diff --git a/openshift-maven-plugin/plugin/pom.xml b/openshift-maven-plugin/plugin/pom.xml
index a984e8f78a..197641cd93 100644
--- a/openshift-maven-plugin/plugin/pom.xml
+++ b/openshift-maven-plugin/plugin/pom.xml
@@ -53,7 +53,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
+            <artifactId>mockito-inline</artifactId>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
diff --git a/openshift-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/OpenshiftHelmLintMojo.java b/openshift-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/OpenshiftHelmLintMojo.java
index 365c28e42b..e6bd5bd204 100644
--- a/openshift-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/OpenshiftHelmLintMojo.java
+++ b/openshift-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/OpenshiftHelmLintMojo.java
@@ -21,6 +21,7 @@
 import org.eclipse.jkube.maven.plugin.mojo.OpenShift;
 
 import java.io.File;
+import java.nio.file.Path;
 
 @Mojo(name = "helm-lint", defaultPhase = LifecyclePhase.INTEGRATION_TEST, requiresDependencyResolution = ResolutionScope.COMPILE)
 public class OpenshiftHelmLintMojo extends HelmLintMojo {
@@ -50,4 +51,9 @@ protected HelmConfig.HelmType getDefaultHelmType() {
   protected String getLogPrefix() {
     return OpenShift.DEFAULT_LOG_PREFIX;
   }
+
+  @Override
+  protected void logChartNotFoundWarning(final Path chart) {
+    getKitLogger().warn("No Helm chart has been generated yet by the oc:helm goal at: " + chart);
+  }
 }
diff --git a/openshift-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/OpenshiftHelmPushMojo.java b/openshift-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/OpenshiftHelmPushMojo.java
index acdeb36000..395e462ab5 100644
--- a/openshift-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/OpenshiftHelmPushMojo.java
+++ b/openshift-maven-plugin/plugin/src/main/java/org/eclipse/jkube/maven/plugin/mojo/build/OpenshiftHelmPushMojo.java
@@ -14,6 +14,7 @@
 package org.eclipse.jkube.maven.plugin.mojo.build;
 
 import java.io.File;
+import java.nio.file.Path;
 
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
@@ -49,4 +50,9 @@ protected HelmConfig.HelmType getDefaultHelmType() {
   protected String getLogPrefix() {
     return OpenShift.DEFAULT_LOG_PREFIX;
   }
+
+  @Override
+  protected void logChartNotFoundWarning(final Path chart) {
+    getKitLogger().warn("No Helm chart has been generated yet by the oc:helm goal at: " + chart);
+  }
 }
diff --git a/openshift-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/OpenshiftHelmLintMojoTest.java b/openshift-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/OpenshiftHelmLintMojoTest.java
new file mode 100644
index 0000000000..8ce64911a8
--- /dev/null
+++ b/openshift-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/OpenshiftHelmLintMojoTest.java
@@ -0,0 +1,78 @@
+package org.eclipse.jkube.maven.plugin.mojo.build;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.nio.file.Path;
+
+import com.marcnuri.helm.Helm;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.settings.Settings;
+import org.eclipse.jkube.kit.common.JKubeException;
+import org.eclipse.jkube.kit.resource.helm.HelmConfig;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+
+class OpenshiftHelmLintMojoTest {
+
+  @TempDir
+  private Path projectDir;
+  private PrintStream originalPrintStream;
+  private ByteArrayOutputStream outputStream;
+  private OpenshiftHelmLintMojo helmLintMojo;
+
+  @BeforeEach
+  void setUp() {
+    originalPrintStream = System.out;
+    outputStream = new ByteArrayOutputStream();
+    System.setOut(new PrintStream(outputStream));
+    helmLintMojo = new OpenshiftHelmLintMojo();
+
+    helmLintMojo.helm = HelmConfig.builder().chartExtension("tgz").build();
+    helmLintMojo.interpolateTemplateParameters = true;
+    helmLintMojo.settings = new Settings();
+    helmLintMojo.project = new MavenProject();
+    helmLintMojo.project.setVersion("0.1.0");
+    helmLintMojo.project.getBuild()
+    .setOutputDirectory(projectDir.resolve("target").resolve("classes").toFile().getAbsolutePath());
+    helmLintMojo.project.getBuild().setDirectory(projectDir.resolve("target").toFile().getAbsolutePath());
+    helmLintMojo.project.setFile(projectDir.resolve("target").toFile());
+  }
+
+  @AfterEach
+  void tearDown() {
+    System.setOut(originalPrintStream);
+    helmLintMojo = null;
+  }
+
+  @Test
+  void execute_withMissingHelmPackage_shouldThrowException() {
+    assertThatThrownBy(helmLintMojo::execute)
+    .isInstanceOf(JKubeException.class)
+    .hasMessage("Linting failed");
+    assertThat(outputStream.toString())
+    .contains("No Helm chart has been generated yet by the oc:helm goal at: ")
+    .contains("Linting empty-project 0.1.0\n")
+    .contains("Using packaged file:")
+    .contains("[[W]]Error unable to open tarball:");
+  }
+
+  @Test
+  void execute_withHelmPackage_shouldSucceed() throws Exception {
+    Helm.create().withDir(projectDir).withName("empty-project").call()
+    .packageIt()
+    .withDestination(
+        projectDir.resolve("target").resolve("jkube").resolve("helm").resolve("empty-project").resolve("openshift"))
+    .call();
+    helmLintMojo.execute();
+    assertThat(outputStream.toString())
+    .contains("Linting empty-project 0.1.0\n")
+    .contains("Using packaged file:")
+    .contains("[[W]][INFO] Chart.yaml: icon is recommended")
+    .contains("Linting successful");
+  }
+}
diff --git a/openshift-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/OpenshiftHelmPushMojoTest.java b/openshift-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/OpenshiftHelmPushMojoTest.java
new file mode 100644
index 0000000000..8b02e343a5
--- /dev/null
+++ b/openshift-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/OpenshiftHelmPushMojoTest.java
@@ -0,0 +1,225 @@
+package org.eclipse.jkube.maven.plugin.mojo.build;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.Mockito.doThrow;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.mockConstruction;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import java.io.ByteArrayOutputStream;
+import java.io.PrintStream;
+import java.nio.file.Path;
+import java.util.HashMap;
+
+import org.apache.maven.plugin.MojoExecution;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.plugin.descriptor.MojoDescriptor;
+import org.apache.maven.plugin.descriptor.PluginDescriptor;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.settings.Server;
+import org.apache.maven.settings.Settings;
+import org.assertj.core.api.ThrowableAssert.ThrowingCallable;
+import org.eclipse.jkube.kit.common.RegistryServerConfiguration;
+import org.eclipse.jkube.kit.resource.helm.BadUploadException;
+import org.eclipse.jkube.kit.resource.helm.HelmConfig;
+import org.eclipse.jkube.kit.resource.helm.HelmRepository;
+import org.eclipse.jkube.kit.resource.helm.HelmRepository.HelmRepoType;
+import org.eclipse.jkube.kit.resource.helm.HelmService;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.io.TempDir;
+import org.mockito.AdditionalAnswers;
+import org.mockito.MockedConstruction;
+import org.sonatype.plexus.components.sec.dispatcher.SecDispatcher;
+
+class OpenshiftHelmPushMojoTest {
+  private PrintStream originalPrintStream;
+  private ByteArrayOutputStream outputStream;
+
+  @TempDir
+  private Path projectDir;
+  private OpenshiftHelmPushMojo helmPushMojo;
+  private MockedConstruction<HelmService> helmServiceMockedConstruction;
+
+  @BeforeEach
+  void setUp() throws Exception {
+    helmServiceMockedConstruction = mockConstruction(HelmService.class);
+
+    originalPrintStream = System.out;
+    outputStream = new ByteArrayOutputStream();
+    System.setOut(new PrintStream(outputStream));
+
+    helmPushMojo = new OpenshiftHelmPushMojo();
+    helmPushMojo.helm = new HelmConfig();
+    helmPushMojo.project = new MavenProject();
+    helmPushMojo.settings = new Settings();
+    helmPushMojo.securityDispatcher = mock(SecDispatcher.class);
+    helmPushMojo.mojoExecution = new MojoExecution(new MojoDescriptor());
+    helmPushMojo.interpolateTemplateParameters = true;
+    helmPushMojo.project.getBuild()
+        .setOutputDirectory(projectDir.resolve("target").resolve("classes").toFile().getAbsolutePath());
+    helmPushMojo.project.getBuild().setDirectory(projectDir.resolve("target").toFile().getAbsolutePath());
+    helmPushMojo.project.setFile(projectDir.resolve("target").toFile());
+    helmPushMojo.mojoExecution.getMojoDescriptor().setPluginDescriptor(new PluginDescriptor());
+    helmPushMojo.mojoExecution.getMojoDescriptor().getPluginDescriptor().setGoalPrefix("k8s");
+    helmPushMojo.mojoExecution.getMojoDescriptor().setGoal("helm-push");
+    when(helmPushMojo.securityDispatcher.decrypt(anyString()))
+        .thenReturn(String.valueOf(AdditionalAnswers.returnsFirstArg()));
+  }
+
+  @AfterEach
+  void tearDown() {
+    helmServiceMockedConstruction.close();
+
+    System.setOut(originalPrintStream);
+    helmPushMojo = null;
+  }
+
+  @Test
+  void execute_withMissingHelmPackage_shouldThrowException() throws MojoExecutionException, MojoFailureException {
+    // Given
+    helmPushMojo.helm.setSnapshotRepository(completeValidRepository());
+    helmPushMojo.project.setVersion("1337-SNAPSHOT");
+    // When
+    helmPushMojo.execute();
+    // Then
+    assertThat(outputStream.toString()).contains("No Helm chart has been generated yet by the oc:helm goal at: ");
+  }
+
+  @Test
+  void execute_withValidXMLConfig_shouldUpload() throws Exception {
+    // Given
+    helmPushMojo.helm.setSnapshotRepository(completeValidRepository());
+    helmPushMojo.project.setVersion("1337-SNAPSHOT");
+    // When
+    helmPushMojo.execute();
+    // Then
+    assertThat(helmPushMojo.helm)
+        .hasFieldOrPropertyWithValue("security", "~/.m2/settings-security.xml")
+        .hasFieldOrPropertyWithValue("snapshotRepository.type", HelmRepoType.ARTIFACTORY);
+    assertHelmServiceUpload(helmServiceMockedConstruction);
+  }
+
+  @Test
+  void execute_withValidXMLConfigAndUploadError_shouldFail() {
+    // Given
+    helmServiceMockedConstruction.close();
+    helmServiceMockedConstruction = mockConstruction(HelmService.class,
+        (mock, ctx) -> doThrow(new BadUploadException("Error uploading helm chart")).when(mock).uploadHelmChart(any()));
+    helmPushMojo.helm.setStableRepository(completeValidRepository());
+    helmPushMojo.project.setVersion("1337");
+    // When
+    final ThrowingCallable throwingCallable = () -> helmPushMojo.execute();
+    // Then
+    assertThatExceptionOfType(MojoExecutionException.class)
+        .isThrownBy(throwingCallable)
+        .withMessage("Error uploading helm chart");
+    assertThat(helmServiceMockedConstruction.constructed()).hasSize(1);
+  }
+
+  @Test
+  void execute_withValidPropertiesConfig_shouldUpload() throws Exception {
+    // Given
+    helmPushMojo.project.getProperties().put("jkube.helm.snapshotRepository.name", "props repo");
+    helmPushMojo.project.getProperties().put("jkube.helm.snapshotRepository.type", "nExus");
+    helmPushMojo.project.getProperties().put("jkube.helm.snapshotRepository.url", "http://example.com/url");
+    helmPushMojo.project.getProperties().put("jkube.helm.snapshotRepository.username", "propsUser");
+    helmPushMojo.project.getProperties().put("jkube.helm.snapshotRepository.password", "propS3cret");
+    helmPushMojo.project.setVersion("1337-SNAPSHOT");
+    // When
+    helmPushMojo.execute();
+    // Then
+    assertThat(helmPushMojo.helm)
+        .hasFieldOrPropertyWithValue("snapshotRepository.name", "props repo")
+        .hasFieldOrPropertyWithValue("snapshotRepository.url", "http://example.com/url")
+        .hasFieldOrPropertyWithValue("snapshotRepository.username", "propsUser")
+        .hasFieldOrPropertyWithValue("snapshotRepository.password", "propS3cret")
+        .hasFieldOrPropertyWithValue("snapshotRepository.type", HelmRepoType.NEXUS)
+        .hasFieldOrPropertyWithValue("security", "~/.m2/settings-security.xml");
+    assertHelmServiceUpload(helmServiceMockedConstruction);
+  }
+
+  @Test
+  void execute_withValidPropertiesAndXMLConfig_shouldGenerateWithPropertiesTakingPrecedence() throws Exception {
+    // Given
+    helmPushMojo.helm.setSnapshotRepository(completeValidRepository());
+    helmPushMojo.project.getProperties().put("jkube.helm.snapshotRepository.password", "propS3cret");
+    helmPushMojo.project.setVersion("1337-SNAPSHOT");
+    // When
+    helmPushMojo.execute();
+    // Then
+    assertThat(helmPushMojo.helm)
+        .hasFieldOrPropertyWithValue("snapshotRepository.name", "SNAP-REPO")
+        .hasFieldOrPropertyWithValue("snapshotRepository.url", "https://example.com/artifactory")
+        .hasFieldOrPropertyWithValue("snapshotRepository.username", "User")
+        .hasFieldOrPropertyWithValue("snapshotRepository.password", "propS3cret")
+        .hasFieldOrPropertyWithValue("snapshotRepository.type", HelmRepoType.ARTIFACTORY)
+        .hasFieldOrPropertyWithValue("security", "~/.m2/settings-security.xml");
+    assertHelmServiceUpload(helmServiceMockedConstruction);
+  }
+
+  @Test
+  void execute_withValidMavenSettings_shouldUpload() throws Exception {
+    // Given
+    helmPushMojo.settings.addServer(completeValidServer());
+    helmPushMojo.project.setVersion("1337-SNAPSHOT");
+    // When
+    helmPushMojo.execute();
+    // Then
+    assertThat(helmPushMojo.jkubeServiceHub.getConfiguration().getRegistryConfig().getSettings()).singleElement()
+        .isEqualTo(RegistryServerConfiguration.builder()
+            .id("SNAP-REPO").username("mavenUser").password("mavenPassword").configuration(new HashMap<>()).build());
+    assertThat(helmServiceMockedConstruction.constructed()).hasSize(1);
+    verify(helmServiceMockedConstruction.constructed().get(0), times(1)).uploadHelmChart(helmPushMojo.helm);
+  }
+
+  @Test
+  void execute_withSkip_shouldSkipExecution() throws Exception {
+    // Given
+    helmPushMojo.skip = true;
+    // When
+    helmPushMojo.execute();
+    // Then
+    assertThat(helmServiceMockedConstruction.constructed()).isEmpty();
+  }
+
+  @Test
+  void shouldSkip_withSkip_shouldReturnTrue() {
+    // Given
+    helmPushMojo.skip = true;
+    // When
+    final boolean result = helmPushMojo.shouldSkip();
+    // Then
+    assertThat(result).isTrue();
+  }
+
+  private void assertHelmServiceUpload(MockedConstruction<HelmService> helmServiceMockedConstruction) throws Exception {
+    assertThat(helmServiceMockedConstruction.constructed()).hasSize(1);
+    verify(helmServiceMockedConstruction.constructed().get(0), times(1)).uploadHelmChart(helmPushMojo.helm);
+  }
+
+  private static HelmRepository completeValidRepository() {
+    final HelmRepository repository = new HelmRepository();
+    repository.setName("SNAP-REPO");
+    repository.setType("ArtIFACTORY");
+    repository.setUrl("https://example.com/artifactory");
+    repository.setUsername("User");
+    repository.setPassword("S3cret");
+    return repository;
+  }
+
+  private static Server completeValidServer() {
+    final Server server = new Server();
+    server.setId("SNAP-REPO");
+    server.setUsername("mavenUser");
+    server.setPassword("mavenPassword");
+    return server;
+  }
+}

From 445b392c663f9be60f37e88495d83ddaae40472a Mon Sep 17 00:00:00 2001
From: Jurrie Overgoor <1213142+Jurrie@users.noreply.github.com>
Date: Wed, 6 Mar 2024 13:08:45 +0100
Subject: [PATCH 2/5] Add forgotten license headers

Signed-off-by: Jurrie Overgoor <eclipse.org@jurr.org>
---
 .../mojo/build/OpenshiftHelmLintMojoTest.java       | 13 +++++++++++++
 .../mojo/build/OpenshiftHelmPushMojoTest.java       | 13 +++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/openshift-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/OpenshiftHelmLintMojoTest.java b/openshift-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/OpenshiftHelmLintMojoTest.java
index 8ce64911a8..e7d63078b9 100644
--- a/openshift-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/OpenshiftHelmLintMojoTest.java
+++ b/openshift-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/OpenshiftHelmLintMojoTest.java
@@ -1,3 +1,16 @@
+/*
+ * Copyright (c) 2019 Red Hat, Inc.
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at:
+ *
+ *     https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *   Red Hat, Inc. - initial API and implementation
+ */
 package org.eclipse.jkube.maven.plugin.mojo.build;
 
 import static org.assertj.core.api.Assertions.assertThat;
diff --git a/openshift-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/OpenshiftHelmPushMojoTest.java b/openshift-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/OpenshiftHelmPushMojoTest.java
index 8b02e343a5..8f5f4d47f7 100644
--- a/openshift-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/OpenshiftHelmPushMojoTest.java
+++ b/openshift-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/OpenshiftHelmPushMojoTest.java
@@ -1,3 +1,16 @@
+/*
+ * Copyright (c) 2019 Red Hat, Inc.
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at:
+ *
+ *     https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *   Red Hat, Inc. - initial API and implementation
+ */
 package org.eclipse.jkube.maven.plugin.mojo.build;
 
 import static org.assertj.core.api.Assertions.assertThat;

From ab0e10361a71635116eaa7c5db5a8ddf07745464 Mon Sep 17 00:00:00 2001
From: Jurrie Overgoor <1213142+Jurrie@users.noreply.github.com>
Date: Wed, 6 Mar 2024 13:11:12 +0100
Subject: [PATCH 3/5] Undo whitespace changes in HelmServiceUtil.java

Signed-off-by: Jurrie Overgoor <eclipse.org@jurr.org>
---
 .../kit/resource/helm/HelmServiceUtil.java    | 68 +++++++++----------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmServiceUtil.java b/jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmServiceUtil.java
index e266768060..6245e03147 100644
--- a/jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmServiceUtil.java
+++ b/jkube-kit/helm/src/main/java/org/eclipse/jkube/kit/resource/helm/HelmServiceUtil.java
@@ -108,7 +108,7 @@ public static HelmConfig.HelmConfigBuilder initHelmConfig(
     helmConfig.setSourceDir(resolveFromPropertyOrDefault(PROPERTY_SOURCE_DIR, project, helmConfig::getSourceDir,
         () -> separatorsToSystem(String.format("%s/META-INF/jkube/", project.getOutputDirectory()))));
     helmConfig.setOutputDir(resolveFromPropertyOrDefault(PROPERTY_OUTPUT_DIR, project, helmConfig::getOutputDir,
-        () -> separatorsToSystem(String.format("%s/jkube/helm/%s", project.getBuildDirectory(), helmConfig.getChart()))));
+      () -> separatorsToSystem(String.format("%s/jkube/helm/%s", project.getBuildDirectory(), helmConfig.getChart()))));
     helmConfig.setIcon(resolveFromPropertyOrDefault(PROPERTY_ICON, project, helmConfig::getIcon,
         () -> findIconURL(new File(helmConfig.getSourceDir()), helmConfig.getTypes())));
     helmConfig.setAppVersion(resolveFromPropertyOrDefault(PROPERTY_APP_VERSION, project, helmConfig::getAppVersion, project::getVersion));
@@ -134,25 +134,25 @@ static HelmRepository initHelmRepository(HelmRepository helmRepository, JavaProj
     }
 
     resolvedHelmRepository.setType(resolveFromPropertyOrDefault(String.format(PROPERTY_UPLOAD_REPO_TYPE, repositoryType), project,
-        resolvedHelmRepository::getTypeAsString, null));
+      resolvedHelmRepository::getTypeAsString, null));
     resolvedHelmRepository.setName(resolveFromPropertyOrDefault(String.format(PROPERTY_UPLOAD_REPO_NAME, repositoryType), project,
-        resolvedHelmRepository::getName, null));
+      resolvedHelmRepository::getName, null));
     resolvedHelmRepository.setUrl(resolveFromPropertyOrDefault(String.format(PROPERTY_UPLOAD_REPO_URL, repositoryType), project,
-        resolvedHelmRepository::getUrl, null));
+      resolvedHelmRepository::getUrl, null));
     resolvedHelmRepository.setUsername(resolveFromPropertyOrDefault(String.format(PROPERTY_UPLOAD_REPO_USERNAME, repositoryType), project,
-        resolvedHelmRepository::getUsername,  null));
+      resolvedHelmRepository::getUsername,  null));
     resolvedHelmRepository.setPassword(resolveFromPropertyOrDefault(String.format(PROPERTY_UPLOAD_REPO_PASSWORD, repositoryType), project,
-        resolvedHelmRepository::getPassword, null));
+      resolvedHelmRepository::getPassword, null));
 
     return resolvedHelmRepository;
   }
 
   static List<HelmConfig.HelmType> resolveHelmTypes(HelmConfig.HelmType defaultHelmType, JavaProject project) {
     final List<HelmConfig.HelmType> helmTypes = Optional.ofNullable(getProperty(PROPERTY_TYPE, project))
-        .filter(StringUtils::isNotBlank)
-        .map(types -> StringUtils.split(types, ","))
-        .map(Stream::of)
-        .map(s -> s.map(prop -> HelmConfig.HelmType.valueOf(prop.trim().toUpperCase())).collect(Collectors.toList())).orElse(null);
+      .filter(StringUtils::isNotBlank)
+      .map(types -> StringUtils.split(types, ","))
+      .map(Stream::of)
+      .map(s -> s.map(prop -> HelmConfig.HelmType.valueOf(prop.trim().toUpperCase())).collect(Collectors.toList())).orElse(null);
     if (helmTypes == null || helmTypes.isEmpty()) {
       return Collections.singletonList(defaultHelmType);
     }
@@ -161,17 +161,17 @@ static List<HelmConfig.HelmType> resolveHelmTypes(HelmConfig.HelmType defaultHel
 
   static String resolveFromPropertyOrDefault(String property, JavaProject project, Supplier<String> getter, Supplier<String> defaultValue) {
     return Optional.ofNullable(getProperty(property, project))
+      .filter(StringUtils::isNotBlank)
+      .orElse(Optional.ofNullable(getter.get())
         .filter(StringUtils::isNotBlank)
-        .orElse(Optional.ofNullable(getter.get())
-            .filter(StringUtils::isNotBlank)
-            .orElseGet(defaultValue == null ? () -> null : defaultValue));
+        .orElseGet(defaultValue == null ? () -> null : defaultValue));
   }
 
   static boolean resolveBooleanFromPropertyOrDefault(String property, JavaProject project, BooleanSupplier getter) {
     return Optional.ofNullable(getProperty(property, project))
-        .filter(StringUtils::isNotBlank)
-        .map(Boolean::parseBoolean)
-        .orElse(getter.getAsBoolean());
+      .filter(StringUtils::isNotBlank)
+      .map(Boolean::parseBoolean)
+      .orElse(getter.getAsBoolean());
   }
 
   static List<File> getAdditionalFiles(HelmConfig helm, JavaProject project) {
@@ -191,8 +191,8 @@ static Optional<File> firstProjectFile(String fileName, JavaProject project) {
       return lower.equalsIgnoreCase(fileName) || lower.startsWith(fileName.toLowerCase() + ".");
     };
     return Optional.ofNullable(project.getBaseDirectory().listFiles(filter))
-        .filter(files -> files.length > 0)
-        .map(files -> files[0]);
+      .filter(files -> files.length > 0)
+      .map(files -> files[0]);
   }
 
   static String findIconURL(File directory, Collection<HelmConfig.HelmType> types) {
@@ -232,15 +232,15 @@ static List<Template> findTemplates(File templateDir) throws IOException {
     final File[] sourceFiles;
     if (templateDir != null && templateDir.isDirectory()) {
       sourceFiles = templateDir.listFiles((dir, filename) ->
-      filename.toLowerCase(Locale.ROOT).endsWith("-template.yml") ||
-      filename.toLowerCase(Locale.ROOT).endsWith("-template.yaml"));
+              filename.toLowerCase(Locale.ROOT).endsWith("-template.yml") ||
+              filename.toLowerCase(Locale.ROOT).endsWith("-template.yaml"));
     } else if (templateDir != null) {
       sourceFiles = new File[] { templateDir };
     } else {
       sourceFiles = new File[0];
     }
     for (File sourceFile : Objects
-        .requireNonNull(sourceFiles, "No template files found in the provided directory")) {
+      .requireNonNull(sourceFiles, "No template files found in the provided directory")) {
       if (!sourceFile.exists()) {
         continue;
       }
@@ -249,12 +249,12 @@ static List<Template> findTemplates(File templateDir) throws IOException {
         ret.add((Template) dto);
       } else if (dto instanceof KubernetesList) {
         Optional.ofNullable(((KubernetesList)dto).getItems())
-        .map(List::stream)
-        .map(items -> items.filter(Template.class::isInstance)
+          .map(List::stream)
+          .map(items -> items.filter(Template.class::isInstance)
             .map(Template.class::cast)
             .collect(Collectors.toList())
-            )
-        .ifPresent(ret::addAll);
+          )
+          .ifPresent(ret::addAll);
       }
     }
     return ret;
@@ -269,9 +269,9 @@ static HelmRepository selectHelmRepository(HelmConfig helmConfig) {
 
   static boolean isRepositoryValid(HelmRepository repository) {
     return repository != null
-        && repository.getType() != null
-        && StringUtils.isNotBlank(repository.getName())
-        && StringUtils.isNotBlank(repository.getUrl());
+      && repository.getType() != null
+      && StringUtils.isNotBlank(repository.getName())
+      && StringUtils.isNotBlank(repository.getUrl());
   }
 
   static void setAuthentication(HelmRepository repository, KitLogger logger, List<RegistryServerConfiguration> registryServerConfigurations, UnaryOperator<String> passwordDecrypter)  {
@@ -285,19 +285,19 @@ static void setAuthentication(HelmRepository repository, KitLogger logger, List<
     } else {
 
       RegistryServerConfiguration server = registryServerConfigurations.stream()
-          .filter(r -> r.getId().equals(id))
-          .findAny()
-          .orElse(null);
+        .filter(r -> r.getId().equals(id))
+        .findAny()
+        .orElse(null);
       if (server == null) {
         throw new IllegalArgumentException(
-            "No credentials found for " + id + " in configuration or settings.xml server list.");
+          "No credentials found for " + id + " in configuration or settings.xml server list.");
       } else {
 
         logger.debug("Use credentials from server list for " + id + ".");
         if (server.getUsername() == null || server.getPassword() == null) {
           throw new IllegalArgumentException("Repo "
-              + id
-              + " was found in server list but has no username/password.");
+            + id
+            + " was found in server list but has no username/password.");
         }
         repository.setUsername(server.getUsername());
         repository.setPassword(passwordDecrypter.apply(server.getPassword()));

From 648e1c5f4932b67b6eb917c5c88a683b2a4d7dea Mon Sep 17 00:00:00 2001
From: Jurrie Overgoor <1213142+Jurrie@users.noreply.github.com>
Date: Fri, 8 Mar 2024 16:03:02 +0100
Subject: [PATCH 4/5] Remove strange unit tests; rename unit test

Signed-off-by: Jurrie Overgoor <eclipse.org@jurr.org>
---
 .../plugin/task/KubernetesHelmPushTaskTest.java      | 12 ------------
 .../gradle/plugin/task/KubernetesHelmTaskTest.java   | 12 ------------
 .../plugin/task/OpenShiftHelmPushTaskTest.java       | 12 ------------
 .../gradle/plugin/task/OpenShiftHelmTaskTest.java    | 12 ------------
 .../maven/plugin/mojo/build/HelmPushMojoTest.java    |  2 +-
 5 files changed, 1 insertion(+), 49 deletions(-)

diff --git a/gradle-plugin/kubernetes/src/test/java/org/eclipse/jkube/gradle/plugin/task/KubernetesHelmPushTaskTest.java b/gradle-plugin/kubernetes/src/test/java/org/eclipse/jkube/gradle/plugin/task/KubernetesHelmPushTaskTest.java
index 7af38e015a..b511add98a 100644
--- a/gradle-plugin/kubernetes/src/test/java/org/eclipse/jkube/gradle/plugin/task/KubernetesHelmPushTaskTest.java
+++ b/gradle-plugin/kubernetes/src/test/java/org/eclipse/jkube/gradle/plugin/task/KubernetesHelmPushTaskTest.java
@@ -52,18 +52,6 @@ void tearDown() {
     helmServiceMockedConstruction.close();
   }
 
-  @Test
-  void runTask_withNoTemplateDir_shouldThrowException() {
-    // Given
-    KubernetesHelmPushTask kubernetesHelmPushTask = new KubernetesHelmPushTask(KubernetesExtension.class);
-
-    // When & Then
-    assertThatIllegalStateException()
-        .isThrownBy(kubernetesHelmPushTask::runTask)
-        .withMessageContaining("META-INF/jkube/kubernetes")
-        .withCauseInstanceOf(NoSuchFileException.class);
-  }
-
   @Test
   void runTask_withTemplateDir_shouldCallHelmService() throws IOException, BadUploadException {
     // Given
diff --git a/gradle-plugin/kubernetes/src/test/java/org/eclipse/jkube/gradle/plugin/task/KubernetesHelmTaskTest.java b/gradle-plugin/kubernetes/src/test/java/org/eclipse/jkube/gradle/plugin/task/KubernetesHelmTaskTest.java
index 0f5bd88fd8..0aba3ba5c1 100644
--- a/gradle-plugin/kubernetes/src/test/java/org/eclipse/jkube/gradle/plugin/task/KubernetesHelmTaskTest.java
+++ b/gradle-plugin/kubernetes/src/test/java/org/eclipse/jkube/gradle/plugin/task/KubernetesHelmTaskTest.java
@@ -52,18 +52,6 @@ void tearDown() {
     helmServiceMockedConstruction.close();
   }
 
-  @Test
-  void runTask_withNoTemplateDir_shouldThrowException() {
-    // Given
-    KubernetesHelmTask kubernetesHelmTask = new KubernetesHelmTask(KubernetesExtension.class);
-
-    // When & Then
-    assertThatIllegalStateException()
-        .isThrownBy(kubernetesHelmTask::runTask)
-        .withMessageContaining("META-INF/jkube/kubernetes")
-        .withCauseInstanceOf(NoSuchFileException.class);
-  }
-
   @Test
   void runTask_withTemplateDir_shouldCallHelmService() throws IOException {
     // Given
diff --git a/gradle-plugin/openshift/src/test/java/org/eclipse/jkube/gradle/plugin/task/OpenShiftHelmPushTaskTest.java b/gradle-plugin/openshift/src/test/java/org/eclipse/jkube/gradle/plugin/task/OpenShiftHelmPushTaskTest.java
index 5882771b06..be11efa1c2 100644
--- a/gradle-plugin/openshift/src/test/java/org/eclipse/jkube/gradle/plugin/task/OpenShiftHelmPushTaskTest.java
+++ b/gradle-plugin/openshift/src/test/java/org/eclipse/jkube/gradle/plugin/task/OpenShiftHelmPushTaskTest.java
@@ -51,18 +51,6 @@ void tearDown() {
     helmServiceMockedConstruction.close();
   }
 
-  @Test
-  void runTask_withNoTemplateDir_shouldThrowException() {
-    // Given
-    OpenShiftHelmPushTask openShiftHelmPushTask = new OpenShiftHelmPushTask(OpenShiftExtension.class);
-
-    // When & Then
-    assertThatIllegalStateException()
-        .isThrownBy(openShiftHelmPushTask::runTask)
-        .withMessageContaining("META-INF/jkube/openshift")
-        .withCauseInstanceOf(NoSuchFileException.class);
-  }
-
   @Test
   void runTask_withTemplateDir_shouldCallHelmService() throws IOException, BadUploadException {
     // Given
diff --git a/gradle-plugin/openshift/src/test/java/org/eclipse/jkube/gradle/plugin/task/OpenShiftHelmTaskTest.java b/gradle-plugin/openshift/src/test/java/org/eclipse/jkube/gradle/plugin/task/OpenShiftHelmTaskTest.java
index 23939518c2..eff5a6db84 100644
--- a/gradle-plugin/openshift/src/test/java/org/eclipse/jkube/gradle/plugin/task/OpenShiftHelmTaskTest.java
+++ b/gradle-plugin/openshift/src/test/java/org/eclipse/jkube/gradle/plugin/task/OpenShiftHelmTaskTest.java
@@ -50,18 +50,6 @@ void tearDown() {
     helmServiceMockedConstruction.close();
   }
 
-  @Test
-  void runTask_withNoTemplateDir_shouldThrowException() {
-    // Given
-    OpenShiftHelmTask kubernetesHelmTask = new OpenShiftHelmTask(OpenShiftExtension.class);
-
-    // When & Then
-    assertThatIllegalStateException()
-        .isThrownBy(kubernetesHelmTask::runTask)
-        .withMessageContaining("META-INF/jkube/openshift")
-        .withCauseInstanceOf(NoSuchFileException.class);
-  }
-
   @Test
   void runTask_withTemplateDir_shouldCallHelmService() throws IOException {
     // Given
diff --git a/kubernetes-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/HelmPushMojoTest.java b/kubernetes-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/HelmPushMojoTest.java
index 26740cef82..ac7c795b27 100644
--- a/kubernetes-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/HelmPushMojoTest.java
+++ b/kubernetes-maven-plugin/plugin/src/test/java/org/eclipse/jkube/maven/plugin/mojo/build/HelmPushMojoTest.java
@@ -97,7 +97,7 @@ void tearDown() {
   }
 
   @Test
-  void execute_withMissingHelmPackage_shouldThrowException() throws MojoExecutionException, MojoFailureException {
+  void execute_withMissingHelmPackage_shouldGenerateWarning() throws MojoExecutionException, MojoFailureException {
     // Given
     helmPushMojo.helm.setSnapshotRepository(completeValidRepository());
     helmPushMojo.project.setVersion("1337-SNAPSHOT");

From e463ef777222592ff93e4520d555c38d92b24e25 Mon Sep 17 00:00:00 2001
From: Jurrie Overgoor <1213142+Jurrie@users.noreply.github.com>
Date: Mon, 11 Mar 2024 09:24:00 +0100
Subject: [PATCH 5/5] Use mockito-extensions to be in line with rest of project

Signed-off-by: Jurrie Overgoor <eclipse.org@jurr.org>
---
 jkube-kit/parent/pom.xml                                    | 6 ------
 openshift-maven-plugin/plugin/pom.xml                       | 2 +-
 .../mockito-extensions/org.mockito.plugins.MockMaker        | 1 +
 3 files changed, 2 insertions(+), 7 deletions(-)
 create mode 100644 openshift-maven-plugin/plugin/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker

diff --git a/jkube-kit/parent/pom.xml b/jkube-kit/parent/pom.xml
index b7cb6b55c7..dca9659b69 100644
--- a/jkube-kit/parent/pom.xml
+++ b/jkube-kit/parent/pom.xml
@@ -736,12 +736,6 @@
         <version>${version.mockito}</version>
         <scope>test</scope>
       </dependency>
-      <dependency>
-        <groupId>org.mockito</groupId>
-        <artifactId>mockito-inline</artifactId>
-        <version>${version.mockito}</version>
-        <scope>test</scope>
-      </dependency>
 
       <dependency>
         <groupId>io.fabric8</groupId>
diff --git a/openshift-maven-plugin/plugin/pom.xml b/openshift-maven-plugin/plugin/pom.xml
index 197641cd93..a984e8f78a 100644
--- a/openshift-maven-plugin/plugin/pom.xml
+++ b/openshift-maven-plugin/plugin/pom.xml
@@ -53,7 +53,7 @@
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
+            <artifactId>mockito-core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
diff --git a/openshift-maven-plugin/plugin/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker b/openshift-maven-plugin/plugin/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
new file mode 100644
index 0000000000..ca6ee9cea8
--- /dev/null
+++ b/openshift-maven-plugin/plugin/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
@@ -0,0 +1 @@
+mock-maker-inline
\ No newline at end of file