Merge pull request #21006 from stuartwdouglas/20910

Exclude tomcat-embed-core
quarkusio · Oct 26, 2021 · fa595c7 · fa595c7
2 parents 7164bfa + fafd37b
commit fa595c7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/bom/application/pom.xml b/bom/application/pom.xml
@@ -2968,6 +2968,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>
@@ -2982,6 +2988,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
@@ -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 -->