[tomcat] branch 8.5.x updated: Fix BZ 64522 back port

[ma...@apache.org]

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 1c318d2  Fix BZ 64522 back port
1c318d2 is described below

commit 1c318d20bd12adb5eb6549d3e1fa55516775049a
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jun 16 16:28:54 2020 +0100

    Fix BZ 64522 back port
---
 build.xml | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/build.xml b/build.xml
index f715a12..348487c 100644
--- a/build.xml
+++ b/build.xml
@@ -849,11 +849,6 @@
       filesDir="${tomcat.classes}"
       filesId="files.catalina-ha" />
 
-    <!-- Server-Side Includes (SSI) -->
-    <jarIt jarfile="${catalina-ssi.jar}"
-      filesDir="${tomcat.classes}"
-      filesId="files.catalina-ssi" />
-
     <!-- Catalina Ant Tasks JAR File -->
     <jarIt jarfile="${catalina-ant.jar}"
       filesDir="${tomcat.classes}"
@@ -2702,11 +2697,6 @@ skip.installer property in build.properties" />
       filesDir="java"
       filesId="files.catalina-ha" />
 
-    <!-- Catalina SSI JAR File -->
-    <jarIt jarfile="${catalina-ssi-src.jar}"
-      filesDir="java"
-      filesId="files.catalina-ssi" />
-
     <!-- Catalina Ant Tasks JAR File -->
     <jarIt jarfile="${catalina-ant-src.jar}"
       filesDir="java"


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