From 679e659cbc9c6bb104b67d12a569c96d53de3881 Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Tue, 10 Nov 2015 09:03:41 -0700
Subject: [PATCH] remove findbugs

---
 pom.xml                                | 64 ++++++++++++++++++++++++++
 spring-cloud-netflix-spectator/pom.xml |  5 --
 2 files changed, 64 insertions(+), 5 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1fb88167..4f252859 100644
--- a/pom.xml
+++ b/pom.xml
@@ -204,6 +204,10 @@
 						<artifactId>commons-logging</artifactId>
 						<groupId>commons-logging</groupId>
 					</exclusion>
+					<exclusion>
+						<groupId>com.google.code.findbugs</groupId>
+						<artifactId>annotations</artifactId>
+					</exclusion>
 				</exclusions>
 			</dependency>
 			<dependency>
@@ -235,6 +239,12 @@
 				<groupId>com.netflix.servo</groupId>
 				<artifactId>servo-core</artifactId>
 				<version>${servo.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>com.google.code.findbugs</groupId>
+						<artifactId>annotations</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>com.fasterxml.jackson.dataformat</groupId>
@@ -254,6 +264,14 @@
 						<artifactId>commons-logging</artifactId>
 						<groupId>commons-logging</groupId>
 					</exclusion>
+					<exclusion>
+						<groupId>com.google.code.findbugs</groupId>
+						<artifactId>jsr305</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>com.google.code.findbugs</groupId>
+						<artifactId>annotations</artifactId>
+					</exclusion>
 				</exclusions>
 			</dependency>
 			<dependency>
@@ -282,6 +300,14 @@
 						<artifactId>com.netflix.blitz4j</artifactId>
 						<groupId>blitz4j</groupId>
 					</exclusion>
+					<exclusion>
+						<groupId>com.google.code.findbugs</groupId>
+						<artifactId>annotations</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>com.google.code.findbugs</groupId>
+						<artifactId>jsr305</artifactId>
+					</exclusion>
 				</exclusions>
 			</dependency>
 			<!-- Eureka core dep that is now optional -->
@@ -319,6 +345,12 @@
 				<groupId>com.netflix.hystrix</groupId>
 				<artifactId>hystrix-core</artifactId>
 				<version>${hystrix.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>com.google.code.findbugs</groupId>
+						<artifactId>annotations</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>com.netflix.hystrix</groupId>
@@ -329,6 +361,16 @@
 				<groupId>com.netflix.hystrix</groupId>
 				<artifactId>hystrix-javanica</artifactId>
 				<version>${hystrix.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>com.google.code.findbugs</groupId>
+						<artifactId>jsr305</artifactId>
+					</exclusion>
+					<exclusion>
+						<groupId>com.google.code.findbugs</groupId>
+						<artifactId>annotations</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>com.netflix.ribbon</groupId>
@@ -345,17 +387,33 @@
 				<groupId>com.netflix.ribbon</groupId>
 				<artifactId>ribbon-core</artifactId>
 				<version>${ribbon.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>com.google.code.findbugs</groupId>
+						<artifactId>annotations</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>com.netflix.ribbon</groupId>
 				<artifactId>ribbon-httpclient</artifactId>
 				<version>${ribbon.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>com.google.code.findbugs</groupId>
+						<artifactId>annotations</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>com.netflix.ribbon</groupId>
 				<artifactId>ribbon-eureka</artifactId>
 				<version>${ribbon.version}</version>
 				<exclusions>
+					<exclusion>
+						<groupId>com.google.code.findbugs</groupId>
+						<artifactId>annotations</artifactId>
+					</exclusion>
 					<exclusion>
 						<groupId>javax.servlet</groupId>
 						<artifactId>servlet-api</artifactId>
@@ -366,6 +424,12 @@
 				<groupId>com.netflix.ribbon</groupId>
 				<artifactId>ribbon-loadbalancer</artifactId>
 				<version>${ribbon.version}</version>
+				<exclusions>
+					<exclusion>
+						<groupId>com.google.code.findbugs</groupId>
+						<artifactId>annotations</artifactId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>io.reactivex</groupId>
diff --git a/spring-cloud-netflix-spectator/pom.xml b/spring-cloud-netflix-spectator/pom.xml
index 47535eae..b4af7b3e 100644
--- a/spring-cloud-netflix-spectator/pom.xml
+++ b/spring-cloud-netflix-spectator/pom.xml
@@ -41,11 +41,6 @@
 				<artifactId>spectator-reg-servo</artifactId>
 				<version>${spectator.version}</version>
 			</dependency>
-			<dependency>
-				<groupId>com.netflix.servo</groupId>
-				<artifactId>servo-core</artifactId>
-				<version>${servo.version}</version>
-			</dependency>
 		</dependencies>
 	</dependencyManagement>
 	<dependencies>