diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 89401ada6..74cbe199b 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -110,6 +110,7 @@ Maneesh Sahu Marcel Schutte Marcus Börger Mariusz Nowostawski +Mark Hecker Martijn Kruithof Martin Landers Martin Poeschl diff --git a/WHATSNEW b/WHATSNEW index 0e1e84ffe..1f5b0c895 100644 --- a/WHATSNEW +++ b/WHATSNEW @@ -126,6 +126,9 @@ Fixed bugs: * Using could break XmlLogger. Bugzilla Report 28993. +* no longer requires keytool to be in your PATH. Bugzilla + Report 29382. + Other changes: -------------- * doc fix concerning the dependencies of the ftp task diff --git a/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java b/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java index e92362b2c..1db939546 100644 --- a/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java +++ b/src/main/org/apache/tools/ant/taskdefs/GenerateKey.java @@ -355,7 +355,7 @@ public class GenerateKey extends Task { log("Generating Key for " + alias); final ExecTask cmd = (ExecTask) getProject().createTask("exec"); - cmd.setExecutable("keytool"); + cmd.setExecutable(JavaEnvUtils.getJdkExecutable("keytool")); Commandline.Argument arg = cmd.createArg(); arg.setLine(sb.toString()); cmd.setFailonerror(true);