Dissolve gerrit-lucene top-level directory

Change-Id: I30df0e9479f809f5f4db3ca2cdfda365d3c63c84

gerrit-acceptance-framework/BUILD

@@ -13,10 +13,10 @@ PROVIDED = [
     "//java/com/google/gerrit/common:server",
     "//java/com/google/gerrit/extensions:api",
     "//java/com/google/gerrit/index",
+    "//java/com/google/gerrit/lucene",
     "//java/com/google/gerrit/metrics",
     "//java/com/google/gerrit/reviewdb:server",
     "//gerrit-httpd:httpd",
-    "//gerrit-lucene:lucene",
     "//gerrit-pgm:init",
     "//gerrit-server:receive",
     "//gerrit-server:server",

gerrit-acceptance-tests/BUILD

@@ -10,7 +10,6 @@ java_library(
         "//gerrit-acceptance-framework:lib",
         "//gerrit-httpd:httpd",
         "//gerrit-launcher:launcher",
-        "//gerrit-lucene:lucene",
         "//gerrit-pgm:init",
         "//gerrit-pgm:pgm",
         "//gerrit-pgm:util",
@@ -24,6 +23,7 @@ java_library(
         "//java/com/google/gerrit/extensions/common/testing:common-test-util",
         "//java/com/google/gerrit/extensions/restapi/testing:restapi-test-util",
         "//java/com/google/gerrit/gpg/testing:gpg-test-util",
+        "//java/com/google/gerrit/lucene",
         "//java/com/google/gerrit/metrics",
         "//java/com/google/gerrit/reviewdb:server",
         "//lib:args4j",

gerrit-pgm/BUILD

@@ -53,9 +53,9 @@ java_library(
         ":init-api",
         ":util",
         "//java/com/google/gerrit/index",
+        "//java/com/google/gerrit/lucene",
         "//gerrit-elasticsearch:elasticsearch",
         "//gerrit-launcher:launcher",  # We want this dep to be provided_deps
-        "//gerrit-lucene:lucene",
         "//lib:args4j",
         "//lib:derby",
         "//lib:gwtjsonrpc",
@@ -120,7 +120,7 @@ REST_PGM_DEPS = [
     "//java/com/google/gerrit/server/cache/h2",
     "//gerrit-elasticsearch:elasticsearch",
     "//java/com/google/gerrit/index",
-    "//gerrit-lucene:lucene",
+    "//java/com/google/gerrit/lucene",
     "//gerrit-oauth:oauth",
     "//gerrit-openid:openid",
     "//lib:args4j",

gerrit-server/BUILD

@@ -148,7 +148,7 @@ TESTUTIL_DEPS = [
     "//java/com/google/gerrit/reviewdb:server",
     "//java/com/google/gerrit/server/cache/h2",
     "//java/com/google/gerrit/index",
-    "//gerrit-lucene:lucene",
+    "//java/com/google/gerrit/lucene",
     "//lib:gwtorm",
     "//lib:h2",
     "//lib:truth",

gerrit-sshd/BUILD

@@ -7,13 +7,13 @@ java_library(
     srcs = SRCS,
     visibility = ["//visibility:public"],
     deps = [
-        "//gerrit-lucene:lucene",
         "//gerrit-server:receive",
         "//gerrit-server:server",
         "//java/com/google/gerrit/common:annotations",
         "//java/com/google/gerrit/common:server",
         "//java/com/google/gerrit/extensions:api",
         "//java/com/google/gerrit/lifecycle",
+        "//java/com/google/gerrit/lucene",
         "//java/com/google/gerrit/metrics",
         "//java/com/google/gerrit/reviewdb:server",
         "//java/com/google/gerrit/server/cache/h2",

gerrit-war/BUILD

@@ -7,7 +7,6 @@ java_library(
     deps = [
         "//gerrit-elasticsearch:elasticsearch",
         "//gerrit-httpd:httpd",
-        "//gerrit-lucene:lucene",
         "//gerrit-oauth:oauth",
         "//gerrit-openid:openid",
         "//gerrit-pgm:http",
@@ -21,6 +20,7 @@ java_library(
         "//java/com/google/gerrit/extensions:api",
         "//java/com/google/gerrit/gpg",
         "//java/com/google/gerrit/lifecycle",
+        "//java/com/google/gerrit/lucene",
         "//java/com/google/gerrit/metrics/dropwizard",
         "//java/com/google/gerrit/reviewdb:server",
         "//java/com/google/gerrit/server/cache/h2",

java/com/google/gerrit/lucene/BUILD

@@ -1,6 +1,4 @@
-QUERY_BUILDER = [
+QUERY_BUILDER = ["QueryBuilder.java"]
-    "src/main/java/com/google/gerrit/lucene/QueryBuilder.java",
-]
 
 java_library(
     name = "query_builder",
@@ -20,7 +18,7 @@ java_library(
 java_library(
     name = "lucene",
     srcs = glob(
-        ["src/main/java/**/*.java"],
+        ["**/*.java"],
         exclude = QUERY_BUILDER,
     ),
     visibility = ["//visibility:public"],

javatests/com/google/gerrit/gpg/BUILD

@@ -5,7 +5,6 @@ junit_tests(
     srcs = glob(["**/*.java"]),
     visibility = ["//visibility:public"],
     deps = [
-        "//gerrit-lucene:lucene",
         "//gerrit-server:server",
         "//gerrit-server:testutil",
         "//java/com/google/gerrit/common:server",
@@ -13,6 +12,7 @@ junit_tests(
         "//java/com/google/gerrit/gpg",
         "//java/com/google/gerrit/gpg/testing:gpg-test-util",
         "//java/com/google/gerrit/lifecycle",
+        "//java/com/google/gerrit/lucene",
         "//java/com/google/gerrit/reviewdb:server",
         "//java/com/google/gerrit/server/cache/h2",
         "//lib:guava",