From 360acf53d0b88d9e51200e3c2374fc397854876e Mon Sep 17 00:00:00 2001
From: Stefan Bodewig <bodewig@apache.org>
Date: Tue, 20 Mar 2018 17:11:37 +0100
Subject: [PATCH] looks as if -storepass might be required on Java7 even
 without -strict

---
 src/main/org/apache/tools/ant/taskdefs/VerifyJar.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/main/org/apache/tools/ant/taskdefs/VerifyJar.java b/src/main/org/apache/tools/ant/taskdefs/VerifyJar.java
index 4cbbe2a31..187a02171 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.
      */