Dissolve gerrit-util-cli top-level directory

Change-Id: I5a3e7fcc1bc8ee5248376113f08f8dde74c3b607

gerrit-gwtdebug/BUILD

@@ -6,7 +6,7 @@ java_library(
         "//gerrit-pgm:daemon",
         "//gerrit-pgm:pgm",
         "//gerrit-pgm:util",
-        "//gerrit-util-cli:cli",
+        "//java/com/google/gerrit/util/cli",
         "//lib/gwt:dev",
         "//lib/jetty:server",
         "//lib/jetty:servlet",

gerrit-httpd/BUILD

@@ -21,13 +21,13 @@ java_library(
         "//gerrit-server:metrics",
         "//gerrit-server:receive",
         "//gerrit-server:server",
-        "//gerrit-util-cli:cli",
         "//gerrit-util-http:http",
         "//java/com/google/gerrit/common:annotations",
         "//java/com/google/gerrit/common:server",
         "//java/com/google/gerrit/extensions:api",
         "//java/com/google/gerrit/prettify:server",
         "//java/com/google/gerrit/reviewdb:server",
+        "//java/com/google/gerrit/util/cli",
         "//java/com/google/gwtexpui/linker:server",
         "//java/com/google/gwtexpui/server",
         "//java/org/eclipse/jgit:server",

gerrit-pgm/BUILD

@@ -65,7 +65,7 @@ java_library(
 
 REST_UTIL_DEPS = [
     "//gerrit-cache-h2:cache-h2",
-    "//gerrit-util-cli:cli",
+    "//java/com/google/gerrit/util/cli",
     "//lib:args4j",
     "//lib/commons:dbcp",
 ]

gerrit-server/BUILD

@@ -43,13 +43,13 @@ java_library(
         "//gerrit-index:index",
         "//gerrit-index:query_exception",
         "//gerrit-patch-commonsnet:commons-net",
-        "//gerrit-util-cli:cli",
         "//gerrit-util-ssl:ssl",
         "//java/com/google/gerrit/common:annotations",
         "//java/com/google/gerrit/common:server",
         "//java/com/google/gerrit/extensions:api",
         "//java/com/google/gerrit/prettify:server",
         "//java/com/google/gerrit/reviewdb:server",
+        "//java/com/google/gerrit/util/cli",
         "//java/org/eclipse/jgit:server",
         "//lib:args4j",
         "//lib:automaton",
@@ -123,11 +123,11 @@ java_library(
     visibility = ["//visibility:public"],
     deps = [
         ":server",
-        "//gerrit-util-cli:cli",
         "//java/com/google/gerrit/common:annotations",
         "//java/com/google/gerrit/common:server",
         "//java/com/google/gerrit/extensions:api",
         "//java/com/google/gerrit/reviewdb:server",
+        "//java/com/google/gerrit/util/cli",
         "//lib:args4j",
         "//lib:guava",
         "//lib:gwtorm",

gerrit-sshd/BUILD

@@ -12,11 +12,11 @@ java_library(
         "//gerrit-server:metrics",
         "//gerrit-server:receive",
         "//gerrit-server:server",
-        "//gerrit-util-cli:cli",
         "//java/com/google/gerrit/common:annotations",
         "//java/com/google/gerrit/common:server",
         "//java/com/google/gerrit/extensions:api",
         "//java/com/google/gerrit/reviewdb:server",
+        "//java/com/google/gerrit/util/cli",
         "//java/org/eclipse/jgit:server",
         "//lib:args4j",
         "//lib:gson",

java/com/google/gerrit/util/cli/BUILD

@@ -1,6 +1,6 @@
 java_library(
     name = "cli",
-    srcs = glob(["src/main/java/**/*.java"]),
+    srcs = glob(["**/*.java"]),
     visibility = ["//visibility:public"],
     deps = [
         "//java/com/google/gerrit/common:annotations",