You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2021/06/10 06:54:22 UTC

[tomcat] branch 8.5.x updated: Downgrade JSign to 2.1 so it can be used with Java 7

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


The following commit(s) were added to refs/heads/8.5.x by this push:
     new f99f054  Downgrade JSign to 2.1 so it can be used with Java 7
f99f054 is described below

commit f99f05498cedc0d3ceef677ef1f140e388632154
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Thu Jun 10 07:54:10 2021 +0100

    Downgrade JSign to 2.1 so it can be used with Java 7
---
 build.properties.default | 9 +++++----
 build.xml                | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index a549ff2..c4a64be 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -294,13 +294,14 @@ findbugs.home=${base.path}/spotbugs-${findbugs.version}
 findbugs.jar=${findbugs.home}/lib/spotbugs-ant.jar
 findbugs.loc=${base-maven.loc}/com/github/spotbugs/spotbugs/${findbugs.version}/spotbugs-${findbugs.version}.tgz
 
-# ----- JSign, version 3.1 or later -----
-jsign.version=3.1
+# ----- JSign, version 2.1 -----
+# JSign 3.0 onwards required Java 8 so use 2.1
+jsign.version=2.1
 
-# checksums for JSign 3.1
+# checksums for JSign 2.1
 jsign.checksum.enable=true
 jsign.checksum.algorithm=MD5|SHA-1
-jsign.checksum.value=ed924fc86b7abe1dfe22fd8fd7e4c417|5736035f64805b2760a41ebc1ff11523f666f2c7
+jsign.checksum.value=3bfcdc43b6e3d6438af6907b79f2ae3a|473378d211a1ecd28400503f3c2556963da0e626
 
 jsign.home=${base.path}/jsign-${jsign.version}
 jsign.jar=${jsign.home}/jsign-${jsign.version}.jar
diff --git a/build.xml b/build.xml
index 777081a..4bf6e98 100644
--- a/build.xml
+++ b/build.xml
@@ -3363,7 +3363,7 @@ Read the Building page on the Apache Tomcat documentation site for details on ho
       <fileset file="${jsign.jar}" />
     </path>
 
-    <taskdef name="jsign" classname="net.jsign.JsignTask" classpathref="jsign.classpath" />
+    <taskdef name="jsign" classname="net.jsign.PESignerTask" classpathref="jsign.classpath" />
   </target>
 
   <macrodef name="jarIt" description="utility macro for standard JAR packaging">

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