This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 10.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.0.x by this push:
new 43dcb9e Update to JSign 4.0 to remove dependency on client tools.
43dcb9e is described below
commit 43dcb9ec5fc6f5266846c600dca727638dff6699
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Aug 17 20:37:01 2021 +0100
Update to JSign 4.0 to remove dependency on client tools.
---
build.properties.default | 13 +++++++------
build.xml | 16 +++++++---------
webapps/docs/changelog.xml | 4 ++++
3 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/build.properties.default b/build.properties.default
index cac92e1..f9f3bda 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -79,9 +79,10 @@ 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.pkcs11properties=${user.home}/.digicertone/pkcs11properties.cfg
-codesigning.alias=Tomcat-PMC-key-2021-04
+codesigning.alias=Tomcat-PMC-cert-2021-04
codesigning.digest=SHA-512
+codesigning.storetype=DIGICERTONE
+codesigning.storepass=set-this-in-build.properties
# ----- Settings to use when downloading files -----
trydownload.httpusecaches=true
@@ -323,13 +324,13 @@
migration-lib.home=${base.path}/migration-${migration-lib.version}
migration-lib.jar=${migration-lib.home}/jakartaee-migration-${migration-lib.version}-shaded.jar
migration-lib.loc=${base-maven.loc}/org/apache/tomcat/jakartaee-migration/${migration-lib.version}/jakartaee-migration-${migration-lib.version}-shaded.jar
-# ----- JSign, version 3.1 or later -----
-jsign.version=3.1
+# ----- JSign, version 4.0 or later -----
+jsign.version=4.0
-# checksums for JSign 3.1
+# checksums for JSign 4.0
jsign.checksum.enable=true
jsign.checksum.algorithm=MD5|SHA-1
-jsign.checksum.value=ed924fc86b7abe1dfe22fd8fd7e4c417|5736035f64805b2760a41ebc1ff11523f666f2c7
+jsign.checksum.value=50982facf864df4f08a051b43f7d2e42|3d203fbffdc45e837f98b7c9c5d311b615661a75
jsign.home=${base.path}/jsign-${jsign.version}
jsign.jar=${jsign.home}/jsign-${jsign.version}.jar
diff --git a/build.xml b/build.xml
index 1ce3b7f..b3a6a7b 100644
--- a/build.xml
+++ b/build.xml
@@ -2625,9 +2625,8 @@ 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.pkcs11properties}"
- storepass="NONE"
- storetype="PKCS11"
+ storepass="${codesigning.storepass}"
+ storetype="${codesigning.storetype}"
alias="${codesigning.alias}"
alg="${codesigning.digest}"
tsaurl="http://timestamp.digicert.com"/>
@@ -2654,12 +2653,11 @@ 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.pkcs11properties}"
- storepass="NONE"
- storetype="PKCS11"
- alias="${codesigning.alias}"
- alg="${codesigning.digest}"
- tsaurl="http://timestamp.digicert.com"/>
+ storepass="${codesigning.storepass}"
+ storetype="${codesigning.storetype}"
+ alias="${codesigning.alias}"
+ alg="${codesigning.digest}"
+ tsaurl="http://timestamp.digicert.com"/>
<!-- .exe has changed so need to redo checksums and OpenPGP signature -->
<delete file="${tomcat.release}/v${version}/bin/${final.name}.exe.asc" />
<delete file="${tomcat.release}/v${version}/bin/${final.name}.exe.sha512"
/>
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4a24838..1c31290 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -168,6 +168,10 @@
Fix failing build when building on non-English locales. Pull request
<pr>441</pr> provided by Dachuan J. (markt)
</fix>
+ <update>
+ Update to JSign version 4.0 to enable code signing without the need for
+ the installation of additional client tools. (markt)
+ </update>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
