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
commit e97575e98bbd9af525015249cd8fbaff4955b372
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jan 18 09:44:28 2022 +0000
Align with 9.0.x
TLD parsing code is only used by Jasper so package it in the embedded
JAR for Jasper
---
build.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/build.xml b/build.xml
index 9faa0b9..8353131 100644
--- a/build.xml
+++ b/build.xml
@@ -92,7 +92,7 @@
<!-- build output directory for jdbc-pool -->
<property name="tomcat.pool" value="${tomcat.output}/jdbc-pool"/>
- <!-- Servlet 3.1 spec requires Java 7+ -->
+ <!-- Java EE 7 platform requires Java 7+ -->
<property name="compile.release" value="7"/>
<property name="min.java.version" value="7"/>
<property name="build.java.version" value="11"/>
@@ -481,11 +481,13 @@
<include name="org/apache/tomcat/jni/**" />
<include name="org/apache/jk/**" />
<include name="org/apache/tomcat/util/**" />
+ <exclude name="org/apache/tomcat/util/descriptor/tld/**" />
</patternset>
<patternset id="files.tomcat-embed-jasper" >
<patternset refid="files.jasper" />
<patternset refid="files.jsp-api" />
+ <include name="org/apache/tomcat/util/descriptor/tld/**" />
</patternset>
<patternset id="files.tomcat-embed-el" >
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
