From 8143d1f36d7eebc02a0785ad1340ae1be8e98f8e Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@pivotal.io>
Date: Mon, 6 Apr 2015 19:47:22 -0700
Subject: [PATCH] Apply animal sniffer to entire build

Move animal sniffer configuration out of spring-boot-dependencies to
spring-boot-parent and apply it to all projects.

See gh-716
---
 spring-boot-actuator/pom.xml                  |  8 -----
 spring-boot-dependencies/pom.xml              | 27 -----------------
 spring-boot-parent/pom.xml                    | 29 +++++++++++++++++++
 .../spring-boot-loader-tools/pom.xml          |  8 +++++
 spring-boot-tools/spring-boot-loader/pom.xml  |  5 ++++
 .../boot/loader/LaunchedURLClassLoader.java   |  3 ++
 .../jta/bitronix/PoolingDataSourceBean.java   |  3 ++
 7 files changed, 48 insertions(+), 35 deletions(-)

diff --git a/spring-boot-actuator/pom.xml b/spring-boot-actuator/pom.xml
index 674b2408ed5..3a280571fc2 100644
--- a/spring-boot-actuator/pom.xml
+++ b/spring-boot-actuator/pom.xml
@@ -201,12 +201,4 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>animal-sniffer-maven-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
 </project>
diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 081e204f8b3..012f0b54d42 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -1671,33 +1671,6 @@
 					<artifactId>maven-war-plugin</artifactId>
 					<version>2.5</version>
 				</plugin>
-				<plugin>
-					<groupId>org.codehaus.mojo</groupId>
-					<artifactId>animal-sniffer-maven-plugin</artifactId>
-					<version>1.14</version>
-				<configuration>
-					<signature>
-						<groupId>org.codehaus.mojo.signature</groupId>
-						<artifactId>java16</artifactId>
-						<version>1.0</version>
-					</signature>
-				</configuration>
-				<executions>
-					<execution>
-						<id>enforce-java-6</id>
-						<phase>test</phase>
-						<goals>
-							<goal>check</goal>
-						</goals>
-						<configuration>
-							<annotations>
-								<annotation>org.springframework.lang.UsesJava8</annotation>
-								<annotation>org.springframework.lang.UsesJava7</annotation>
-							</annotations>
-						</configuration>
-					</execution>
-				</executions>
-				</plugin>
 				<plugin>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>build-helper-maven-plugin</artifactId>
diff --git a/spring-boot-parent/pom.xml b/spring-boot-parent/pom.xml
index e210b5a07c7..cf40c72b88e 100644
--- a/spring-boot-parent/pom.xml
+++ b/spring-boot-parent/pom.xml
@@ -278,6 +278,11 @@
 					<artifactId>maven-site-plugin</artifactId>
 					<version>3.4</version>
 				</plugin>
+				<plugin>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>animal-sniffer-maven-plugin</artifactId>
+					<version>1.14</version>
+				</plugin>
 				<plugin>
 					<groupId>org.codehaus.cargo</groupId>
 					<artifactId>cargo-maven2-plugin</artifactId>
@@ -492,6 +497,30 @@
 				</execution>
 			  </executions>
 			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>animal-sniffer-maven-plugin</artifactId>
+				<configuration>
+					<signature>
+						<groupId>org.codehaus.mojo.signature</groupId>
+						<artifactId>java16</artifactId>
+						<version>1.0</version>
+					</signature>
+					<annotations>
+						<annotation>org.springframework.lang.UsesJava8</annotation>
+						<annotation>org.springframework.lang.UsesJava7</annotation>
+					</annotations>
+				</configuration>
+				<executions>
+					<execution>
+						<id>enforce-java-6</id>
+						<phase>test</phase>
+						<goals>
+							<goal>check</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
 		</plugins>
 	</build>
 	<profiles>
diff --git a/spring-boot-tools/spring-boot-loader-tools/pom.xml b/spring-boot-tools/spring-boot-loader-tools/pom.xml
index 5cb2e1f34b1..107b06aedda 100644
--- a/spring-boot-tools/spring-boot-loader-tools/pom.xml
+++ b/spring-boot-tools/spring-boot-loader-tools/pom.xml
@@ -128,6 +128,14 @@
 					</archive>
 				</configuration>
 			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>animal-sniffer-maven-plugin</artifactId>
+				<configuration>
+					<!-- The use of SignalUtils seems to mess up animal sniffer -->
+					<skip>true</skip>
+				</configuration>
+			</plugin>
 		</plugins>
 	</build>
 </project>
diff --git a/spring-boot-tools/spring-boot-loader/pom.xml b/spring-boot-tools/spring-boot-loader/pom.xml
index 669d1a3ecf9..c3a1067efa2 100644
--- a/spring-boot-tools/spring-boot-loader/pom.xml
+++ b/spring-boot-tools/spring-boot-loader/pom.xml
@@ -20,6 +20,11 @@
 	</properties>
 	<dependencies>
 		<!-- Must never have compile/runtime time dependencies -->
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-core</artifactId>
+			<optional>true</optional>
+		</dependency>
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>jcl-over-slf4j</artifactId>
diff --git a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/LaunchedURLClassLoader.java b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/LaunchedURLClassLoader.java
index 48b76904d9e..ee8b58d9afd 100644
--- a/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/LaunchedURLClassLoader.java
+++ b/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/LaunchedURLClassLoader.java
@@ -27,6 +27,7 @@ import java.util.Enumeration;
 
 import org.springframework.boot.loader.jar.Handler;
 import org.springframework.boot.loader.jar.JarFile;
+import org.springframework.lang.UsesJava7;
 
 /**
  * {@link ClassLoader} used by the {@link Launcher}.
@@ -224,6 +225,7 @@ public class LaunchedURLClassLoader extends URLClassLoader {
 		}
 	}
 
+	@UsesJava7
 	private static LockProvider setupLockProvider() {
 		try {
 			ClassLoader.registerAsParallelCapable();
@@ -248,6 +250,7 @@ public class LaunchedURLClassLoader extends URLClassLoader {
 	/**
 	 * Java 7 specific {@link LockProvider}.
 	 */
+	@UsesJava7
 	private static class Java7LockProvider extends LockProvider {
 
 		@Override
diff --git a/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingDataSourceBean.java b/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingDataSourceBean.java
index 5ae82b4dc86..adba55d5a38 100644
--- a/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingDataSourceBean.java
+++ b/spring-boot/src/main/java/org/springframework/boot/jta/bitronix/PoolingDataSourceBean.java
@@ -29,6 +29,7 @@ import javax.sql.XADataSource;
 import org.springframework.beans.factory.BeanNameAware;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.lang.UsesJava7;
 import org.springframework.util.StringUtils;
 
 import bitronix.tm.resource.common.ResourceBean;
@@ -110,6 +111,7 @@ public class PoolingDataSourceBean extends PoolingDataSource implements BeanName
 	}
 
 	@Override
+	@UsesJava7
 	public Logger getParentLogger() throws SQLFeatureNotSupportedException {
 		try {
 			return ((DataSource) this).getParentLogger();
@@ -166,6 +168,7 @@ public class PoolingDataSourceBean extends PoolingDataSource implements BeanName
 		}
 
 		@Override
+		@UsesJava7
 		public Logger getParentLogger() throws SQLFeatureNotSupportedException {
 			return this.dataSource.getParentLogger();
 		}