From 4840690222644d7398749922ac3128ff726c5124 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Mon, 15 Sep 2014 20:56:02 -0400 Subject: Bump dependency versions. --- pom.xml | 4 ++-- sangria-log4j/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 794108c..3eada4a 100644 --- a/pom.xml +++ b/pom.xml @@ -99,13 +99,13 @@ com.google.guava guava - 17.0 + 18.0 com.google.code.findbugs jsr305 - 2.0.3 + 3.0.0 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 @@ org.apache.logging.log4j log4j-api - 2.0-rc1 + 2.0.2 @@ -59,7 +59,7 @@ org.apache.logging.log4j log4j-core - 2.0-rc1 + 2.0.2 test -- cgit v1.2.3 From 76770fc4a0983220eee6d673a7a187a9e26ce0f8 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Mon, 15 Sep 2014 21:05:42 -0400 Subject: Don't use Guava's Objects. --- .../com/tavianator/sangria/contextual/ContextSensitiveBinder.java | 7 +++---- .../main/java/com/tavianator/sangria/listbinder/ListBinder.java | 3 +-- 2 files changed, 4 insertions(+), 6 deletions(-) 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 { @Override public int hashCode() { - return Objects.hashCode(providerListKey); + return providerListKey.hashCode(); } } -- cgit v1.2.3 From e842df4ea72951a63ad7267b65fccf4a8311e398 Mon Sep 17 00:00:00 2001 From: Tavian Barnes Date: Mon, 15 Sep 2014 21:23:12 -0400 Subject: Update JavaDoc links. --- pom.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 3eada4a..3ae6035 100644 --- a/pom.xml +++ b/pom.xml @@ -202,14 +202,14 @@ maven-javadoc-plugin - https://google-guice.googlecode.com/git/latest-javadoc/ - http://docs.guava-libraries.googlecode.com/git-history/v17.0/javadoc/ + https://google.github.io/guice/api-docs/latest/javadoc/ + http://docs.guava-libraries.googlecode.com/git-history/v18.0/javadoc/ http://slf4j.org/api/ http://logging.apache.org/log4j/2.x/log4j-api/apidocs/ http://jsr-305.googlecode.com/svn/trunk/javadoc/ - http://junit.sourceforge.net/javadoc/ + http://junit.org/javadoc/4.11/ http://hamcrest.org/JavaHamcrest/javadoc/1.3/ - http://docs.mockito.googlecode.com/hg/latest/ + http://docs.mockito.googlecode.com/hg/1.9.5/ @@ -260,14 +260,14 @@ maven-javadoc-plugin - https://google-guice.googlecode.com/git/latest-javadoc/ - http://docs.guava-libraries.googlecode.com/git-history/v17.0/javadoc/ + https://google.github.io/guice/api-docs/latest/javadoc/ + http://docs.guava-libraries.googlecode.com/git-history/v18.0/javadoc/ http://slf4j.org/api/ http://logging.apache.org/log4j/2.x/log4j-api/apidocs/ http://jsr-305.googlecode.com/svn/trunk/javadoc/ - http://junit.sourceforge.net/javadoc/ + http://junit.org/javadoc/4.11/ http://hamcrest.org/JavaHamcrest/javadoc/1.3/ - http://docs.mockito.googlecode.com/hg/latest/ + http://docs.mockito.googlecode.com/hg/1.9.5/ -- cgit v1.2.3