[tomcat] branch 10.0.x updated: Align with 10.1.x (few minor fixes)

[markt]

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 aa6d5c8  Align with 10.1.x (few minor fixes)
aa6d5c8 is described below

commit aa6d5c89fcf8be2c9a58b7109c775cd613d3f2b0
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Nov 9 09:26:43 2021 +0000

    Align with 10.1.x (few minor fixes)
---
 build.properties.default | 2 +-
 build.xml                | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/build.properties.default b/build.properties.default
index dff0e11..d353e2f 100644
--- a/build.properties.default
+++ b/build.properties.default
@@ -331,7 +331,7 @@ 
migration-lib.loc=${base-maven.loc}/org/apache/tomcat/jakartaee-migration/${migr
 jsign.version=4.0
 
 # checksums for JSign 4.0
-jsign.checksum.enable=true
+jsign.checksum.enabled=true
 jsign.checksum.algorithm=MD5|SHA-1
 
jsign.checksum.value=50982facf864df4f08a051b43f7d2e42|3d203fbffdc45e837f98b7c9c5d311b615661a75
 
diff --git a/build.xml b/build.xml
index 3909a9c..707515f 100644
--- a/build.xml
+++ b/build.xml
@@ -1990,8 +1990,6 @@
           <sysproperty key="tomcat.test.relaxTiming" 
value="${test.relaxTiming}" />
           <sysproperty key="tomcat.test.sslImplementation" 
value="${test.sslImplementation}" />
           <sysproperty key="tomcat.test.http2.loopCount" 
value="${test.http2.loopCount}" />
-          <!-- File for Cobertura to write coverage results to -->
-          <sysproperty key="net.sourceforge.cobertura.datafile" 
file="${cobertura.datafile}" />
 
           <formatter type="${junit.formatter.type}"
                      usefile="${junit.formatter.usefile}"
@@ -2000,10 +1998,10 @@
           <!-- If test.entry is defined, run a single test, otherwise run all 
valid tests -->
           <test todir="${test.reports}" name="${test.entry}"
                 if="test.entry" unless="test.entry.methods"
-             />
+                />
           <test todir="${test.reports}" name="${test.entry}" 
methods="${test.entry.methods}"
                 if="test.entry.methods"
-             />
+                />
           <batchtest todir="${test.reports}" unless="test.entry">
             <!-- Include all by default -->
             <fileset dir="test" includes="${test.name}" 
excludes="${test.exclude}">

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