From 759245a49a00315a41b28da8fe52a2894d4f57ea Mon Sep 17 00:00:00 2001
From: Jisi Liu <jisi.liu@gmail.com>
Date: Tue, 25 Jul 2017 11:52:33 -0700
Subject: Merge from master

---
 java/core/pom.xml | 5 -----
 java/pom.xml      | 8 +-------
 2 files changed, 1 insertion(+), 12 deletions(-)

(limited to 'java')

diff --git a/java/core/pom.xml b/java/core/pom.xml
index 2a989d98..4608fce6 100644
--- a/java/core/pom.xml
+++ b/java/core/pom.xml
@@ -34,11 +34,6 @@
       <artifactId>easymockclassextension</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.truth</groupId>
-      <artifactId>truth</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 
   <build>
diff --git a/java/pom.xml b/java/pom.xml
index 7aff7b41..dd3ba3b8 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -84,13 +84,7 @@
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
-        <version>20.0</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.truth</groupId>
-        <artifactId>truth</artifactId>
-        <scope>test</scope>
-        <version>0.32</version>
+        <version>19.0</version>
       </dependency>
     </dependencies>
   </dependencyManagement>
-- 
cgit v1.2.3