SimonStewart: Bumping guava libraries to the latest released version

r14357
showhand · Oct 25, 2011 · 0fe8618 · 0fe8618
1 parent e795869
commit 0fe8618
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/.classpath b/.classpath
@@ -38,7 +38,7 @@
 	<classpathentry kind="lib" path="third_party/java/jetty/jetty-util-7.2.0.v20101020.jar"/>
 	<classpathentry kind="lib" path="third_party/java/servlet-api/servlet-api-2.5-6.1.9.jar"/>
 	<classpathentry kind="lib" path="third_party/java/jetty/jetty-servlet-7.2.0.v20101020.jar"/>
-	<classpathentry kind="lib" path="third_party/java/guava-libraries/guava-r09.jar" sourcepath="third_party/java/guava-libraries/guava-r09-src.jar"/>
+	<classpathentry kind="lib" path="third_party/java/guava-libraries/guava-10.0.1.jar" sourcepath="third_party/java/guava-libraries/guava-10.0.1-src.jar"/>
 	<classpathentry kind="lib" path="third_party/java/jasper/jasper-compiler-jdt-5.5.15.jar"/>
 	<classpathentry kind="lib" path="third_party/java/jasper/jasper-compiler-5.5.15.jar"/>
 	<classpathentry kind="lib" path="third_party/java/jasper/jsp-api-2.0.jar"/>
@@ -58,5 +58,6 @@
 	<classpathentry kind="lib" path="third_party/java/commons-jxpath/commons-jxpath-1.3.jar"/>
 	<classpathentry kind="lib" path="third_party/java/jmock/jmock-legacy-2.5.1.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/objenesis-1.0"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/webbit"/>
 	<classpathentry kind="output" path="out/production/selenium"/>
 </classpath>
diff --git a/maven/pom.xml b/maven/pom.xml
@@ -125,7 +125,7 @@
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>r09</version>
+                <version>10.0.1</version>
             </dependency>
             <dependency>
                 <groupId>commons-io</groupId>

diff --git a/selenium.eml b/selenium.eml
@@ -124,10 +124,10 @@
 	<lib name="jetty-servlet-7.2.0.v20101020.jar" scope="COMPILE">
 		<relative-module-cls project-related="jar://$PROJECT_DIR$/third_party/java/jetty/jetty-servlet-7.2.0.v20101020.jar!/"/>
 	</lib>
-	<lib name="guava-r09.jar" scope="COMPILE">
-		<srcroot url="jar://$MODULE_DIR$/third_party/java/guava-libraries/guava-r09-src.jar!/"/>
-		<relative-module-src project-related="jar://$PROJECT_DIR$/third_party/java/guava-libraries/guava-r09-src.jar!/"/>
-		<relative-module-cls project-related="jar://$PROJECT_DIR$/third_party/java/guava-libraries/guava-r09.jar!/"/>
+	<lib name="guava-10.0.1.jar" scope="COMPILE">
+		<srcroot url="jar://$MODULE_DIR$/third_party/java/guava-libraries/guava-10.0.1-src.jar!/"/>
+		<relative-module-src project-related="jar://$PROJECT_DIR$/third_party/java/guava-libraries/guava-10.0.1-src.jar!/"/>
+		<relative-module-cls project-related="jar://$PROJECT_DIR$/third_party/java/guava-libraries/guava-10.0.1.jar!/"/>
 	</lib>
 	<lib name="jasper-compiler-jdt-5.5.15.jar" scope="COMPILE">
 		<relative-module-cls project-related="jar://$PROJECT_DIR$/third_party/java/jasper/jasper-compiler-jdt-5.5.15.jar!/"/>

diff --git a/third_party/java/guava-libraries/build.desc b/third_party/java/guava-libraries/build.desc
@@ -1,3 +1,3 @@
 
 java_library(name = "guava-libraries",
-  deps = [ "guava-r09.jar" ])
+  deps = [ "guava-10.0.1.jar" ])
diff --git a/third_party/java/guava-libraries/guava-r09-src.jar b/third_party/java/guava-libraries/guava-r09-src.jar
diff --git a/third_party/java/guava-libraries/guava-r09.jar b/third_party/java/guava-libraries/guava-r09.jar