Reduce the dependencies pulled in via guava.

R=herhut@google.com, yroussel@google.com

Change-Id: I86f40662210e3b038a99d3f41d1e2c8e7b64f08e

3 files changed, 9 insertions, 40 deletions

diff --git a/LIBRARY-LICENSE b/LIBRARY-LICENSE
index 7970f989a..b4f1d2a08 100644
--- a/LIBRARY-LICENSE
+++ b/LIBRARY-LICENSE
@@ -3,24 +3,6 @@
   copyrightHolder: The Guava Authors
   license: The Apache Software License, Version 2.0
   licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-- artifact: com.google.code.findbugs:jsr305:+
-  name: FindBugs-jsr305
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: http://findbugs.sourceforge.net/
-- artifact: com.google.errorprone:error_prone_annotations:+
-  name: error-prone annotations
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-- artifact: com.google.j2objc:j2objc-annotations:+
-  name: J2ObjC Annotations
-  license: The Apache Software License, Version 2.0
-  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
-  url: https://github.com/google/j2objc/
-- artifact: org.codehaus.mojo:animal-sniffer-annotations:+
-  name: Animal Sniffer Annotations
-  license: The MIT License
-  licenseUrl: https://opensource.org/licenses/mit-license.php
 - artifact: com.googlecode.json-simple:json-simple:+
   name: JSON.Simple
   license: The Apache Software License, Version 2.0
diff --git a/build.gradle b/build.gradle
index c25de07ff..51fcf4e23 100644
--- a/build.gradle
+++ b/build.gradle
@@ -117,7 +117,15 @@ configurations {
 dependencies {
     compile 'net.sf.jopt-simple:jopt-simple:4.6'
     compile 'com.googlecode.json-simple:json-simple:1.1'
-    compile group: 'com.google.guava', name: 'guava', version: '23.0'
+    // Include all of guava when compiling the code, but exclude annotations that we don't
+    // need from the packaging.
+    compileOnly('com.google.guava:guava:23.0')
+    compile('com.google.guava:guava:23.0', {
+        exclude group: 'com.google.errorprone'
+        exclude group: 'com.google.code.findbugs'
+        exclude group: 'com.google.j2objc'
+        exclude group: 'org.codehaus.mojo'
+    })
     compile group: 'it.unimi.dsi', name: 'fastutil', version: '7.2.0'
     compile group: 'org.apache.commons', name: 'commons-compress', version: '1.12'
     compile group: 'org.ow2.asm', name: 'asm', version: '5.1'
diff --git a/library-licensing/animal-sniffer-annotations.txt b/library-licensing/animal-sniffer-annotations.txt
deleted file mode 100644
index 370fb559b..000000000
--- a/library-licensing/animal-sniffer-annotations.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License
-
-Copyright (c) 2009 codehaus.org.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.