diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-rest/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-rest/pom.xml
index c26b68d113..47a23097bd 100644
--- a/spring-boot-project/spring-boot-starters/spring-boot-starter-data-rest/pom.xml
+++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-data-rest/pom.xml
@@ -38,26 +38,4 @@
 			</exclusions>
 		</dependency>
 	</dependencies>
-	<build>
-			<plugins>
-				<plugin>
-					<groupId>org.basepom.maven</groupId>
-					<artifactId>duplicate-finder-maven-plugin</artifactId>
-					<executions>
-						<execution>
-							<id>duplicate-dependencies</id>
-							<phase>validate</phase>
-							<goals>
-								<goal>check</goal>
-							</goals>
-							<configuration>
-								<ignoredClassPatterns>
-									<ignoredClassPattern>javax.annotation.*</ignoredClassPattern>
-								</ignoredClassPatterns>
-							</configuration>
-						</execution>
-					</executions>
-				</plugin>
-			</plugins>
-		</build>
 </project>
diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-freemarker/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-freemarker/pom.xml
index 97f2e86de7..1fe8c90ff5 100644
--- a/spring-boot-project/spring-boot-starters/spring-boot-starter-freemarker/pom.xml
+++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-freemarker/pom.xml
@@ -27,26 +27,4 @@
 			<artifactId>spring-context-support</artifactId>
 		</dependency>
 	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.basepom.maven</groupId>
-				<artifactId>duplicate-finder-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>duplicate-dependencies</id>
-						<phase>validate</phase>
-						<goals>
-							<goal>check</goal>
-						</goals>
-						<configuration>
-							<ignoredClassPatterns>
-								<ignoredClassPattern>javax.annotation.*</ignoredClassPattern>
-							</ignoredClassPatterns>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
 </project>
diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-groovy-templates/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-groovy-templates/pom.xml
index b64611441d..56ee425cf4 100644
--- a/spring-boot-project/spring-boot-starters/spring-boot-starter-groovy-templates/pom.xml
+++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-groovy-templates/pom.xml
@@ -41,7 +41,6 @@
 						</goals>
 						<configuration>
 							<ignoredClassPatterns>
-								<ignoredClassPattern>javax.annotation.*</ignoredClassPattern>
 								<ignoredClassPattern>module-info</ignoredClassPattern>
 							</ignoredClassPatterns>
 						</configuration>
diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-hateoas/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-hateoas/pom.xml
index 529255aea9..cc12f4ebb4 100644
--- a/spring-boot-project/spring-boot-starters/spring-boot-starter-hateoas/pom.xml
+++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-hateoas/pom.xml
@@ -28,26 +28,4 @@
 			<artifactId>spring-plugin-core</artifactId>
 		</dependency>
 	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.basepom.maven</groupId>
-				<artifactId>duplicate-finder-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>duplicate-dependencies</id>
-						<phase>validate</phase>
-						<goals>
-							<goal>check</goal>
-						</goals>
-						<configuration>
-							<ignoredClassPatterns>
-								<ignoredClassPattern>javax.annotation.*</ignoredClassPattern>
-							</ignoredClassPatterns>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
 </project>
diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-tomcat/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-tomcat/pom.xml
index 611f387e40..e6d8090b2e 100644
--- a/spring-boot-project/spring-boot-starters/spring-boot-starter-tomcat/pom.xml
+++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-tomcat/pom.xml
@@ -15,9 +15,19 @@
 		<main.basedir>${basedir}/../../..</main.basedir>
 	</properties>
 	<dependencies>
+		<dependency>
+			<groupId>javax.annotation</groupId>
+			<artifactId>javax.annotation-api</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.apache.tomcat.embed</groupId>
 			<artifactId>tomcat-embed-core</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.apache.tomcat</groupId>
+					<artifactId>tomcat-annotations-api</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.tomcat.embed</groupId>
diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-web-services/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-web-services/pom.xml
index 70ceb7460d..f493afaf8e 100644
--- a/spring-boot-project/spring-boot-starters/spring-boot-starter-web-services/pom.xml
+++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-web-services/pom.xml
@@ -31,26 +31,4 @@
 			<artifactId>spring-ws-core</artifactId>
 		</dependency>
 	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.basepom.maven</groupId>
-				<artifactId>duplicate-finder-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>duplicate-dependencies</id>
-						<phase>validate</phase>
-						<goals>
-							<goal>check</goal>
-						</goals>
-						<configuration>
-							<ignoredClassPatterns>
-								<ignoredClassPattern>javax.annotation.*</ignoredClassPattern>
-							</ignoredClassPatterns>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
 </project>
diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-web/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-web/pom.xml
index 83791dad77..86318fe01d 100644
--- a/spring-boot-project/spring-boot-starters/spring-boot-starter-web/pom.xml
+++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-web/pom.xml
@@ -40,26 +40,4 @@
 			<artifactId>spring-webmvc</artifactId>
 		</dependency>
 	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.basepom.maven</groupId>
-				<artifactId>duplicate-finder-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>duplicate-dependencies</id>
-						<phase>validate</phase>
-						<goals>
-							<goal>check</goal>
-						</goals>
-						<configuration>
-							<ignoredClassPatterns>
-								<ignoredClassPattern>javax.annotation.*</ignoredClassPattern>
-							</ignoredClassPatterns>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
 </project>
diff --git a/spring-boot-project/spring-boot-starters/spring-boot-starter-websocket/pom.xml b/spring-boot-project/spring-boot-starters/spring-boot-starter-websocket/pom.xml
index 0e880528e9..97e5956959 100644
--- a/spring-boot-project/spring-boot-starters/spring-boot-starter-websocket/pom.xml
+++ b/spring-boot-project/spring-boot-starters/spring-boot-starter-websocket/pom.xml
@@ -32,26 +32,4 @@
 			<artifactId>spring-websocket</artifactId>
 		</dependency>
 	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.basepom.maven</groupId>
-				<artifactId>duplicate-finder-maven-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>duplicate-dependencies</id>
-						<phase>validate</phase>
-						<goals>
-							<goal>check</goal>
-						</goals>
-						<configuration>
-							<ignoredClassPatterns>
-								<ignoredClassPattern>javax.annotation.*</ignoredClassPattern>
-							</ignoredClassPatterns>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
-		</plugins>
-	</build>
 </project>