diff --git a/README.md b/README.md
index 3fbbe96c..9b93a912 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ Add following dependency to your pom.xml:
io.kokuwa.maven
helm-maven-plugin
- 6.12.0
+ 6.13.0
```
@@ -49,7 +49,7 @@ The default setting is to construct the Helm download URL based upon the detecte
io.kokuwa.maven
helm-maven-plugin
- 6.12.0
+ 6.13.0
${project.basedir}
${project.version}
@@ -70,7 +70,7 @@ If you leave `helmVersion` and `helmDownloadUrl` empty the plugin will determine
io.kokuwa.maven
helm-maven-plugin
- 6.12.0
+ 6.13.0
${project.basedir}
${project.version}
@@ -94,7 +94,7 @@ When `useLocalHelmBinary` is enabled, the plugin by default will search for the
io.kokuwa.maven
helm-maven-plugin
- 6.12.0
+ 6.13.0
${project.basedir}
${project.version}
@@ -117,7 +117,7 @@ and disables the auto-detection feature:
io.kokuwa.maven
helm-maven-plugin
- 6.12.0
+ 6.13.0
${project.basedir}
${project.version}
@@ -141,7 +141,7 @@ and disables the auto-detection feature:
io.kokuwa.maven
helm-maven-plugin
- 6.12.0
+ 6.13.0
${project.basedir}
${project.version}
@@ -173,7 +173,7 @@ and disables the auto-detection feature:
io.kokuwa.maven
helm-maven-plugin
- 6.12.0
+ 6.13.0
${project.basedir}
${project.version}
diff --git a/pom.xml b/pom.xml
index e0bc9df5..00b82361 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,7 @@
helm-maven-plugin
- 6.12.1-SNAPSHOT
+ 6.13.0-SNAPSHOT
maven-plugin
Helm Maven Plugin
@@ -88,7 +88,7 @@
3
- true
+ false
0.5C
${project.basedir}/src/it/settings.xml
diff --git a/src/bin/aarch64/helm b/src/bin/aarch64/helm
new file mode 100755
index 00000000..af23c9d3
Binary files /dev/null and b/src/bin/aarch64/helm differ
diff --git a/src/it/helm-executables/x86_64-helm/helm b/src/bin/amd64/helm
similarity index 100%
rename from src/it/helm-executables/x86_64-helm/helm
rename to src/bin/amd64/helm
diff --git a/src/it/helm.exe b/src/bin/amd64/helm.exe
similarity index 100%
rename from src/it/helm.exe
rename to src/bin/amd64/helm.exe
diff --git a/src/it/dependency-with-overwrite/pom.xml b/src/it/dependency-with-overwrite/pom.xml
index 23c06b8b..b49e366f 100644
--- a/src/it/dependency-with-overwrite/pom.xml
+++ b/src/it/dependency-with-overwrite/pom.xml
@@ -20,7 +20,7 @@
false
true
- ${project.basedir}/..
+ ${test.helmExecutableDirectory}
kokuwaio
diff --git a/src/it/extension/pom.xml b/src/it/extension/pom.xml
index 911e3d1e..bd819ef5 100644
--- a/src/it/extension/pom.xml
+++ b/src/it/extension/pom.xml
@@ -20,7 +20,7 @@
false
true
- ${project.basedir}/..
+ ${test.helmExecutableDirectory}
kokuwaio
diff --git a/src/it/init-with-debug/pom.xml b/src/it/init-with-debug/pom.xml
index da133c2a..00bbbfe6 100644
--- a/src/it/init-with-debug/pom.xml
+++ b/src/it/init-with-debug/pom.xml
@@ -24,7 +24,7 @@
false
true
- ${project.basedir}/..
+ ${test.helmExecutableDirectory}
kokuwaio-with-credentials
diff --git a/src/it/init-with-helm-from-directory/pom.xml b/src/it/init-with-helm-from-directory/pom.xml
index 791bf866..b80857c6 100644
--- a/src/it/init-with-helm-from-directory/pom.xml
+++ b/src/it/init-with-helm-from-directory/pom.xml
@@ -26,7 +26,7 @@
false
true
- ${project.basedir}/..
+ ${test.helmExecutableDirectory}
false
${project.basedir}/src/main/helm
1.0.0
diff --git a/src/it/init-with-helm-from-directory/postbuild.bsh b/src/it/init-with-helm-from-directory/postbuild.bsh
index a5b28e46..044a7783 100644
--- a/src/it/init-with-helm-from-directory/postbuild.bsh
+++ b/src/it/init-with-helm-from-directory/postbuild.bsh
@@ -1,5 +1,6 @@
// verify that configured helm was used
+System.out.println(basedir);
return org.codehaus.plexus.util.FileUtils
.fileRead(basedir + "/build.log")
- .contains("Using local HELM binary [" + basedir + "/../helm]")
+ .contains("Using local HELM binary [" + basedir + "/../../../src/bin/amd64/helm]")
diff --git a/src/it/init-without-k8s-warning/pom.xml b/src/it/init-without-k8s-warning/pom.xml
index a4a106a2..f55cbc1d 100644
--- a/src/it/init-without-k8s-warning/pom.xml
+++ b/src/it/init-without-k8s-warning/pom.xml
@@ -24,7 +24,7 @@
false
true
- ${project.basedir}/..
+ ${test.helmExecutableDirectory}
false
${project.basedir}/src/main/helm
1.0.0
diff --git a/src/it/lint-with-dependency/pom.xml b/src/it/lint-with-dependency/pom.xml
index e5970bc9..74bc506f 100644
--- a/src/it/lint-with-dependency/pom.xml
+++ b/src/it/lint-with-dependency/pom.xml
@@ -28,7 +28,7 @@
false
true
- ${project.basedir}/..
+ ${test.helmExecutableDirectory}
kokuwaio
diff --git a/src/it/path with spaces/pom.xml b/src/it/path with spaces/pom.xml
index c03ad4fe..78e8587b 100644
--- a/src/it/path with spaces/pom.xml
+++ b/src/it/path with spaces/pom.xml
@@ -20,7 +20,7 @@
false
true
- ${project.basedir}/..
+ ${test.helmExecutableDirectory}
kokuwaio
diff --git a/src/it/pom.xml b/src/it/pom.xml
index 8a988150..df0c9ff5 100644
--- a/src/it/pom.xml
+++ b/src/it/pom.xml
@@ -20,6 +20,8 @@
@maven.compiler.source@
@maven.compiler.target@
+ ${project.basedir}/../../../src/bin/amd64
+
diff --git a/src/it/push-with-auth-from-pom/pom.xml b/src/it/push-with-auth-from-pom/pom.xml
index 186adae4..1038307e 100644
--- a/src/it/push-with-auth-from-pom/pom.xml
+++ b/src/it/push-with-auth-from-pom/pom.xml
@@ -27,7 +27,7 @@
false
true
- ${project.basedir}/..
+ ${test.helmExecutableDirectory}
false
${project.basedir}/src/main/helm
1.0.0
diff --git a/src/it/push-with-auth-from-pom/postbuild.bsh b/src/it/push-with-auth-from-pom/postbuild.bsh
index 31182151..04db562f 100644
--- a/src/it/push-with-auth-from-pom/postbuild.bsh
+++ b/src/it/push-with-auth-from-pom/postbuild.bsh
@@ -2,4 +2,4 @@
return org.codehaus.plexus.util.FileUtils
.fileRead(basedir + "/build.log")
- .contains(basedir + "/../helm registry login 127.0.0.1 --username auth-from-pom --password-stdin\n")
+ .contains(basedir + "/../../../src/bin/amd64/helm registry login 127.0.0.1 --username auth-from-pom --password-stdin\n")
diff --git a/src/it/push-with-auth-from-settings/pom.xml b/src/it/push-with-auth-from-settings/pom.xml
index 20a458ae..2dc026c9 100644
--- a/src/it/push-with-auth-from-settings/pom.xml
+++ b/src/it/push-with-auth-from-settings/pom.xml
@@ -27,7 +27,7 @@
false
true
- ${project.basedir}/..
+ ${test.helmExecutableDirectory}
false
${project.basedir}/src/main/helm
1.0.0
diff --git a/src/it/push-with-auth-from-settings/postbuild.bsh b/src/it/push-with-auth-from-settings/postbuild.bsh
index b325d50d..0c98d48b 100644
--- a/src/it/push-with-auth-from-settings/postbuild.bsh
+++ b/src/it/push-with-auth-from-settings/postbuild.bsh
@@ -2,4 +2,4 @@
return org.codehaus.plexus.util.FileUtils
.fileRead(basedir + "/build.log")
- .contains(basedir + "/../helm registry login 127.0.0.1 --username auth-from-settings --password-stdin\n")
+ .contains(basedir + "/../../../src/bin/amd64/helm registry login 127.0.0.1 --username auth-from-settings --password-stdin\n")
diff --git a/src/it/push-without-auth/pom.xml b/src/it/push-without-auth/pom.xml
index b5da0c5f..0739cde4 100644
--- a/src/it/push-without-auth/pom.xml
+++ b/src/it/push-without-auth/pom.xml
@@ -27,7 +27,7 @@
false
true
- ${project.basedir}/..
+ ${test.helmExecutableDirectory}
false
${project.basedir}/src/main/helm
1.0.0
diff --git a/src/it/push-without-auth/postbuild.bsh b/src/it/push-without-auth/postbuild.bsh
index 424552dc..967c2999 100644
--- a/src/it/push-without-auth/postbuild.bsh
+++ b/src/it/push-without-auth/postbuild.bsh
@@ -2,4 +2,4 @@
return org.codehaus.plexus.util.FileUtils
.fileRead(basedir + "/build.log")
- .contains(basedir + "/../helm push " + basedir + "/target/helm/repo/app-1.0.0.tgz oci://127.0.0.1\n")
+ .contains(basedir + "/../../../src/bin/amd64/helm push " + basedir + "/target/helm/repo/app-1.0.0.tgz oci://127.0.0.1\n")
diff --git a/src/it/template-with-additional-arguments/pom.xml b/src/it/template-with-additional-arguments/pom.xml
index 2774f12a..7621d02e 100644
--- a/src/it/template-with-additional-arguments/pom.xml
+++ b/src/it/template-with-additional-arguments/pom.xml
@@ -26,7 +26,7 @@
false
true
- ${project.basedir}/..
+ ${test.helmExecutableDirectory}
false
${project.basedir}/src/main/helm
1.0.0
diff --git a/src/test/java/io/kokuwa/maven/helm/HelmMojoTest.java b/src/test/java/io/kokuwa/maven/helm/HelmMojoTest.java
index 781753ae..c9275a11 100644
--- a/src/test/java/io/kokuwa/maven/helm/HelmMojoTest.java
+++ b/src/test/java/io/kokuwa/maven/helm/HelmMojoTest.java
@@ -38,9 +38,8 @@ class Executable {
void fixed(LintMojo mojo) {
mojo.setUseLocalHelmBinary(true);
mojo.setAutoDetectLocalHelmBinary(false);
- mojo.setHelmExecutableDirectory(MojoExtension.determineHelmExecutableDirectory());
- Path expected = Paths.get(MojoExtension.determineHelmExecutableDirectory().toString())
- .resolve(HELM).toAbsolutePath();
+ mojo.setHelmExecutableDirectory(MojoExtension.determineHelmExecutableDirectory().toFile());
+ Path expected = MojoExtension.determineHelmExecutableDirectory().resolve(HELM);
Path actual = assertDoesNotThrow(() -> mojo.getHelmExecutablePath());
assertEquals(expected, actual);
}
diff --git a/src/test/java/io/kokuwa/maven/helm/InitMojoTest.java b/src/test/java/io/kokuwa/maven/helm/InitMojoTest.java
index 4c2a46f2..61eaf423 100644
--- a/src/test/java/io/kokuwa/maven/helm/InitMojoTest.java
+++ b/src/test/java/io/kokuwa/maven/helm/InitMojoTest.java
@@ -104,7 +104,7 @@ void localHelm(InitMojo mojo) {
mojo.setUseLocalHelmBinary(true);
mojo.setFallbackBinaryDownload(false);
mojo.setHelmVersion(null);
- mojo.setHelmExecutableDirectory(MojoExtension.determineHelmExecutableDirectory());
+ mojo.setHelmExecutableDirectory(MojoExtension.determineHelmExecutableDirectory().toFile());
assertHelm(mojo, "version", "repo add stable " + InitMojo.STABLE_HELM_REPO);
}
diff --git a/src/test/java/io/kokuwa/maven/helm/junit/MojoExtension.java b/src/test/java/io/kokuwa/maven/helm/junit/MojoExtension.java
index 8e0d6a2f..241c7b03 100644
--- a/src/test/java/io/kokuwa/maven/helm/junit/MojoExtension.java
+++ b/src/test/java/io/kokuwa/maven/helm/junit/MojoExtension.java
@@ -8,6 +8,8 @@
import java.io.File;
import java.io.InputStream;
import java.lang.reflect.Field;
+import java.nio.file.Path;
+import java.nio.file.Paths;
import java.util.HashMap;
import java.util.Map;
@@ -114,7 +116,7 @@ public Object resolveParameter(ParameterContext parameterContext, ExtensionConte
// preconfigure
mojo.setChartDirectory(new File("src/test/resources/simple")); // set some sane defaults for tests
- mojo.setHelmExecutableDirectory(determineHelmExecutableDirectory());
+ mojo.setHelmExecutableDirectory(determineHelmExecutableDirectory().toFile()); // avoid download helm
mojo.setHelmVersion("3.12.0"); // avoid github api
return mojo;
@@ -125,13 +127,10 @@ public Object resolveParameter(ParameterContext parameterContext, ExtensionConte
/**
* Determines which helm executable to use based on the machine's architecture.
+ *
* @return location of appropriate helm executable
*/
- public static File determineHelmExecutableDirectory() {
- if (System.getProperty("os.arch").equals("aarch64")) {
- return new File("src/it/helm-executables/aarch64-helm/");
- } else {
- return new File("src/it/helm-executables/x86_64-helm/");
- }
+ public static Path determineHelmExecutableDirectory() {
+ return Paths.get("src/bin/" + System.getProperty("os.arch")).toAbsolutePath();
}
}