Updating guava to 14.0 final

mindsocket · Feb 27, 2013 · 22e1240 · 22e1240
1 parent bf0a3c4
commit 22e1240
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 8 deletions.
diff --git a/.idea/libraries/guava_libraries.xml b/.idea/libraries/guava_libraries.xml
diff --git a/android/.classpath b/android/.classpath
@@ -7,6 +7,6 @@
 	<classpathentry kind="lib" path="/third-party/java/android/android-14.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/servlet-api/servlet-api-2.5-6.1.9.jar" sourcepath="/third-party/java/servlet-api/servlet-api-2.5-6.1.9-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/webbit/webbit-0.4.14.jar" sourcepath="/third-party/java/webbit/webbit-0.4.14-src.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/guava-libraries/guava-14.0-rc1.jar" sourcepath="/third-party/java/guava-libraries/guava-14.0-rc1-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/guava-libraries/guava-14.0.jar" sourcepath="/third-party/java/guava-libraries/guava-14.0-sources.jar"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/android/build.xml b/android/build.xml
@@ -47,7 +47,7 @@
     <copy file="${build.location}/java/server/src/org/openqa/selenium/remote/server/server_core.jar" tofile="libs/remote-wdserver.jar" />
     <copy file="${build.location}/java/server/src/org/openqa/selenium/server/logging.jar" tofile="libs/remote-logging.jar" />
     <copy file="${build.location}/third_party/java/webbit/webbit-standalone.jar" tofile="libs/webbit-server.jar" />
-    <copy file="${third_party.location}/java/guava-libraries/guava-14.0-rc1.jar" todir="libs/"  />
+    <copy file="${third_party.location}/java/guava-libraries/guava-14.0.jar" todir="libs/"  />
     <copy file="${third_party.location}/java/json/json-20080701.jar" todir="libs/" />
     <copy file="${build.location}/java/client/src/org/openqa/selenium/android/android_library.jar" todir="libs" />
     <copy file="${build.location}/java/client/src/org/openqa/selenium/io/io.jar" todir="libs" />

diff --git a/java/client/.classpath b/java/client/.classpath
@@ -7,7 +7,7 @@
 	<classpathentry kind="lib" path="/third-party/java/hamcrest/hamcrest-core-1.3.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/hamcrest/hamcrest-library-1.3.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/testng/testng-6.8.jar" sourcepath="/third-party/java/testng/testng-6.8-sources.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/guava-libraries/guava-14.0-rc1.jar" sourcepath="/third-party/java/guava-libraries/guava-14.0-rc1-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/guava-libraries/guava-14.0.jar" sourcepath="/third-party/java/guava-libraries/guava-14.0-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-2.11.jar" sourcepath="/third-party/java/htmlunit/htmlunit-2.11-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-core-js-2.11.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/jna/jna-3.4.0.jar" sourcepath="/third-party/java/jna/jna-3.4.0-src.jar"/>

diff --git a/java/server/.classpath b/java/server/.classpath
@@ -26,6 +26,6 @@
 	<classpathentry kind="lib" path="/third-party/java/bouncycastle/bcpkix-jdk15on-1.48.jar"  sourcepath="/third-party/java/bouncycastle/bcpkix-jdk15on-1.48-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/webbit/webbit-0.4.14.jar" sourcepath="/third-party/java/webbit/webbit-0.4.14-src.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/netty/netty-3.5.7.Final.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/guava-libraries/guava-14.0-rc1.jar" sourcepath="/third-party/java/guava-libraries/guava-14.0-rc1-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/guava-libraries/guava-14.0.jar" sourcepath="/third-party/java/guava-libraries/guava-14.0-sources.jar"/>
 	<classpathentry kind="output" path="build/production"/>
 </classpath>
diff --git a/maven/pom.xml b/maven/pom.xml
@@ -141,7 +141,7 @@
             <dependency>
                 <groupId>com.google.guava</groupId>
                 <artifactId>guava</artifactId>
-                <version>14.0-rc1</version>
+                <version>14.0</version>
             </dependency>
             <dependency>
                 <groupId>commons-io</groupId>

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-14.0-rc1.jar" ])
+  deps = [ "guava-14.0.jar" ])
diff --git a/...uava-libraries/guava-14.0-rc1-sources.jar → ...va/guava-libraries/guava-14.0-sources.jar b/...uava-libraries/guava-14.0-rc1-sources.jar → ...va/guava-libraries/guava-14.0-sources.jar
diff --git a/...y/java/guava-libraries/guava-14.0-rc1.jar → ...party/java/guava-libraries/guava-14.0.jar b/...y/java/guava-libraries/guava-14.0-rc1.jar → ...party/java/guava-libraries/guava-14.0.jar