Merge branch 'upgrade-dependencies'

4 files changed, 16 insertions, 18 deletions

diff --git a/pom.xml b/pom.xml
index 794108c..3ae6035 100644
--- a/pom.xml
+++ b/pom.xml
@@ -99,13 +99,13 @@
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>17.0</version>
+                <version>18.0</version>
             </dependency>
 
             <dependency>
                 <groupId>com.google.code.findbugs</groupId>
                 <artifactId>jsr305</artifactId>
-                <version>2.0.3</version>
+                <version>3.0.0</version>
             </dependency>
 
             <dependency>
@@ -202,14 +202,14 @@
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
                     <links>
-                        <link>https://google-guice.googlecode.com/git/latest-javadoc/</link>
-                        <link>http://docs.guava-libraries.googlecode.com/git-history/v17.0/javadoc/</link>
+                        <link>https://google.github.io/guice/api-docs/latest/javadoc/</link>
+                        <link>http://docs.guava-libraries.googlecode.com/git-history/v18.0/javadoc/</link>
                         <link>http://slf4j.org/api/</link>
                         <link>http://logging.apache.org/log4j/2.x/log4j-api/apidocs/</link>
                         <link>http://jsr-305.googlecode.com/svn/trunk/javadoc/</link>
-                        <link>http://junit.sourceforge.net/javadoc/</link>
+                        <link>http://junit.org/javadoc/4.11/</link>
                         <link>http://hamcrest.org/JavaHamcrest/javadoc/1.3/</link>
-                        <link>http://docs.mockito.googlecode.com/hg/latest/</link>
+                        <link>http://docs.mockito.googlecode.com/hg/1.9.5/</link>
                     </links>
                 </configuration>
                 <executions>
@@ -260,14 +260,14 @@
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <configuration>
                     <links>
-                        <link>https://google-guice.googlecode.com/git/latest-javadoc/</link>
-                        <link>http://docs.guava-libraries.googlecode.com/git-history/v17.0/javadoc/</link>
+                        <link>https://google.github.io/guice/api-docs/latest/javadoc/</link>
+                        <link>http://docs.guava-libraries.googlecode.com/git-history/v18.0/javadoc/</link>
                         <link>http://slf4j.org/api/</link>
                         <link>http://logging.apache.org/log4j/2.x/log4j-api/apidocs/</link>
                         <link>http://jsr-305.googlecode.com/svn/trunk/javadoc/</link>
-                        <link>http://junit.sourceforge.net/javadoc/</link>
+                        <link>http://junit.org/javadoc/4.11/</link>
                         <link>http://hamcrest.org/JavaHamcrest/javadoc/1.3/</link>
-                        <link>http://docs.mockito.googlecode.com/hg/latest/</link>
+                        <link>http://docs.mockito.googlecode.com/hg/1.9.5/</link>
                     </links>
                 </configuration>
                 <reportSets>
diff --git a/sangria-contextual/src/main/java/com/tavianator/sangria/contextual/ContextSensitiveBinder.java b/sangria-contextual/src/main/java/com/tavianator/sangria/contextual/ContextSensitiveBinder.java
index ec2d7a7..6d5e502 100644
--- a/sangria-contextual/src/main/java/com/tavianator/sangria/contextual/ContextSensitiveBinder.java
+++ b/sangria-contextual/src/main/java/com/tavianator/sangria/contextual/ContextSensitiveBinder.java
@@ -21,7 +21,6 @@ import java.lang.annotation.Annotation;
 import java.util.*;
 import javax.inject.Inject;
 
-import com.google.common.base.Objects;
 import com.google.inject.AbstractModule;
 import com.google.inject.Binder;
 import com.google.inject.Binding;
@@ -236,7 +235,7 @@ public class ContextSensitiveBinder {
 
         @Override
         public int hashCode() {
-            return Objects.hashCode(providerKey);
+            return providerKey.hashCode();
         }
     }
 
@@ -296,7 +295,7 @@ public class ContextSensitiveBinder {
 
         @Override
         public int hashCode() {
-            return Objects.hashCode(instance);
+            return instance.hashCode();
         }
     }
 
@@ -358,7 +357,7 @@ public class ContextSensitiveBinder {
 
         @Override
         public int hashCode() {
-            return Objects.hashCode(key);
+            return key.hashCode();
         }
     }
 }
diff --git a/sangria-listbinder/src/main/java/com/tavianator/sangria/listbinder/ListBinder.java b/sangria-listbinder/src/main/java/com/tavianator/sangria/listbinder/ListBinder.java
index 003e25e..ec36d1d 100644
--- a/sangria-listbinder/src/main/java/com/tavianator/sangria/listbinder/ListBinder.java
+++ b/sangria-listbinder/src/main/java/com/tavianator/sangria/listbinder/ListBinder.java
@@ -23,7 +23,6 @@ import javax.inject.Inject;
 import javax.inject.Provider;
 
 import com.google.common.base.Function;
-import com.google.common.base.Objects;
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.ListMultimap;
@@ -396,7 +395,7 @@ public class ListBinder<T> {
 
         @Override
         public int hashCode() {
-            return Objects.hashCode(providerListKey);
+            return providerListKey.hashCode();
         }
     }
 
diff --git a/sangria-log4j/pom.xml b/sangria-log4j/pom.xml
index f05b454..224081d 100644
--- a/sangria-log4j/pom.xml
+++ b/sangria-log4j/pom.xml
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>2.0-rc1</version>
+            <version>2.0.2</version>
         </dependency>
 
         <dependency>
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>2.0-rc1</version>
+            <version>2.0.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>