Merge pull request #20126 from geoand/#20125

Remove tomcat-annotations-api from Jaeger
quarkusio · Sep 14, 2021 · 9083b54 · 9083b54
2 parents 7a1c973 + 1a86e9e
commit 9083b54
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/extensions/jaeger/runtime/pom.xml b/extensions/jaeger/runtime/pom.xml
@@ -30,6 +30,12 @@
                     <groupId>javax.annotation</groupId>
                     <artifactId>javax.annotation-api</artifactId>
                 </exclusion>
+                <!-- it also pulls in the jakarta annotations via the 'org.apache.tomcat:tomcat-annotations-api' which seems to be a copy of 'jakarta.annotation:jakarta.annotation-api'-->
+                <!-- https://mvnrepository.com/artifact/org.apache.tomcat/tomcat-annotations-api -->
+                <exclusion>
+                    <groupId>org.apache.tomcat</groupId>
+                    <artifactId>tomcat-annotations-api</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -46,6 +52,10 @@
             <groupId>com.sun.activation</groupId>
             <artifactId>jakarta.activation</artifactId>
         </dependency>
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.graalvm.nativeimage</groupId>
             <artifactId>svm</artifactId>