Dissolve gerrit-elasticsearch top-level directory

Change-Id: Iede5fe438d0166b3c1c805be15f83f6099ca31f1

gerrit-elasticsearch/BUILD

@@ -1,70 +0,0 @@
-java_library(
-    name = "elasticsearch",
-    srcs = glob(["src/main/java/**/*.java"]),
-    visibility = ["//visibility:public"],
-    deps = [
-        "//gerrit-server:server",
-        "//java/com/google/gerrit/extensions:api",
-        "//java/com/google/gerrit/index",
-        "//java/com/google/gerrit/index:query_exception",
-        "//java/com/google/gerrit/lifecycle",
-        "//java/com/google/gerrit/reviewdb:server",
-        "//lib:gson",
-        "//lib:guava",
-        "//lib:gwtorm",
-        "//lib:protobuf",
-        "//lib/commons:codec",
-        "//lib/commons:lang",
-        "//lib/elasticsearch",
-        "//lib/elasticsearch:jest",
-        "//lib/elasticsearch:jest-common",
-        "//lib/elasticsearch:joda-time",
-        "//lib/guice",
-        "//lib/guice:guice-assistedinject",
-        "//lib/jgit/org.eclipse.jgit:jgit",
-        "//lib/log:api",
-        "//lib/lucene:lucene-analyzers-common",
-        "//lib/lucene:lucene-core",
-    ],
-)
-
-load("//tools/bzl:junit.bzl", "junit_tests")
-
-java_library(
-    name = "elasticsearch_test_utils",
-    testonly = 1,
-    srcs = glob(["src/test/java/**/ElasticTestUtils.java"]),
-    deps = [
-        ":elasticsearch",
-        "//gerrit-server:server",
-        "//java/com/google/gerrit/extensions:api",
-        "//java/com/google/gerrit/index",
-        "//java/com/google/gerrit/reviewdb:server",
-        "//lib:gson",
-        "//lib:guava",
-        "//lib:junit",
-        "//lib:truth",
-        "//lib/elasticsearch",
-        "//lib/jgit/org.eclipse.jgit:jgit",
-        "//lib/jgit/org.eclipse.jgit.junit:junit",
-    ],
-)
-
-junit_tests(
-    name = "elasticsearch_tests",
-    size = "large",
-    srcs = glob(["src/test/java/**/*Test.java"]),
-    tags = [
-        "elastic",
-    ],
-    deps = [
-        ":elasticsearch",
-        ":elasticsearch_test_utils",
-        "//gerrit-server:query_tests_code",
-        "//gerrit-server:server",
-        "//gerrit-server:testutil",
-        "//lib/guice",
-        "//lib/jgit/org.eclipse.jgit:jgit",
-        "//lib/jgit/org.eclipse.jgit.junit:junit",
-    ],
-)

gerrit-pgm/BUILD

@@ -52,9 +52,9 @@ java_library(
     deps = DEPS + [
         ":init-api",
         ":util",
+        "//java/com/google/gerrit/elasticsearch",
         "//java/com/google/gerrit/index",
         "//java/com/google/gerrit/lucene",
-        "//gerrit-elasticsearch:elasticsearch",
         "//gerrit-launcher:launcher",  # We want this dep to be provided_deps
         "//lib:args4j",
         "//lib:derby",
@@ -116,9 +116,9 @@ REST_PGM_DEPS = [
     ":init",
     ":init-api",
     ":util",
+    "//java/com/google/gerrit/elasticsearch",
     "//java/com/google/gerrit/gpg",
     "//java/com/google/gerrit/server/cache/h2",
-    "//gerrit-elasticsearch:elasticsearch",
     "//java/com/google/gerrit/index",
     "//java/com/google/gerrit/lucene",
     "//gerrit-oauth:oauth",

gerrit-war/BUILD

@@ -5,7 +5,6 @@ java_library(
     srcs = glob(["src/main/java/**/*.java"]),
     visibility = ["//visibility:public"],
     deps = [
-        "//gerrit-elasticsearch:elasticsearch",
         "//gerrit-httpd:httpd",
         "//gerrit-oauth:oauth",
         "//gerrit-openid:openid",
@@ -17,6 +16,7 @@ java_library(
         "//gerrit-server:receive",
         "//gerrit-server:server",
         "//gerrit-sshd:sshd",
+        "//java/com/google/gerrit/elasticsearch",
         "//java/com/google/gerrit/extensions:api",
         "//java/com/google/gerrit/gpg",
         "//java/com/google/gerrit/lifecycle",

java/com/google/gerrit/elasticsearch/BUILD

@@ -0,0 +1,29 @@
+java_library(
+    name = "elasticsearch",
+    srcs = glob(["**/*.java"]),
+    visibility = ["//visibility:public"],
+    deps = [
+        "//gerrit-server:server",
+        "//java/com/google/gerrit/extensions:api",
+        "//java/com/google/gerrit/index",
+        "//java/com/google/gerrit/index:query_exception",
+        "//java/com/google/gerrit/lifecycle",
+        "//java/com/google/gerrit/reviewdb:server",
+        "//lib:gson",
+        "//lib:guava",
+        "//lib:gwtorm",
+        "//lib:protobuf",
+        "//lib/commons:codec",
+        "//lib/commons:lang",
+        "//lib/elasticsearch",
+        "//lib/elasticsearch:jest",
+        "//lib/elasticsearch:jest-common",
+        "//lib/elasticsearch:joda-time",
+        "//lib/guice",
+        "//lib/guice:guice-assistedinject",
+        "//lib/jgit/org.eclipse.jgit:jgit",
+        "//lib/log:api",
+        "//lib/lucene:lucene-analyzers-common",
+        "//lib/lucene:lucene-core",
+    ],
+)

javatests/com/google/gerrit/elasticsearch/BUILD

@@ -0,0 +1,40 @@
+load("//tools/bzl:junit.bzl", "junit_tests")
+
+java_library(
+    name = "elasticsearch_test_utils",
+    testonly = 1,
+    srcs = ["ElasticTestUtils.java"],
+    deps = [
+        "//gerrit-server:server",
+        "//java/com/google/gerrit/elasticsearch",
+        "//java/com/google/gerrit/extensions:api",
+        "//java/com/google/gerrit/index",
+        "//java/com/google/gerrit/reviewdb:server",
+        "//lib:gson",
+        "//lib:guava",
+        "//lib:junit",
+        "//lib:truth",
+        "//lib/elasticsearch",
+        "//lib/jgit/org.eclipse.jgit:jgit",
+        "//lib/jgit/org.eclipse.jgit.junit:junit",
+    ],
+)
+
+junit_tests(
+    name = "elasticsearch_tests",
+    size = "large",
+    srcs = glob(["**/*Test.java"]),
+    tags = [
+        "elastic",
+    ],
+    deps = [
+        ":elasticsearch_test_utils",
+        "//gerrit-server:query_tests_code",
+        "//gerrit-server:server",
+        "//gerrit-server:testutil",
+        "//java/com/google/gerrit/elasticsearch",
+        "//lib/guice",
+        "//lib/jgit/org.eclipse.jgit:jgit",
+        "//lib/jgit/org.eclipse.jgit.junit:junit",
+    ],
+)