From fafd37ba433463bc5128b3a8d22167b0406720d7 Mon Sep 17 00:00:00 2001
From: Stuart Douglas <stuart.w.douglas@gmail.com>
Date: Tue, 26 Oct 2021 20:48:39 +1100
Subject: [PATCH] Exclude tomcat-embed-core

It contains an old copy of the Servlet API and causes problems.

Fixes #20910
---
 bom/application/pom.xml | 10 ++++++++++
 build-parent/pom.xml    |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/bom/application/pom.xml b/bom/application/pom.xml
index e7147679c9fda..c16c430143641 100644
--- a/bom/application/pom.xml
+++ b/bom/application/pom.xml
@@ -2948,6 +2948,12 @@
                 <groupId>io.jaegertracing</groupId>
                 <artifactId>jaeger-thrift</artifactId>
                 <version>${jaeger.version}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.tomcat.embed</groupId>
+                        <artifactId>tomcat-embed-core</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
             <dependency>
                 <groupId>io.jaegertracing</groupId>
@@ -2962,6 +2968,10 @@
                         <groupId>javax.annotation</groupId>
                         <artifactId>javax.annotation-api</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.tomcat.embed</groupId>
+                        <artifactId>tomcat-embed-core</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
             <dependency>
diff --git a/build-parent/pom.xml b/build-parent/pom.xml
index 19ce068d52829..78100c56fa5ab 100644
--- a/build-parent/pom.xml
+++ b/build-parent/pom.xml
@@ -516,6 +516,8 @@
                                             <exclude>org.jboss.resteasy:resteasy-context-propagation</exclude>
                                             <exclude>com.google.android:annotations</exclude>
                                             <exclude>org.codehaus.mojo:animal-sniffer-annotations</exclude>
+                                            <!-- Includes its own copy of an old version of the servlet API-->
+                                            <exclude>org.apache.tomcat.embed:tomcat-embed-core</exclude>
                                         </excludes>
                                         <includes>
                                             <!-- this is for REST Assured -->