From 45ef01760942b9575a6094effeb4eb034db9a113 Mon Sep 17 00:00:00 2001
From: Sam Berlin <sameb@google.com>
Date: Fri, 13 Jan 2012 18:22:35 -0500
Subject: Cleanup a few things: 1) Remove invalid annotation. 2) Update to
 Guava 11.0.1, from r9. 3) Remove some unused files. 4) Forcibly keep
 Throwables, since servlet uses it but core doesn't (so jarjar was wiping it).
 5) Disable failing Multibinder test.

R=jessewilson
DELTA=193  (10 added, 174 deleted, 9 changed)

Revision created by MOE tool push_codebase.
MOE_MIGRATION=4087
---
 pom.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'pom.xml')

diff --git a/pom.xml b/pom.xml
index 001892bc..3b764843 100644
--- a/pom.xml
+++ b/pom.xml
@@ -234,6 +234,11 @@ See the Apache License Version 2.0 for the specific language governing permissio
               <keep>
                 <pattern>com.googlecode.**</pattern>
               </keep>
+              <keep>
+                <!-- the servlet extension uses this but core doesn't,
+                     so we explicitly instruct the build to keep it. -->
+                <pattern>com.google.common.base.Throwables</pattern>
+              </keep>
             </rules>
           </configuration>
           <!--
@@ -319,7 +324,7 @@ See the Apache License Version 2.0 for the specific language governing permissio
             <archive>
               <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
               <!--  Exclude to mirror ant build -->
-     		  <addMavenDescriptor>false</addMavenDescriptor>
+          <addMavenDescriptor>false</addMavenDescriptor>
             </archive>
           </configuration>
           <executions>
-- 
cgit v1.2.3