[java] Upgrading guava

quehanwei · Apr 7, 2019 · fd34075 · fd34075
1 parent a652ddc
commit fd34075
Show file tree

Hide file tree

Showing 12 changed files with 33 additions and 7 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,9 @@
 	<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-25.0-jre.jar" sourcepath="/third-party/java/guava/guava-25.0-jre-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/guava/guava-27.1-jre.jar" sourcepath="/third-party/java/guava/guava-27.1-jre-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/guava/listenablefuture-1.0.jar" sourcepath="/third-party/java/guava/listenablefuture-1.0-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/guava/failureaccess-1.0.1.jar" sourcepath="/third-party/java/guava/failureaccess-1.0.1-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-2.34.1.jar" sourcepath="/third-party/java/htmlunit/htmlunit-2.34.1-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/htmlunit/neko-htmlunit-2.34.0.jar" sourcepath="/third-party/java/htmlunit/neko-htmlunit-2.34.0-sources.jar"/>
 	<classpathentry kind="lib" path="/third-party/java/htmlunit/htmlunit-core-js-2.34.0.jar" sourcepath="/third-party/java/htmlunit/htmlunit-core-js-2.34.0-sources.jar"/>

diff --git a/java/server/.classpath b/java/server/.classpath
@@ -10,7 +10,9 @@
 	<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.25.Final.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/guava/guava-27.1-jre.jar" sourcepath="/third-party/java/guava/guava-27.1-jre-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/guava/listenablefuture-1.0.jar" sourcepath="/third-party/java/guava/listenablefuture-1.0-sources.jar"/>
+	<classpathentry kind="lib" path="/third-party/java/guava/failureaccess-1.0.1.jar" sourcepath="/third-party/java/guava/failureaccess-1.0.1-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,9 +1,27 @@
 prebuilt_jar(
     name = "guava",
-    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",
+    maven_coords = "com.google.guava:guava:jar:27.1-jre",
+    binary_jar = "guava-27.1-jre.jar",
+    source_jar = "guava-27.1-jre-sources.jar",
+    deps = [
+        ":listenablefuture",
+        ":failureaccess",
+    ],
     visibility = [
         "PUBLIC",
     ],
 )
+
+prebuilt_jar(
+    name = "listenablefuture",
+    maven_coords = "com.google.guava:listenablefuture:jar:1.0",
+    binary_jar = "listenablefuture-1.0.jar",
+    source_jar = "listenablefuture-1.0-sources.jar",
+)
+
+prebuilt_jar(
+    name = "failureaccess",
+    maven_coords = "com.google.guava:failureaccess:jar:1.0.1",
+    binary_jar = "failureaccess-1.0.1.jar",
+    source_jar = "failureaccess-1.0.1-sources.jar",
+)
diff --git a/third_party/java/guava/failureaccess-1.0.1-sources.jar b/third_party/java/guava/failureaccess-1.0.1-sources.jar
diff --git a/third_party/java/guava/failureaccess-1.0.1.jar b/third_party/java/guava/failureaccess-1.0.1.jar
diff --git a/third_party/java/guava/guava-25.0-jre-sources.jar b/third_party/java/guava/guava-25.0-jre-sources.jar
diff --git a/third_party/java/guava/guava-25.0-jre.jar b/third_party/java/guava/guava-25.0-jre.jar
diff --git a/third_party/java/guava/guava-27.1-jre-sources.jar b/third_party/java/guava/guava-27.1-jre-sources.jar
diff --git a/third_party/java/guava/guava-27.1-jre.jar b/third_party/java/guava/guava-27.1-jre.jar
diff --git a/third_party/java/guava/listenablefuture-1.0-sources.jar b/third_party/java/guava/listenablefuture-1.0-sources.jar
diff --git a/third_party/java/guava/listenablefuture-1.0.jar b/third_party/java/guava/listenablefuture-1.0.jar