From 95f08610053bcb50cf5421696141cf083f3bbfe4 Mon Sep 17 00:00:00 2001
From: cgruber <cgruber@google.com>
Date: Thu, 21 Apr 2016 12:03:24 -0700
Subject: [PATCH] Revert the workaround to classpath issues caused by
 google-java-format bundling but not relocating their copy of guava, which
 affected 2.3.  The issue is no longer there, and the tests should fail if it
 regresses.

relates to google/dagger#288 and was partly resolved by google/google-java-format#20 and depending on the newer released (unshaded) formatter.
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=120469748
---
 compiler/src/it/functional-tests/pom.xml | 4 ----
 compiler/src/it/tck/pom.xml              | 5 -----
 2 files changed, 9 deletions(-)

diff --git a/compiler/src/it/functional-tests/pom.xml b/compiler/src/it/functional-tests/pom.xml
index 8f3252eee12..87acf995e60 100644
--- a/compiler/src/it/functional-tests/pom.xml
+++ b/compiler/src/it/functional-tests/pom.xml
@@ -28,10 +28,6 @@ limitations under the License.
   <artifactId>functional-tests</artifactId>
   <name>Functional Tests</name>
   <dependencies>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.google.dagger</groupId>
       <artifactId>dagger</artifactId>
diff --git a/compiler/src/it/tck/pom.xml b/compiler/src/it/tck/pom.xml
index 4a27fb334ea..f07c6f0fc17 100644
--- a/compiler/src/it/tck/pom.xml
+++ b/compiler/src/it/tck/pom.xml
@@ -28,11 +28,6 @@ limitations under the License.
   <artifactId>tck</artifactId>
   <name>TCK</name>
   <dependencies>
-    <dependency>
-      <!-- Force the correct version of Guava to be on the classpath. -->
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.google.dagger</groupId>
       <artifactId>dagger</artifactId>