[tomcat] branch main updated: Parameterise JSign task - no functional change

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
     new 90da2ca  Parameterise JSign task - no functional change
90da2ca is described below

commit 90da2caa0e186c066b57b01bd1cb7b444436ee2e
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Aug 17 20:37:01 2021 +0100

    Parameterise JSign task - no functional change
    
    This is preparation for the move to JSign for
---
 build.properties.default | 2 ++
 build.xml                | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index 77fc389..bc8bc41 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -82,6 +82,8 @@ do.codesigning=false
 codesigning.pkcs11properties=${user.home}/.digicertone/pkcs11properties.cfg
 codesigning.alias=Tomcat-PMC-key-2021-04
 codesigning.digest=SHA-512
+codesigning.storetype=PKCS11
+codesigning.storepass=NONE
 
 # ----- Settings to use when downloading files -----
 trydownload.httpusecaches=true
diff --git a/build.xml b/build.xml
index 3a3011e..b0a5da6 100644
--- a/build.xml
+++ b/build.xml
@@ -2597,8 +2597,8 @@ skip.installer property in build.properties" />
       if="${do.codesigning}">
     <jsign file="${tomcat.dist}/Uninstall.exe"
         keystore="${codesigning.pkcs11properties}"
-        storepass="NONE"
-        storetype="PKCS11"
+        storepass="${codesigning.storepass}"
+        storetype="${codesigning.storetype}"
         alias="${codesigning.alias}"
         alg="${codesigning.digest}"
         tsaurl="http://timestamp.digicert.com"/>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org