This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 1083bce76d6b6bff26fd388dfc3933ef18ea48c9
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 fd4ed58..64cb22e 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -84,19 +84,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 39a8b32..8427711 100644
--- a/build.xml
+++ b/build.xml
@@ -2186,7 +2186,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}"
@@ -2215,7 +2214,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-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
