You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@ant.apache.org by bo...@apache.org on 2018/03/20 16:12:13 UTC
[1/2] ant git commit: signing with a PKCS12 keystore seems to fail on
Java6 as well
Repository: ant
Updated Branches:
refs/heads/1.9.x e60b048ea -> 360acf53d
signing with a PKCS12 keystore seems to fail on Java6 as well
Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/9399b032
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/9399b032
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/9399b032
Branch: refs/heads/1.9.x
Commit: 9399b03205ef3210ddb6b6070bcb9e32f34b97b6
Parents: e60b048
Author: Stefan Bodewig <bo...@apache.org>
Authored: Tue Mar 20 17:10:49 2018 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Tue Mar 20 17:10:49 2018 +0100
----------------------------------------------------------------------
src/tests/antunit/taskdefs/signjar-test.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ant/blob/9399b032/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 0faa94b..8fff479 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+" if="jdk1.6+">
+ <target name="basic-pkcs12" depends="jar" unless="jdk9+" if="jdk1.7+">
<sign keystore="${testkeystore.pkcs12}" storetype="pkcs12" strict="true"/>
</target>
@@ -245,7 +245,7 @@
</target>
<target name="testVerifyJarPKCS12" depends="basic-pkcs12"
- unless="jdk9+" if="jdk1.6+">
+ unless="jdk9+" if="jdk1.7+">
<verify-base-pkcs12 jar="${signtest.jar}" />
</target>
[2/2] ant git commit: looks as if -storepass might be required on
Java7 even without -strict
Posted by bo...@apache.org.
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/1.9.x
Commit: 360acf53d0b88d9e51200e3c2374fc397854876e
Parents: 9399b03
Author: Stefan Bodewig <bo...@apache.org>
Authored: Tue Mar 20 17:11:37 2018 +0100
Committer: Stefan Bodewig <bo...@apache.org>
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.
*/