This is an automated email from the ASF dual-hosted git repository.
markt-asf pushed a commit to branch 11.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/11.0.x by this push:
new 54b7b76f1a Align with 12.0.x
54b7b76f1a is described below
commit 54b7b76f1ab3b587e7f71ebd8d1a07aa74b1e7b5
Author: Mark Thomas <[email protected]>
AuthorDate: Sat Jun 20 15:14:39 2026 +0100
Align with 12.0.x
---
build.xml | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
diff --git a/build.xml b/build.xml
index 2f15bdc481..db06afddc9 100644
--- a/build.xml
+++ b/build.xml
@@ -319,7 +319,6 @@
<include name="**/NOTICE"/>
<include name="**/RELEASE-NOTES"/>
<include name="**/index.db"/>
- <include name="**/index.db.attr"/>
<include name="**/jakarta.el.ExpressionFactory"/>
<include name="**/jakarta.servlet.ServletContainerInitializer"/>
<include name="**/jakarta.websocket.ContainerProvider"/>
@@ -4542,13 +4541,7 @@ Read the Building page on the Apache Tomcat
documentation site for details on ho
</antcall>
<condition property="success">
- <or>
- <available file="${tomcat.release.verify}/@{basefile}.sha512" />
- <and>
- <contains string="${version}" substring="11.0." /><!-- Super hack
-->
- <contains string="@{basefile}" substring="x86" />
- </and>
- </or>
+ <available file="${tomcat.release.verify}/@{basefile}.sha512" />
</condition>
<fail unless="success">
@@ -4644,13 +4637,7 @@ Invalid signature for @{src-or-bin}/@{basefile}
</antcall>
<condition property="success">
- <or>
- <available file="${tomcat.release.verify}/@{basefile}.asc" />
- <and>
- <contains string="${version}" substring="11.0." /><!-- Super hack
-->
- <contains string="@{basefile}" substring="x86" />
- </and>
- </or>
+ <available file="${tomcat.release.verify}/@{basefile}.asc" />
</condition>
<fail unless="success">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
