This is an automated email from the ASF dual-hosted git repository. markt pushed a commit to branch 9.0.x in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push: new 396eea5 Update to JSign 4.0 to remove dependency on client tools. 396eea5 is described below commit 396eea5bb15537bc183eea006a0040c02fd2e739 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 71cb1c8..c22e58b 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 @@ -311,13 +312,13 @@ osgi-annotations.home=${base.path}/osgi-annotations-${osgi-annotations.version} osgi-annotations.jar=${osgi-annotations.home}/org.osgi.annotation.bundle-${osgi-annotations.version}.jar osgi-annotations.loc=${base-maven.loc}/org/osgi/org.osgi.annotation.bundle/${osgi-annotations.version}/org.osgi.annotation.bundle-${osgi-annotations.version}.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 1aef121..17c357d 100644 --- a/build.xml +++ b/build.xml @@ -2607,9 +2607,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"/> @@ -2636,12 +2635,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 3025d8a..204fe7f 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