diff --git a/build.gradle b/build.gradle
index d27fd0dc..7b18efdd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,7 +33,7 @@ dependencies {
     
     compile ("org.apache.jclouds:jclouds-core:${jcloudsVersion}") 
     compile ('com.google.auto.service:auto-service:1.0-rc3') 
-    compile ('com.google.auto.value:auto-value:1.5.1')
+    compile ('com.google.auto.value:auto-value:1.5.3')
     
     testCompile ("org.apache.jclouds:jclouds-core:${jcloudsVersion}:tests")
     testCompile ("org.apache.jclouds.driver:jclouds-slf4j:${jcloudsVersion}") 
diff --git a/src/main/java/com/cdancy/bitbucket/rest/BitbucketAuthentication.java b/src/main/java/com/cdancy/bitbucket/rest/BitbucketAuthentication.java
index c479b27f..3fd6fee0 100644
--- a/src/main/java/com/cdancy/bitbucket/rest/BitbucketAuthentication.java
+++ b/src/main/java/com/cdancy/bitbucket/rest/BitbucketAuthentication.java
@@ -20,9 +20,9 @@
 import static com.google.common.io.BaseEncoding.base64;
 
 import com.cdancy.bitbucket.rest.auth.AuthenticationType;
-import javax.annotation.Nullable;
 
 import org.jclouds.domain.Credentials;
+import org.jclouds.javax.annotation.Nullable;
 
 /**
  * Credentials instance for Bitbucket authentication. 
diff --git a/src/main/java/com/cdancy/bitbucket/rest/BitbucketUtils.java b/src/main/java/com/cdancy/bitbucket/rest/BitbucketUtils.java
index 12f25f20..53c60575 100644
--- a/src/main/java/com/cdancy/bitbucket/rest/BitbucketUtils.java
+++ b/src/main/java/com/cdancy/bitbucket/rest/BitbucketUtils.java
@@ -28,6 +28,7 @@
 import static com.cdancy.bitbucket.rest.BitbucketConstants.JCLOUDS_VARIABLE_ID;
 import static com.cdancy.bitbucket.rest.BitbucketConstants.TOKEN_ENVIRONMENT_VARIABLE;
 import static com.cdancy.bitbucket.rest.BitbucketConstants.TOKEN_SYSTEM_PROPERTY;
+
 import com.google.common.base.Throwables;
 
 import java.util.List;
@@ -42,7 +43,7 @@
 import java.util.Enumeration;
 import java.util.Objects;
 import java.util.Properties;
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 /**
  * Collection of static methods to be used globally.
diff --git a/src/test/java/com/cdancy/bitbucket/rest/features/BitbucketClientLiveTest.java b/src/test/java/com/cdancy/bitbucket/rest/features/BitbucketClientLiveTest.java
index 7c767085..3c5fe36c 100644
--- a/src/test/java/com/cdancy/bitbucket/rest/features/BitbucketClientLiveTest.java
+++ b/src/test/java/com/cdancy/bitbucket/rest/features/BitbucketClientLiveTest.java
@@ -38,7 +38,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Properties;
-import javax.annotation.Nullable;
+import org.jclouds.javax.annotation.Nullable;
 
 @Test(groups = "live", testName = "BitbucketClientLiveTest", singleThreaded = true)
 @SuppressWarnings("PMD.TooManyStaticImports")