Revert "Remove rebasing for guava, closure and gss & upgrade versions."

This reverts commit 77c7d4c. Change-Id: I038e1739b9b6ba136210fae4a3ed926a8e3d8fb8
gwtproject · Feb 18, 2015 · 519e16b · 519e16b
1 parent a150efc
commit 519e16b
Show file tree

Hide file tree

Showing 324 changed files with 2,925 additions and 2,983 deletions.
diff --git a/dev/BUILD b/dev/BUILD
@@ -123,29 +123,6 @@ AugmentedJar(
     wrap_javalibrary = 0,
 )
 
-GUAVA_DEPS = [
-  "//java/com/google/common/annotations",
-  "//java/com/google/common/base",
-  "//java/com/google/common/cache",
-  "//java/com/google/common/collect",
-  "//java/com/google/common/hash",
-  "//java/com/google/common/io",
-  "//java/com/google/common/primitives",
-  "//java/com/google/common/util/concurrent",
-]
-
-JS_COMP_DEPS = [
-  "//java/com/google/javascript/jscomp",
-  "//third_party/java/rhino_ast/java/com/google/javascript/rhino",
-  "//third_party/java_src/jscomp/java/com/google/debugging/sourcemap:common",
-  "//third_party/java_src/jscomp/java/com/google/debugging/sourcemap:shared", 
-]
-
-PROTO_DEPS = [
-  "//java/com/google/protobuf",
-  "//java/com/google/protobuf:protobuf_lite",
-]
-
 # The gwt-dev classes for GWT internal use only.
 # They must be jarjar-ed and dependencies stripped before exposing to google3.
 java_library(
@@ -156,10 +133,9 @@ java_library(
     ),
     deps = [
         ":compiler.standalone.super",
-        "//third_party/java_src/gwt/svn/tools:compiler_deps",
         "//third_party/java_src/gwt/svn/tools:dev_deps",
         "//third_party/java_src/gwt/svn/tools:servlet_api_3",
-    ] + GUAVA_DEPS + JS_COMP_DEPS + PROTO_DEPS,
+    ],
 )
 
 # Resource files in core/src.
@@ -228,7 +204,7 @@ java_library(
     deps = [
         ":compiler.standalone.super",
         "//third_party/java_src/gwt/svn/tools:compiler_deps",
-    ] + GUAVA_DEPS + JS_COMP_DEPS,
+    ],
 )
 
 # This is a bootstrap library; it will later be stripped out of the classpath
@@ -322,10 +298,9 @@ java_library(
     deps = [
         ":compiler.standalone.super",
         ":gwt-dev-bare",
-        "//third_party/java/gson",
         "//third_party/java/junit",
         "//third_party/java_src/gwt/svn/tools:dev_deps",
-    ] + GUAVA_DEPS + JS_COMP_DEPS,
+    ],
 )
 
 # The "dev" directory is tested by loose tests.  Some of them fail because of

diff --git a/dev/build.xml b/dev/build.xml
@@ -36,7 +36,7 @@
                excludes="**/super/**">
       <classpath>
         <pathelement location="${javac.out}"/>
-        <pathelement location="${gwt.tools.lib}/gss/2015-02-13/closure-stylesheets-library-20150213.jar"/>
+        <pathelement location="${gwt.tools.lib}/gss/2014-09-11/closure-stylesheets-rebased.jar"/>
         <pathelement location="${gwt.tools.lib}/junit/junit-4.8.2.jar"/>
         <pathelement location="${gwt.tools.lib}/selenium/selenium-java-client-driver.jar"/>
         <pathelement location="${gwt.tools.lib}/w3c/sac/sac-1.3.jar"/>
@@ -46,7 +46,7 @@
         <pathelement
             location="${gwt.tools.lib}/javax/validation/validation-api-1.0.0.GA.jar"/>
         <pathelement
-            location="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5.jar"/>
+            location="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar"/>
         <pathelement location="${gwt.build.lib}/gwt-dev-${build.host.platform}.jar"/>
         <pathelement location="${alldeps.jar}"/>
       </classpath>
@@ -65,13 +65,14 @@
           <include name="eclipse/org.eclipse.jdt.core_3.11.0.v20150126-2015.jar"/>
           <include name="eclipse/jdtCompilerAdapter_3.11.0.v20150126-2015.jar"/>
           <include name="objectweb/asm-5.0.3/lib/asm-all-5.0.3.jar"/>
-          <include name="guava/guava-18.0/guava-18.0.jar"/>
+          <include name="guava/guava-16.0.1/guava-16.0.1-rebased.jar"/>
           <include name="icu4j/50.1.1/icu4j.jar"/>
           <include name="jetty/jetty-8.1.12.v20130726/jetty-8.1.12.v20130726.jar"/>
           <include name="jetty/jetty-8.1.12.v20130726/servlet-api-3.0-NoMetaInf.jar"/>
-          <include name="jscomp/20150201/compiler-stripped.jar"/>
+          <include name="jscomp/20131118.json.rebased/compiler-rebased.jar"/>
+          <include name="jscomp/20131118.json.rebased/sourcemap-rebased.jar"/>
           <include name="jsr305/jsr305.jar"/>
-          <include name="protobuf/protobuf-2.5.0/protobuf-java-2.5.0.jar"/>
+          <include name="protobuf/protobuf-2.5.0/protobuf-java-rebased-2.5.0.jar"/>
           <!-- dependencies needed for JSP support in DevMode: BEGIN -->
           <include name="tomcat/commons-el-1.0.jar"/>
           <include name="tomcat/jasper-compiler-1.0.jar"/>
@@ -116,16 +117,17 @@
               src="${gwt.tools.lib}/eclipse/org.eclipse.jdt.core_3.11.0.v20150126-2015.jar"/>
           <zipfileset
               src="${gwt.tools.lib}/eclipse/jdtCompilerAdapter_3.11.0.v20150126-2015.jar"/>
-          <zipfileset src="${gwt.tools.lib}/guava/guava-18.0/guava-18.0.jar"/>
+          <zipfileset src="${gwt.tools.lib}/guava/guava-16.0.1/guava-16.0.1-rebased.jar"/>
           <zipfileset src="${gwt.tools.lib}/icu4j/50.1.1/icu4j.jar"/>
           <zipfileset
               src="${gwt.tools.lib}/jetty/jetty-8.1.12.v20130726/jetty-8.1.12.v20130726.jar"/>
           <zipfileset
               src="${gwt.tools.lib}/jetty/jetty-8.1.12.v20130726/servlet-api-3.0-NoMetaInf.jar"/>
-          <zipfileset src="${gwt.tools.lib}/jscomp/20150201/compiler-stripped.jar"/>
+          <zipfileset src="${gwt.tools.lib}/jscomp/20131118.json.rebased/compiler-rebased.jar"/>
+          <zipfileset src="${gwt.tools.lib}/jscomp/20131118.json.rebased/sourcemap-rebased.jar"/>
           <zipfileset src="${gwt.tools.lib}/jsr305/jsr305.jar"/>
           <zipfileset
-              src="${gwt.tools.lib}/protobuf/protobuf-2.5.0/protobuf-java-2.5.0.jar"/>
+              src="${gwt.tools.lib}/protobuf/protobuf-2.5.0/protobuf-java-rebased-2.5.0.jar"/>
           <!-- dependencies needed for JSP support in DevMode: BEGIN -->
           <zipfileset src="${gwt.tools.lib}/tomcat/commons-el-1.0.jar"/>
           <zipfileset src="${gwt.tools.lib}/tomcat/jasper-compiler-1.0.jar"/>
@@ -203,12 +205,13 @@
         <pathelement
             location="${gwt.tools.lib}/eclipse/jdtCompilerAdapter_3.11.0.v20150126-2015.jar"/>
         <pathelement
-            location="${gwt.tools.lib}/guava/guava-18.0/guava-18.0.jar"/>
+            location="${gwt.tools.lib}/guava/guava-16.0.1/guava-16.0.1-rebased.jar"/>
-        <pathelement location="${gwt.tools.lib}/jscomp/20150201/compiler-stripped.jar"/>
+        <pathelement location="${gwt.tools.lib}/jscomp/20131118.json.rebased/compiler-rebased.jar"/>
+        <pathelement location="${gwt.tools.lib}/jscomp/20131118.json.rebased/sourcemap-rebased.jar"/>
         <pathelement location="${gwt.tools.lib}/json/android-sdk-19.1/json-android-rebased.jar"/>
         <pathelement location="${gwt.tools.lib}/jsr305/jsr305.jar"/>
         <pathelement
-            location="${gwt.tools.lib}/protobuf/protobuf-2.5.0/protobuf-java-2.5.0.jar"/>
+            location="${gwt.tools.lib}/protobuf/protobuf-2.5.0/protobuf-java-rebased-2.5.0.jar"/>
       </classpath>
     </gwt.javac>
   </target>
@@ -305,7 +308,7 @@
         <pathelement location="${gwt.root}/samples/hello/src/"/>
         <!-- CompilerTest needs the dependecies to compile a project that uses UiBinder. -->
         <pathelement location="${gwt.tools.lib}/gss/2014-09-11/closure-stylesheets-rebased.jar"/>
-	<pathelement location="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5.jar"/>
+	<pathelement location="${gwt.tools.lib}/streamhtmlparser/streamhtmlparser-jsilver-r10/streamhtmlparser-jsilver-r10-1.5-rebased.jar"/>
       </extraclasspaths>
     </gwt.junit>
   </target>
@@ -346,4 +349,3 @@
     </outofdate>
   </target>
 </project>
-
diff --git a/dev/codeserver/BUILD b/dev/codeserver/BUILD
@@ -34,15 +34,10 @@ java_library(
         "java/**/*.js",
     ]),
     deps = [
-        "//java/com/google/common/base",
-        "//java/com/google/common/collect",
-        "//java/com/google/common/io",
-        "//java/com/google/common/util/concurrent",
         # dependencies for open source code (should match ant)
         "//third_party/java_src/gwt/svn/trunk/dev:gwt-dev-bare",
         "//third_party/java_src/gwt/svn/tools:dev_deps",
         "//third_party/java_src/gwt/svn/tools:servlet_api_3",
-        "//third_party/java_src/jscomp/java/com/google/debugging/sourcemap:common",
     ],
 )
 
@@ -52,10 +47,7 @@ java_library(
     srcs = glob(["javatests/**/*.java"]),
     deps = [
         ":codeserver-bare",
-        "//java/com/google/common/base",
         "//java/com/google/common/collect",
-        "//java/com/google/common/io",
-        "//java/com/google/common/util/concurrent",
         "//third_party/java/junit",
         "//third_party/java_src/gwt",
         "//third_party/java_src/gwt/svn/tools:dev_deps",
@@ -98,11 +90,6 @@ AugmentedJar(
     constraints = [],
     dojarjar = 1,
     export_deps = [
-        "//java/com/google/common/base",
-        "//java/com/google/common/cache",
-        "//java/com/google/common/collect",
-        "//java/com/google/common/io",
-        "//java/com/google/common/util/concurrent",
         # Dependencies for google3 (after jarjar).
         "//third_party/java_src/gwt:gwt-dev",
         "//third_party/java_src/gwt:gwt-dev-private",

diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/CompileDir.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/CompileDir.java
@@ -16,12 +16,12 @@
 
 package com.google.gwt.dev.codeserver;
 
-import com.google.common.base.Charsets;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-import com.google.common.io.Files;
 import com.google.gwt.core.ext.TreeLogger;
 import com.google.gwt.core.ext.UnableToCompleteException;
+import com.google.gwt.thirdparty.guava.common.base.Charsets;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.io.Files;
 
 import java.io.File;
 import java.io.FilenameFilter;

diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/CompilerOptionsImpl.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/CompilerOptionsImpl.java
@@ -16,9 +16,6 @@
 
 package com.google.gwt.dev.codeserver;
 
-import com.google.common.collect.LinkedListMultimap;
-import com.google.common.collect.ListMultimap;
-import com.google.common.collect.Lists;
 import com.google.gwt.core.ext.TreeLogger;
 import com.google.gwt.dev.cfg.Properties;
 import com.google.gwt.dev.jjs.JsOutputOption;
@@ -27,6 +24,9 @@
 import com.google.gwt.dev.util.arg.OptionMethodNameDisplayMode;
 import com.google.gwt.dev.util.arg.OptionOptimize;
 import com.google.gwt.dev.util.arg.SourceLevel;
+import com.google.gwt.thirdparty.guava.common.collect.LinkedListMultimap;
+import com.google.gwt.thirdparty.guava.common.collect.ListMultimap;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
 
 import java.io.File;
 import java.util.List;

diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/Job.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/Job.java
@@ -15,19 +15,19 @@
  */
 package com.google.gwt.dev.codeserver;
 
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSortedMap;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.SettableFuture;
 import com.google.gwt.core.ext.TreeLogger;
 import com.google.gwt.core.ext.TreeLogger.Type;
 import com.google.gwt.dev.cfg.ModuleDef;
 import com.google.gwt.dev.codeserver.JobEvent.CompileStrategy;
 import com.google.gwt.dev.codeserver.JobEvent.Status;
 import com.google.gwt.dev.util.log.AbstractTreeLogger;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableMap;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableSortedMap;
+import com.google.gwt.thirdparty.guava.common.util.concurrent.Futures;
+import com.google.gwt.thirdparty.guava.common.util.concurrent.ListenableFuture;
+import com.google.gwt.thirdparty.guava.common.util.concurrent.SettableFuture;
 
 import java.util.Map;
 import java.util.Set;

diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/JobEvent.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/JobEvent.java
@@ -15,13 +15,13 @@
  */
 package com.google.gwt.dev.codeserver;
 
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSortedMap;
 import com.google.gwt.dev.cfg.ModuleDef;
 import com.google.gwt.dev.cfg.ModuleDefSchema;
 import com.google.gwt.dev.util.log.MetricName;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableMap;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableSortedMap;
 
 import java.util.List;
 import java.util.Map;

diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/JobEventTable.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/JobEventTable.java
@@ -15,11 +15,11 @@
  */
 package com.google.gwt.dev.codeserver;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Maps;
 import com.google.gwt.core.ext.TreeLogger;
 import com.google.gwt.core.ext.TreeLogger.Type;
 import com.google.gwt.dev.codeserver.JobEvent.Status;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
 
 import java.util.LinkedHashSet;
 import java.util.Map;

diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/LauncherDir.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/LauncherDir.java
@@ -15,16 +15,16 @@
  */
 package com.google.gwt.dev.codeserver;
 
-import com.google.common.base.Charsets;
-import com.google.common.base.Preconditions;
-import com.google.common.io.Files;
-import com.google.common.io.Resources;
 import com.google.gwt.core.ext.TreeLogger;
 import com.google.gwt.core.ext.TreeLogger.Type;
 import com.google.gwt.core.ext.UnableToCompleteException;
 import com.google.gwt.dev.cfg.ModuleDef;
 import com.google.gwt.dev.codeserver.CompileDir.PolicyFile;
 import com.google.gwt.dev.resource.impl.ResourceOracleImpl;
+import com.google.gwt.thirdparty.guava.common.base.Charsets;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
+import com.google.gwt.thirdparty.guava.common.io.Files;
+import com.google.gwt.thirdparty.guava.common.io.Resources;
 
 import java.io.File;
 import java.io.IOException;

diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/Options.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/Options.java
@@ -16,10 +16,6 @@
 
 package com.google.gwt.dev.codeserver;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.LinkedListMultimap;
-import com.google.common.collect.ListMultimap;
 import com.google.gwt.core.ext.TreeLogger;
 import com.google.gwt.dev.ArgProcessorBase;
 import com.google.gwt.dev.cfg.ModuleDef;
@@ -38,6 +34,10 @@
 import com.google.gwt.dev.util.arg.OptionSetProperties;
 import com.google.gwt.dev.util.arg.OptionSourceLevel;
 import com.google.gwt.dev.util.arg.SourceLevel;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableSet;
+import com.google.gwt.thirdparty.guava.common.collect.LinkedListMultimap;
+import com.google.gwt.thirdparty.guava.common.collect.ListMultimap;
 import com.google.gwt.util.tools.ArgHandler;
 import com.google.gwt.util.tools.ArgHandlerDir;
 import com.google.gwt.util.tools.ArgHandlerExtra;

diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/Outbox.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/Outbox.java
@@ -16,12 +16,12 @@
 
 package com.google.gwt.dev.codeserver;
 
-import com.google.common.base.Preconditions;
 import com.google.gwt.core.ext.TreeLogger;
 import com.google.gwt.core.ext.UnableToCompleteException;
 import com.google.gwt.dev.cfg.ModuleDef;
 import com.google.gwt.dev.codeserver.CompileDir.PolicyFile;
 import com.google.gwt.dev.codeserver.Job.Result;
+import com.google.gwt.thirdparty.guava.common.base.Preconditions;
 
 import java.io.BufferedInputStream;
 import java.io.File;

diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/OutboxTable.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/OutboxTable.java
@@ -16,11 +16,11 @@
 
 package com.google.gwt.dev.codeserver;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 import com.google.gwt.core.ext.TreeLogger;
 import com.google.gwt.core.ext.UnableToCompleteException;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableList;
+import com.google.gwt.thirdparty.guava.common.collect.Lists;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
 
 import java.io.File;
 import java.util.Collection;

diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/Pages.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/Pages.java
@@ -16,10 +16,10 @@
 
 package com.google.gwt.dev.codeserver;
 
-import com.google.common.io.Resources;
 import com.google.gwt.core.ext.TreeLogger;
 import com.google.gwt.core.ext.TreeLogger.Type;
 import com.google.gwt.dev.json.JsonObject;
+import com.google.gwt.thirdparty.guava.common.io.Resources;
 
 import java.io.IOException;
 import java.io.OutputStreamWriter;

diff --git a/dev/codeserver/java/com/google/gwt/dev/codeserver/Recompiler.java b/dev/codeserver/java/com/google/gwt/dev/codeserver/Recompiler.java
@@ -15,13 +15,6 @@
  */
 package com.google.gwt.dev.codeserver;
 
-import com.google.common.base.Charsets;
-import com.google.common.base.Joiner;
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Maps;
-import com.google.common.io.Files;
-import com.google.common.io.Resources;
 import com.google.gwt.core.ext.Linker;
 import com.google.gwt.core.ext.TreeLogger;
 import com.google.gwt.core.ext.TreeLogger.Type;
@@ -51,6 +44,13 @@
 import com.google.gwt.dev.resource.impl.ZipFileClassPathEntry;
 import com.google.gwt.dev.util.log.CompositeTreeLogger;
 import com.google.gwt.dev.util.log.PrintWriterTreeLogger;
+import com.google.gwt.thirdparty.guava.common.base.Charsets;
+import com.google.gwt.thirdparty.guava.common.base.Joiner;
+import com.google.gwt.thirdparty.guava.common.base.Objects;
+import com.google.gwt.thirdparty.guava.common.collect.ImmutableMap;
+import com.google.gwt.thirdparty.guava.common.collect.Maps;
+import com.google.gwt.thirdparty.guava.common.io.Files;
+import com.google.gwt.thirdparty.guava.common.io.Resources;
 
 import java.io.File;
 import java.io.IOException;