ant git commit: and Java5 doesn't seem to support PKCS12 when signing

[bo...@apache.org]

Repository: ant
Updated Branches:
  refs/heads/1.9.x 0f173ac82 -> e60b048ea


and Java5 doesn't seem to support PKCS12 when signing


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/e60b048e
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/e60b048e
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/e60b048e

Branch: refs/heads/1.9.x
Commit: e60b048eae78324a4943e1cbea738cfd91c0d84b
Parents: 0f173ac
Author: Stefan Bodewig <bo...@apache.org>
Authored: Tue Mar 20 15:42:06 2018 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Tue Mar 20 15:42:06 2018 +0100

----------------------------------------------------------------------
 src/tests/antunit/taskdefs/signjar-test.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant/blob/e60b048e/src/tests/antunit/taskdefs/signjar-test.xml
----------------------------------------------------------------------
diff --git a/src/tests/antunit/taskdefs/signjar-test.xml b/src/tests/antunit/taskdefs/signjar-test.xml
index dd2722a..0faa94b 100644
--- a/src/tests/antunit/taskdefs/signjar-test.xml
+++ b/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.6+">
     <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.6+">
     <verify-base-pkcs12 jar="${signtest.jar}" />
   </target>