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:32:51 UTC

[1/4] ant git commit: and Java5 doesn't seem to support PKCS12 when signing

Repository: ant
Updated Branches:
  refs/heads/master 9b9ae5f34 -> f59ad6edc


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/master
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>

[3/4] 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/master
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.
      */

[4/4] ant git commit: Merge branch '1.9.x'

Posted by bo...@apache.org.
Merge branch '1.9.x'


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

Branch: refs/heads/master
Commit: f59ad6edc9dbfd40573fb125571826595acfc461
Parents: 9b9ae5f 360acf5
Author: Stefan Bodewig <bo...@apache.org>
Authored: Tue Mar 20 17:32:13 2018 +0100
Committer: Stefan Bodewig <bo...@apache.org>
Committed: Tue Mar 20 17:32:13 2018 +0100

----------------------------------------------------------------------
 src/main/org/apache/tools/ant/taskdefs/VerifyJar.java | 6 +-----
 src/tests/antunit/taskdefs/signjar-test.xml           | 5 +++--
 2 files changed, 4 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant/blob/f59ad6ed/src/main/org/apache/tools/ant/taskdefs/VerifyJar.java
----------------------------------------------------------------------

[2/4] ant git commit: signing with a PKCS12 keystore seems to fail on Java6 as well

Posted by bo...@apache.org.
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/master
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>