[tomcat] branch main updated: Revert "Temporary workaround for broken DigiCert ONE REST API"

[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 f50f3e3  Revert "Temporary workaround for broken DigiCert ONE REST API"
f50f3e3 is described below

commit f50f3e306fe649b6afa6b270dea518a9b1a3d239
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Mar 8 16:42:46 2022 +0000

    Revert "Temporary workaround for broken DigiCert ONE REST API"
    
    This reverts commit 7c54e369e87f1eedd50e42f895c2b0cd058e30b8.
---
 build.properties.default | 12 ++----------
 build.xml                |  2 --
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index d5bdf0e..0d7e958 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -79,19 +79,11 @@ gpg.exec=/path/to/gpg
 # Code signing of Windows installer
 # See https://infra.apache.org/digicert-use.html for setup instructions
 do.codesigning=false
-#codesigning.alias=Tomcat-PMC-cert-2021-11
+codesigning.alias=Tomcat-PMC-cert-2021-11
 codesigning.digest=SHA-512
-#codesigning.storetype=DIGICERTONE
+codesigning.storetype=DIGICERTONE
 # Set codesigning.storepass in build.properties with the following syntax
 #codesigning.storepass=<api-key>|/path/to/Certificate_pkcs12.p12|<password>
-# Once DigiCert fix the broken REST API
-# - Uncomment alias & storetype above
-# - Remove the four lines below
-# - Remove the keystore field from build.xml
-codesigning.keystore=${user.home}/.digicertone/pkcs11properties.cfg
-codesigning.storepass=NONE
-codesigning.storetype=PKCS11
-codesigning.alias=Tomcat-PMC-key-2021-11
 
 # ----- Settings to use when downloading files -----
 trydownload.httpusecaches=true
diff --git a/build.xml b/build.xml
index fb5c56a..54cd5fd 100644
--- a/build.xml
+++ b/build.xml
@@ -2562,7 +2562,6 @@ skip.installer property in build.properties" />
       unless="skip.installer" depends="-installer-create-uninstaller,setup-jsign"
       if="${do.codesigning}">
     <jsign file="${tomcat.dist}/Uninstall.exe"
-        keystore="${codesigning.keystore}"
         storepass="${codesigning.storepass}"
         storetype="${codesigning.storetype}"
         alias="${codesigning.alias}"
@@ -2591,7 +2590,6 @@ skip.installer property in build.properties" />
       description="Builds and optionally signs the Windows installer"
       depends="-installer,setup-jsign" if="${do.codesigning}" >
     <jsign file="${tomcat.release}/v${version}/bin/${final.name}.exe"
-        keystore="${codesigning.keystore}"
         storepass="${codesigning.storepass}"
         storetype="${codesigning.storetype}"
         alias="${codesigning.alias}"

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