From c082e31d10a582d1655aba50d64698a7a2f0d51f Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Fri, 8 Sep 2017 13:56:31 +0100
Subject: [PATCH 1/2] Add javax.annotation-api dependency to
 spring-boot-starter

Closes gh-9366
---
 spring-boot-dependencies/pom.xml                 | 6 ++++++
 spring-boot-starters/spring-boot-starter/pom.xml | 4 ++++
 2 files changed, 10 insertions(+)

diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 3d8f09809d9..b6853d39955 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -97,6 +97,7 @@
 		<jackson.version>2.9.1</jackson.version>
 		<janino.version>3.0.7</janino.version>
 		<javassist.version>3.21.0-GA</javassist.version> <!-- Same as Hibernate -->
+		<javax-annotation.version>1.3</javax-annotation.version>
 		<javax-cache.version>1.0.0</javax-cache.version>
 		<javax-jms.version>2.0.1</javax-jms.version>
 		<javax-mail.version>1.6.0</javax-mail.version>
@@ -874,6 +875,11 @@
 				<artifactId>undertow-websockets-jsr</artifactId>
 				<version>${undertow.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>javax.annotation</groupId>
+				<artifactId>javax.annotation-api</artifactId>
+				<version>${javax-annotation.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>javax.cache</groupId>
 				<artifactId>cache-api</artifactId>
diff --git a/spring-boot-starters/spring-boot-starter/pom.xml b/spring-boot-starters/spring-boot-starter/pom.xml
index 9e52892801d..2d9c595886b 100644
--- a/spring-boot-starters/spring-boot-starter/pom.xml
+++ b/spring-boot-starters/spring-boot-starter/pom.xml
@@ -30,6 +30,10 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-logging</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>javax.annotation</groupId>
+			<artifactId>javax.annotation-api</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-core</artifactId>

From 5d67ae4d819e1a7bcc9ad13711d904c55882318c Mon Sep 17 00:00:00 2001
From: Andy Wilkinson <awilkinson@pivotal.io>
Date: Fri, 8 Sep 2017 13:57:04 +0100
Subject: [PATCH 2/2] Ignore duplicate javax.annotation classes from
 tomcat-embed-core

See gh-9366
---
 .../spring-boot-starter-data-rest/pom.xml     |  3 +++
 .../spring-boot-starter-freemarker/pom.xml    | 22 +++++++++++++++++++
 .../pom.xml                                   | 22 +++++++++++++++++++
 .../spring-boot-starter-hateoas/pom.xml       | 22 +++++++++++++++++++
 .../spring-boot-starter-mobile/pom.xml        | 22 +++++++++++++++++++
 .../pom.xml                                   | 22 +++++++++++++++++++
 .../pom.xml                                   | 22 +++++++++++++++++++
 .../pom.xml                                   | 22 +++++++++++++++++++
 .../spring-boot-starter-web-services/pom.xml  | 22 +++++++++++++++++++
 .../spring-boot-starter-web/pom.xml           | 22 +++++++++++++++++++
 .../spring-boot-starter-websocket/pom.xml     | 22 +++++++++++++++++++
 11 files changed, 223 insertions(+)

diff --git a/spring-boot-starters/spring-boot-starter-data-rest/pom.xml b/spring-boot-starters/spring-boot-starter-data-rest/pom.xml
index f7e3326b80b..e386e8af56b 100644
--- a/spring-boot-starters/spring-boot-starter-data-rest/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-data-rest/pom.xml
@@ -55,6 +55,9 @@
 							<goal>check</goal>
 						</goals>
 						<configuration>
+							<ignoredClassPatterns>
+								<ignoredClassPattern>javax.annotation.*</ignoredClassPattern>
+							</ignoredClassPatterns>
 							<ignoredResourcePatterns>
 								<ignoredResourcePattern>changelog.txt</ignoredResourcePattern>
 							</ignoredResourcePatterns>
diff --git a/spring-boot-starters/spring-boot-starter-freemarker/pom.xml b/spring-boot-starters/spring-boot-starter-freemarker/pom.xml
index d0881a4959c..3b17a7f10d2 100644
--- a/spring-boot-starters/spring-boot-starter-freemarker/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-freemarker/pom.xml
@@ -35,4 +35,26 @@
 			<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-starters/spring-boot-starter-groovy-templates/pom.xml b/spring-boot-starters/spring-boot-starter-groovy-templates/pom.xml
index dcee7ec77fd..89a2eb97e26 100644
--- a/spring-boot-starters/spring-boot-starter-groovy-templates/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-groovy-templates/pom.xml
@@ -31,4 +31,26 @@
 			<artifactId>groovy-templates</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-starters/spring-boot-starter-hateoas/pom.xml b/spring-boot-starters/spring-boot-starter-hateoas/pom.xml
index 54423582324..4e5201611c5 100644
--- a/spring-boot-starters/spring-boot-starter-hateoas/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-hateoas/pom.xml
@@ -32,4 +32,26 @@
 			<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-starters/spring-boot-starter-mobile/pom.xml b/spring-boot-starters/spring-boot-starter-mobile/pom.xml
index 9b79d1befd9..fe645d59a82 100644
--- a/spring-boot-starters/spring-boot-starter-mobile/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-mobile/pom.xml
@@ -31,4 +31,26 @@
 			<artifactId>spring-mobile-device</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-starters/spring-boot-starter-social-facebook/pom.xml b/spring-boot-starters/spring-boot-starter-social-facebook/pom.xml
index 0d66a3aca6e..4e1475a5060 100644
--- a/spring-boot-starters/spring-boot-starter-social-facebook/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-social-facebook/pom.xml
@@ -43,4 +43,26 @@
 			<artifactId>spring-social-facebook</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-starters/spring-boot-starter-social-linkedin/pom.xml b/spring-boot-starters/spring-boot-starter-social-linkedin/pom.xml
index adbae495ac6..450847b76ef 100644
--- a/spring-boot-starters/spring-boot-starter-social-linkedin/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-social-linkedin/pom.xml
@@ -43,4 +43,26 @@
 			<artifactId>spring-social-linkedin</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-starters/spring-boot-starter-social-twitter/pom.xml b/spring-boot-starters/spring-boot-starter-social-twitter/pom.xml
index 7898a81d2b6..83e92e4af84 100644
--- a/spring-boot-starters/spring-boot-starter-social-twitter/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-social-twitter/pom.xml
@@ -43,4 +43,26 @@
 			<artifactId>spring-social-twitter</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-starters/spring-boot-starter-web-services/pom.xml b/spring-boot-starters/spring-boot-starter-web-services/pom.xml
index 31324f51aad..3877bb200bf 100644
--- a/spring-boot-starters/spring-boot-starter-web-services/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-web-services/pom.xml
@@ -35,4 +35,26 @@
 			<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-starters/spring-boot-starter-web/pom.xml b/spring-boot-starters/spring-boot-starter-web/pom.xml
index dcad4603b64..c849cd9d173 100644
--- a/spring-boot-starters/spring-boot-starter-web/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-web/pom.xml
@@ -44,4 +44,26 @@
 			<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-starters/spring-boot-starter-websocket/pom.xml b/spring-boot-starters/spring-boot-starter-websocket/pom.xml
index e05a7d40f45..cba2cd00983 100644
--- a/spring-boot-starters/spring-boot-starter-websocket/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-websocket/pom.xml
@@ -36,4 +36,26 @@
 			<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>