Updating guava

SeleniumHQ · May 10, 2018 · 7f0ddee · 7f0ddee
1 parent 841f7ee
commit 7f0ddee
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/.idea/libraries/guava.xml b/.idea/libraries/guava.xml
diff --git a/java/client/.classpath b/java/client/.classpath
@@ -6,7 +6,7 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<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/guava/guava-23.6-jre.jar" sourcepath="/third-party/java/guava/guava-23.6-jre-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/guava/guava-25.0-jre.jar" sourcepath="/third-party/java/guava/guava-25.0-jre-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-2.29.jar" sourcepath="/third-party/java/htmlunit/htmlunit-2.29-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/htmlunit/neko-htmlunit-2.28.jar" sourcepath="/third-party/java/htmlunit/neko-htmlunit-2.28-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-core-js-2.28.jar" sourcepath="/third-party/java/htmlunit/htmlunit-core-js-2.28-sources.jar"/>

diff --git a/java/server/.classpath b/java/server/.classpath
@@ -14,7 +14,7 @@
 	<classpathentry kind="lib" path="/third-party/java/commons-logging/commons-logging-1.2.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/jcip/jcip-annotations-1.0.jar" sourcepath="/third-party/java/jcip/jcip-annotations-1.0-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/netty/netty-all-4.1.19.Final.jar"/>
-	<classpathentry kind="lib" path="/third-party/java/guava/guava-23.6-jre.jar" sourcepath="/third-party/java/guava/guava-23.6-jre-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/guava/guava-25.0-jre.jar" sourcepath="/third-party/java/guava/guava-25.0-jre-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/mockito/mockito-core-2.18.0.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/jetty/jetty-repacked.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/yaml/snakeyaml-1.19.jar" sourcepath="/third-party/java/yaml/snakeyaml-1.19-sources.jar"/>

diff --git a/third_party/java/guava/BUCK b/third_party/java/guava/BUCK
@@ -1,10 +1,9 @@
 prebuilt_jar(
   name = 'guava',
-  maven_coords = 'com.google.guava:guava:jar:23.6-jre',
-  binary_jar = 'guava-23.6-jre.jar',
-  source_jar = 'guava-23.6-jre-sources.jar',
+  maven_coords = 'com.google.guava:guava:jar:25.0-jre',
+  binary_jar = 'guava-25.0-jre.jar',
+  source_jar = 'guava-25.0-jre-sources.jar',
   visibility = [
     'PUBLIC',
   ],
 )
-
diff --git a/...rty/java/guava/guava-23.6-jre-sources.jar → ...rty/java/guava/guava-25.0-jre-sources.jar b/...rty/java/guava/guava-23.6-jre-sources.jar → ...rty/java/guava/guava-25.0-jre-sources.jar
diff --git a/third_party/java/guava/guava-23.6-jre.jar → third_party/java/guava/guava-25.0-jre.jar b/third_party/java/guava/guava-23.6-jre.jar → third_party/java/guava/guava-25.0-jre.jar