looks as if -storepass might be required on Java7 even without -strict
Project: http://git-wip-us.apache.org/repos/asf/ant/repo Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/360acf53 Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/360acf53 Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/360acf53 Branch: refs/heads/master Commit: 360acf53d0b88d9e51200e3c2374fc397854876e Parents: 9399b03 Author: Stefan Bodewig <[email protected]> Authored: Tue Mar 20 17:11:37 2018 +0100 Committer: Stefan Bodewig <[email protected]> Committed: Tue Mar 20 17:11:37 2018 +0100 ---------------------------------------------------------------------- src/main/org/apache/tools/ant/taskdefs/VerifyJar.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ant/blob/360acf53/src/main/org/apache/tools/ant/taskdefs/VerifyJar.java ---------------------------------------------------------------------- diff --git a/src/main/org/apache/tools/ant/taskdefs/VerifyJar.java b/src/main/org/apache/tools/ant/taskdefs/VerifyJar.java index 4cbbe2a..187a021 100644 --- a/src/main/org/apache/tools/ant/taskdefs/VerifyJar.java +++ b/src/main/org/apache/tools/ant/taskdefs/VerifyJar.java @@ -118,7 +118,7 @@ public class VerifyJar extends AbstractJarSignerTask { // So if strict is true then we hide storepass from the base // implementation and instead add the -storepass command line // argument - if (mustHideStorePass()) { + if (storepass != null) { savedStorePass = storepass; setStorepass(null); } @@ -193,10 +193,6 @@ public class VerifyJar extends AbstractJarSignerTask { } } - private boolean mustHideStorePass() { - return strict && storepass != null; - } - /** * we are not thread safe here. Do not use on multiple threads at the same time. */
