update to Guava 21, Gradle 3.3

build.gradle

@@ -1,13 +1,8 @@
 
 plugins {
     id "org.sonarqube" version "2.2"
-    id "org.ajoberstar.github-pages" version "1.6.0-rc.1"
-    id "org.xbib.gradle.plugin.jbake" version "1.2.1"
 }
 
-group = 'org.xbib'
-version = '4.0.3'
-
 apply plugin: 'java'
 apply plugin: 'maven'
 apply plugin: 'signing'
@@ -27,12 +22,12 @@ configurations {
 dependencies {
     compile "javax.inject:javax.inject:1"
     compile 'org.xbib:jsr-305:1.0.0'
-    compile "com.google.guava:guava:20.0"
+    compile "com.google.guava:guava:21.0"
     testCompile "junit:junit:4.12"
     testCompile "org.apache.logging.log4j:log4j-slf4j-impl:2.7"
     testCompile "org.apache.logging.log4j:log4j-core:2.7"
     testCompile "javax.inject:javax.inject-tck:1"
-    testCompile "com.google.guava:guava-testlib:19.0"
+    testCompile "com.google.guava:guava-testlib:21.0"
     wagon 'org.apache.maven.wagon:wagon-ssh-external:2.10'
 }
 

gradle.properties

@@ -0,0 +1,3 @@
+group = org.xbib
+name = guice
+version = 4.0.4

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed Nov 23 12:29:03 CET 2016
+#Fri Feb 03 12:38:43 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip

gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -154,16 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save ( ) {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
 # by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [[ "$(uname)" == "Darwin" ]] && [[ "$HOME" == "$PWD" ]]; then
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
   cd "$(dirname "$0")"
 fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"

settings.gradle

@@ -1 +1 @@
-rootProject.name = 'guice'
+rootProject.name = name

src/main/java/com/google/inject/assistedinject/FactoryProvider2.java

@@ -1,5 +1,6 @@
 package com.google.inject.assistedinject;
 
+import com.google.common.base.MoreObjects;
 import com.google.common.base.Objects;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.ImmutableList;
@@ -807,7 +808,7 @@ final class FactoryProvider2<F> implements InvocationHandler,
 
         @Override
         public String toString() {
-            return Objects.toStringHelper(getClass())
+            return MoreObjects.toStringHelper(getClass())
                     .add("ctor", constructor)
                     .add("return type", returnType)
                     .add("param type", paramTypes)