Espresso open source: more pom cleanup (preventing dex preverification errors)
-------------
Created by MOE: http://code.google.com/p/moe-java
MOE_MIGRATED_REVID=59152452
diff --git a/espresso/contrib/pom.xml b/espresso/contrib/pom.xml
index ff84db9..cbf70d1 100644
--- a/espresso/contrib/pom.xml
+++ b/espresso/contrib/pom.xml
@@ -16,31 +16,15 @@
       <scope>provided</scope>
     </dependency>
     <dependency>
-      <groupId>javax.inject</groupId>
-      <artifactId>javax.inject</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.android</groupId>
-      <artifactId>android-test</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
       <groupId>android.support</groupId>
       <artifactId>compatibility-v4</artifactId>
+      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>com.google.android.apps.common.testing</groupId>
       <artifactId>espresso</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>javax.annotation-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
   </dependencies>
   <build>
     <plugins>
diff --git a/espresso/contribtests/pom.xml b/espresso/contribtests/pom.xml
index e0613fe..ea1bc7c 100644
--- a/espresso/contribtests/pom.xml
+++ b/espresso/contribtests/pom.xml
@@ -37,7 +37,6 @@
     <dependency>
       <groupId>com.google.android.apps.common.testing</groupId>
       <artifactId>espresso-contrib</artifactId>
-      <scope>provided</scope>
       <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/espresso/libtests/pom.xml b/espresso/libtests/pom.xml
index c2cbd91..ad05caa 100644
--- a/espresso/libtests/pom.xml
+++ b/espresso/libtests/pom.xml
@@ -39,6 +39,12 @@
       <groupId>com.google.android.apps.common.testing</groupId>
       <artifactId>espresso</artifactId>
       <version>${project.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.google.android</groupId>
@@ -53,11 +59,6 @@
       <groupId>com.google.dexmaker</groupId>
       <artifactId>dexmaker</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.android.apps.common.testing</groupId>
-      <artifactId>testrunner-runtime</artifactId>
-      <version>${project.version}</version>
-    </dependency>
   </dependencies>
   <build>
     <finalName>${project.artifactId}</finalName>
diff --git a/testapp_test/pom.xml b/testapp_test/pom.xml
index 2503111..f525b4b 100644
--- a/testapp_test/pom.xml
+++ b/testapp_test/pom.xml
@@ -39,6 +39,12 @@
       <groupId>com.google.android.apps.common.testing</groupId>
       <artifactId>espresso</artifactId>
       <version>${project.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
     <dependency>
       <groupId>com.google.android</groupId>
@@ -48,8 +54,13 @@
     <dependency>
       <groupId>com.google.android.apps.common.testing</groupId>
       <artifactId>espresso-contrib</artifactId>
-      <scope>provided</scope>
       <version>${project.version}</version>
+      <exclusions>
+        <exclusion>
+          <groupId>com.google.guava</groupId>
+          <artifactId>guava</artifactId>
+        </exclusion>
+      </exclusions>
     </dependency>
   </dependencies>
   <build>