Skip to content

Commit 0aedd3f

Browse files
wilkinsonawilkinsona
committed
Exclude tomcat-annotations-api and use javax.annotations-api instead
Closes gh-10133
1 parent a780838 commit 0aedd3f

File tree

8 files changed

+10
-133
lines changed
  • spring-boot-project/spring-boot-starters
    • spring-boot-starter-data-rest
    • spring-boot-starter-freemarker
    • spring-boot-starter-groovy-templates
    • spring-boot-starter-hateoas
    • spring-boot-starter-tomcat
    • spring-boot-starter-web
    • spring-boot-starter-web-services
    • spring-boot-starter-websocket

8 files changed

+10
-133
lines changed

‎spring-boot-project/spring-boot-starters/spring-boot-starter-data-rest/pom.xml

-22
Original file line numberDiff line numberDiff line change
@@ -38,26 +38,4 @@
3838
</exclusions>
3939
</dependency>
4040
</dependencies>
41-
<build>
42-
<plugins>
43-
<plugin>
44-
<groupId>org.basepom.maven</groupId>
45-
<artifactId>duplicate-finder-maven-plugin</artifactId>
46-
<executions>
47-
<execution>
48-
<id>duplicate-dependencies</id>
49-
<phase>validate</phase>
50-
<goals>
51-
<goal>check</goal>
52-
</goals>
53-
<configuration>
54-
<ignoredClassPatterns>
55-
<ignoredClassPattern>javax.annotation.*</ignoredClassPattern>
56-
</ignoredClassPatterns>
57-
</configuration>
58-
</execution>
59-
</executions>
60-
</plugin>
61-
</plugins>
62-
</build>
6341
</project>

‎spring-boot-project/spring-boot-starters/spring-boot-starter-freemarker/pom.xml

-22
Original file line numberDiff line numberDiff line change
@@ -27,26 +27,4 @@
2727
<artifactId>spring-context-support</artifactId>
2828
</dependency>
2929
</dependencies>
30-
<build>
31-
<plugins>
32-
<plugin>
33-
<groupId>org.basepom.maven</groupId>
34-
<artifactId>duplicate-finder-maven-plugin</artifactId>
35-
<executions>
36-
<execution>
37-
<id>duplicate-dependencies</id>
38-
<phase>validate</phase>
39-
<goals>
40-
<goal>check</goal>
41-
</goals>
42-
<configuration>
43-
<ignoredClassPatterns>
44-
<ignoredClassPattern>javax.annotation.*</ignoredClassPattern>
45-
</ignoredClassPatterns>
46-
</configuration>
47-
</execution>
48-
</executions>
49-
</plugin>
50-
</plugins>
51-
</build>
5230
</project>

‎spring-boot-project/spring-boot-starters/spring-boot-starter-groovy-templates/pom.xml

-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
</goals>
4242
<configuration>
4343
<ignoredClassPatterns>
44-
<ignoredClassPattern>javax.annotation.*</ignoredClassPattern>
4544
<ignoredClassPattern>module-info</ignoredClassPattern>
4645
</ignoredClassPatterns>
4746
</configuration>

‎spring-boot-project/spring-boot-starters/spring-boot-starter-hateoas/pom.xml

-22
Original file line numberDiff line numberDiff line change
@@ -28,26 +28,4 @@
2828
<artifactId>spring-plugin-core</artifactId>
2929
</dependency>
3030
</dependencies>
31-
<build>
32-
<plugins>
33-
<plugin>
34-
<groupId>org.basepom.maven</groupId>
35-
<artifactId>duplicate-finder-maven-plugin</artifactId>
36-
<executions>
37-
<execution>
38-
<id>duplicate-dependencies</id>
39-
<phase>validate</phase>
40-
<goals>
41-
<goal>check</goal>
42-
</goals>
43-
<configuration>
44-
<ignoredClassPatterns>
45-
<ignoredClassPattern>javax.annotation.*</ignoredClassPattern>
46-
</ignoredClassPatterns>
47-
</configuration>
48-
</execution>
49-
</executions>
50-
</plugin>
51-
</plugins>
52-
</build>
5331
</project>

‎spring-boot-project/spring-boot-starters/spring-boot-starter-tomcat/pom.xml

+10
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,19 @@
1515
<main.basedir>${basedir}/../../..</main.basedir>
1616
</properties>
1717
<dependencies>
18+
<dependency>
19+
<groupId>javax.annotation</groupId>
20+
<artifactId>javax.annotation-api</artifactId>
21+
</dependency>
1822
<dependency>
1923
<groupId>org.apache.tomcat.embed</groupId>
2024
<artifactId>tomcat-embed-core</artifactId>
25+
<exclusions>
26+
<exclusion>
27+
<groupId>org.apache.tomcat</groupId>
28+
<artifactId>tomcat-annotations-api</artifactId>
29+
</exclusion>
30+
</exclusions>
2131
</dependency>
2232
<dependency>
2333
<groupId>org.apache.tomcat.embed</groupId>

‎spring-boot-project/spring-boot-starters/spring-boot-starter-web-services/pom.xml

-22
Original file line numberDiff line numberDiff line change
@@ -31,26 +31,4 @@
3131
<artifactId>spring-ws-core</artifactId>
3232
</dependency>
3333
</dependencies>
34-
<build>
35-
<plugins>
36-
<plugin>
37-
<groupId>org.basepom.maven</groupId>
38-
<artifactId>duplicate-finder-maven-plugin</artifactId>
39-
<executions>
40-
<execution>
41-
<id>duplicate-dependencies</id>
42-
<phase>validate</phase>
43-
<goals>
44-
<goal>check</goal>
45-
</goals>
46-
<configuration>
47-
<ignoredClassPatterns>
48-
<ignoredClassPattern>javax.annotation.*</ignoredClassPattern>
49-
</ignoredClassPatterns>
50-
</configuration>
51-
</execution>
52-
</executions>
53-
</plugin>
54-
</plugins>
55-
</build>
5634
</project>

‎spring-boot-project/spring-boot-starters/spring-boot-starter-web/pom.xml

-22
Original file line numberDiff line numberDiff line change
@@ -40,26 +40,4 @@
4040
<artifactId>spring-webmvc</artifactId>
4141
</dependency>
4242
</dependencies>
43-
<build>
44-
<plugins>
45-
<plugin>
46-
<groupId>org.basepom.maven</groupId>
47-
<artifactId>duplicate-finder-maven-plugin</artifactId>
48-
<executions>
49-
<execution>
50-
<id>duplicate-dependencies</id>
51-
<phase>validate</phase>
52-
<goals>
53-
<goal>check</goal>
54-
</goals>
55-
<configuration>
56-
<ignoredClassPatterns>
57-
<ignoredClassPattern>javax.annotation.*</ignoredClassPattern>
58-
</ignoredClassPatterns>
59-
</configuration>
60-
</execution>
61-
</executions>
62-
</plugin>
63-
</plugins>
64-
</build>
6543
</project>

‎spring-boot-project/spring-boot-starters/spring-boot-starter-websocket/pom.xml

-22
Original file line numberDiff line numberDiff line change
@@ -32,26 +32,4 @@
3232
<artifactId>spring-websocket</artifactId>
3333
</dependency>
3434
</dependencies>
35-
<build>
36-
<plugins>
37-
<plugin>
38-
<groupId>org.basepom.maven</groupId>
39-
<artifactId>duplicate-finder-maven-plugin</artifactId>
40-
<executions>
41-
<execution>
42-
<id>duplicate-dependencies</id>
43-
<phase>validate</phase>
44-
<goals>
45-
<goal>check</goal>
46-
</goals>
47-
<configuration>
48-
<ignoredClassPatterns>
49-
<ignoredClassPattern>javax.annotation.*</ignoredClassPattern>
50-
</ignoredClassPatterns>
51-
</configuration>
52-
</execution>
53-
</executions>
54-
</plugin>
55-
</plugins>
56-
</build>
5735
</project>

0 commit comments

Comments
 (0)