diff --git a/core/src/main/java/hudson/tasks/Maven.java b/core/src/main/java/hudson/tasks/Maven.java index a1a37b34eb9b5b27a0c55052673ecb9cd1772442..c61255afcaea074188c9087b1636c49d92811e80 100644 --- a/core/src/main/java/hudson/tasks/Maven.java +++ b/core/src/main/java/hudson/tasks/Maven.java @@ -585,12 +585,20 @@ public class Maven extends Builder { } private File getExeFile(String execName) { - if(File.separatorChar=='\\') - execName += ".bat"; - String m2Home = Util.replaceMacro(getHome(),EnvVars.masterEnvVars); - return new File(m2Home, "bin/" + execName); + if(Functions.isWindows()) { + File exeFile = new File(m2Home, "bin/" + execName + ".bat"); + + // since Maven 3.3 .bat files are replaced with .cmd + if (!exeFile.exists()) { + return new File(m2Home, "bin/" + execName + ".cmd"); + } + + return exeFile; + } else { + return new File(m2Home, "bin/" + execName); + } } /**