Remove org.json:json and fix gwt-dev deps

GWT 2.7 dev JAR no longer lists org.json:json as a dep in its pom.xml
file.  Instead it requests ow2-asm.  Fix the dep list to drop the
difficult org.json:json and put in the requested ow2 JARs.

Move ow2-asm deps down onto gwt-dev JAR where they belong.  These are
required by the compiler code inside gwt-dev, not user code linked
with gwt_module().

Change-Id: I54df92daf40d77e61bed4ed4b549981e8d798ca1
(cherry picked from commit b0735a3c02)

gerrit-gwtui/BUCK

@@ -2,9 +2,10 @@ include_defs('//gerrit-gwtui/gwt.defs')
 include_defs('//tools/gwt-constants.defs')
 from multiprocessing import cpu_count
 
-DEPS = GWT_COMMON_DEPS + [
+DEPS = [
   '//gerrit-gwtexpui:CSS',
   '//lib:gwtjsonrpc',
+  '//lib/gwt:dev',
 ]
 
 genrule(

lib/gwt/BUCK

@@ -15,23 +15,19 @@ maven_jar(
   id = 'com.google.gwt:gwt-dev:' + VERSION,
   sha1 = 'c2c3dd5baf648a0bb199047a818be5e560f48982',
   license = 'Apache2.0',
-  deps = [
+  exported_deps = [
     ':javax-validation',
     ':javax-validation_src',
-    ':json',
+    '//lib/ow2:ow2-asm',
+    '//lib/ow2:ow2-asm-analysis',
+    '//lib/ow2:ow2-asm-commons',
+    '//lib/ow2:ow2-asm-tree',
+    '//lib/ow2:ow2-asm-util',
   ],
   attach_source = False,
   exclude = ['org/eclipse/jetty/*'],
 )
 
-maven_jar(
-  name = 'json',
-  id = 'org.json:json:20140107',
-  sha1 = 'd1ffca6e2482b002702c6a576166fd685e3370e3',
-  license = 'DO_NOT_DISTRIBUTE',
-  attach_source = False,
-)
-
 maven_jar(
   name = 'javax-validation',
   id = 'javax.validation:validation-api:1.0.0.GA',

lib/ow2/BUCK

@@ -16,6 +16,14 @@ maven_jar(
   license = 'ow2',
 )
 
+maven_jar(
+  name = 'ow2-asm-commons',
+  id = 'org.ow2.asm:asm-commons:' + VERSION,
+  sha1 = 'a7111830132c7f87d08fe48cb0ca07630f8cb91c',
+  deps = [':ow2-asm-tree'],
+  license = 'ow2',
+)
+
 maven_jar(
   name = 'ow2-asm-tree',
   id = 'org.ow2.asm:asm-tree:' + VERSION,

tools/default.defs

@@ -167,8 +167,7 @@ def gerrit_plugin(
       srcs = [],
       resources = list(set(srcs + resources)),
       deps = deps,
-      provided_deps = ['//lib/gwt:dev'] +
-        GWT_PLUGIN_DEPS,
+      provided_deps = GWT_PLUGIN_DEPS,
       visibility = ['PUBLIC'],
     )
     prebuilt_jar(
@@ -187,7 +186,7 @@ def gerrit_plugin(
     gwt_binary(
       name = name + '__gwt_application',
       modules = [gwt_module],
-      deps = GWT_PLUGIN_DEPS,
+      deps = GWT_PLUGIN_DEPS + ['//lib/gwt:dev'],
       module_deps = [':%s__gwt_module' % name],
       local_workers = cpu_count(),
       strict = True,

tools/gwt-constants.defs

@@ -5,14 +5,7 @@ GWT_COMPILER_ARGS = [
   '-XdisableCastChecking',
 ]
 
-GWT_COMMON_DEPS = [
-  '//lib/ow2:ow2-asm',
-  '//lib/ow2:ow2-asm-analysis',
-  '//lib/ow2:ow2-asm-util',
-  '//lib/ow2:ow2-asm-tree',
-]
-
-GWT_PLUGIN_DEPS = GWT_COMMON_DEPS + [
+GWT_PLUGIN_DEPS = [
   '//gerrit-plugin-gwtui:gwtui-api-lib',
   '//lib/gwt:user',
 ]