Skip to content

Commit

Permalink
Exclude tomcat-embed-core
Browse files Browse the repository at this point in the history
It contains an old copy of the Servlet API and causes problems.

Fixes #20910
  • Loading branch information
stuartwdouglas committed Oct 26, 2021
1 parent 834ed9d commit fafd37b
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 0 deletions.
10 changes: 10 additions & 0 deletions bom/application/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions build-parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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 -->
Expand Down

0 comments on commit fafd37b

Please sign in to comment.