Dissolve gerrit-index top-level directory
Change-Id: Id480f7a9408389ef0af05cce567148799f66fc19
This commit is contained in:
parent
0c36f1f74a
commit
cefa09d0d9
@ -12,8 +12,8 @@ PROVIDED = [
|
|||||||
"//java/com/google/gerrit/common:annotations",
|
"//java/com/google/gerrit/common:annotations",
|
||||||
"//java/com/google/gerrit/common:server",
|
"//java/com/google/gerrit/common:server",
|
||||||
"//java/com/google/gerrit/extensions:api",
|
"//java/com/google/gerrit/extensions:api",
|
||||||
|
"//java/com/google/gerrit/index",
|
||||||
"//gerrit-httpd:httpd",
|
"//gerrit-httpd:httpd",
|
||||||
"//gerrit-index:index",
|
|
||||||
"//gerrit-lucene:lucene",
|
"//gerrit-lucene:lucene",
|
||||||
"//gerrit-pgm:init",
|
"//gerrit-pgm:init",
|
||||||
"//java/com/google/gerrit/reviewdb:server",
|
"//java/com/google/gerrit/reviewdb:server",
|
||||||
@ -41,13 +41,13 @@ java_library2(
|
|||||||
srcs = SRCS,
|
srcs = SRCS,
|
||||||
exported_deps = [
|
exported_deps = [
|
||||||
"//gerrit-gpg:gpg",
|
"//gerrit-gpg:gpg",
|
||||||
"//gerrit-index:query_exception",
|
|
||||||
"//gerrit-launcher:launcher",
|
"//gerrit-launcher:launcher",
|
||||||
"//gerrit-openid:openid",
|
"//gerrit-openid:openid",
|
||||||
"//gerrit-pgm:daemon",
|
"//gerrit-pgm:daemon",
|
||||||
"//gerrit-pgm:http-jetty",
|
"//gerrit-pgm:http-jetty",
|
||||||
"//gerrit-pgm:util-nodep",
|
"//gerrit-pgm:util-nodep",
|
||||||
"//gerrit-server:testutil",
|
"//gerrit-server:testutil",
|
||||||
|
"//java/com/google/gerrit/index:query_exception",
|
||||||
"//lib:jimfs",
|
"//lib:jimfs",
|
||||||
"//lib:truth",
|
"//lib:truth",
|
||||||
"//lib:truth-java8-extension",
|
"//lib:truth-java8-extension",
|
||||||
|
@ -3,10 +3,10 @@ java_library(
|
|||||||
srcs = glob(["src/main/java/**/*.java"]),
|
srcs = glob(["src/main/java/**/*.java"]),
|
||||||
visibility = ["//visibility:public"],
|
visibility = ["//visibility:public"],
|
||||||
deps = [
|
deps = [
|
||||||
"//gerrit-index:index",
|
|
||||||
"//gerrit-index:query_exception",
|
|
||||||
"//gerrit-server:server",
|
"//gerrit-server:server",
|
||||||
"//java/com/google/gerrit/extensions:api",
|
"//java/com/google/gerrit/extensions:api",
|
||||||
|
"//java/com/google/gerrit/index",
|
||||||
|
"//java/com/google/gerrit/index:query_exception",
|
||||||
"//java/com/google/gerrit/reviewdb:server",
|
"//java/com/google/gerrit/reviewdb:server",
|
||||||
"//lib:gson",
|
"//lib:gson",
|
||||||
"//lib:guava",
|
"//lib:guava",
|
||||||
@ -35,9 +35,9 @@ java_library(
|
|||||||
srcs = glob(["src/test/java/**/ElasticTestUtils.java"]),
|
srcs = glob(["src/test/java/**/ElasticTestUtils.java"]),
|
||||||
deps = [
|
deps = [
|
||||||
":elasticsearch",
|
":elasticsearch",
|
||||||
"//gerrit-index:index",
|
|
||||||
"//gerrit-server:server",
|
"//gerrit-server:server",
|
||||||
"//java/com/google/gerrit/extensions:api",
|
"//java/com/google/gerrit/extensions:api",
|
||||||
|
"//java/com/google/gerrit/index",
|
||||||
"//java/com/google/gerrit/reviewdb:server",
|
"//java/com/google/gerrit/reviewdb:server",
|
||||||
"//lib:gson",
|
"//lib:gson",
|
||||||
"//lib:guava",
|
"//lib:guava",
|
||||||
|
@ -16,7 +16,6 @@ java_library(
|
|||||||
resources = RESOURCES,
|
resources = RESOURCES,
|
||||||
visibility = ["//visibility:public"],
|
visibility = ["//visibility:public"],
|
||||||
deps = [
|
deps = [
|
||||||
"//gerrit-index:query_exception",
|
|
||||||
"//gerrit-launcher:launcher",
|
"//gerrit-launcher:launcher",
|
||||||
"//gerrit-server:metrics",
|
"//gerrit-server:metrics",
|
||||||
"//gerrit-server:receive",
|
"//gerrit-server:receive",
|
||||||
@ -25,6 +24,7 @@ java_library(
|
|||||||
"//java/com/google/gerrit/common:annotations",
|
"//java/com/google/gerrit/common:annotations",
|
||||||
"//java/com/google/gerrit/common:server",
|
"//java/com/google/gerrit/common:server",
|
||||||
"//java/com/google/gerrit/extensions:api",
|
"//java/com/google/gerrit/extensions:api",
|
||||||
|
"//java/com/google/gerrit/index:query_exception",
|
||||||
"//java/com/google/gerrit/prettify:server",
|
"//java/com/google/gerrit/prettify:server",
|
||||||
"//java/com/google/gerrit/reviewdb:server",
|
"//java/com/google/gerrit/reviewdb:server",
|
||||||
"//java/com/google/gerrit/util/cli",
|
"//java/com/google/gerrit/util/cli",
|
||||||
|
@ -7,9 +7,9 @@ java_library(
|
|||||||
srcs = QUERY_BUILDER,
|
srcs = QUERY_BUILDER,
|
||||||
visibility = ["//visibility:public"],
|
visibility = ["//visibility:public"],
|
||||||
deps = [
|
deps = [
|
||||||
"//gerrit-index:index",
|
|
||||||
"//gerrit-index:query_exception",
|
|
||||||
"//gerrit-server:server",
|
"//gerrit-server:server",
|
||||||
|
"//java/com/google/gerrit/index",
|
||||||
|
"//java/com/google/gerrit/index:query_exception",
|
||||||
"//java/com/google/gerrit/reviewdb:server",
|
"//java/com/google/gerrit/reviewdb:server",
|
||||||
"//lib:guava",
|
"//lib:guava",
|
||||||
"//lib:gwtorm",
|
"//lib:gwtorm",
|
||||||
@ -26,12 +26,12 @@ java_library(
|
|||||||
visibility = ["//visibility:public"],
|
visibility = ["//visibility:public"],
|
||||||
deps = [
|
deps = [
|
||||||
":query_builder",
|
":query_builder",
|
||||||
"//gerrit-index:index",
|
|
||||||
"//gerrit-index:query_exception",
|
|
||||||
"//gerrit-server:server",
|
"//gerrit-server:server",
|
||||||
"//java/com/google/gerrit/common:annotations",
|
"//java/com/google/gerrit/common:annotations",
|
||||||
"//java/com/google/gerrit/common:server",
|
"//java/com/google/gerrit/common:server",
|
||||||
"//java/com/google/gerrit/extensions:api",
|
"//java/com/google/gerrit/extensions:api",
|
||||||
|
"//java/com/google/gerrit/index",
|
||||||
|
"//java/com/google/gerrit/index:query_exception",
|
||||||
"//java/com/google/gerrit/reviewdb:server",
|
"//java/com/google/gerrit/reviewdb:server",
|
||||||
"//lib:guava",
|
"//lib:guava",
|
||||||
"//lib:gwtorm",
|
"//lib:gwtorm",
|
||||||
|
@ -50,7 +50,7 @@ java_library(
|
|||||||
deps = DEPS + [
|
deps = DEPS + [
|
||||||
":init-api",
|
":init-api",
|
||||||
":util",
|
":util",
|
||||||
"//gerrit-index:index",
|
"//java/com/google/gerrit/index",
|
||||||
"//gerrit-elasticsearch:elasticsearch",
|
"//gerrit-elasticsearch:elasticsearch",
|
||||||
"//gerrit-launcher:launcher", # We want this dep to be provided_deps
|
"//gerrit-launcher:launcher", # We want this dep to be provided_deps
|
||||||
"//gerrit-lucene:lucene",
|
"//gerrit-lucene:lucene",
|
||||||
@ -117,7 +117,7 @@ REST_PGM_DEPS = [
|
|||||||
"//gerrit-cache-h2:cache-h2",
|
"//gerrit-cache-h2:cache-h2",
|
||||||
"//gerrit-elasticsearch:elasticsearch",
|
"//gerrit-elasticsearch:elasticsearch",
|
||||||
"//gerrit-gpg:gpg",
|
"//gerrit-gpg:gpg",
|
||||||
"//gerrit-index:index",
|
"//java/com/google/gerrit/index",
|
||||||
"//gerrit-lucene:lucene",
|
"//gerrit-lucene:lucene",
|
||||||
"//gerrit-oauth:oauth",
|
"//gerrit-oauth:oauth",
|
||||||
"//gerrit-openid:openid",
|
"//gerrit-openid:openid",
|
||||||
|
@ -6,12 +6,12 @@ PLUGIN_API = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
EXPORTS = [
|
EXPORTS = [
|
||||||
"//gerrit-index:index",
|
|
||||||
"//gerrit-index:query_exception",
|
|
||||||
"//gerrit-index:query_parser",
|
|
||||||
"//java/com/google/gerrit/common:annotations",
|
"//java/com/google/gerrit/common:annotations",
|
||||||
"//java/com/google/gerrit/common:server",
|
"//java/com/google/gerrit/common:server",
|
||||||
"//java/com/google/gerrit/extensions:api",
|
"//java/com/google/gerrit/extensions:api",
|
||||||
|
"//java/com/google/gerrit/index",
|
||||||
|
"//java/com/google/gerrit/index:query_exception",
|
||||||
|
"//java/com/google/gerrit/index:query_parser",
|
||||||
"//java/com/google/gwtexpui/server",
|
"//java/com/google/gwtexpui/server",
|
||||||
"//gerrit-server:metrics",
|
"//gerrit-server:metrics",
|
||||||
"//java/com/google/gerrit/reviewdb:server",
|
"//java/com/google/gerrit/reviewdb:server",
|
||||||
@ -76,14 +76,15 @@ java_binary(
|
|||||||
visibility = ["//visibility:public"],
|
visibility = ["//visibility:public"],
|
||||||
runtime_deps = [
|
runtime_deps = [
|
||||||
"//gerrit-httpd:libhttpd-src.jar",
|
"//gerrit-httpd:libhttpd-src.jar",
|
||||||
"//gerrit-index:libquery_exception-src.jar",
|
|
||||||
"//gerrit-index:libquery_parser-src.jar",
|
|
||||||
"//gerrit-pgm:libinit-api-src.jar",
|
"//gerrit-pgm:libinit-api-src.jar",
|
||||||
"//gerrit-server:libserver-src.jar",
|
"//gerrit-server:libserver-src.jar",
|
||||||
"//gerrit-sshd:libsshd-src.jar",
|
"//gerrit-sshd:libsshd-src.jar",
|
||||||
"//java/com/google/gerrit/common:libannotations-src.jar",
|
"//java/com/google/gerrit/common:libannotations-src.jar",
|
||||||
"//java/com/google/gerrit/common:libserver-src.jar",
|
"//java/com/google/gerrit/common:libserver-src.jar",
|
||||||
"//java/com/google/gerrit/extensions:libapi-src.jar",
|
"//java/com/google/gerrit/extensions:libapi-src.jar",
|
||||||
|
"//java/com/google/gerrit/index:libindex-src.jar",
|
||||||
|
"//java/com/google/gerrit/index:libquery_exception-src.jar",
|
||||||
|
"//java/com/google/gerrit/index:libquery_parser-src.jar",
|
||||||
"//java/com/google/gerrit/reviewdb:libserver-src.jar",
|
"//java/com/google/gerrit/reviewdb:libserver-src.jar",
|
||||||
"//java/com/google/gwtexpui/server:libserver-src.jar",
|
"//java/com/google/gwtexpui/server:libserver-src.jar",
|
||||||
],
|
],
|
||||||
@ -94,8 +95,9 @@ load("//tools/bzl:javadoc.bzl", "java_doc")
|
|||||||
java_doc(
|
java_doc(
|
||||||
name = "plugin-api-javadoc",
|
name = "plugin-api-javadoc",
|
||||||
libs = PLUGIN_API + [
|
libs = PLUGIN_API + [
|
||||||
"//gerrit-index:query_exception",
|
"//java/com/google/gerrit/index",
|
||||||
"//gerrit-index:query_parser",
|
"//java/com/google/gerrit/index:query_exception",
|
||||||
|
"//java/com/google/gerrit/index:query_parser",
|
||||||
"//java/com/google/gerrit/common:annotations",
|
"//java/com/google/gerrit/common:annotations",
|
||||||
"//java/com/google/gerrit/common:server",
|
"//java/com/google/gerrit/common:server",
|
||||||
"//java/com/google/gerrit/extensions:api",
|
"//java/com/google/gerrit/extensions:api",
|
||||||
|
@ -40,11 +40,11 @@ java_library(
|
|||||||
deps = [
|
deps = [
|
||||||
":constants",
|
":constants",
|
||||||
":metrics",
|
":metrics",
|
||||||
"//gerrit-index:index",
|
|
||||||
"//gerrit-index:query_exception",
|
|
||||||
"//java/com/google/gerrit/common:annotations",
|
"//java/com/google/gerrit/common:annotations",
|
||||||
"//java/com/google/gerrit/common:server",
|
"//java/com/google/gerrit/common:server",
|
||||||
"//java/com/google/gerrit/extensions:api",
|
"//java/com/google/gerrit/extensions:api",
|
||||||
|
"//java/com/google/gerrit/index",
|
||||||
|
"//java/com/google/gerrit/index:query_exception",
|
||||||
"//java/com/google/gerrit/prettify:server",
|
"//java/com/google/gerrit/prettify:server",
|
||||||
"//java/com/google/gerrit/reviewdb:server",
|
"//java/com/google/gerrit/reviewdb:server",
|
||||||
"//java/com/google/gerrit/util/cli",
|
"//java/com/google/gerrit/util/cli",
|
||||||
@ -160,7 +160,7 @@ TESTUTIL_DEPS = [
|
|||||||
"//gerrit-cache-h2:cache-h2",
|
"//gerrit-cache-h2:cache-h2",
|
||||||
"//java/com/google/gerrit/extensions:api",
|
"//java/com/google/gerrit/extensions:api",
|
||||||
"//gerrit-gpg:gpg",
|
"//gerrit-gpg:gpg",
|
||||||
"//gerrit-index:index",
|
"//java/com/google/gerrit/index",
|
||||||
"//gerrit-lucene:lucene",
|
"//gerrit-lucene:lucene",
|
||||||
"//java/com/google/gerrit/reviewdb:server",
|
"//java/com/google/gerrit/reviewdb:server",
|
||||||
"//lib:gwtorm",
|
"//lib:gwtorm",
|
||||||
@ -297,7 +297,7 @@ junit_tests(
|
|||||||
deps = TESTUTIL_DEPS + [
|
deps = TESTUTIL_DEPS + [
|
||||||
":custom-truth-subjects",
|
":custom-truth-subjects",
|
||||||
":testutil",
|
":testutil",
|
||||||
"//gerrit-index:query_exception",
|
"//java/com/google/gerrit/index:query_exception",
|
||||||
"//java/org/eclipse/jgit:server",
|
"//java/org/eclipse/jgit:server",
|
||||||
"//java/com/google/gerrit/extensions/common/testing:common-test-util",
|
"//java/com/google/gerrit/extensions/common/testing:common-test-util",
|
||||||
"//lib:args4j",
|
"//lib:args4j",
|
||||||
|
@ -1,9 +1,8 @@
|
|||||||
load("//tools/bzl:genrule2.bzl", "genrule2")
|
load("//tools/bzl:genrule2.bzl", "genrule2")
|
||||||
load("//tools/bzl:junit.bzl", "junit_tests")
|
|
||||||
|
|
||||||
QUERY_PARSE_EXCEPTION_SRCS = [
|
QUERY_PARSE_EXCEPTION_SRCS = [
|
||||||
"src/main/java/com/google/gerrit/index/query/QueryParseException.java",
|
"query/QueryParseException.java",
|
||||||
"src/main/java/com/google/gerrit/index/query/QueryRequiresAuthException.java",
|
"query/QueryRequiresAuthException.java",
|
||||||
]
|
]
|
||||||
|
|
||||||
java_library(
|
java_library(
|
||||||
@ -15,7 +14,10 @@ java_library(
|
|||||||
java_library(
|
java_library(
|
||||||
name = "query_parser",
|
name = "query_parser",
|
||||||
srcs = ["//antlr3:query"],
|
srcs = ["//antlr3:query"],
|
||||||
visibility = ["//gerrit-plugin-api:__pkg__"],
|
visibility = [
|
||||||
|
"//gerrit-plugin-api:__pkg__",
|
||||||
|
"//javatests/com/google/gerrit/index:__pkg__",
|
||||||
|
],
|
||||||
deps = [
|
deps = [
|
||||||
":query_exception",
|
":query_exception",
|
||||||
"//lib/antlr:java_runtime",
|
"//lib/antlr:java_runtime",
|
||||||
@ -25,7 +27,7 @@ java_library(
|
|||||||
java_library(
|
java_library(
|
||||||
name = "index",
|
name = "index",
|
||||||
srcs = glob(
|
srcs = glob(
|
||||||
["src/main/java/**/*.java"],
|
["**/*.java"],
|
||||||
exclude = QUERY_PARSE_EXCEPTION_SRCS,
|
exclude = QUERY_PARSE_EXCEPTION_SRCS,
|
||||||
),
|
),
|
||||||
visibility = ["//visibility:public"],
|
visibility = ["//visibility:public"],
|
||||||
@ -44,19 +46,3 @@ java_library(
|
|||||||
"//lib/log:api",
|
"//lib/log:api",
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
junit_tests(
|
|
||||||
name = "index_tests",
|
|
||||||
size = "small",
|
|
||||||
srcs = glob(["src/test/java/**/*.java"]),
|
|
||||||
visibility = ["//visibility:public"],
|
|
||||||
deps = [
|
|
||||||
":index",
|
|
||||||
":query_exception",
|
|
||||||
":query_parser",
|
|
||||||
"//lib:junit",
|
|
||||||
"//lib:truth",
|
|
||||||
"//lib/antlr:java_runtime",
|
|
||||||
"//lib/jgit/org.eclipse.jgit:jgit",
|
|
||||||
],
|
|
||||||
)
|
|
17
javatests/com/google/gerrit/index/BUILD
Normal file
17
javatests/com/google/gerrit/index/BUILD
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
load("//tools/bzl:junit.bzl", "junit_tests")
|
||||||
|
|
||||||
|
junit_tests(
|
||||||
|
name = "tests",
|
||||||
|
size = "small",
|
||||||
|
srcs = glob(["**/*.java"]),
|
||||||
|
visibility = ["//visibility:public"],
|
||||||
|
deps = [
|
||||||
|
"//java/com/google/gerrit/index",
|
||||||
|
"//java/com/google/gerrit/index:query_exception",
|
||||||
|
"//java/com/google/gerrit/index:query_parser",
|
||||||
|
"//lib:junit",
|
||||||
|
"//lib:truth",
|
||||||
|
"//lib/antlr:java_runtime",
|
||||||
|
"//lib/jgit/org.eclipse.jgit:jgit",
|
||||||
|
],
|
||||||
|
)
|
@ -1,4 +1,4 @@
|
|||||||
package(default_visibility = ["//gerrit-index:__pkg__"])
|
package(default_visibility = ["//java/com/google/gerrit/index:__pkg__"])
|
||||||
|
|
||||||
[java_library(
|
[java_library(
|
||||||
name = n,
|
name = n,
|
||||||
|
@ -11,7 +11,6 @@ TEST_DEPS = [
|
|||||||
"//gerrit-gpg:gpg_tests",
|
"//gerrit-gpg:gpg_tests",
|
||||||
"//gerrit-gwtui:ui_tests",
|
"//gerrit-gwtui:ui_tests",
|
||||||
"//gerrit-httpd:httpd_tests",
|
"//gerrit-httpd:httpd_tests",
|
||||||
"//gerrit-index:index_tests",
|
|
||||||
"//gerrit-server:server_tests",
|
"//gerrit-server:server_tests",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user