From 473ab8eae2a46fb130535f13e48b064eac87fe90 Mon Sep 17 00:00:00 2001
From: Adam <Adam@sigterm.info>
Date: Tue, 2 Jun 2020 19:00:18 -0400
Subject: [PATCH] client: remove unnecessary annotation-providing dependencies
 from runtime classpath

---
 runelite-api/pom.xml    |  3 ++-
 runelite-client/pom.xml | 28 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/runelite-api/pom.xml b/runelite-api/pom.xml
index 3c5726a53e..a38aa80369 100644
--- a/runelite-api/pom.xml
+++ b/runelite-api/pom.xml
@@ -48,7 +48,8 @@
 		<dependency>
 			<groupId>com.google.code.findbugs</groupId>
 			<artifactId>jsr305</artifactId>
-			<version>1.3.9</version>
+			<version>3.0.2</version>
+			<scope>provided</scope>
 		</dependency>
 
 		<dependency>
diff --git a/runelite-client/pom.xml b/runelite-client/pom.xml
index 41c2ab1b72..d9742f56c9 100644
--- a/runelite-client/pom.xml
+++ b/runelite-client/pom.xml
@@ -59,6 +59,28 @@
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
+			<exclusions>
+				<!--
+				compile time annotations for static analysis in Guava
+				https://github.com/google/guava/wiki/UseGuavaInYourBuild#what-about-guavas-own-dependencies
+				-->
+				<exclusion>
+					<groupId>com.google.code.findbugs</groupId>
+					<artifactId>jsr305</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.google.errorprone</groupId>
+					<artifactId>error_prone_annotations</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>com.google.j2objc</groupId>
+					<artifactId>j2objc-annotations</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.codehaus.mojo</groupId>
+					<artifactId>animal-sniffer-annotations</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>com.google.inject</groupId>
@@ -173,6 +195,12 @@
 			<artifactId>jna-platform</artifactId>
 			<version>4.5.1</version>
 		</dependency>
+		<dependency>
+			<groupId>com.google.code.findbugs</groupId>
+			<artifactId>jsr305</artifactId>
+			<version>3.0.2</version>
+			<scope>provided</scope>
+		</dependency>
 
 		<dependency>
 			<groupId>net.runelite</groupId>