Merge branch '1.9.x'

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.
      */

src/tests/antunit/taskdefs/signjar-test.xml

@@ -68,7 +68,7 @@
     <sign />
   </target>
 
-  <target name="basic-pkcs12" depends="jar" unless="jdk9+">
+  <target name="basic-pkcs12" depends="jar" unless="jdk9+" if="jdk1.7+">
     <sign keystore="${testkeystore.pkcs12}" storetype="pkcs12" strict="true"/>
   </target>
 
@@ -244,7 +244,8 @@
     <verify-base jar="${signtest.jar}" />
   </target>
 
-  <target name="testVerifyJarPKCS12" depends="basic-pkcs12" unless="jdk9+">
+  <target name="testVerifyJarPKCS12" depends="basic-pkcs12"
+          unless="jdk9+" if="jdk1.7+">
     <verify-base-pkcs12 jar="${signtest.jar}" />
   </target>