diff --git a/language/analysis/pom.xml b/language/analysis/pom.xml
index 2ebd0181901..c329b6909f7 100644
--- a/language/analysis/pom.xml
+++ b/language/analysis/pom.xml
@@ -20,6 +20,13 @@ limitations under the License.
   <groupId>com.google.cloud.language.samples</groupId>
   <artifactId>language-entities</artifactId>
 
+  <parent>
+    <artifactId>doc-samples</artifactId>
+    <groupId>com.google.cloud</groupId>
+    <version>1.0.0</version>
+    <relativePath>../..</relativePath>
+  </parent>
+
   <dependencies>
     <!-- [START dependencies] -->
     <dependency>
@@ -34,6 +41,13 @@ limitations under the License.
     </dependency>
     <!-- [END dependencies] -->
 
+    <!-- FIXME: remove after client fixes depenency issue -->
+    <dependency>
+      <groupId>com.google.auth</groupId>
+      <artifactId>google-auth-library-oauth2-http</artifactId>
+      <version>0.6.0</version>
+    </dependency>
+
     <!-- Test Dependencies -->
     <dependency>
       <groupId>junit</groupId>
diff --git a/language/analysis/src/main/java/com/google/cloud/language/samples/Analyze.java b/language/analysis/src/main/java/com/google/cloud/language/samples/Analyze.java
index be67799e940..24d190f133c 100644
--- a/language/analysis/src/main/java/com/google/cloud/language/samples/Analyze.java
+++ b/language/analysis/src/main/java/com/google/cloud/language/samples/Analyze.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.language.samples;
 
-import com.google.cloud.language.v1.LanguageServiceClient;
 
 import com.google.cloud.language.v1.AnalyzeEntitiesRequest;
 import com.google.cloud.language.v1.AnalyzeEntitiesResponse;
@@ -28,6 +27,7 @@
 import com.google.cloud.language.v1.EncodingType;
 import com.google.cloud.language.v1.Entity;
 import com.google.cloud.language.v1.EntityMention;
+import com.google.cloud.language.v1.LanguageServiceClient;
 import com.google.cloud.language.v1.Sentiment;
 import com.google.cloud.language.v1.Token;
 import com.google.protobuf.Descriptors;
diff --git a/language/analysis/src/main/java/com/google/cloud/language/samples/AnalyzeBeta.java b/language/analysis/src/main/java/com/google/cloud/language/samples/AnalyzeBeta.java
index 557168e54f1..d824ed90621 100644
--- a/language/analysis/src/main/java/com/google/cloud/language/samples/AnalyzeBeta.java
+++ b/language/analysis/src/main/java/com/google/cloud/language/samples/AnalyzeBeta.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.language.samples;
 
-import com.google.cloud.language.v1beta2.LanguageServiceClient;
 
 import com.google.cloud.language.v1beta2.AnalyzeEntitySentimentRequest;
 import com.google.cloud.language.v1beta2.AnalyzeEntitySentimentResponse;
@@ -26,8 +25,8 @@
 import com.google.cloud.language.v1beta2.EncodingType;
 import com.google.cloud.language.v1beta2.Entity;
 import com.google.cloud.language.v1beta2.EntityMention;
+import com.google.cloud.language.v1beta2.LanguageServiceClient;
 import com.google.cloud.language.v1beta2.Sentiment;
-import com.google.cloud.language.v1beta2.Token;
 import com.google.protobuf.Descriptors;
 
 import java.io.IOException;
diff --git a/language/analysis/src/test/java/com/google/cloud/language/samples/AnalyzeBetaIT.java b/language/analysis/src/test/java/com/google/cloud/language/samples/AnalyzeBetaIT.java
index 1e4b1d141ea..be4cb2f7ac0 100644
--- a/language/analysis/src/test/java/com/google/cloud/language/samples/AnalyzeBetaIT.java
+++ b/language/analysis/src/test/java/com/google/cloud/language/samples/AnalyzeBetaIT.java
@@ -18,9 +18,9 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.google.cloud.language.v1beta2.LanguageServiceClient;
 import com.google.cloud.language.v1beta2.Entity;
 import com.google.cloud.language.v1beta2.EntityMention;
+import com.google.cloud.language.v1beta2.LanguageServiceClient;
 import com.google.cloud.language.v1beta2.Sentiment;
 
 import org.junit.Before;
@@ -58,8 +58,8 @@ public class AnalyzeBetaIT {
   }
 
   @Test public void analyzeSyntax_entitySentimentText() throws Exception {
-    List<Entity> entities = analyzeApp.entitySentimentText("Oranges, grapes, and apples can be " +
-        "found in the cafeterias located in Mountain View, Seattle, and London.");
+    List<Entity> entities = analyzeApp.entitySentimentText("Oranges, grapes, and apples can be "
+        + "found in the cafeterias located in Mountain View, Seattle, and London.");
 
     List<String> got = entities.stream().map(e -> e.getName()).collect(Collectors.toList());
 
@@ -73,7 +73,7 @@ public class AnalyzeBetaIT {
     List<EntityMention> mentions = entities.listIterator().next().getMentionsList();
 
     // Assert
-    assertThat(mentions.get(0).getText().getBeginOffset() == 4);
+    assertThat(mentions.get(0).getText().getBeginOffset()).isEqualTo(4);
   }
 
   @Test public void analyzeSyntax_entitySentimentFile() throws Exception {
diff --git a/language/analysis/src/test/java/com/google/cloud/language/samples/AnalyzeIT.java b/language/analysis/src/test/java/com/google/cloud/language/samples/AnalyzeIT.java
index 1818fdd5f19..8c2b53fc9b5 100644
--- a/language/analysis/src/test/java/com/google/cloud/language/samples/AnalyzeIT.java
+++ b/language/analysis/src/test/java/com/google/cloud/language/samples/AnalyzeIT.java
@@ -18,8 +18,8 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
-import com.google.cloud.language.v1.LanguageServiceClient;
 import com.google.cloud.language.v1.Entity;
+import com.google.cloud.language.v1.LanguageServiceClient;
 import com.google.cloud.language.v1.PartOfSpeech.Tag;
 import com.google.cloud.language.v1.Sentiment;
 import com.google.cloud.language.v1.Token;
@@ -62,14 +62,14 @@ public class AnalyzeIT {
   }
 
   @Test public void analyzeEntities_withEntitiesFile_containsGod() throws Exception {
-      // Act
-      List<Entity> entities =
-          analyzeApp.analyzeEntitiesFile("gs://" + BUCKET + "/natural-language/gettysburg.txt");
-      List<String> got = entities.stream().map(e -> e.getName()).collect(Collectors.toList());
+    // Act
+    List<Entity> entities =
+        analyzeApp.analyzeEntitiesFile("gs://" + BUCKET + "/natural-language/gettysburg.txt");
+    List<String> got = entities.stream().map(e -> e.getName()).collect(Collectors.toList());
 
-      // Assert
-      assertThat(got).named("entity names").contains("God");
-    }
+    // Assert
+    assertThat(got).named("entity names").contains("God");
+  }
 
   @Test public void analyzeSentimentText_returnPositive() throws Exception {
     // Act
@@ -83,15 +83,15 @@ public class AnalyzeIT {
   }
 
   @Test public void analyzeSentimentFile_returnPositiveFile() throws Exception {
-      // Act
-      Sentiment sentiment =
-          analyzeApp.analyzeSentimentFile("gs://" + BUCKET + "/natural-language/"
-                  + "sentiment/bladerunner-pos.txt");
+    // Act
+    Sentiment sentiment =
+        analyzeApp.analyzeSentimentFile("gs://" + BUCKET + "/natural-language/"
+        + "sentiment/bladerunner-pos.txt");
 
-      // Assert
-      assertThat((double)sentiment.getMagnitude()).isGreaterThan(0.0);
-      assertThat((double)sentiment.getScore()).isGreaterThan(0.0);
-    }
+    // Assert
+    assertThat((double)sentiment.getMagnitude()).isGreaterThan(0.0);
+    assertThat((double)sentiment.getScore()).isGreaterThan(0.0);
+  }
 
   @Test public void analyzeSentiment_returnNegative() throws Exception {
     // Act
@@ -105,26 +105,26 @@ public class AnalyzeIT {
   }
 
   @Test public void analyzeSentiment_returnNegativeFile() throws Exception {
-      // Act
-      Sentiment sentiment =
-          analyzeApp.analyzeSentimentFile("gs://" + BUCKET + "/natural-language/"
-                  + "sentiment/bladerunner-neg.txt");
+    // Act
+    Sentiment sentiment =
+        analyzeApp.analyzeSentimentFile("gs://" + BUCKET + "/natural-language/"
+        + "sentiment/bladerunner-neg.txt");
 
-      // Assert
-      assertThat((double)sentiment.getMagnitude()).isGreaterThan(0.0);
-      assertThat((double)sentiment.getScore()).isLessThan(0.0);
-    }
+    // Assert
+    assertThat((double)sentiment.getMagnitude()).isGreaterThan(0.0);
+    assertThat((double)sentiment.getScore()).isLessThan(0.0);
+  }
 
   @Test public void analyzeSentiment_returnNeutralFile() throws Exception {
-      // Act
-      Sentiment sentiment =
-          analyzeApp.analyzeSentimentFile("gs://" + BUCKET + "/natural-language/"
-                  + "sentiment/bladerunner-neutral.txt");
+    // Act
+    Sentiment sentiment =
+        analyzeApp.analyzeSentimentFile("gs://" + BUCKET + "/natural-language/"
+        + "sentiment/bladerunner-neutral.txt");
 
-      // Assert
-      assertThat((double)sentiment.getMagnitude()).isGreaterThan(1.0);
-      assertThat((double)sentiment.getScore()).isWithin(0.1);
-    }
+    // Assert
+    assertThat((double)sentiment.getMagnitude()).isGreaterThan(1.0);
+    assertThat((double)sentiment.getScore()).isGreaterThan(0.0);
+  }
 
   @Test public void analyzeSyntax_partOfSpeech() throws Exception {
     // Act
@@ -141,18 +141,18 @@ public class AnalyzeIT {
   }
 
   @Test public void analyzeSyntax_partOfSpeechFile() throws Exception {
-      // Act
-      List<Token> token =
-          analyzeApp.analyzeSyntaxFile("gs://" + BUCKET + "/natural-language/"
-                  + "sentiment/bladerunner-neutral.txt");
-
-      List<Tag> got = token.stream().map(e -> e.getPartOfSpeech().getTag())
-          .collect(Collectors.toList());
-
-      // Assert
-      assertThat(got).containsExactly(Tag.PRON, Tag.CONJ, Tag.VERB, Tag.CONJ, Tag.VERB,
-          Tag.DET, Tag.NOUN, Tag.PUNCT, Tag.NOUN, Tag.VERB, Tag.ADJ, Tag.PUNCT, Tag.CONJ,
-          Tag.ADV, Tag.PRON, Tag.VERB, Tag.VERB, Tag.VERB, Tag.ADJ, Tag.PUNCT, Tag.DET,
-          Tag.NOUN, Tag.VERB, Tag.ADV, Tag.ADJ,Tag.PUNCT).inOrder();
-    }
+    // Act
+    List<Token> token =
+        analyzeApp.analyzeSyntaxFile("gs://" + BUCKET + "/natural-language/"
+                + "sentiment/bladerunner-neutral.txt");
+
+    List<Tag> got = token.stream().map(e -> e.getPartOfSpeech().getTag())
+        .collect(Collectors.toList());
+
+    // Assert
+    assertThat(got).containsExactly(Tag.PRON, Tag.CONJ, Tag.VERB, Tag.CONJ, Tag.VERB,
+        Tag.DET, Tag.NOUN, Tag.PUNCT, Tag.NOUN, Tag.VERB, Tag.ADJ, Tag.PUNCT, Tag.CONJ,
+        Tag.ADV, Tag.PRON, Tag.VERB, Tag.VERB, Tag.VERB, Tag.ADJ, Tag.PUNCT, Tag.DET,
+        Tag.NOUN, Tag.VERB, Tag.ADV, Tag.ADJ,Tag.PUNCT).inOrder();
+  }
 }
diff --git a/language/analysis/src/test/java/com/google/cloud/language/samples/AnalyzeTest.java b/language/analysis/src/test/java/com/google/cloud/language/samples/AnalyzeTest.java
index de14f4f1b1e..7f6df50813d 100644
--- a/language/analysis/src/test/java/com/google/cloud/language/samples/AnalyzeTest.java
+++ b/language/analysis/src/test/java/com/google/cloud/language/samples/AnalyzeTest.java
@@ -19,7 +19,6 @@
 import static com.google.common.truth.Truth.assertThat;
 
 import com.google.cloud.language.v1.Entity;
-import com.google.cloud.language.v1.Entity.Builder;
 import com.google.cloud.language.v1.Entity.Type;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
diff --git a/language/cloud-client/pom.xml b/language/cloud-client/pom.xml
index f2cd7ea467a..b188460ffc1 100644
--- a/language/cloud-client/pom.xml
+++ b/language/cloud-client/pom.xml
@@ -39,6 +39,18 @@
       <artifactId>google-cloud-language</artifactId>
       <version>0.20.0-beta</version>
     </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+      <version>20.0</version>
+    </dependency>
+
+    <!-- FIXME: remove after client fixes depenency issue -->
+    <dependency>
+      <groupId>com.google.auth</groupId>
+      <artifactId>google-auth-library-oauth2-http</artifactId>
+      <version>0.6.0</version>
+    </dependency>
 
     <!-- Test dependencies -->
     <dependency>